From: Christopher Faylor <me@cgf.cx>
Date: Sun, 5 Aug 2001 01:38:46 +0000 (+0000)
Subject: * ini.h (_CategoryPackage): Change pkg field to pkgname for consistency.
X-Git-Tag: Z-cygwin_daemon_merge-new_HEAD~8
X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=969a294c70b6d0c81e0b0446f57f756babead887;p=cygwin-apps%2Fsetup.git

* ini.h (_CategoryPackage): Change pkg field to pkgname for consistency.
* choose.cc: Use pkgname field when referencing _CategoryPackage throughout.
(fill_missing_category): Don't add excluded packages.
(default_trust): Ditto.
(_view::insert_pkg): Ditto.
* iniparse.y (register_category): Use consistent variable name.
---

diff --git a/ChangeLog b/ChangeLog
index 8663f91b..e64e7897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Aug  4 21:35:53 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* ini.h (_CategoryPackage): Change pkg field to pkgname for
+	consistency.
+	* choose.cc: Use pkgname field when referencing _CategoryPackage
+	throughout.
+	(fill_missing_category): Don't add excluded packages.
+	(default_trust): Ditto.
+	(_view::insert_pkg): Ditto.
+	* iniparse.y (register_category): Use consistent variable name.
+
 2001-07-09  Egor Duda <deo@logos-m.ru>
 
 	* choose.cc: Use system foreground color for text output.
diff --git a/choose.cc b/choose.cc
index bc4501d6..e10ec141 100644
--- a/choose.cc
+++ b/choose.cc
@@ -541,7 +541,7 @@ static void
 fill_missing_category ()
 {
   for (Package *pkg = package; pkg->name; pkg++)
-    if (!pkg->category)
+    if (!pkg->exclude && !pkg->category)
       add_category (pkg, register_category ("Misc"));
 }
 
@@ -560,13 +560,14 @@ default_trust (HWND h, trusts trust)
 
   deftrust = trust;
   for (Package *pkg = package; pkg->name; pkg++)
-    {
-      pkg->action = (actions) trust;
-      if (pkg->category && !(getpackagecategorybyname (pkg, "Required") ||
-			     getpackagecategorybyname (pkg, "Misc")))
-	pkg->action = keep_or_skip (pkg);
-      set_action (pkg, 0);
-    }
+    if (!pkg->exclude)
+      {
+	pkg->action = (actions) trust;
+	if (pkg->category && !(getpackagecategorybyname (pkg, "Required") ||
+			       getpackagecategorybyname (pkg, "Misc")))
+	  pkg->action = keep_or_skip (pkg);
+	set_action (pkg, 0);
+      }
   RECT r;
   GetClientRect (h, &r);
   InvalidateRect (h, &r, TRUE);
@@ -774,6 +775,8 @@ void
 _view::insert_pkg (Package *pkg)
 {
   pick_line line;
+  if (pkg->exclude)
+    return;
   line.set_line (pkg);
   if (view_mode != VIEW_CATEGORY)
     {
@@ -826,7 +829,7 @@ _view::insert_category (Category *cat, int collapsed)
       insert_at (0, line);
       if (!collapsed)
 	for (CategoryPackage *catpkg = cat->packages; catpkg; catpkg = catpkg->next)
-	  insert_pkg (getpkgbyname (catpkg->pkg));
+	  insert_pkg (getpkgbyname (catpkg->pkgname));
     }
   else
     {
@@ -840,7 +843,7 @@ _view::insert_category (Category *cat, int collapsed)
 	      insert_at (n, line);
 	      if (!collapsed)
 		for (CategoryPackage *catpkg = cat->packages; catpkg; catpkg = catpkg->next)
-		  insert_pkg (getpkgbyname (catpkg->pkg));
+		  insert_pkg (getpkgbyname (catpkg->pkgname));
 	      n = nlines;
 	    }
 	  else if (lines[n].get_category () == cat)
@@ -854,7 +857,7 @@ _view::insert_category (Category *cat, int collapsed)
 	  insert_at (n, line);
 	  if (!collapsed)
 	    for (CategoryPackage *catpkg = cat->packages; catpkg; catpkg = catpkg->next)
-	      insert_pkg (getpkgbyname (catpkg->pkg));
+	      insert_pkg (getpkgbyname (catpkg->pkgname));
 	}
     }
 }
@@ -949,7 +952,7 @@ _view::click (int row, int x)
 	  int count = nlines;
 	  for (CategoryPackage *catpkg = lines[row].get_category ()->packages; catpkg; catpkg = catpkg->next)
 	    {
-	      Package * pkg = getpkgbyname (catpkg->pkg);
+	      Package * pkg = getpkgbyname (catpkg->pkgname);
 	      int n = row + 1;
 	      pick_line line;
 	      line.set_line (pkg);
diff --git a/ini.h b/ini.h
index f398ff1e..9b6a97f0 100644
--- a/ini.h
+++ b/ini.h
@@ -118,7 +118,7 @@ typedef struct _Info
 typedef struct _CategoryPackage
 {
   struct _CategoryPackage *next;  /* The next package pointer in the list */
-  char *pkg;			  /* This should be Package *, but the packages can move*/
+  char *pkgname;		  /* This should be Package *, but the packages can move*/
 } CategoryPackage;
 
 typedef struct _Category
diff --git a/iniparse.y b/iniparse.y
index eed6ed0a..0e742e44 100644
--- a/iniparse.y
+++ b/iniparse.y
@@ -201,7 +201,7 @@ register_category (char *name)
 }
 
 void
-add_category (Package *package, Category *cat)
+add_category (Package *pkg, Category *cat)
 {
   /* add a new record for the package list */
   /* TODO: alpabetical inserts ? */
@@ -209,13 +209,13 @@ add_category (Package *package, Category *cat)
   CategoryPackage *templink;
   tempcat = new (Category);
   memset (tempcat, '\0', sizeof (Category));
-  tempcat->next = package->category;
+  tempcat->next = pkg->category;
   tempcat->name = cat->name;
-  package->category = tempcat;
+  pkg->category = tempcat;
 
   templink = new (CategoryPackage);
   templink->next = cat->packages;
-  templink->pkg = package->name;
+  templink->pkgname = pkg->name;
   cat->packages = templink;
  
   /* hack to ensure we allocate enough space */