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

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 5d50746..6c3f806 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -25,14 +25,11 @@
 extern int verbose;
 extern int dry_run;
 extern int preserve_times;
-extern int preserve_dir_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;
 
 
@@ -142,8 +139,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        }
 
        if (!preserve_times || S_ISLNK(st->st_mode))
-               flags |= PERMS_SKIP_TIME;
-       if (!(flags & PERMS_SKIP_TIME)
+               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 */
@@ -248,7 +245,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
                do_unlink(fnametmp);
        } else {
                set_perms(fname, file, NULL,
-                         ok_to_set_time ? 0 : PERMS_SKIP_TIME);
+                         ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
        }
 }