Patch from vodz:

[oweals/busybox.git] / libbb / copyfd.c

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 4df1fd084af856eb19590ad5736346edf5853ce9..05bed6b733a8f49c624f721c7275a54e0c23d170 100644 (file)
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -2,7 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,65 +22,51 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include "libbb.h"
+#include "busybox.h"
 
-/* If chunksize is 0 copy untill EOF */
-extern int copyfd(int fd1, int fd2, const off_t chunksize)
+#if BUFSIZ < 4096
+#undef BUFSIZ
+#define BUFSIZ 4096
+#endif
+
+/* If chunksize is 0 copy until EOF */
+extern int bb_copyfd(int fd1, int fd2, const off_t chunksize)
 {
-       size_t nread;
-       size_t nwritten;
+       ssize_t nread;
        size_t size;
-       size_t remaining;
-       char buffer[BUFSIZ];
+       off_t remaining;
+       RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
 
+       remaining = size = BUFSIZ;
        if (chunksize) {
                remaining = chunksize;
-       } else {
-               remaining = -1;
        }
 
        do {
-               if ((chunksize > BUFSIZ) || (chunksize == 0)) {
-                       size = BUFSIZ;
-               } else {
-                       size = chunksize;
+               if (size > remaining) {
+                       size = remaining;
                }
 
-               nread = safe_read(fd1, buffer, size);
-
-               if (nread == -1) {
-                       perror_msg("read failure");
-                       return(-1);
-               }
-               else if (nread == 0) {
+               if ((nread = safe_read(fd1, buffer, size)) > 0) {
+                       if (bb_full_write(fd2, buffer, nread) < 0) {
+                               bb_perror_msg(bb_msg_write_error);      /* match Read error below */
+                               break;
+                       }
+                       if (chunksize && ((remaining -= nread) == 0)) {
+                               return 0;
+                       }
+               } else if (!nread) {
                        if (chunksize) {
-                               error_msg("Unable to read all data");
-                               return(-1);
-                       } else {
-                               return(0);
+                               bb_error_msg("Unable to read all data");
+                               break;
                        }
+                       return 0;
+               } else {                                /* nread < 0 */
+                       bb_perror_msg("Read error");    /* match bb_msg_write_error above */
+                       break;
                }
 
-               nwritten = full_write(fd2, buffer, nread);
+       } while (1);
 
-               if (nwritten != nread) {
-                       error_msg("Unable to write all data");
-                       return(-1);
-               }
-
-               if (chunksize) {
-                       remaining -= nwritten;
-               }
-       } while (remaining != 0);
-
-       return 0;
+       return -1;
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/