Changed sum_init() to take a seed value as an arg instead of always

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index be639e4..a474c9b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -252,41 +252,46 @@ 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));
+               rsyserr(FERROR, errno, "open %s", full_fname(source));
                return -1;
        }
 
        if (robust_unlink(dest) && errno != ENOENT) {
-               rprintf(FERROR,"unlink %s: %s\n",
-                       dest,strerror(errno));
+               rsyserr(FERROR, errno, "unlink %s", full_fname(dest));
                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));
+               rsyserr(FERROR, errno, "open %s", full_fname(dest));
                close(ifd);
                return -1;
        }
 
        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));
+                       rsyserr(FERROR, errno, "write %s", full_fname(dest));
                        close(ifd);
                        close(ofd);
                        return -1;
                }
        }
 
-       close(ifd);
-       close(ofd);
-
        if (len < 0) {
-               rprintf(FERROR,"read %s: %s\n",
-                       source,strerror(errno));
+               rsyserr(FERROR, errno, "read %s", full_fname(source));
+               close(ifd);
+               close(ofd);
+               return -1;
+       }
+
+       if (close(ifd) < 0) {
+               rsyserr(FINFO, errno, "close failed on %s",
+                       full_fname(source));
+       }
+
+       if (close(ofd) < 0) {
+               rsyserr(FERROR, errno, "close failed on %s",
+                       full_fname(dest));
                return -1;
        }
 
@@ -476,7 +481,7 @@ static int exclude_server_path(char *arg)
        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;
                        }
@@ -489,7 +494,10 @@ static int exclude_server_path(char *arg)
 static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
 {
 #if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
-       if (!*s) s = ".";
+       if (maxargs <= *argc)
+               return;
+       if (!*s)
+               s = ".";
        s = argv[*argc] = strdup(s);
        exclude_server_path(s);
        (*argc)++;
@@ -498,12 +506,12 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
        glob_t globbuf;
        int i;
 
-       if (!*s) s = ".";
+       if (!*s)
+               s = ".";
 
        s = argv[*argc] = strdup(s);
-       if (sanitize_paths) {
+       if (sanitize_paths)
                sanitize_path(s, NULL);
-       }
 
        memset(&globbuf, 0, sizeof globbuf);
        if (!exclude_server_path(s))
@@ -805,7 +813,6 @@ char *alloc_sanitize_path(const char *path, const char *rootdir)
                        rlen--;
                buf[rlen] = '\0';
        }
-       fprintf(stderr, "p:`%s'\n", buf);
 
        return buf;
 }