Start 1.6.0.4 cycle

diff --git a/copy.c b/copy.c
index 7100eedbc3277b9b0997311459d054ba06950b61..e54d15aced7595ccb11423b0de121db9051ad1f3 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -3,15 +3,13 @@
 int copy_fd(int ifd, int ofd)
 {
        while (1) {
-               int len;
                char buffer[8192];
                char *buf = buffer;
-               len = xread(ifd, buffer, sizeof(buffer));
+               ssize_t len = xread(ifd, buffer, sizeof(buffer));
                if (!len)
                        break;
                if (len < 0) {
-                       int read_error;
-                       read_error = errno;
+                       int read_error = errno;
                        close(ifd);
                        return error("copy-fd: read returned %s",
                                     strerror(read_error));
@@ -22,14 +20,38 @@ int copy_fd(int ifd, int ofd)
                                buf += written;
                                len -= written;
                        }
-                       else if (!written)
+                       else if (!written) {
+                               close(ifd);
                                return error("copy-fd: write returned 0");
-                       else
+                       } else {
+                               int write_error = errno;
+                               close(ifd);
                                return error("copy-fd: write returned %s",
-                                            strerror(errno));
+                                            strerror(write_error));
+                       }
                }
        }
        close(ifd);
        return 0;
 }
 
+int copy_file(const char *dst, const char *src, int mode)
+{
+       int fdi, fdo, status;
+
+       mode = (mode & 0111) ? 0777 : 0666;
+       if ((fdi = open(src, O_RDONLY)) < 0)
+               return fdi;
+       if ((fdo = open(dst, O_WRONLY | O_CREAT | O_EXCL, mode)) < 0) {
+               close(fdi);
+               return fdo;
+       }
+       status = copy_fd(fdi, fdo);
+       if (close(fdo) != 0)
+               return error("%s: close error: %s", dst, strerror(errno));
+
+       if (!status && adjust_shared_perm(dst))
+               return -1;
+
+       return status;
+}