Merge pull request #2672 from AZero13/ferror

Fix error checking in writing files

(cherry picked from commit ffde04f27231cabb91cebcbd7eca08d0f5088dc8)

diff --git a/libarchive/archive_check_magic.c b/libarchive/archive_check_magic.c
index d12f0c496e279ba298a69e5cfc995bd2783eed52..6b8e0c5595f469bf204b62bbfcc16b9aea53c638 100644 (file)
--- a/libarchive/archive_check_magic.c
+++ b/libarchive/archive_check_magic.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <stdio.h>
+#include <errno.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -54,8 +55,14 @@ errmsg(const char *m)
 
        while (s > 0) {
                written = write(2, m, s);
-               if (written <= 0)
+               if (written == 0)
                        return;
+               if (written < 0)
+               {
+                       if (errno == EINTR)
+                               continue;
+                       return;
+               }
                m += written;
                s -= written;
        }

diff --git a/libarchive/archive_write_open_fd.c b/libarchive/archive_write_open_fd.c
index 8a3f68d0699dc060c9801eb7ceec64cfbb1fbe2a..ba034ed92f8a1c634138f8c4b4c118a59c38e11d 100644 (file)
--- a/libarchive/archive_write_open_fd.c
+++ b/libarchive/archive_write_open_fd.c
@@ -122,7 +122,7 @@ file_write(struct archive *a, void *client_data, const void *buff, size_t length
        mine = (struct write_fd_data *)client_data;
        for (;;) {
                bytesWritten = write(mine->fd, buff, length);
-               if (bytesWritten <= 0) {
+               if (bytesWritten < 0) {
                        if (errno == EINTR)
                                continue;
                        archive_set_error(a, errno, "Write error");

diff --git a/libarchive/archive_write_open_file.c b/libarchive/archive_write_open_file.c
index 4c6ebfb2269dfe9cd98c2504b91c442909b751a6..0b310f3da83b41cf1f04ed41c8484bda2dd03a9c 100644 (file)
--- a/libarchive/archive_write_open_file.c
+++ b/libarchive/archive_write_open_file.c
@@ -85,16 +85,12 @@ file_write(struct archive *a, void *client_data, const void *buff, size_t length
        size_t  bytesWritten;
 
        mine = client_data;
-       for (;;) {
-               bytesWritten = fwrite(buff, 1, length, mine->f);
-               if (bytesWritten <= 0) {
-                       if (errno == EINTR)
-                               continue;
-                       archive_set_error(a, errno, "Write error");
-                       return (-1);
-               }
-               return (bytesWritten);
+       bytesWritten = fwrite(buff, 1, length, mine->f);
+       if (bytesWritten != length) {
+               archive_set_error(a, errno, "Write error");
+               return (-1);
        }
+       return (bytesWritten);
 }
 
 static int

diff --git a/libarchive/archive_write_open_filename.c b/libarchive/archive_write_open_filename.c
index 633f7fe1794d31eca1ff9ca508c2998ac55fae62..7d0f9bde1dbb2a59729cbdea7ffab90ec88e6414 100644 (file)
--- a/libarchive/archive_write_open_filename.c
+++ b/libarchive/archive_write_open_filename.c
@@ -228,7 +228,7 @@ file_write(struct archive *a, void *client_data, const void *buff,
        mine = (struct write_file_data *)client_data;
        for (;;) {
                bytesWritten = write(mine->fd, buff, length);
-               if (bytesWritten <= 0) {
+               if (bytesWritten < 0) {
                        if (errno == EINTR)
                                continue;
                        archive_set_error(a, errno, "Write error");