Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/copyfd.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/copyfd.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/libbb/copyfd.c

@@ -8 +8 @@
  */
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "libbb.h"
-
 
 #if BUFSIZ < 4096
@@ -21 +15 @@
 #endif
 
+/* Used by NOFORK applets (e.g. cat) - must not use xmalloc */
 
-static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
+static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
 {
     int status = -1;
-    size_t total = 0;
-    RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+    off_t total = 0;
+    char buffer[BUFSIZ];
 
-    if (src_fd < 0) goto out;
-    while (!size || total < size)
-    {
-        ssize_t wrote, xread;
+    if (src_fd < 0)
+        goto out;
 
-        xread = safe_read(src_fd, buffer,
-                (!size || size - total > BUFSIZ) ? BUFSIZ : size - total);
+    if (!size) {
+        size = BUFSIZ;
+        status = 1; /* copy until eof */
+    }
 
-        if (xread > 0) {
-            /* A -1 dst_fd means we need to fake it... */
-            wrote = (dst_fd < 0) ? xread : bb_full_write(dst_fd, buffer, xread);
-            if (wrote < xread) {
+    while (1) {
+        ssize_t rd;
+
+        rd = safe_read(src_fd, buffer, size > BUFSIZ ? BUFSIZ : size);
+
+        if (!rd) { /* eof - all done */
+            status = 0;
+            break;
+        }
+        if (rd < 0) {
+            bb_perror_msg(bb_msg_read_error);
+            break;
+        }
+        /* dst_fd == -1 is a fake, else... */
+        if (dst_fd >= 0) {
+            ssize_t wr = full_write(dst_fd, buffer, rd);
+            if (wr < rd) {
                 bb_perror_msg(bb_msg_write_error);
                 break;
             }
-            total += wrote;
-            if (total == size) status = 0;
-        } else if (xread < 0) {
-            bb_perror_msg(bb_msg_read_error);
-            break;
-        } else if (xread == 0) {
-            /* All done. */
-            status = 0;
-            break;
+        }
+        total += rd;
+        if (status < 0) { /* if we aren't copying till EOF... */
+            size -= rd;
+            if (!size) {
+                /* 'size' bytes copied - all done */
+                status = 0;
+                break;
+            }
         }
     }
-
-out:
-    RELEASE_CONFIG_BUFFER(buffer);
-
-    return status ? status : (ssize_t)total;
+ out:
+    return status ? -1 : total;
 }
 
 
-int bb_copyfd_size(int fd1, int fd2, const off_t size)
+#if 0
+void complain_copyfd_and_die(off_t sz)
+{
+    if (sz != -1)
+        bb_error_msg_and_die("short read");
+    /* if sz == -1, bb_copyfd_XX already complained */
+    xfunc_die();
+}
+#endif
+
+off_t bb_copyfd_size(int fd1, int fd2, off_t size)
 {
     if (size) {
-        return(bb_full_fd_action(fd1, fd2, size));
+        return bb_full_fd_action(fd1, fd2, size);
     }
-    return(0);
+    return 0;
 }
 
-int bb_copyfd_eof(int fd1, int fd2)
+void bb_copyfd_exact_size(int fd1, int fd2, off_t size)
 {
-    return(bb_full_fd_action(fd1, fd2, 0));
+    off_t sz = bb_copyfd_size(fd1, fd2, size);
+    if (sz == size)
+        return;
+    if (sz != -1)
+        bb_error_msg_and_die("short read");
+    /* if sz == -1, bb_copyfd_XX already complained */
+    xfunc_die();
 }
+
+off_t bb_copyfd_eof(int fd1, int fd2)
+{
+    return bb_full_fd_action(fd1, fd2, 0);
+}