More doogie-patches

diff --git a/ChangeLog b/ChangeLog
index 2998942cc765840ccf6fd3c91692b46266a26283..db253c10b1fd354343c99706c7e602ffbdc7f684 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 10 00:10:27 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * lib/mlib.c: remove no longer used struct
+  * lib/mlib.c: return number of bytes read in do_fd_read
+  * main/enquiry.c: one more place where we cah use read_fd_vbuf
+
 Sat Dec 09 12:21:35 CET 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po, doc/sv/deb.5, doc/sv/deb-old.5, doc/sv/dpkg.8:

diff --git a/lib/mlib.c b/lib/mlib.c
index d8a7d11e6e4025874e4f541762145de44a80c5d6..d527cdba8f726de13ff8eafeee3c256f705e6c0b 100644 (file)
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -124,9 +124,6 @@ void waitsubproc(pid_t pid, const char *description, int sigpipeok) {
   checksubprocerr(status,description,sigpipeok);
 }
 
-typedef struct do_fd_copy_data {
-  int fd;
-} do_fd_copy_data_t;
 typedef struct do_fd_buf_data {
   void *buf;
   int type;
@@ -156,6 +153,7 @@ int read_fd_combined(int fd, void *buf, int type, int limit, char *desc, ...) {
   do_fd_buf_data_t data = { buf, type };
   va_list al;
   struct varbuf v;
+  int ret;
 
   varbufinit(&v);
 
@@ -163,8 +161,9 @@ int read_fd_combined(int fd, void *buf, int type, int limit, char *desc, ...) {
   varbufvprintf(&v, desc, al);
   va_end(al);
 
-  do_fd_read(fd, limit, do_fd_write_combined, &data, v.buf);
+  ret = do_fd_read(fd, limit, do_fd_write_combined, &data, v.buf);
   varbuffree(&v);
+  return ret;
 }
 
 
@@ -196,4 +195,5 @@ int do_fd_read(int fd1, int limit, do_fd_write_t write_proc, void *proc_data, ch
   if (count<0) ohshite(_("failed in do_fd_read on read (%s)"), desc);
 
   free(buf);
+  return bytesread;
 }

diff --git a/main/enquiry.c b/main/enquiry.c
index a352bc00ea9e65358a7d6417bb491016ce22b6e6..0575ac72c35eeaf8b8cb54fb7a43f679f7cd74a6 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -697,8 +697,7 @@ void printarch(const char *const *argv) {
     exit(0);
   }
   close(p1[1]);
-  while ((c= getc(ccpipe)) != EOF) varbufaddc(&vb,c);
-  if (ferror(ccpipe)) ohshite(_("error reading from CC pipe"));
+  read_fd_vbuf(fileno(ccpipe), &vb, -1, _("error reading from CC pipe"));
   waitsubproc(c1,"gcc --print-libgcc-file-name",0);
   if (!vb.used) badlgccfn(ccompiler,"",_("empty output"));
   varbufaddc(&vb,0);