Apply patch from Christian Haggstrom to fix #213038, #217286,

#213543 and #213846; there was an extra %s in the error message
printed when out of disk space, causing a strange SEGV.

diff --git a/ChangeLog b/ChangeLog
index 93e4c41ba4141c16323503773da0b8f4dcf992ee..8020ff7640566d619205689939a917354844013a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  8 16:49:13 GMT 2004 Christian Haggstrom <chm@c00.info>
+
+  * lib/mlib.c: Remove extraneous %s in ohshite() call when out of
+  disk space so that condition gets handled correctly and not with
+  a SEGV.
+
 Mon Mar  8 10:14:27 GMT 2004 Colin Watson <cjwatson@debian.org>
  
   * dselect/methlist.cc, dselect/pkgdisplay.cc: Set the total display width

diff --git a/THANKS b/THANKS
index 3904b23f742beb9891d4a043d3d3b30dcf2eba20..ad371e7def72c3dcb1609f44976dab54a90275e0 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ Bruce Perens <bruce@pixar.com>
 Carl Streeter <streeter@cae.wisc.edu>
 Carlos Laviola <claviola@brfree.com.br>
 Charles Briscoe-Smith <cpbs@debian.org>
+Christian Haggstrom <chm@c00.info>
 Christophe Le Bars <clebars@teaser.fr>
 Colin Plumb <colin@nyx.net>
 Colin Watson <cjw44@flatline.org.uk>

diff --git a/debian/changelog b/debian/changelog
index ab9226286da7049b1ced08eadd22e60fdfa13788..47d7001ca27be142718bb2388e879a45c88e0834 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dpkg (1.10.19) unstable; urgency=low
     Closes: #217943, #235266.
   * Force NULL-termination of all tar file entry names.  Closes: #232025.
   * Allow dselect to use the full window width.  Closes: #139781.
+  * Pass correct number of arguments for format string when out of disk
+    space.  Closes: #213038, #217286, #213543, #213846.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/lib/mlib.c b/lib/mlib.c
index 3a0d73d002d59375d27cd64d6dd4139740a31304..d8d0be007cba063cd56e402bccff532fd758529d 100644 (file)
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -196,7 +196,7 @@ off_t buffer_write(buffer_data_t data, void *buf, off_t length, const char *desc
       break;
     case BUFFER_WRITE_FD:
       if((ret= write(data->data.i, buf, length)) < 0 && errno != EINTR)
-       ohshite(_("failed in buffer_write(fd) (%i, ret=%li %s): %s"), data->data.i, (long)ret, desc);
+       ohshite(_("failed in buffer_write(fd) (%i, ret=%li): %s"), data->data.i, (long)ret, desc);
       break;
     case BUFFER_WRITE_NULL:
       break;