Got rid of fuzz.

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

diff --git a/atimes.diff b/atimes.diff
index 51c34da..151378a 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -128,7 +128,7 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- orig/generator.c   2004-09-20 19:50:13
+--- orig/generator.c   2004-10-06 00:12:16
 +++ generator.c        2004-07-03 20:15:41
 @@ -92,7 +92,7 @@ static int skip_file(char *fname, struct
        if (ignore_times)
@@ -139,7 +139,7 @@ command before "make":
  }
  
  
-@@ -484,7 +484,7 @@ static void recv_generator(char *fname, 
+@@ -482,7 +482,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", safe_fname(fname));
                return;
---- orig/options.c     2004-09-23 17:42:07
+--- orig/options.c     2004-10-14 17:11:40
 +++ options.c  2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -166,15 +166,15 @@ 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");
-@@ -362,6 +364,7 @@ static struct poptOption long_options[] 
+@@ -355,6 +357,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 },
 +  {"copy-atimes",     'A', POPT_ARG_NONE,   &copy_atimes, 0, 0, 0 },
    {"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 },
-@@ -950,6 +953,8 @@ void server_options(char **args,int *arg
+   {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
+   {"quiet",           'q', POPT_ARG_NONE,   0, 'q', 0, 0 },
+@@ -1007,6 +1010,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -230,7 +230,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h       2004-09-22 08:47:31
+--- orig/rsync.h       2004-10-09 03:21:56
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -248,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -426,6 +428,7 @@ struct file_struct {
+@@ -429,6 +431,7 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;
@@ -256,7 +256,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2004-09-24 16:42:30
+--- orig/rsync.yo      2004-10-06 00:12:16
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group