Check the return code from close() and output an error if it

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index d197a5f..5129c35 100644 (file)
--- a/util.c
+++ b/util.c
@@ -28,6 +28,7 @@
 #include "rsync.h"
 
 extern int verbose;
+extern struct exclude_list_struct server_exclude_list;
 
 int sanitize_paths = 0;
 
@@ -252,20 +253,20 @@ int copy_file(char *source, char *dest, mode_t mode)
        ifd = do_open(source, O_RDONLY, 0);
        if (ifd == -1) {
                rprintf(FERROR,"open %s: %s\n",
-                       source,strerror(errno));
+                       full_fname(source), strerror(errno));
                return -1;
        }
 
        if (robust_unlink(dest) && errno != ENOENT) {
                rprintf(FERROR,"unlink %s: %s\n",
-                       dest,strerror(errno));
+                       full_fname(dest), strerror(errno));
                return -1;
        }
 
        ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
        if (ofd == -1) {
                rprintf(FERROR,"open %s: %s\n",
-                       dest,strerror(errno));
+                       full_fname(dest), strerror(errno));
                close(ifd);
                return -1;
        }
@@ -273,19 +274,27 @@ int copy_file(char *source, char *dest, mode_t mode)
        while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
                if (full_write(ofd, buf, len) < 0) {
                        rprintf(FERROR,"write %s: %s\n",
-                               dest,strerror(errno));
+                               full_fname(dest), strerror(errno));
                        close(ifd);
                        close(ofd);
                        return -1;
                }
        }
 
-       close(ifd);
-       close(ofd);
+       if (close(ifd) < 0) {
+               rprintf(FINFO, "close failed on %s: %s\n",
+                       full_fname(source), strerror(errno));
+       }
+
+       if (close(ofd) < 0) {
+               rprintf(FERROR, "close failed on %s: %s\n",
+                       full_fname(dest), strerror(errno));
+               return -1;
+       }
 
        if (len < 0) {
                rprintf(FERROR,"read %s: %s\n",
-                       source,strerror(errno));
+                       full_fname(source), strerror(errno));
                return -1;
        }
 
@@ -471,12 +480,11 @@ int lock_range(int fd, int offset, int len)
 static int exclude_server_path(char *arg)
 {
        char *s;
-       extern struct exclude_struct **server_exclude_list;
 
-       if (server_exclude_list) {
+       if (server_exclude_list.head) {
                for (s = arg; (s = strchr(s, '/')) != NULL; ) {
                        *s = '\0';
-                       if (check_exclude(server_exclude_list, arg, 1)) {
+                       if (check_exclude(&server_exclude_list, arg, 1) < 0) {
                                /* We must leave arg truncated! */
                                return 1;
                        }
@@ -785,9 +793,11 @@ char *alloc_sanitize_path(const char *path, const char *rootdir)
        char *buf;
        int rlen, plen = strlen(path);
 
-       if (*path == '/' && rootdir)
+       if (*path == '/' && rootdir) {
                rlen = strlen(rootdir);
-       else
+               if (rlen == 1)
+                       path++;
+       } else
                rlen = 0;
        if (!(buf = new_array(char, rlen + plen + 1)))
                out_of_memory("alloc_sanitize_path");
@@ -795,11 +805,14 @@ char *alloc_sanitize_path(const char *path, const char *rootdir)
                memcpy(buf, rootdir, rlen);
        memcpy(buf + rlen, path, plen + 1);
 
-       if (rlen)
+       if (rlen > 1)
                rlen++;
        sanitize_path(buf + rlen, NULL);
-       if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0')
-               buf[rlen-1] = '\0';
+       if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0') {
+               if (rlen > 1)
+                       rlen--;
+               buf[rlen] = '\0';
+       }
 
        return buf;
 }