X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/b78a6aba971b5e2e8fe359fc63047ff66f86ea70..6e93e60a173cded58e2645eedba5e0ca039be642:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 5b575fa..9a8a292 100644
--- 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	2005-02-12 19:54:27
+--- orig/flist.c	2005-02-14 02:45:10
 +++ flist.c	2005-02-07 21:06:04
 @@ -62,6 +62,7 @@ extern int make_backups;
  extern int backup_suffix_len;
@@ -27,7 +27,7 @@ command before "make":
  extern int max_delete;
 @@ -147,16 +148,18 @@ static void list_file_entry(struct file_
  
- #if SUPPORT_LINKS
+ #ifdef SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
 -		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 +		rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
@@ -74,7 +74,7 @@ command before "make":
 +			atime = file->atime;
 +	}
  
- #if SUPPORT_HARD_LINKS
+ #ifdef SUPPORT_HARD_LINKS
  	if (file->link_u.idev) {
 @@ -439,6 +449,8 @@ void send_file_entry(struct file_struct 
  		write_int(f, modtime);
@@ -85,15 +85,15 @@ command before "make":
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -512,6 +524,7 @@ static void receive_file_entry(struct fi
- 			       unsigned short flags, int f)
+@@ -512,6 +524,7 @@ static struct file_struct *receive_file_
+ 					      unsigned short flags, int f)
  {
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -530,7 +543,7 @@ static void receive_file_entry(struct fi
+@@ -530,7 +543,7 @@ static struct file_struct *receive_file_
  	struct file_struct *file;
  
  	if (!flist) {
@@ -102,7 +102,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -586,6 +599,8 @@ static void receive_file_entry(struct fi
+@@ -586,6 +599,8 @@ static struct file_struct *receive_file_
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -111,7 +111,7 @@ command before "make":
  
  	if (preserve_uid && !(flags & XMIT_SAME_UID))
  		uid = (uid_t)read_int(f);
-@@ -636,6 +651,7 @@ static void receive_file_entry(struct fi
+@@ -636,6 +651,7 @@ static struct file_struct *receive_file_
  
  	file->flags = 0;
  	file->modtime = modtime;
@@ -119,7 +119,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -883,6 +899,7 @@ skip_filters:
+@@ -885,6 +901,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-02-13 05:50:28
+--- orig/generator.c	2005-02-14 02:45:10
 +++ generator.c	2004-11-03 23:02:12
-@@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru
+@@ -100,7 +100,7 @@ static int unchanged_file(char *fn, stru
  	if (ignore_times)
  		return 0;
  
@@ -138,7 +138,7 @@ command before "make":
  }
  
  
-@@ -512,7 +512,7 @@ static void recv_generator(char *fname, 
+@@ -612,7 +612,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && fnamecmp_type == FNAMECMP_FNAME
@@ -147,7 +147,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2005-02-13 05:50:28
+--- orig/options.c	2005-02-14 02:45:10
 +++ options.c	2005-01-24 01:51:48
 @@ -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;
-@@ -272,6 +273,7 @@ void usage(enum logcode F)
+@@ -273,6 +274,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");
-@@ -392,6 +394,7 @@ static struct poptOption long_options[] 
+@@ -394,6 +396,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_NONE,   &omit_dir_times, 0, 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 },
-@@ -1211,6 +1214,8 @@ void server_options(char **args,int *arg
+@@ -1214,6 +1217,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 && am_sender)
  		argstr[x++] = 'O';
  	if (preserve_perms)
---- orig/rsync.c	2005-02-07 20:41:57
+--- orig/rsync.c	2005-02-14 02:45:10
 +++ rsync.c	2005-01-24 01:59:12
 @@ -26,6 +26,7 @@ extern int verbose;
  extern int dry_run;
@@ -235,7 +235,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2005-02-12 19:54:27
+--- orig/rsync.h	2005-02-14 02:45:10
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -245,7 +245,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -114,6 +115,7 @@
+@@ -115,6 +116,7 @@
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
@@ -253,7 +253,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -481,6 +483,7 @@ struct file_struct {
+@@ -483,6 +485,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -261,7 +261,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-02-13 05:50:28
+--- orig/rsync.yo	2005-02-14 02:45:11
 +++ rsync.yo	2005-01-24 01:57:18
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
@@ -271,7 +271,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
-@@ -642,6 +643,11 @@ dit(bf(-O, --omit-dir-times)) This tells
+@@ -643,6 +644,11 @@ dit(bf(-O, --omit-dir-times)) This tells
  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  
@@ -485,7 +485,7 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2005-02-11 10:53:15
+--- orig/util.c	2005-02-14 02:45:11
 +++ util.c	2005-02-07 21:09:12
 @@ -128,12 +128,17 @@ void overflow(char *str)
  
@@ -510,13 +510,13 @@ command before "make":
  	if (dry_run)
 @@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt
  	{
- #if HAVE_UTIMBUF
+ #ifdef HAVE_UTIMBUF
  		struct utimbuf tbuf;
 -		tbuf.actime = time(NULL);
 +		tbuf.actime = atime;
  		tbuf.modtime = modtime;
  		return utime(fname,&tbuf);
- #elif HAVE_UTIME
+ #elif defined HAVE_UTIME
  		time_t t[2];
 -		t[0] = time(NULL);
 +		t[0] = atime;