Updated.

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index ca71b8a..1bd975b 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -128,9 +128,9 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- orig/generator.c   2004-07-15 02:21:10
+--- orig/generator.c   2004-07-16 19:35:29
 +++ generator.c        2004-07-03 20:15:41
-@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
+@@ -99,7 +99,7 @@ static int skip_file(char *fname, struct
        if (ignore_times)
                return 0;
  
@@ -139,7 +139,7 @@ command before "make":
  }
  
  
-@@ -468,7 +468,7 @@ static void recv_generator(char *fname, 
+@@ -471,7 +471,7 @@ static void recv_generator(char *fname, 
        }
  
        if (update_only && fnamecmp == fname
@@ -148,7 +148,7 @@ command before "make":
                if (verbose > 1)
                        rprintf(FINFO,"%s is newer\n",fname);
                return;
---- orig/options.c     2004-07-15 16:51:50
+--- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -158,7 +158,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -244,6 +245,7 @@ void usage(enum logcode F)
+@@ -251,6 +252,7 @@ void usage(enum logcode F)
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
@@ -166,7 +166,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
-@@ -351,6 +353,7 @@ static struct poptOption long_options[] 
+@@ -359,6 +361,7 @@ static struct poptOption long_options[] 
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
@@ -174,7 +174,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
-@@ -840,6 +843,8 @@ void server_options(char **args,int *arg
+@@ -875,6 +878,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -183,7 +183,7 @@ command before "make":
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)
---- orig/rsync.c       2004-07-02 18:06:32
+--- orig/rsync.c       2004-07-16 20:07:23
 +++ rsync.c    2004-07-03 20:15:41
 @@ -25,6 +25,7 @@
  extern int verbose;
@@ -193,7 +193,7 @@ command before "make":
  extern int am_root;
  extern int am_sender;
  extern int am_generator;
-@@ -143,17 +144,31 @@ int set_perms(char *fname,struct file_st
+@@ -144,17 +145,31 @@ int set_perms(char *fname,struct file_st
        if (!preserve_times || S_ISLNK(st->st_mode)
            || (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
                flags |= PERMS_SKIP_MTIME;
@@ -229,7 +229,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h       2004-07-07 08:27:00
+--- orig/rsync.h       2004-07-16 20:07:23
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -255,9 +255,9 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2004-07-15 02:21:11
+--- orig/rsync.yo      2004-07-16 20:07:23
 +++ rsync.yo   2004-07-03 20:15:41
-@@ -300,6 +300,7 @@ verb(
+@@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
@@ -265,7 +265,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -552,6 +553,11 @@ cause the next transfer to behave as if 
+@@ -564,6 +565,11 @@ cause the next transfer to behave as if 
  their checksums compared and show up in log messages even if they haven't
  changed.