Index: choose.cc
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/choose.cc,v
retrieving revision 2.11
diff -p -2 -r2.11 choose.cc
*** choose.cc	2000/12/11 00:07:56	2.11
--- choose.cc	2001/02/08 03:11:49
*************** static char *cvsid = "\n%%% $Id: choose.
*** 31,34 ****
--- 31,35 ----
  #include <stdio.h>
  #include <stdlib.h>
+ #include <io.h>
  #include <ctype.h>
  
*************** static char *cvsid = "\n%%% $Id: choose.
*** 42,46 ****
  #include "find.h"
  
! #define HMARGIN		10
  #define ROW_MARGIN	5
  #define ICON_MARGIN	4
--- 43,49 ----
  #include "find.h"
  
! #include "port.h"
! 
! #define HMARGIN	10
  #define ROW_MARGIN	5
  #define ICON_MARGIN	4
*************** static int initialized = 0;
*** 55,58 ****
--- 58,62 ----
  
  static int full_list = 0;
+ static int which_trust = TRUST_CURR;
  
  static int scroll_ulc_x, scroll_ulc_y;
*************** paint (HWND hwnd)
*** 181,184 ****
--- 185,190 ----
      {
        static char *msg = "Nothing to Install/Update";
+       if (source == IDC_SOURCE_DOWNLOAD)
+          msg = "Nothing to Download";
        TextOut (hdc, HMARGIN, header_height, msg, strlen (msg));
      }
*************** list_click (HWND hwnd, BOOL dblclk, int 
*** 281,284 ****
--- 287,295 ----
      {
        extra[p].pick ++;
+       while ((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;
*************** list_click (HWND hwnd, BOOL dblclk, int 
*** 287,291 ****
    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)
  	package[p].srcaction ^= (SRCACTION_NO^SRCACTION_YES);
      }
--- 298,303 ----
    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 && 
!           package[p].info[extra[p].chooser[extra[p].pick].trust].source_exists)
  	package[p].srcaction ^= (SRCACTION_NO^SRCACTION_YES);
      }
*************** note_width (HDC dc, char *string, int ad
*** 351,365 ****
  }
  
  static int
  best_trust (int p, int trust)
  {
    int t;
!   for (t=trust; t>=0; t--)
!     if (package[p].info[t].install)
        return t;
!   for (t=trust+1; t<=NTRUST; t++)
!     if (package[p].info[t].install)
!       return t;
!   if (extra[p].installed_file)
      return TRUST_KEEP;
    return TRUST_NONE;
--- 363,437 ----
  }
  
+ 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;
!   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;
!   if (extra[p].installed_file && extra[p].installed_ver == package[p].info[t].version)
      return TRUST_KEEP;
    return TRUST_NONE;
*************** default_trust (HWND h, int trust)
*** 371,378 ****
--- 443,453 ----
    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)
*************** set_full_list (HWND h, int isfull)
*** 395,399 ****
    for (i=j=0; i<npackages; i++)
      {
!       if (isfull || extra[i].in_partial_list)
  	package_indexes[j++] = i;
      }
--- 470,480 ----
    for (i=j=0; i<npackages; i++)
      {
!       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;
      }
*************** build_labels ()
*** 450,460 ****
  		C.caption = "0.0";
  	      C.trust = t;
! 	      if (package[i].info[t].source)
  		C.src_avail = 1;
  	      c++;
- 	      /* we intentionally skip TRUST_PREV */
- 	      if (t != TRUST_PREV || !extra[i].installed_ver)
- 		extra[i].in_partial_list = 1;
- 
  	    }
  
--- 531,541 ----
  		C.caption = "0.0";
  	      C.trust = t;
! 	      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++;
  	    }
  
*************** create_listview (HWND dlg, RECT *r)
*** 531,536 ****
    headers[PACKAGE_COL].x = headers[SRC_COL].x + headers[SRC_COL].width + HMARGIN;
  
-   set_full_list (lv, full_list);
    default_trust (lv, TRUST_CURR);
  
    ReleaseDC (lv, dc);
--- 612,619 ----
    headers[PACKAGE_COL].x = headers[SRC_COL].x + headers[SRC_COL].width + HMARGIN;
  
    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);
*************** dialog_cmd (HWND h, int id, HWND hwndctl
*** 545,554 ****
--- 628,640 ----
      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:
*************** base (char *s)
*** 633,636 ****
--- 719,760 ----
    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)
*** 638,654 ****
  {
    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";
  	}
  }
  
--- 762,830 ----
  {
    int i, t;
!   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;
+         }
+       } 
+     }
  }
  
*************** read_installed_db ()
*** 685,688 ****
--- 861,865 ----
  	    extra[i].installed_file = inst;
  	    extra[i].installed_size = instsz;
+ 	    get_package_version(i, -1);
  
  	    for (t=0; t<NTRUST; t++)
*************** read_installed_db ()
*** 692,721 ****
  		  extra[i].which_is_installed = t;
  		  extra[i].installed_ver = package[i].info[t].version;
  		  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;
  	  }
      }
--- 869,880 ----
  		  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 */
! 	      get_package_version(i, -1);
!             break;
  	  }
      }
*************** do_choose (HINSTANCE h)
*** 749,760 ****
    memset (extra, 0, npackages * sizeof (ExtraPackageInfo));
    for (i=0; i<npackages; i++)
!     extra[i].which_is_installed = -1;
  
    register_windows (h);
  
!   if (source == IDC_SOURCE_DOWNLOAD)
      scan_downloaded_files ();
!   else
!     read_installed_db ();
    build_labels ();
  
--- 908,931 ----
    memset (extra, 0, npackages * sizeof (ExtraPackageInfo));
    for (i=0; i<npackages; i++)
!     {
!       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 || source == IDC_SOURCE_CWD)
      scan_downloaded_files ();
!     
!   read_installed_db ();
!   set_existence ();
    build_labels ();
  
*************** do_choose (HINSTANCE h)
*** 784,788 ****
  	case TRUST_NONE:
  	default:
! 	  package[i].action = ACTION_SAME;
  	  break;
  	}
--- 955,959 ----
  	case TRUST_NONE:
  	default:
!           package[i].action = ACTION_SAME;
  	  break;
  	}
*************** do_choose (HINSTANCE h)
*** 804,820 ****
  			    : (package[i].action == ACTION_ERROR) ? "error"
  			    : "unknown");
  
!       log (LOG_BABBLE, "[%s] action=%s trust=%s src? %s", package[i].name, action, trust,
! 	   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",
  		 infos[t],
  		 package[i].info[t].version ?: "(none)",
  		 package[i].info[t].install ?: "(none)",
  		 package[i].info[t].install_size,
  		 package[i].info[t].source ?: "(none)",
! 		 package[i].info[t].source_size);
  	}
      }
--- 975,999 ----
  			    : (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 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 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_exists == 1) ? "yes":"no");
  	}
      }
Index: ini.h
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/ini.h,v
retrieving revision 2.4
diff -p -2 -r2.4 ini.h
*** ini.h	2000/11/09 01:40:15	2.4
--- ini.h	2001/02/08 03:11:49
*************** typedef struct {
*** 52,57 ****
--- 52,60 ----
      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: res.rc
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/res.rc,v
retrieving revision 2.11
diff -p -2 -r2.11 res.rc
*** res.rc	2000/12/26 23:15:56	2.11
--- res.rc	2001/02/08 03:11:53
*************** BEGIN
*** 233,239 ****
                      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
      DEFPUSHBUTTON   "&Next -->",IDOK,175,185,45,15
      PUSHBUTTON      "Cancel",IDCANCEL,240,185,45,15
--- 233,239 ----
                      IDC_STATIC,65,170,220,8
      PUSHBUTTON      "Full/Part",IDC_CHOOSE_FULLPART,250,5,35,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