Fixed a failing hunk.

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

diff --git a/atimes.diff b/atimes.diff
index a023be9..d212c27 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -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-09-21 09:40:27
+--- orig/flist.c       2005-01-01 21:11:00
 +++ flist.c    2004-07-03 20:15:41
 @@ -59,6 +59,7 @@ extern int relative_paths;
  extern int implied_dirs;
@@ -120,7 +120,7 @@ command before "make":
        file->length = file_length;
        file->mode = mode;
        file->uid = uid;
-@@ -868,6 +882,7 @@ skip_excludes:
+@@ -873,6 +887,7 @@ skip_excludes:
  
        file->flags = flags;
        file->modtime = st.st_mtime;
@@ -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-09-20 19:50:13
-+++ generator.c        2004-07-03 20:15:41
-@@ -92,7 +92,7 @@ static int skip_file(char *fname, struct
+--- orig/generator.c   2005-01-01 21:11:00
++++ generator.c        2004-11-03 23:02:12
+@@ -96,7 +96,7 @@ static int unchanged_file(char *fn, stru
        if (ignore_times)
                return 0;
  
@@ -139,16 +139,16 @@ command before "make":
  }
  
  
-@@ -484,7 +484,7 @@ static void recv_generator(char *fname, 
+@@ -513,7 +513,7 @@ static void recv_generator(char *fname, 
        }
  
-       if (update_only && fnamecmp == fname
+       if (update_only && fnamecmp_type == 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", safe_fname(fname));
                return;
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2005-01-01 21:11:00
 +++ 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;
-@@ -253,6 +254,7 @@ void usage(enum logcode F)
+@@ -260,6 +261,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,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[] 
+@@ -366,6 +368,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 },
-@@ -946,6 +949,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 },
+@@ -1081,6 +1084,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-08-03 15:41:32
+--- orig/rsync.h       2005-01-01 21:11:01
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -240,7 +240,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -111,6 +112,7 @@
+@@ -114,6 +115,7 @@
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)
@@ -248,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -425,6 +427,7 @@ struct file_struct {
+@@ -436,6 +438,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-20 05:10:48
+--- orig/rsync.yo      2005-01-01 21:11:01
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -266,7 +266,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
-@@ -603,6 +604,11 @@ cause the next transfer to behave as if 
+@@ -628,6 +629,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).
  
@@ -346,7 +346,7 @@ command before "make":
      if [ -z "$failed" ] ; then
        return 0
      else
---- orig/tls.c 2004-05-15 20:10:13
+--- orig/tls.c 2005-01-01 21:11:01
 +++ tls.c      2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  
@@ -394,9 +394,9 @@ command before "make":
 +      char mtimebuf[50];
 +      char atimebuf[50];
        char linkbuf[4096];
+       int ret;
  
-       if (do_lstat(fname, &buf) == -1)
-@@ -96,19 +113,8 @@ static void list_file(const char *fname)
+@@ -102,19 +119,8 @@ static void list_file(const char *fname)
  
        permstring(permbuf, buf.st_mode);
  
@@ -418,7 +418,7 @@ command before "make":
  
        /* TODO: Perhaps escape special characters in fname? */
  
-@@ -119,24 +125,55 @@ static void list_file(const char *fname)
+@@ -125,24 +131,55 @@ static void list_file(const char *fname)
                    (long)minor(buf.st_rdev));
        } else /* NB: use double for size since it might not fit in a long. */
                printf("%12.0f", (double)buf.st_size);