fix printf warning

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

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 41b78c7d651ebdc8737ccd751b21288d8d688812..baf99df51949ca3da997bdb7d98c7f26022d47ab 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-2005 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
@@ -19,54 +19,81 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "busybox.h"
+#include "libbb.h"
+
 
 #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)
+
+static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
 {
-       ssize_t nread;
-       size_t size;
-       off_t remaining;
-       RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+       int status;
+       size_t xread, wrote, total, size = size2;
 
-       remaining = size = BUFSIZ;
-       if (chunksize) {
-               remaining = chunksize;
+       if ((dst_fd < 0) || (src_fd < 0)) {
+               return -1;
        }
 
-       do {
-               if (size > remaining) {
-                       size = remaining;
-               }
+       if (size == 0) {
+               /* If size is 0 copy until EOF */
+               size = ULONG_MAX;
+       }
 
-               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 */
+       {
+               RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+               total = 0;
+               wrote = 0;
+               status = -1;
+               while (total < size)
+               {
+                       xread = BUFSIZ;
+                       if (size < (wrote + BUFSIZ))
+                               xread = size - wrote;
+                       xread = bb_full_read(src_fd, buffer, xread);
+                       if (xread > 0) {
+                               wrote = bb_full_write(dst_fd, buffer, xread);
+                               if (wrote < xread) {
+                                       bb_perror_msg(bb_msg_write_error);
+                                       break;
+                               }
+                               total += wrote;
+                       } else if (xread < 0) {
+                               bb_perror_msg(bb_msg_read_error);
                                break;
-                       }
-                       if (chunksize && ((remaining -= nread) == 0)) {
-                               return 0;
-                       }
-               } else if (!nread) {
-                       if (chunksize) {
-                               bb_error_msg("Unable to read all data");
+                       } else if (xread == 0) {
+                               /* All done. */
+                               status = 0;
                                break;
                        }
-                       return 0;
-               } else {                                /* nread < 0 */
-                       bb_perror_msg("Read error");    /* match bb_msg_write_error above */
-                       break;
                }
+               RELEASE_CONFIG_BUFFER(buffer);
+       }
 
-       } while (1);
-
+       if (status == 0 || wrote)
+               return wrote;
+       /* Some sortof error occured */
        return -1;
 }
+
+
+extern int bb_copyfd_size(int fd1, int fd2, const off_t size)
+{
+       if (size) {
+               return(bb_full_fd_action(fd1, fd2, size));
+       }
+       return(0);
+}
+
+extern int bb_copyfd_eof(int fd1, int fd2)
+{
+       return(bb_full_fd_action(fd1, fd2, 0));
+}