Changed rprintf() calls that included strerror() to use rsyserr().

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 1eab8ab..7af64e7 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -26,12 +26,10 @@ extern int verbose;
 extern int dry_run;
 extern int preserve_times;
 extern int am_root;
-extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int preserve_perms;
 extern int make_backups;
 
 
@@ -70,8 +68,8 @@ int delete_file(char *fname)
        if (!S_ISDIR(st.st_mode)) {
                if (robust_unlink(fname) == 0 || errno == ENOENT)
                        return 0;
-               rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "delete_file: unlink %s failed",
+                       full_fname(fname));
                return -1;
        }
 
@@ -79,15 +77,15 @@ int delete_file(char *fname)
                return 0;
        if (!force_delete || !recurse
            || (errno != ENOTEMPTY && errno != EEXIST)) {
-               rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+                       full_fname(fname));
                return -1;
        }
 
        /* now we do a recsursive delete on the directory ... */
        if (!(d = opendir(fname))) {
-               rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "delete_file: opendir %s failed",
+                       full_fname(fname));
                return -1;
        }
 
@@ -105,8 +103,8 @@ int delete_file(char *fname)
                }
        }
        if (errno) {
-               rprintf(FERROR, "delete_file: readdir %s failed: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "delete_file: readdir %s failed",
+                       full_fname(fname));
                closedir(d);
                return -1;
        }
@@ -114,8 +112,8 @@ int delete_file(char *fname)
        closedir(d);
 
        if (do_rmdir(fname) != 0) {
-               rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
-                       full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+                       full_fname(fname));
                return -1;
        }
 
@@ -123,7 +121,7 @@ int delete_file(char *fname)
 }
 
 int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
-               int report)
+             int flags)
 {
        int updated = 0;
        STRUCT_STAT st2;
@@ -133,21 +131,23 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
        if (!st) {
                if (link_stat(fname,&st2) != 0) {
-                       rprintf(FERROR, "stat %s failed: %s\n",
-                               full_fname(fname), strerror(errno));
+                       rsyserr(FERROR, errno, "stat %s failed",
+                               full_fname(fname));
                        return 0;
                }
                st = &st2;
        }
 
-       if (preserve_times && !S_ISLNK(st->st_mode) &&
-           cmp_modtime(st->st_mtime, file->modtime) != 0) {
+       if (!preserve_times || S_ISLNK(st->st_mode))
+               flags |= PERMS_SKIP_MTIME;
+       if (!(flags & PERMS_SKIP_MTIME)
+           && cmp_modtime(st->st_mtime, file->modtime) != 0) {
                /* don't complain about not setting times on directories
                 * because some filesystems can't do it */
                if (set_modtime(fname,file->modtime) != 0 &&
                    !S_ISDIR(st->st_mode)) {
-                       rprintf(FERROR, "failed to set times on %s: %s\n",
-                               full_fname(fname), strerror(errno));
+                       rsyserr(FERROR, errno, "failed to set times on %s",
+                               full_fname(fname));
                        return 0;
                }
                updated = 1;
@@ -174,9 +174,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                    change_gid ? file->gid : st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                         * unless have the privilege */
-                       rprintf(FERROR, "%s %s failed: %s\n",
+                       rsyserr(FERROR, errno, "%s %s failed",
                            change_uid ? "chown" : "chgrp",
-                           full_fname(fname), strerror(errno));
+                           full_fname(fname));
                        return 0;
                }
                /* a lchown had been done - we have to re-stat if the
@@ -193,15 +193,15 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
                        updated = 1;
                        if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
-                               rprintf(FERROR, "failed to set permissions on %s: %s\n",
-                                       full_fname(fname), strerror(errno));
+                               rsyserr(FERROR, errno, "failed to set permissions on %s",
+                                       full_fname(fname));
                                return 0;
                        }
                }
        }
 #endif
 
-       if (verbose > 1 && report) {
+       if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
                else
@@ -228,7 +228,8 @@ void sig_int(void)
 
 /* finish off a file transfer, renaming the file and setting the permissions
    and ownership */
-void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
+void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
+                    int ok_to_set_time)
 {
        int ret;
 
@@ -238,12 +239,13 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
        /* move tmp file over real file */
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
        if (ret < 0) {
-               rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+               rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
-                   full_fname(fnametmp), fname, strerror(errno));
+                   full_fname(fnametmp), fname);
                do_unlink(fnametmp);
        } else {
-               set_perms(fname,file,NULL,0);
+               set_perms(fname, file, NULL,
+                         ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
        }
 }