tee: fix bug: argv[-1] is a no-no!

bb_full_fd_action: optimize
die_if_ferror: "<applet>: filename" isn't a good err msg, add "..I/O error"


git-svn-id: svn://busybox.net/trunk/busybox@16669 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 32 insertions, 19 deletions

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 601c51ce4..c6b886647 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -25,37 +25,50 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
 {
         int status = -1;
         off_t total = 0;
-        RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+        RESERVE_CONFIG_BUFFER(buffer, BUFSIZ);
 
         if (src_fd < 0) goto out;
-        while (!size || total < size) {
-                ssize_t wr, rd;
 
-                rd = safe_read(src_fd, buffer,
-                                (!size || size - total > BUFSIZ) ? BUFSIZ : size - total);
+        if (!size) {
+                size = BUFSIZ;
+                status = 1; /* copy until eof */
+        }
+
+        while (1) {
+                ssize_t rd;
 
-                if (rd > 0) {
-                        /* A -1 dst_fd means we need to fake it... */
-                        wr = (dst_fd < 0) ? rd : full_write(dst_fd, buffer, 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 += wr;
-                        if (total == size) status = 0;
-                } else if (rd < 0) {
-                        bb_perror_msg(bb_msg_read_error);
-                        break;
-                } else { /* eof - all done. */
-                        status = 0;
-                        break;
+                }
+                total += rd;
+                if (status < 0) {
+                        size -= rd;
+                        if (!size) {
+                                status = 0;
+                                break;
+                        }
                 }
         }
 
 out:
         RELEASE_CONFIG_BUFFER(buffer);
 
-        return status ? status : total;
+        return status ? -1 : total;
 }
 
 
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 1dbd7521b..773e718b8 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -124,7 +124,7 @@ int ndelay_on(int fd)
 }
 
 // Die with an error message if we can't write the entire buffer.
-void xwrite(int fd, void *buf, size_t count)
+void xwrite(int fd, const void *buf, size_t count)
 {
         if (count) {
                 ssize_t size = full_write(fd, buf, count);
@@ -146,7 +146,7 @@ off_t xlseek(int fd, off_t offset, int whence)
 void die_if_ferror(FILE *fp, const char *fn)
 {
         if (ferror(fp)) {
-                bb_error_msg_and_die("%s", fn);
+                bb_error_msg_and_die("%s: I/O error", fn);
         }
 }