Fix failing hunks.

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

diff --git a/atimes.diff b/atimes.diff
index 1bd975b..db78a51 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c       2004-07-15 16:51:50
+--- orig/batch.c       2004-07-24 16:52:09
 +++ batch.c    2004-07-03 20:15:41
-@@ -63,6 +63,8 @@ void show_flist(int index, struct file_s
+@@ -186,6 +186,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-15 02:21:10
+--- orig/flist.c       2004-07-17 15:20:05
 +++ 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-16 19:35:29
+--- orig/generator.c   2004-07-28 10:05:29
 +++ generator.c        2004-07-03 20:15:41
-@@ -99,7 +99,7 @@ static int skip_file(char *fname, struct
+@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
        if (ignore_times)
                return 0;
  
@@ -139,16 +139,16 @@ command before "make":
  }
  
  
-@@ -471,7 +471,7 @@ static void recv_generator(char *fname, 
+@@ -473,7 +473,7 @@ static void recv_generator(char *fname, 
        }
  
        if (update_only && fnamecmp == fname
 -          && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 +          && cmp_time(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
-                       rprintf(FINFO,"%s is newer\n",fname);
+                       rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;
---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13
 +++ 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;
-@@ -251,6 +252,7 @@ void usage(enum logcode F)
+@@ -252,6 +253,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");
-@@ -359,6 +361,7 @@ static struct poptOption long_options[] 
+@@ -360,6 +362,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 },
-@@ -875,6 +878,8 @@ void server_options(char **args,int *arg
+@@ -881,6 +884,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-16 20:07:23
+--- orig/rsync.c       2004-07-26 16:06:53
 +++ rsync.c    2004-07-03 20:15:41
 @@ -25,6 +25,7 @@
  extern int verbose;
@@ -229,7 +229,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h       2004-07-16 20:07:23
+--- orig/rsync.h       2004-07-23 17:16:13
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -255,7 +255,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-24 16:52:10
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group
@@ -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
-@@ -564,6 +565,11 @@ cause the next transfer to behave as if 
+@@ -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.
  
@@ -299,7 +299,7 @@ command before "make":
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- orig/testsuite/rsync.fns   2004-06-28 21:08:14
+--- orig/testsuite/rsync.fns   2004-07-23 17:16:13
 +++ testsuite/rsync.fns        2004-07-03 20:15:41
 @@ -50,7 +50,7 @@ printmsg() {
  
@@ -482,7 +482,7 @@ command before "make":
  
        return 0;
  }
---- orig/util.c        2004-06-09 21:54:47
+--- orig/util.c        2004-07-26 16:33:24
 +++ util.c     2004-07-03 20:15:41
 @@ -127,31 +127,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;
-@@ -1078,8 +1086,8 @@ int msleep(int t)
+@@ -1103,8 +1111,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
-@@ -1088,7 +1096,7 @@ int msleep(int t)
+@@ -1113,7 +1121,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/