Removed fuzz.

diff --git a/atimes.diff b/atimes.diff
index db78a51..47e0870 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c       2004-07-24 16:52:09
+--- orig/batch.c       2004-08-02 05:02:24
 +++ batch.c    2004-07-03 20:15:41
-@@ -186,6 +186,8 @@ void show_flist(int index, struct file_s
+@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
                        (long unsigned) fptr[i]->modtime);
@@ -15,7 +15,7 @@ command before "make":
                rprintf(FINFO, "flist->length=%.0f\n",
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c       2004-07-17 15:20:05
+--- orig/flist.c       2004-08-05 21:57:29
 +++ flist.c    2004-07-03 20:15:41
 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
@@ -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-28 10:05:29
+--- orig/generator.c   2004-08-05 18:24:21
 +++ generator.c        2004-07-03 20:15:41
-@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
+@@ -90,7 +90,7 @@ static int skip_file(char *fname, struct
        if (ignore_times)
                return 0;
  
@@ -139,7 +139,7 @@ command before "make":
  }
  
  
-@@ -473,7 +473,7 @@ static void recv_generator(char *fname, 
+@@ -470,7 +470,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-07-23 17:16:13
+--- orig/options.c     2004-08-05 21:57:29
 +++ 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;
-@@ -252,6 +253,7 @@ void usage(enum logcode F)
+@@ -253,6 +254,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");
-@@ -360,6 +362,7 @@ static struct poptOption long_options[] 
+@@ -362,6 +364,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 },
-@@ -881,6 +884,8 @@ void server_options(char **args,int *arg
+@@ -940,6 +943,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-26 16:06:53
+--- orig/rsync.c       2004-08-09 21:07:10
 +++ 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;
-@@ -144,17 +145,31 @@ int set_perms(char *fname,struct file_st
+@@ -145,17 +146,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-23 17:16:13
+--- orig/rsync.h       2004-08-03 15:41:32
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -247,7 +247,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -422,6 +424,7 @@ struct file_struct {
+@@ -425,6 +427,7 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;
@@ -255,7 +255,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2004-07-24 16:52:10
+--- orig/rsync.yo      2004-08-11 17:26:27
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group
@@ -265,9 +265,9 @@ 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
-@@ -567,6 +568,11 @@ cause the next transfer to behave as if 
- their checksums compared and show up in log messages even if they haven't
- changed.
+@@ -574,6 +575,11 @@ cause the next transfer to behave as if 
+ updated (though the rsync algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using -t).
  
 +dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
 +along with the files and update them on the remote system.  Note that
@@ -482,9 +482,9 @@ command before "make":
  
        return 0;
  }
---- orig/util.c        2004-07-26 16:33:24
+--- orig/util.c        2004-08-09 21:07:10
 +++ util.c     2004-07-03 20:15:41
-@@ -127,31 +127,39 @@ void overflow(char *str)
+@@ -128,31 +128,39 @@ void overflow(char *str)
  
  
  
@@ -530,7 +530,7 @@ command before "make":
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;
-@@ -1103,8 +1111,8 @@ int msleep(int t)
+@@ -1156,8 +1164,8 @@ int msleep(int t)
  
  
  /**
@@ -541,7 +541,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1113,7 +1121,7 @@ int msleep(int t)
+@@ -1166,7 +1174,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/