* lib/tarfn.c: add braces around if to fix compiler warning

diff --git a/ChangeLog b/ChangeLog
index 00ed3c7b985df6518a244c30877441750b608531..ff3f49188a44f444061ebdd2a95227f389c923ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 11 20:14:02 EST 1999 Ben Collins <bcollins@debian.org>
+
+  * lib/tarfn.c: add braces around if to fix compiler warning
+
 Fri Nov 12 01:47:24 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Correct names for build-depency names according to Bug# 49792

diff --git a/TODO b/TODO
index 8fc839bc71e235509e5b715b3265e9441f346c30..a376e51f7f9c1f9a4e71ef41785b5e78c2c77d5f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@ urgent
  * Several things ought to be configurable but aren't.
  * Filenames containing newlines.  Conffile names containing spaces.
  * dpkg --status for virtual packages
- * update-alternatives prompting.
  * logging, both transcript logs (kept briefly)
    and action logs (kept forever?)  957
  * start-stop-daemon process status check. 1480
@@ -24,9 +23,9 @@ other stuff unlikely to get done soon
  * Purge a.out compatibility from source (keep the upgrade stuff in
    place).
  * Automatically remove <file>.gz if <file> can't be found ? and maybe,
-   remove <file> if <file.gz> can't be found? Bug mess when we start
+   remove <file> if <file.gz> can't be found? Big mess when we start
    thinking about bz2 :/
- * Local version number (using non-numeric epoch, perhaps ?), or better yet,
+ * Local version number (using non-numeric epoch, perhaps, or better yet,
    a --local option in dpkg, so that it marks this package as a local install
    (when running dpkg -i)? Keeps it from being listed as obsolete, and maybe
    from being considered for auto-upgrades (apt-get needs to know about this
@@ -39,7 +38,8 @@ other stuff unlikely to get done soon
  * single maintainer script, and new package getting there first
  * dpkg -s show something for virtual packages
  * settable defaults for update-rc.d
- * local conffiles
+ * local conffiles, aswell as local files that dpkg should check before
+   overwriting
  * hooks
  * gzip -0 option for dpkg-deb (probably easier to add a -z# option)
  * There is no documentation. 1526
@@ -70,6 +70,7 @@ done
  * conffiles handling options, including `replace removed files'
  * `diff' option at conffile prompt
  * check description in dpkg-deb
+ * update-alternatives prompting.
 
 obsoleted so not done
  * version numbers not starting digit early.

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e9c9ac699940d55b618642bac75fdec262bc9535 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1 +1,2 @@
 Makefile.in
+manuals-version

diff --git a/lib/tarfn.c b/lib/tarfn.c
index 799f0c6bb32c4305edc24885d8f6ef97cb7d09a4..18c0bc17bc63e2431037a8652d04b4abbdb38ba1 100644 (file)
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -200,13 +200,14 @@ TarExtractor(
 
                    status = functions->Read(userData, buffer, 512);
                    // if we didn't get 512 bytes read, punt
-                   if (512 != status)
+                   if (512 != status) {
                     if ( status > 0 ) { /* Read partial header record */
                       errno = 0;
                       return -1;
                     } else {
                        return status;
                      }
+                  }
 
                    copysize = long_read > 512 ? 512 : long_read;
                    memcpy (bp, buffer, copysize);