2002-07-05 Robert Collins <rbtcollins@hotmail.com>

        * choose.cc (default_trust): Check package accessibility before
        triggering an install. (Suggested by Pavel).

2002-07-03  Pavel Tsekov  <ptsekov@gmx.net>

        * compress_gz.cc (compress_gz::construct): Always initialize key members
        to ensure the destructor does the right thing.

diff --git a/ChangeLog b/ChangeLog
index faaa0f9f64df36c3f3abaca05aac37ac495afb8d..66a152ac9468aaba7c34a590ae536eb6b1814ae4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-05  Robert Collins  <rbtcollins@hotmail.com>
+
+       * choose.cc (default_trust): Check package accessibility before
+       triggering an install. (Suggested by Pavel).
+
+2002-07-03  Pavel Tsekov  <ptsekov@gmx.net>
+
+       * compress_gz.cc (compress_gz::construct): Always initialize key members
+       to ensure the destructor does the right thing.
+
 2002-07-03  Pavel Tsekov  <ptsekov@gmx.net>
 
        * filemanip.cc (parse_filename): Do not try to parse empty

diff --git a/choose.cc b/choose.cc
index c0d5e06e2b2c312f7c5c8f4309462c75e5b0f3af..61ce6a5fd9decb8829932a13a94a65362a02a841 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -329,7 +329,8 @@ default_trust (HWND h, trusts trust)
        {
          pkg.desired = pkg.trustp (trust);
          if (pkg.desired)
-           pkg.desired.pick (pkg.desired != pkg.installed);
+           pkg.desired.pick (pkg.desired.accessible() 
+                             && pkg.desired != pkg.installed);
        }
       else
        pkg.desired = packageversion ();

diff --git a/compress_gz.cc b/compress_gz.cc
index 5d9d1da9227775ebba75a2ba038651eb3dde3914..49f79ebb370713ff86d8f6ef8053fa1562b9c48b 100644 (file)
--- a/compress_gz.cc
+++ b/compress_gz.cc
@@ -90,6 +90,13 @@ compress_gz::construct (io_stream * parent, const char *openmode)
   transparent = 0;
 
   mode = '\0';
+
+  if (!parent)
+    {
+      z_err = Z_STREAM_ERROR;
+      return;
+    }
+  
   do
     {
       if (*p == 'r')

diff --git a/filemanip.cc b/filemanip.cc
index 67edc258dd32b18bbbd57555b38a9af406c9a121..f1e37ee18aa0175bf745aede7ea539171b7ccb53 100644 (file)
--- a/filemanip.cc
+++ b/filemanip.cc
@@ -84,10 +84,9 @@ int
 parse_filename (String const &in_fn, fileparse & f)
 {
   char *p, *ver;
-  char *fn;
+  char *fn = in_fn.cstr ();
   int n;
 
-  fn = in_fn.cstr ();
   if (fn == 0 || !(n = find_tar_ext (fn)))
     return 0;