X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5e048c14dd26a88afec23cc5b29dd6de84c64160..36bbf3d1758aadd1232e6f3942ad2b522b4c9aab:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 3b821c1..2fdfda2 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-03-01 01:22:58
+--- orig/batch.c	2005-03-16 02:19:29.133830510
 +++ batch.c	2004-07-03 20:15:41
-@@ -202,6 +202,8 @@ void show_flist(int index, struct file_s
+@@ -197,6 +197,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,9 +15,9 @@ 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-02-26 19:27:54
+--- orig/flist.c	2005-03-16 02:19:29.897764030
 +++ flist.c	2005-02-07 21:06:04
-@@ -56,6 +56,7 @@ extern int relative_paths;
+@@ -54,6 +54,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
@@ -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-03 02:58:55
+--- orig/generator.c	2005-03-16 02:19:29.980756807
 +++ generator.c	2004-11-03 23:02:12
-@@ -357,7 +357,7 @@ static int unchanged_file(char *fn, stru
+@@ -373,7 +373,7 @@ static int unchanged_file(char *fn, stru
  	if (ignore_times)
  		return 0;
  
@@ -138,7 +138,7 @@ command before "make":
  }
  
  
-@@ -808,7 +808,7 @@ static void recv_generator(char *fname, 
+@@ -838,7 +838,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-02 09:52:06
+--- orig/options.c	2005-03-16 02:19:30.152741841
 +++ 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;
-@@ -284,6 +285,7 @@ void usage(enum logcode F)
+@@ -285,6 +286,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");
-@@ -407,6 +409,7 @@ static struct poptOption long_options[] 
+@@ -409,6 +411,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 },
-@@ -1269,6 +1272,8 @@ void server_options(char **args,int *arg
+@@ -1277,6 +1280,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -182,7 +182,7 @@ command before "make":
  	if (omit_dir_times == 2 && am_sender)
  		argstr[x++] = 'O';
  	if (preserve_perms)
---- orig/rsync.c	2005-02-25 18:44:31
+--- orig/rsync.c	2005-03-16 02:19:30.453715649
 +++ rsync.c	2005-02-21 10:57:03
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
@@ -192,7 +192,7 @@ command before "make":
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -57,6 +58,7 @@ int set_perms(char *fname,struct file_st
+@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st
  	int updated = 0;
  	STRUCT_STAT st2;
  	int change_uid, change_gid;
@@ -200,7 +200,7 @@ command before "make":
  
  	if (!st) {
  		if (dry_run)
-@@ -69,17 +71,27 @@ int set_perms(char *fname,struct file_st
+@@ -68,17 +70,27 @@ int set_perms(char *fname,struct file_st
  		st = &st2;
  	}
  
@@ -234,7 +234,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2005-03-03 00:14:56
+--- orig/rsync.h	2005-03-16 02:19:30.524709471
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -244,7 +244,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -116,6 +117,7 @@
+@@ -118,6 +119,7 @@
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
@@ -252,7 +252,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -501,6 +503,7 @@ struct file_struct {
+@@ -510,6 +512,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -260,7 +260,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-03-03 02:23:27
+--- orig/rsync.yo	2005-03-16 02:19:30.727691806
 +++ rsync.yo	2005-01-24 01:57:18
 @@ -321,6 +321,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
@@ -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)
-@@ -653,6 +654,11 @@ it is preserving modification times (see
+@@ -654,6 +655,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).
  
@@ -304,7 +304,7 @@ command before "make":
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- orig/testsuite/rsync.fns	2005-02-21 07:29:00
+--- orig/testsuite/rsync.fns	2005-02-21 07:26:59
 +++ testsuite/rsync.fns	2005-02-21 07:30:11
 @@ -50,7 +50,7 @@ printmsg() {
  
@@ -332,7 +332,7 @@ command before "make":
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  
---- orig/tls.c	2005-01-19 20:11:10
+--- orig/tls.c	2005-01-19 19:30:29
 +++ tls.c	2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  
@@ -469,7 +469,7 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2005-02-23 02:57:27
+--- orig/util.c	2005-03-11 17:36:35
 +++ 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;
-@@ -1145,8 +1150,8 @@ int msleep(int t)
+@@ -1146,8 +1151,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
-@@ -1155,7 +1160,7 @@ int msleep(int t)
+@@ -1156,7 +1161,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/