X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..refs/heads/master:/detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index f85c1b6..2df5d30 100644
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -32,11 +32,11 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/compat.c b/compat.c
-index 6e00072..5fc9e37 100644
 --- a/compat.c
 +++ b/compat.c
-@@ -40,6 +40,7 @@ extern int checksum_seed;
+@@ -41,6 +41,7 @@ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
  extern int protocol_version;
@@ -44,7 +44,7 @@ index 6e00072..5fc9e37 100644
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
-@@ -119,6 +120,7 @@ void set_allow_inc_recurse(void)
+@@ -121,6 +122,7 @@ void set_allow_inc_recurse(void)
  		allow_inc_recurse = 0;
  	else if (!am_sender
  	 && (delete_before || delete_after
@@ -53,7 +53,6 @@ index 6e00072..5fc9e37 100644
  		allow_inc_recurse = 0;
  	else if (am_server && !local_server
 diff --git a/delete.c b/delete.c
-index 33fdd0e..6130a4c 100644
 --- a/delete.c
 +++ b/delete.c
 @@ -25,6 +25,7 @@
@@ -103,7 +102,6 @@ index 33fdd0e..6130a4c 100644
  enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
  {
 diff --git a/flist.c b/flist.c
-index 09b4fc5..929aa85 100644
 --- a/flist.c
 +++ b/flist.c
 @@ -63,6 +63,7 @@ extern int non_perishable_cnt;
@@ -114,7 +112,7 @@ index 09b4fc5..929aa85 100644
  extern int protocol_version;
  extern int sanitize_paths;
  extern int munge_symlinks;
-@@ -124,6 +125,8 @@ static int64 tmp_dev, tmp_ino;
+@@ -134,6 +135,8 @@ static int64 tmp_dev, tmp_ino;
  #endif
  static char tmp_sum[MAX_DIGEST_LEN];
  
@@ -123,7 +121,7 @@ index 09b4fc5..929aa85 100644
  static char empty_sum[MAX_DIGEST_LEN];
  static int flist_count_offset; /* for --delete --progress */
  
-@@ -291,6 +294,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -301,6 +304,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
  	return 0;
  }
  
@@ -169,7 +167,7 @@ index 09b4fc5..929aa85 100644
  static void send_directory(int f, struct file_list *flist,
  			   char *fbuf, int len, int flags);
  
-@@ -2464,6 +2506,25 @@ struct file_list *recv_file_list(int f)
+@@ -2548,6 +2590,25 @@ struct file_list *recv_file_list(int f)
  
  	flist_sort_and_clean(flist, relative_paths);
  
@@ -196,10 +194,9 @@ index 09b4fc5..929aa85 100644
  		/* Recv the io_error flag */
  		int err = read_int(f);
 diff --git a/generator.c b/generator.c
-index 12007a1..35ba203 100644
 --- a/generator.c
 +++ b/generator.c
-@@ -81,6 +81,7 @@ extern char *partial_dir;
+@@ -80,6 +80,7 @@ extern char *partial_dir;
  extern int compare_dest;
  extern int copy_dest;
  extern int link_dest;
@@ -207,10 +204,10 @@ index 12007a1..35ba203 100644
  extern int whole_file;
  extern int list_only;
  extern int read_batch;
-@@ -98,10 +99,12 @@ extern uid_t our_uid;
+@@ -97,10 +98,12 @@ extern char *tmpdir;
  extern char *basis_dir[MAX_BASIS_DIRS+1];
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct filter_list_struct filter_list, daemon_filter_list;
+ extern filter_rule_list filter_list, daemon_filter_list;
 +extern struct file_list the_fattr_list;
  
  int maybe_ATTRS_REPORT = 0;
@@ -220,7 +217,7 @@ index 12007a1..35ba203 100644
  static int deldelay_size = 0, deldelay_cnt = 0;
  static char *deldelay_buf = NULL;
  static int deldelay_fd = -1;
-@@ -181,6 +184,8 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag
+@@ -180,6 +183,8 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag
  		if (!flush_delete_delay())
  			return 0;
  	}
@@ -229,7 +226,7 @@ index 12007a1..35ba203 100644
  
  	return 1;
  }
-@@ -272,13 +277,18 @@ static void do_delayed_deletions(char *delbuf)
+@@ -271,13 +276,18 @@ static void do_delayed_deletions(char *delbuf)
   * all the --delete-WHEN options.  Note that the fbuf pointer must point to a
   * MAXPATHLEN buffer with the name of the directory in it (the functions we
   * call will append names onto the end, but the old dir value will be restored
@@ -252,8 +249,8 @@ index 12007a1..35ba203 100644
  	int save_uid_ndx = uid_ndx;
  
  	if (!fbuf) {
-@@ -293,17 +303,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
- 		maybe_send_keepalive();
+@@ -292,17 +302,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+ 		maybe_send_keepalive(time(NULL), True);
  
  	if (io_error && !ignore_errors) {
 -		if (already_warned)
@@ -280,7 +277,7 @@ index 12007a1..35ba203 100644
  	if (one_file_system) {
  		if (file->flags & FLAG_TOP_DIR)
  			filesystem_dev = *fs_dev;
-@@ -316,6 +331,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -315,6 +330,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  
  	dirlist = get_dirlist(fbuf, dlen, 0);
  
@@ -295,7 +292,7 @@ index 12007a1..35ba203 100644
  	/* If an item in dirlist is not found in flist, delete it
  	 * from the filesystem. */
  	for (i = dirlist->used; i--; ) {
-@@ -328,6 +351,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -327,6 +350,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  					f_name(fp, NULL));
  			continue;
  		}
@@ -306,7 +303,7 @@ index 12007a1..35ba203 100644
  		/* Here we want to match regardless of file type.  Replacement
  		 * of a file with one of another type is handled separately by
  		 * a delete_item call with a DEL_MAKE_ROOM flag. */
-@@ -336,14 +363,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -335,14 +362,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  			if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
  				flags |= DEL_NO_UID_WRITE;
  			f_name(fp, delbuf);
@@ -330,7 +327,7 @@ index 12007a1..35ba203 100644
  	flist_free(dirlist);
  
  	if (!save_uid_ndx) {
-@@ -381,14 +413,122 @@ static void do_delete_pass(void)
+@@ -380,14 +412,122 @@ static void do_delete_pass(void)
  		 || !S_ISDIR(st.st_mode))
  			continue;
  
@@ -454,8 +451,8 @@ index 12007a1..35ba203 100644
 +
  int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
  {
- #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
-@@ -1042,6 +1182,7 @@ static void list_file_entry(struct file_struct *f)
+ #ifndef CAN_SET_SYMLINK_TIMES
+@@ -1048,6 +1188,7 @@ static void list_file_entry(struct file_struct *f)
  	}
  }
  
@@ -463,7 +460,7 @@ index 12007a1..35ba203 100644
  static int phase = 0;
  static int dflt_perms;
  
-@@ -1321,9 +1462,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1327,9 +1468,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		}
  		else if (delete_during && f_out != -1 && !phase
  		    && !(file->flags & FLAG_MISSING_DIR)) {
@@ -479,7 +476,7 @@ index 12007a1..35ba203 100644
  				change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
  		}
  		goto cleanup;
-@@ -1601,8 +1745,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1588,8 +1732,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  			goto cleanup;
  		}
  #endif
@@ -495,7 +492,7 @@ index 12007a1..35ba203 100644
  		rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
  			full_fname(fname));
  		goto cleanup;
-@@ -2003,6 +2153,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2056,6 +2206,12 @@ void generate_files(int f_out, const char *local_name)
  	if (DEBUG_GTE(GENR, 1))
  		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
@@ -508,7 +505,7 @@ index 12007a1..35ba203 100644
  	if (delete_before && !solo_file && cur_flist->used > 0)
  		do_delete_pass();
  	if (delete_during == 2) {
-@@ -2013,7 +2169,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2066,7 +2222,7 @@ void generate_files(int f_out, const char *local_name)
  	}
  	info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
  
@@ -517,7 +514,7 @@ index 12007a1..35ba203 100644
  		whole_file = 0;
  	if (DEBUG_GTE(FLIST, 1)) {
  		rprintf(FINFO, "delta-transmission %s\n",
-@@ -2055,7 +2211,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2102,7 +2258,7 @@ void generate_files(int f_out, const char *local_name)
  						dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
  					} else
  						dirdev = MAKEDEV(0, 0);
@@ -526,7 +523,7 @@ index 12007a1..35ba203 100644
  				} else
  					change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
  			}
-@@ -2102,7 +2258,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -2149,7 +2305,21 @@ void generate_files(int f_out, const char *local_name)
  	} while ((cur_flist = cur_flist->next) != NULL);
  
  	if (delete_during)
@@ -550,7 +547,6 @@ index 12007a1..35ba203 100644
  	if (DEBUG_GTE(GENR, 1))
  		rprintf(FINFO, "generate_files phase=%d\n", phase);
 diff --git a/options.c b/options.c
-index e7c6c61..7e454b3 100644
 --- a/options.c
 +++ b/options.c
 @@ -80,6 +80,7 @@ int am_server = 0;
@@ -561,7 +557,7 @@ index e7c6c61..7e454b3 100644
  int implied_dirs = 1;
  int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
  int numeric_ids = 0;
-@@ -742,6 +743,7 @@ void usage(enum logcode F)
+@@ -743,6 +744,7 @@ void usage(enum logcode F)
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
@@ -569,7 +565,7 @@ index e7c6c61..7e454b3 100644
    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");
-@@ -937,6 +939,7 @@ static struct poptOption long_options[] = {
+@@ -938,6 +940,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 },
@@ -577,7 +573,7 @@ index e7c6c61..7e454b3 100644
    {"fuzzy",           'y', POPT_ARG_VAL,    &fuzzy_basis, 1, 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2105,7 +2108,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2157,7 +2160,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		inplace = 1;
  	}
  
@@ -586,7 +582,7 @@ index e7c6c61..7e454b3 100644
  		partial_dir = tmp_partialdir;
  
  	if (inplace) {
-@@ -2114,6 +2117,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2166,6 +2169,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			snprintf(err_buf, sizeof err_buf,
  				 "--%s cannot be used with --%s\n",
  				 append_mode ? "append" : "inplace",
@@ -594,7 +590,7 @@ index e7c6c61..7e454b3 100644
  				 delay_updates ? "delay-updates" : "partial-dir");
  			return 0;
  		}
-@@ -2476,6 +2480,8 @@ void server_options(char **args, int *argc_p)
+@@ -2528,6 +2532,8 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--super";
  		if (size_only)
  			args[ac++] = "--size-only";
@@ -604,11 +600,10 @@ index e7c6c61..7e454b3 100644
  			args[ac++] = "--stats";
  	} else {
 diff --git a/rsync.h b/rsync.h
-index be7cf8a..278e282 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -242,7 +242,7 @@ enum msgcode {
- #define NDX_DEL_STATS -2
+@@ -246,7 +246,7 @@ enum msgcode {
+ #define NDX_DEL_STATS -3
  #define NDX_FLIST_OFFSET -101
  
 -/* For calling delete_item() and delete_dir_contents(). */
@@ -616,7 +611,7 @@ index be7cf8a..278e282 100644
  #define DEL_NO_UID_WRITE 	(1<<0) /* file/dir has our uid w/o write perm */
  #define DEL_RECURSE		(1<<1) /* if dir, delete all contents */
  #define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
-@@ -252,6 +252,7 @@ enum msgcode {
+@@ -256,6 +256,7 @@ enum msgcode {
  #define DEL_FOR_DEVICE		(1<<6) /* making room for a replacement device */
  #define DEL_FOR_SPECIAL 	(1<<7) /* making room for a replacement special */
  #define DEL_FOR_BACKUP	 	(1<<8) /* the delete is for a backup operation */
@@ -625,7 +620,6 @@ index be7cf8a..278e282 100644
  #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
  
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..4df39b0 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -397,6 +397,7 @@ to the detailed description below for a complete description.  verb(
@@ -636,7 +630,7 @@ index 941f7a5..4df39b0 100644
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
-@@ -1605,6 +1606,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
+@@ -1640,6 +1641,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
  fuzzy-match files, so either use bf(--delete-after) or specify some
  filename exclusions if you need to prevent this.
  
@@ -659,10 +653,9 @@ index 941f7a5..4df39b0 100644
  the destination machine as an additional hierarchy to compare destination
  files against doing transfers (if the files are missing in the destination
 diff --git a/util.c b/util.c
-index 0cafed6..7e5c71f 100644
 --- a/util.c
 +++ b/util.c
-@@ -1064,6 +1064,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
+@@ -1088,6 +1088,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
  	return path;
  }