From: Wayne Davison <wayned@samba.org>
Date: Mon, 7 Feb 2005 21:13:19 +0000 (+0000)
Subject: Fixed failing hunks.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/2ae38ef57caa0762065a10f844607465320b688a

Fixed failing hunks.
---

diff --git a/atimes.diff b/atimes.diff
index bdad561..acb5dbb 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-02-03 02:04:20
+--- orig/batch.c	2005-02-07 20:41:56
 +++ batch.c	2004-07-03 20:15:41
-@@ -204,6 +204,8 @@ void show_flist(int index, struct file_s
+@@ -206,6 +206,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,8 +15,8 @@ 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-03 02:04:20
-+++ flist.c	2005-02-01 10:42:59
+--- orig/flist.c	2005-02-07 20:41:56
++++ flist.c	2005-02-07 21:06:04
 @@ -63,6 +63,7 @@ extern int make_backups;
  extern int backup_suffix_len;
  extern int copy_links;
@@ -25,7 +25,7 @@ command before "make":
  extern int protocol_version;
  extern int sanitize_paths;
  extern int delete_excluded;
-@@ -150,17 +151,17 @@ static void list_file_entry(struct file_
+@@ -150,16 +151,18 @@ static void list_file_entry(struct file_
  
  #if SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
@@ -33,8 +33,8 @@ command before "make":
 +		rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
  			perms,
  			(double)f->length, timestring(f->modtime),
--			f_name(f), f->u.link);
-+			timestring(f->atime), f_name(f), f->u.link);
++			timestring(f->atime),
+ 			safe_fname(f_name(f)), safe_fname(f->u.link));
  	} else
  #endif
  	{
@@ -42,12 +42,11 @@ command before "make":
 +		rprintf(FINFO, "%s %11.0f %s %s %s\n",
  			perms,
  			(double)f->length, timestring(f->modtime),
--			f_name(f));
-+			timestring(f->atime), f_name(f));
++			timestring(f->atime),
+ 			safe_fname(f_name(f)));
  	}
  }
- 
-@@ -323,6 +324,7 @@ void send_file_entry(struct file_struct 
+@@ -323,6 +326,7 @@ void send_file_entry(struct file_struct 
  {
  	unsigned short flags;
  	static time_t modtime;
@@ -55,7 +54,7 @@ command before "make":
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -338,7 +340,7 @@ void send_file_entry(struct file_struct 
+@@ -338,7 +342,7 @@ void send_file_entry(struct file_struct 
  
  	if (!file) {
  		write_byte(f, 0);
@@ -64,7 +63,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -387,6 +389,12 @@ void send_file_entry(struct file_struct 
+@@ -387,6 +391,12 @@ void send_file_entry(struct file_struct 
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
@@ -77,7 +76,7 @@ command before "make":
  
  #if SUPPORT_HARD_LINKS
  	if (file->link_u.idev) {
-@@ -442,6 +450,8 @@ void send_file_entry(struct file_struct 
+@@ -442,6 +452,8 @@ void send_file_entry(struct file_struct 
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -86,7 +85,7 @@ command before "make":
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -515,6 +525,7 @@ static void receive_file_entry(struct fi
+@@ -515,6 +527,7 @@ static void receive_file_entry(struct fi
  			       unsigned short flags, int f)
  {
  	static time_t modtime;
@@ -94,7 +93,7 @@ command before "make":
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -533,7 +544,7 @@ static void receive_file_entry(struct fi
+@@ -533,7 +546,7 @@ static void receive_file_entry(struct fi
  	struct file_struct *file;
  
  	if (!flist) {
@@ -103,7 +102,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -589,6 +600,8 @@ static void receive_file_entry(struct fi
+@@ -589,6 +602,8 @@ static void receive_file_entry(struct fi
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -112,7 +111,7 @@ command before "make":
  
  	if (preserve_uid && !(flags & XMIT_SAME_UID))
  		uid = (uid_t)read_int(f);
-@@ -639,6 +652,7 @@ static void receive_file_entry(struct fi
+@@ -639,6 +654,7 @@ static void receive_file_entry(struct fi
  
  	file->flags = 0;
  	file->modtime = modtime;
@@ -120,7 +119,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -885,6 +899,7 @@ skip_filters:
+@@ -886,6 +902,7 @@ skip_filters:
  
  	file->flags = flags;
  	file->modtime = st.st_mtime;
@@ -128,7 +127,7 @@ command before "make":
  	file->length = st.st_size;
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
---- orig/generator.c	2005-02-03 02:04:20
+--- orig/generator.c	2005-02-07 20:41:56
 +++ generator.c	2004-11-03 23:02:12
 @@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru
  	if (ignore_times)
@@ -139,7 +138,7 @@ command before "make":
  }
  
  
-@@ -497,7 +497,7 @@ static void recv_generator(char *fname, 
+@@ -503,7 +503,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && fnamecmp_type == FNAMECMP_FNAME
@@ -148,7 +147,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2005-02-01 10:39:22
+--- orig/options.c	2005-02-07 20:41:56
 +++ options.c	2005-01-24 01:51:48
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
@@ -158,7 +157,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -270,6 +271,7 @@ void usage(enum logcode F)
+@@ -269,6 +270,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 +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");
-@@ -389,6 +391,7 @@ static struct poptOption long_options[] 
+@@ -388,6 +390,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 },
@@ -174,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 },
-@@ -1152,6 +1155,8 @@ void server_options(char **args,int *arg
+@@ -1151,6 +1154,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -183,7 +182,7 @@ command before "make":
  	if (omit_dir_times && am_sender)
  		argstr[x++] = 'O';
  	if (preserve_perms)
---- orig/rsync.c	2005-02-01 10:39:22
+--- orig/rsync.c	2005-02-07 20:41:57
 +++ rsync.c	2005-01-24 01:59:12
 @@ -26,6 +26,7 @@ extern int verbose;
  extern int dry_run;
@@ -193,7 +192,7 @@ command before "make":
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -155,6 +156,7 @@ int set_perms(char *fname,struct file_st
+@@ -156,6 +157,7 @@ int set_perms(char *fname,struct file_st
  	int updated = 0;
  	STRUCT_STAT st2;
  	int change_uid, change_gid;
@@ -201,7 +200,7 @@ command before "make":
  
  	if (!st) {
  		if (dry_run)
-@@ -167,18 +169,28 @@ int set_perms(char *fname,struct file_st
+@@ -168,18 +170,28 @@ int set_perms(char *fname,struct file_st
  		st = &st2;
  	}
  
@@ -236,7 +235,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2005-02-03 02:04:20
+--- orig/rsync.h	2005-02-07 20:41:57
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -246,7 +245,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -118,6 +119,7 @@
+@@ -114,6 +115,7 @@
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
@@ -254,7 +253,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -485,6 +487,7 @@ struct file_struct {
+@@ -481,6 +483,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -262,7 +261,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-02-01 10:39:23
+--- orig/rsync.yo	2005-02-06 07:24:23
 +++ 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)
@@ -489,9 +488,9 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2005-01-28 19:08:20
-+++ util.c	2005-01-21 18:56:05
-@@ -128,12 +128,20 @@ void overflow(char *str)
+--- orig/util.c	2005-02-07 20:41:57
++++ util.c	2005-02-07 21:09:12
+@@ -128,12 +128,17 @@ void overflow(char *str)
  
  
  
@@ -501,21 +500,18 @@ command before "make":
  	if (verbose > 2) {
 -		rprintf(FINFO, "set modtime of %s to (%ld) %s",
 +		char mtimebuf[200];
-+		char atimebuf[200];
 +
 +		strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
-+		strlcpy(atimebuf, timestring(atime), sizeof atimebuf);
-+
 +		rprintf(FINFO,
 +			"set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
- 			fname, (long)modtime,
+ 			safe_fname(fname), (long)modtime,
 -			asctime(localtime(&modtime)));
 +			mtimebuf,
-+			(long)atime, atimebuf);
++			(long)atime, timestring(atime));
  	}
  
  	if (dry_run)
-@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt
+@@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt
  	{
  #if HAVE_UTIMBUF
  		struct utimbuf tbuf;
@@ -536,7 +532,7 @@ command before "make":
  		t[0].tv_usec = 0;
  		t[1].tv_sec = modtime;
  		t[1].tv_usec = 0;
-@@ -1138,8 +1146,8 @@ int msleep(int t)
+@@ -1141,8 +1146,8 @@ int msleep(int t)
  
  
  /**
@@ -547,7 +543,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1148,7 +1156,7 @@ int msleep(int t)
+@@ -1151,7 +1156,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/
diff --git a/link-by-hash.diff b/link-by-hash.diff
index 903827b..ee6c89c 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,9 +365,9 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c	2005-02-01 10:39:22
+--- orig/options.c	2005-02-07 20:41:56
 +++ options.c	2005-01-28 19:32:26
-@@ -132,6 +132,7 @@ char *log_format = NULL;
+@@ -131,6 +131,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -375,7 +375,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -303,6 +304,7 @@ void usage(enum logcode F)
+@@ -302,6 +303,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
@@ -383,7 +383,7 @@ the file's name.
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -341,7 +343,7 @@ void usage(enum logcode F)
+@@ -340,7 +342,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -392,7 +392,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -408,6 +410,7 @@ static struct poptOption long_options[] 
+@@ -407,6 +409,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -400,7 +400,7 @@ the file's name.
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -802,6 +805,21 @@ int parse_arguments(int *argc, const cha
+@@ -799,6 +802,21 @@ int parse_arguments(int *argc, const cha
  			basis_dir[basis_dir_cnt++] = (char *)arg;
  			break;
  
@@ -422,7 +422,7 @@ the file's name.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off (opt-BASE is its index). */
-@@ -1305,6 +1323,11 @@ void server_options(char **args,int *arg
+@@ -1304,6 +1322,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -434,7 +434,7 @@ the file's name.
  	if (files_from && (!am_sender || remote_filesfrom_file)) {
  		if (remote_filesfrom_file) {
  			args[ac++] = "--files-from";
---- orig/receiver.c	2005-02-03 02:04:20
+--- orig/receiver.c	2005-02-07 20:41:56
 +++ receiver.c	2005-01-15 21:29:13
 @@ -35,6 +35,7 @@ extern int preserve_hard_links;
  extern int preserve_perms;
@@ -444,7 +444,7 @@ the file's name.
  extern char *partial_dir;
  extern char *basis_dir[];
  extern int basis_dir_cnt;
-@@ -136,12 +137,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -137,12 +138,13 @@ static int get_tmpname(char *fnametmp, c
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@ -459,7 +459,7 @@ the file's name.
  	int32 len;
  	OFF_T offset = 0;
  	OFF_T offset2;
-@@ -161,6 +163,9 @@ static int receive_data(int f_in, char *
+@@ -162,6 +164,9 @@ static int receive_data(int f_in, char *
  	} else
  		mapbuf = NULL;
  
@@ -469,7 +469,7 @@ the file's name.
  	sum_init(checksum_seed);
  
  	while ((i = recv_token(f_in, &data)) != 0) {
-@@ -177,6 +182,8 @@ static int receive_data(int f_in, char *
+@@ -178,6 +183,8 @@ static int receive_data(int f_in, char *
  			cleanup_got_literal = 1;
  
  			sum_update(data, i);
@@ -478,7 +478,7 @@ the file's name.
  
  			if (fd != -1 && write_file(fd,data,i) != i)
  				goto report_write_error;
-@@ -203,6 +210,8 @@ static int receive_data(int f_in, char *
+@@ -204,6 +211,8 @@ static int receive_data(int f_in, char *
  
  			see_token(map, len);
  			sum_update(map, len);
@@ -487,7 +487,7 @@ the file's name.
  		}
  
  		if (inplace) {
-@@ -243,6 +252,8 @@ static int receive_data(int f_in, char *
+@@ -244,6 +253,8 @@ static int receive_data(int f_in, char *
  	}
  
  	sum_end(file_sum1);
@@ -496,7 +496,7 @@ the file's name.
  
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -258,7 +269,7 @@ static int receive_data(int f_in, char *
+@@ -259,7 +270,7 @@ static int receive_data(int f_in, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,7 +505,7 @@ the file's name.
  }
  
  
-@@ -500,8 +511,12 @@ int recv_files(int f_in, struct file_lis
+@@ -501,8 +512,12 @@ int recv_files(int f_in, struct file_lis
  			rprintf(FINFO, "%s\n", safe_fname(fname));
  
  		/* recv file data */
@@ -519,8 +519,8 @@ the file's name.
  
  		log_recv(file, &initial_stats);
  
---- orig/rsync.c	2005-02-01 10:39:22
-+++ rsync.c	2004-08-13 18:14:34
+--- orig/rsync.c	2005-02-07 20:41:57
++++ rsync.c	2005-02-07 21:11:30
 @@ -36,6 +36,7 @@ extern int force_delete;
  extern int recurse;
  extern int keep_dirlinks;
@@ -529,10 +529,10 @@ the file's name.
  extern char *backup_dir;
  extern int inplace;
  
-@@ -282,7 +283,12 @@ void finish_transfer(char *fname, char *
- 	/* move tmp file over real file */
- 	if (verbose > 2)
- 		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+@@ -287,7 +288,12 @@ void finish_transfer(char *fname, char *
+ 		rprintf(FINFO, "renaming %s to %s\n",
+ 			safe_fname(fnametmp), safe_fname(fname));
+ 	}
 -	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 +#if HAVE_LINK
 +	if (link_by_hash_dir)
@@ -543,9 +543,9 @@ the file's name.
  	if (ret < 0) {
  		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
  		    ret == -2 ? "copy" : "rename",
---- orig/rsync.h	2005-02-03 02:04:20
+--- orig/rsync.h	2005-02-07 20:41:57
 +++ rsync.h	2004-07-03 20:20:15
-@@ -598,6 +598,14 @@ struct stats {
+@@ -600,6 +600,14 @@ struct stats {
  	int current_file_index;
  };
  
@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo	2005-02-01 10:39:23
+--- orig/rsync.yo	2005-02-06 07:24:23
 +++ rsync.yo	2005-01-28 19:32:45
 @@ -354,6 +354,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR