Index: winsup/cinstall/choose.cc
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/choose.cc,v
retrieving revision 2.11
diff -u -p -r2.11 choose.cc
--- choose.cc	2000/12/11 00:07:56	2.11
+++ choose.cc	2001/03/06 04:38:44
@@ -30,6 +30,7 @@ static char *cvsid = "\n%%% $Id: choose.
 #include "win32.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <io.h>
 #include <ctype.h>
 
 #include "dialog.h"
@@ -41,7 +42,9 @@ static char *cvsid = "\n%%% $Id: choose.
 #include "log.h"
 #include "find.h"
 
-#define HMARGIN		10
+#include "port.h"
+
+#define HMARGIN	10
 #define ROW_MARGIN	5
 #define ICON_MARGIN	4
 
@@ -54,6 +57,7 @@ static char *cvsid = "\n%%% $Id: choose.
 static int initialized = 0;
 
 static int full_list = 0;
+static int which_trust = TRUST_CURR;
 
 static int scroll_ulc_x, scroll_ulc_y;
 
@@ -180,6 +184,8 @@ paint (HWND hwnd)
   if (nindexes == 0)
     {
       static char *msg = "Nothing to Install/Update";
+      if (source == IDC_SOURCE_DOWNLOAD)
+         msg = "Nothing to Download";
       TextOut (hdc, HMARGIN, header_height, msg, strlen (msg));
     }
   
@@ -280,13 +286,20 @@ list_click (HWND hwnd, BOOL dblclk, int 
   if (x >= headers[NEW_COL].x - HMARGIN/2 && x <= headers[NEW_COL+1].x - HMARGIN/2)
     {
       extra[p].pick ++;
+      while (extra[p].chooser[extra[p].pick].trust < NTRUST && 
+	(package[p].info[extra[p].chooser[extra[p].pick].trust].install_exists
+        ==0 && source == IDC_SOURCE_CWD) && 
+        package[p].info[extra[p].chooser[extra[p].pick].trust].install &&
+        extra[p].chooser[extra[p].pick].caption != 0)
+          extra[p].pick ++;
       if (extra[p].chooser[extra[p].pick].caption == 0)
 	extra[p].pick = 0;
     }
 
   if (x >= headers[SRC_COL].x - HMARGIN/2 && x <= headers[SRC_COL+1].x - HMARGIN/2)
     {
-      if (extra[p].chooser[extra[p].pick].src_avail)
+      if (extra[p].chooser[extra[p].pick].src_avail && 
+          package[p].info[extra[p].chooser[extra[p].pick].trust].source_exists)
 	package[p].srcaction ^= (SRCACTION_NO^SRCACTION_YES);
     }
 
@@ -350,17 +363,77 @@ note_width (HDC dc, char *string, int ad
     headers[column].width = s.cx + addend;
 }
 
+static int 
+check_existence (int p, int trust, int check_src)
+{
+  if (source == IDC_SOURCE_NETINST)
+        return 1;
+  if (source == IDC_SOURCE_DOWNLOAD)
+     {
+     if ( check_src == 0 && _access(package[p].info[trust].install,0) == 0)
+        return 1;
+     else if ( check_src == 1 && _access(package[p].info[trust].source,0) == 0 )
+        return 1;
+     else
+        return 0;
+     }
+  if (source == IDC_SOURCE_CWD)
+     {
+     if ( check_src == 0  && package[p].info[trust].install &&
+           _access(package[p].info[trust].install,0) == 0 )
+         return 1;
+     else if ( check_src == 1 && package[p].info[trust].source && 
+               _access(package[p].info[trust].source,0) == 0 )
+         return 1;
+     }
+  return 0;
+}
+
+static void
+set_existence ()
+{
+  for (int i=0; i<npackages; i++)
+    {
+      for (int t=0; t<NTRUST; t++)
+        {
+          /* 0 = check install file */
+          package[i].info[t].install_exists = check_existence(i,t,0); 
+          /* 1 = check source file */
+          package[i].info[t].source_exists = check_existence(i,t,1); 
+        }
+      for (int t=0; t<NTRUST; t++)
+        {
+          if (package[i].info[t].install && 
+              extra[i].installed_ver != package[i].info[t].version )
+            {
+            if (source == IDC_SOURCE_NETINST )
+               package[i].info[t].partial_list_display=1;
+            else if (source == IDC_SOURCE_DOWNLOAD )
+               package[i].info[t].partial_list_display = 1-package[i].info[t].install_exists;
+            else if (source == IDC_SOURCE_CWD )
+	       if (package[i].info[t].install_exists)
+                  package[i].info[t].partial_list_display = 1;
+               else 
+		  package[i].info[t].partial_list_display = 0;
+            }
+          if (package[i].info[t].partial_list_display )
+            extra[i].in_partial_list = 1;
+	    
+        }
+    }
+}
+
 static int
 best_trust (int p, int trust)
 {
   int t;
-  for (t=trust; t>=0; t--)
-    if (package[p].info[t].install)
+  t=trust; 
+    if (package[p].info[t].install &&
+        ((package[p].info[t].install_exists && source == IDC_SOURCE_CWD) ||
+        (package[p].info[t].install_exists == 0 && 
+        source == IDC_SOURCE_DOWNLOAD) || source == IDC_SOURCE_NETINST))
       return t;
-  for (t=trust+1; t<=NTRUST; t++)
-    if (package[p].info[t].install)
-      return t;
-  if (extra[p].installed_file)
+  if (extra[p].installed_file && extra[p].installed_ver == package[p].info[t].version)
     return TRUST_KEEP;
   return TRUST_NONE;
 }
@@ -370,10 +443,13 @@ default_trust (HWND h, int trust)
 {
   int i, t, c;
 
+  which_trust=trust;
+
   for (i=0; i<npackages; i++)
     {
       t = best_trust (i, trust);
       extra[i].pick = 1;
+      package[i].trust = t;
       for (c=0; c<extra[i].npick; c++)
 	if (t == extra[i].chooser[c].trust)
 	  extra[i].pick = c;
@@ -394,7 +470,13 @@ set_full_list (HWND h, int isfull)
     package_indexes = (int *) malloc (npackages * sizeof (int));
   for (i=j=0; i<npackages; i++)
     {
-      if (isfull || extra[i].in_partial_list)
+      if ((isfull || (extra[i].in_partial_list && 
+         extra[i].chooser[extra[i].pick].trust != TRUST_KEEP &&
+         extra[i].chooser[extra[i].pick].trust != TRUST_NONE)) && 
+         (source == IDC_SOURCE_DOWNLOAD || source == IDC_SOURCE_NETINST || 
+         package[i].info[TRUST_PREV].install_exists || 
+         package[i].info[TRUST_CURR].install_exists || 
+         package[i].info[TRUST_TEST].install_exists) )
 	package_indexes[j++] = i;
     }
   nindexes = j;
@@ -449,13 +531,13 @@ build_labels ()
 	      if (C.caption == 0 || C.caption[0] == 0)
 		C.caption = "0.0";
 	      C.trust = t;
-	      if (package[i].info[t].source)
+	      if (package[i].info[t].source && 
+                  ((package[i].info[t].source_exists && 
+                  source==IDC_SOURCE_CWD) || 
+                  (package[i].info[t].source_exists==0 && 
+                  source==IDC_SOURCE_DOWNLOAD) || source==IDC_SOURCE_NETINST))
 		C.src_avail = 1;
 	      c++;
-	      /* we intentionally skip TRUST_PREV */
-	      if (t != TRUST_PREV || !extra[i].installed_ver)
-		extra[i].in_partial_list = 1;
-
 	    }
 
       if (c == 0)
@@ -530,8 +612,10 @@ create_listview (HWND dlg, RECT *r)
   headers[SRC_COL].x = headers[NEW_COL].x + headers[NEW_COL].width + HMARGIN;
   headers[PACKAGE_COL].x = headers[SRC_COL].x + headers[SRC_COL].width + HMARGIN;
 
-  set_full_list (lv, full_list);
   default_trust (lv, TRUST_CURR);
+  set_full_list (lv, full_list);
+  static int ta[] = { IDC_CHOOSE_CURR, 0 };
+  rbset (dlg, ta, IDC_CHOOSE_CURR);
 
   ReleaseDC (lv, dc);
 }
@@ -544,12 +628,15 @@ dialog_cmd (HWND h, int id, HWND hwndctl
 
     case IDC_CHOOSE_PREV:
       default_trust (lv, TRUST_PREV);
+      set_full_list (lv, full_list);
       break;
     case IDC_CHOOSE_CURR:
       default_trust (lv, TRUST_CURR);
+      set_full_list (lv, full_list);
       break;
     case IDC_CHOOSE_EXP:
       default_trust (lv, TRUST_TEST);
+      set_full_list (lv, full_list);
       break;
     case IDC_CHOOSE_FULLPART:
       set_full_list (lv, !full_list);
@@ -632,24 +719,114 @@ base (char *s)
     }
   return rv;
 }
+	      
+static void
+get_package_version(int p , int trust)
+{
+  char *v, *d;
+  char instpkg[_MAX_PATH];
+  instpkg[0]=0;  /* make sure empty to start with */
+  if (trust==-1)
+    strcpy (instpkg,extra[p].installed_file);
+  else
+    strcpy (instpkg,package[p].info[trust].install);
+  for (v=base (instpkg); *v; v++)
+    if (*v == '-' && isdigit(v[1]))
+    {
+      v++;
+      break;
+    }
+  if (!v)
+    v = instpkg;
+  for (d=v; *d; d++)
+    if (strncmp (d, ".tar", 4) == 0)
+      {
+        *d = 0;
+        break;
+      }
+  if (v[0])
+    {
+    if (trust != -1)
+      package[p].info[trust].version=strdup(v);
+    extra[p].installed_ver = strdup (v);
+    }
+  else
+    {
+    if (trust != -1)
+      package[p].info[trust].version="0";
+    extra[p].installed_ver = "0";
+    }
+}
 
 static void
 scan2 (char *path, unsigned int size)
 {
   int i, t;
-  for (i=0; i<npackages; i++)
-    for (t=0; t<NTRUST; t++)
-      if (package[i].info[t].install
-	  && strcmp (base (package[i].info[t].install), base (path)) == 0
-	  && package[i].info[t].install_size == size)
-	{
-	  extra[i].installed_file = package[i].info[t].install;
-	  extra[i].installed_size = size;
-	  extra[i].which_is_installed = t;
-	  extra[i].installed_ver = package[i].info[t].version;
-	  if (!extra[i].installed_ver)
-	    extra[i].installed_ver = "0";
+  if (strcmp(path+strlen(path)-7,".tar.gz") == 0)
+    {
+    char mainpkg[_MAX_PATH],pkginfo[_MAX_PATH], *ver, *verinfo;
+    strcpy (mainpkg,path);
+    mainpkg[strlen(mainpkg)-7] = 0; /* strip off the tar.gz */
+    for (ver=mainpkg; *ver; ver++)
+      if ((*ver == '-' || *ver == '_') && isdigit(ver[1]))
+        {
+          *ver++ = 0;
+          break;
 	}
+    for (i=0; i<npackages; i++)
+      {
+        pkginfo[0] = 0;
+        for (t=0; t<NTRUST; t++)
+          {
+          if (package[i].info[t].install)
+            {
+              strcpy (pkginfo,package[i].info[t].install);
+              pkginfo[strlen(pkginfo)-7] = 0; /* strip off the tar.gz */
+              for (verinfo=pkginfo; *verinfo; verinfo++)
+                { 
+                  if ((*verinfo == '-' || *verinfo == '_') && isdigit(verinfo[1]))
+                    {
+                      *verinfo++ = 0;
+                      break;
+	            }
+                }
+            break;
+            }
+          }  
+      if (strcmp(pkginfo,mainpkg) == 0 )
+        {
+        for (t=0; t<NTRUST; t++) 
+          if (package[i].info[t].install && 
+              strcmp (base (package[i].info[t].install), base (path)) == 0)
+	    {
+              package[i].info[t].install_exists=1;
+              break;
+	    }
+          else if (t>=NTRUST-1)
+            if (!package[i].info[TRUST_CURR].install)
+              {
+                package[i].info[TRUST_CURR].version = 0;
+                package[i].info[TRUST_CURR].install = strdup(path);
+                package[i].info[TRUST_CURR].install_size = size;
+                package[i].info[TRUST_CURR].install_exists=1;
+                if (package[i].info[TRUST_CURR].version == 0) 
+	          get_package_version(i,TRUST_CURR);
+                break;
+              }
+            else if (!package[i].info[TRUST_PREV].install )
+              {
+                package[i].info[TRUST_PREV].version = 0;
+                package[i].info[TRUST_PREV].install = strdup(path);
+                package[i].info[TRUST_PREV].install_size = size;
+                package[i].info[TRUST_PREV].install_exists=1;
+                if (package[i].info[TRUST_PREV].version == 0) 
+	          get_package_version(i,TRUST_PREV);
+                break;
+              }
+        break;
+        }
+      } 
+    }
 }
 
 static void
@@ -684,6 +861,7 @@ read_installed_db ()
 	    int t;
 	    extra[i].installed_file = inst;
 	    extra[i].installed_size = instsz;
+	    get_package_version(i, -1);
 
 	    for (t=0; t<NTRUST; t++)
 	      if (package[i].info[t].install
@@ -691,32 +869,14 @@ read_installed_db ()
 		{
 		  extra[i].which_is_installed = t;
 		  extra[i].installed_ver = package[i].info[t].version;
+	          if (extra[i].installed_ver == 0) /* still */
+		    get_package_version(i,t);
 		  break;
 		}
 
 	    if (extra[i].installed_ver == 0) /* still */
-	      {
-		char *v, *d;
-		for (v=base (inst); *v; v++)
-		  if (*v == '-' && isdigit(v[1]))
-		    {
-		      v++;
-		      break;
-		    }
-		if (!v)
-		  v = inst;
-		for (d=v; *d; d++)
-		  if (strncmp (d, ".tar", 4) == 0)
-		    {
-		      *d = 0;
-		      break;
-		    }
-		if (v[0])
-		  extra[i].installed_ver = strdup (v);
-		else
-		  extra[i].installed_ver = "0";
-	      }
-	    break;
+	      get_package_version(i, -1);
+            break;
 	  }
     }
   fclose (db);
@@ -748,14 +908,26 @@ do_choose (HINSTANCE h)
   extra = (ExtraPackageInfo *) malloc (npackages * sizeof (ExtraPackageInfo));
   memset (extra, 0, npackages * sizeof (ExtraPackageInfo));
   for (i=0; i<npackages; i++)
-    extra[i].which_is_installed = -1;
+    {
+      extra[i].which_is_installed = -1;
+      extra[i].in_partial_list = 0;
+      extra[i].pick = 1;
+      extra[i].chooser[extra[i].pick].trust = TRUST_NONE;
+	for (int t=0; t<NTRUST; t++)
+          {
+          package[i].info[t].partial_list_display=0;
+          package[i].info[t].install_exists=0;
+          package[i].info[t].source_exists=0;
+          }
+    }
 
   register_windows (h);
 
-  if (source == IDC_SOURCE_DOWNLOAD)
+  if (source == IDC_SOURCE_DOWNLOAD || source == IDC_SOURCE_CWD)
     scan_downloaded_files ();
-  else
-    read_installed_db ();
+    
+  read_installed_db ();
+  set_existence ();
   build_labels ();
 
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_CHOOSE), 0, dialog_proc);
@@ -783,7 +955,7 @@ do_choose (HINSTANCE h)
 	case TRUST_KEEP:
 	case TRUST_NONE:
 	default:
-	  package[i].action = ACTION_SAME;
+          package[i].action = ACTION_SAME;
 	  break;
 	}
     }
@@ -803,19 +975,27 @@ do_choose (HINSTANCE h)
 			    : (package[i].action == ACTION_UNINSTALL) ? "uninstall"
 			    : (package[i].action == ACTION_ERROR) ? "error"
 			    : "unknown");
+      const char *installed = ((extra[i].which_is_installed == -1) ? "none"
+			   : (extra[i].which_is_installed == TRUST_PREV) ? "prev"
+			   : (extra[i].which_is_installed == TRUST_CURR) ? "curr"
+			   : (extra[i].which_is_installed == TRUST_TEST) ? "test"
+			   : "unknown");
+      const char *partial_list = ((extra[i].in_partial_list == 1) ? "yes" : "no");
 
-      log (LOG_BABBLE, "[%s] action=%s trust=%s src? %s", package[i].name, action, trust,
-	   package[i].srcaction == SRCACTION_NO ? "no" : "yes");
+      log (LOG_BABBLE, "[%s] action=%s trust=%s installed=%s partial_list=%s src?=%s", package[i].name, action, trust,installed,partial_list,package[i].srcaction == SRCACTION_NO ? "no" : "yes");
       for (int t=0; t<NTRUST; t++)
 	{
 	  if (package[i].info[t].install)
-	    log (LOG_BABBLE, "[%s] ver %s inst %s %d src %s %d",
+	    log (LOG_BABBLE, "     [%s] ver=%s partial_list=%s \r\n            inst=%s %d exists=%s \r\n            src=%s %d exists=%s",
 		 infos[t],
 		 package[i].info[t].version ?: "(none)",
+		 (package[i].info[t].partial_list_display == 1 ) ? "yes":"no",
 		 package[i].info[t].install ?: "(none)",
 		 package[i].info[t].install_size,
+		 (package[i].info[t].install_exists == 1) ? "yes":"no",
 		 package[i].info[t].source ?: "(none)",
-		 package[i].info[t].source_size);
+		 package[i].info[t].source_size,
+		 (package[i].info[t].source_exists == 1) ? "yes":"no");
 	}
     }
 }
Index: winsup/cinstall/ini.h
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/ini.h,v
retrieving revision 2.4
diff -u -p -r2.4 ini.h
--- ini.h	2000/11/09 01:40:15	2.4
+++ ini.h	2001/03/06 04:38:47
@@ -51,8 +51,11 @@ typedef struct {
     char *version;	/* version part of filename */
     char *install;	/* file name to install */
     int install_size;	/* in bytes */
+    int install_exists; /* install file exists on disk */
     char *source;	/* sources for installed binaries */
     int source_size;	/* in bytes */
+    int source_exists;  /* source file exists on disk */
+    int partial_list_display;/* display this version in partial list */
   } info[NTRUST+1];	/* +1 for TRUST_UNKNOWN */
 } Package;
 
Index: winsup/cinstall/res.rc
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/res.rc,v
retrieving revision 2.11
diff -u -p -r2.11 res.rc
--- res.rc	2000/12/26 23:15:56	2.11
+++ res.rc	2001/03/06 04:38:52
@@ -232,9 +239,9 @@ BEGIN
     LTEXT           "= click to choose action, (p) = previous version, (x) = experimental",
                     IDC_STATIC,65,170,220,8
     PUSHBUTTON      "Full/Part",IDC_CHOOSE_FULLPART,250,5,35,10
-    PUSHBUTTON      "Exp",IDC_CHOOSE_EXP,215,5,25,10
-    PUSHBUTTON      "Curr",IDC_CHOOSE_CURR,190,5,25,10
-    PUSHBUTTON      "Prev",IDC_CHOOSE_PREV,165,5,25,10
+    CONTROL         "Exp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,215,5,25,10
+    CONTROL         "Curr",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON,189,5,25,10
+    CONTROL         "Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON,161,5,27,10
     DEFPUSHBUTTON   "&Next -->",IDOK,175,185,45,15
     PUSHBUTTON      "Cancel",IDCANCEL,240,185,45,15
     PUSHBUTTON      "<-- &Back",IDC_BACK,130,185,45,15