X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/896871f8c1a4f6e6226fb8f81ef27431e2860f6b..388bf7ccf1f04928edf6cbe0cc367061194e0930:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 4d9863e..653fa26 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-03-27 05:13:14
+--- orig/batch.c	2005-04-09 18:00:28
 +++ batch.c	2004-07-03 20:15:41
-@@ -207,6 +207,8 @@ void show_flist(int index, struct file_s
+@@ -208,6 +208,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	2005-03-30 17:31:41
+--- orig/flist.c	2005-04-28 15:56:50
 +++ flist.c	2005-02-07 21:06:04
 @@ -54,6 +54,7 @@ extern int relative_paths;
  extern int implied_dirs;
@@ -119,7 +119,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -879,6 +895,7 @@ skip_filters:
+@@ -882,6 +898,7 @@ skip_filters:
  
  	file->flags = flags;
  	file->modtime = st.st_mtime;
@@ -127,9 +127,9 @@ command before "make":
  	file->length = st.st_size;
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
---- orig/generator.c	2005-03-30 16:35:08
+--- orig/generator.c	2005-04-28 16:26:28
 +++ generator.c	2004-11-03 23:02:12
-@@ -372,7 +372,7 @@ static int unchanged_file(char *fn, stru
+@@ -380,7 +380,7 @@ static int unchanged_file(char *fn, stru
  	if (ignore_times)
  		return 0;
  
@@ -138,7 +138,7 @@ command before "make":
  }
  
  
-@@ -837,7 +837,7 @@ static void recv_generator(char *fname, 
+@@ -854,7 +854,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && statret == 0
@@ -147,7 +147,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2005-03-31 00:24:21
+--- orig/options.c	2005-05-03 16:47:32
 +++ options.c	2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
@@ -157,7 +157,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -285,6 +286,7 @@ void usage(enum logcode F)
+@@ -286,6 +287,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");
@@ -165,7 +165,7 @@ command before "make":
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
-@@ -410,6 +412,7 @@ static struct poptOption long_options[] 
+@@ -414,6 +416,7 @@ static struct poptOption long_options[] 
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
@@ -173,7 +173,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 },
-@@ -1272,6 +1275,8 @@ void server_options(char **args,int *arg
+@@ -1294,6 +1297,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -234,7 +234,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2005-03-28 20:56:55
+--- orig/rsync.h	2005-04-14 01:53:12
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -252,7 +252,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -510,6 +512,7 @@ struct file_struct {
+@@ -509,6 +511,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -260,9 +260,9 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-03-30 16:57:29
+--- orig/rsync.yo	2005-05-03 16:47:33
 +++ rsync.yo	2005-01-24 01:57:18
-@@ -321,6 +321,7 @@ to the detailed description below for a 
+@@ -330,6 +330,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
   -O, --omit-dir-times        omit directories when preserving times
@@ -270,7 +270,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)
-@@ -655,6 +656,11 @@ it is preserving modification times (see
+@@ -667,6 +668,11 @@ it is preserving modification times (see
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -469,7 +469,7 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2005-03-30 20:45:02
+--- orig/util.c	2005-05-03 16:47:33
 +++ util.c	2005-02-07 21:09:12
 @@ -128,12 +128,17 @@ void overflow(char *str)
  
@@ -513,7 +513,7 @@ command before "make":
  		t[0].tv_usec = 0;
  		t[1].tv_sec = modtime;
  		t[1].tv_usec = 0;
-@@ -1146,8 +1151,8 @@ int msleep(int t)
+@@ -1156,8 +1161,8 @@ int msleep(int t)
  
  
  /**
@@ -524,7 +524,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1156,7 +1161,7 @@ int msleep(int t)
+@@ -1166,7 +1171,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/