X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9aab301ce40f66967d3cc8ff3b09e38088de546a..a5e6228afbf1809d33d9a31e0895c5e955c39ce1:/detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 4f927d9..d063ece 100644
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -32,8 +32,9 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
---- old/compat.c
-+++ new/compat.c
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
 @@ -41,6 +41,7 @@ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
@@ -42,7 +43,7 @@ TODO:
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
-@@ -108,6 +109,7 @@ void set_allow_inc_recurse(void)
+@@ -107,6 +108,7 @@ void set_allow_inc_recurse(void)
  		allow_inc_recurse = 0;
  	else if (!am_sender
  	 && (delete_before || delete_after
@@ -50,8 +51,9 @@ TODO:
  	  || delay_updates || prune_empty_dirs))
  		allow_inc_recurse = 0;
  	else if (am_server && !local_server
---- old/flist.c
-+++ new/flist.c
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
 @@ -61,6 +61,7 @@ extern int non_perishable_cnt;
  extern int prune_empty_dirs;
  extern int copy_links;
@@ -59,8 +61,8 @@ TODO:
 +extern int detect_renamed;
  extern int protocol_version;
  extern int sanitize_paths;
- extern struct stats stats;
-@@ -113,6 +114,8 @@ static int64 tmp_dev, tmp_ino;
+ extern int munge_symlinks;
+@@ -118,6 +119,8 @@ static int64 tmp_dev, tmp_ino;
  #endif
  static char tmp_sum[MAX_DIGEST_LEN];
  
@@ -69,7 +71,7 @@ TODO:
  static char empty_sum[MAX_DIGEST_LEN];
  static int flist_count_offset; /* for --delete --progress */
  static int dir_count = 0;
-@@ -252,6 +255,45 @@ static int is_excluded(char *fname, int 
+@@ -261,6 +264,45 @@ static int is_excluded(char *fname, int is_dir, int filter_level)
  	return 0;
  }
  
@@ -115,9 +117,9 @@ TODO:
  static void send_directory(int f, struct file_list *flist,
  			   char *fbuf, int len, int flags);
  
-@@ -2154,6 +2196,25 @@ struct file_list *recv_file_list(int f)
+@@ -2178,6 +2220,25 @@ struct file_list *recv_file_list(int f)
  
- 	clean_flist(flist, relative_paths);
+ 	flist_sort_and_clean(flist, relative_paths);
  
 +	if (detect_renamed) {
 +		int j = flist->used;
@@ -141,8 +143,9 @@ TODO:
  	if (protocol_version < 30) {
  		/* Recv the io_error flag */
  		if (ignore_errors)
---- old/generator.c
-+++ new/generator.c
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
 @@ -79,6 +79,7 @@ extern char *basis_dir[];
  extern int compare_dest;
  extern int copy_dest;
@@ -151,15 +154,15 @@ TODO:
  extern int whole_file;
  extern int list_only;
  extern int read_batch;
-@@ -95,6 +96,7 @@ extern char *backup_suffix;
+@@ -97,6 +98,7 @@ extern char *backup_suffix;
  extern int backup_suffix_len;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct server_filter_list;
 +extern struct file_list the_fattr_list;
- #ifdef ICONV_OPTION
- extern int ic_ndx;
- #endif
-@@ -105,6 +107,7 @@ int maybe_ATTRS_REPORT = 0;
+ 
+ int ignore_perishable = 0;
+ int non_perishable_cnt = 0;
+@@ -104,6 +106,7 @@ int maybe_ATTRS_REPORT = 0;
  
  static dev_t dev_zero;
  static int deletion_count = 0; /* used to implement --max-delete */
@@ -167,17 +170,24 @@ TODO:
  static int deldelay_size = 0, deldelay_cnt = 0;
  static char *deldelay_buf = NULL;
  static int deldelay_fd = -1;
-@@ -114,7 +117,8 @@ static int need_retouch_dir_times;
+@@ -113,7 +116,7 @@ static int need_retouch_dir_times;
  static int need_retouch_dir_perms;
  static const char *solo_file = NULL;
  
 -/* For calling delete_item() and delete_dir_contents(). */
 +/* For calling delete_item(), delete_dir_contents(), and delete_in_dir(). */
-+#define DEL_NO_DELETIONS	(1<<0)
- #define DEL_RECURSE		(1<<1) /* recurse */
+ #define DEL_OWNED_BY_US 	(1<<0) /* file/dir has our uid */
+ #define DEL_RECURSE		(1<<1) /* if dir, delete all contents */
  #define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
+@@ -122,6 +125,7 @@ static const char *solo_file = NULL;
+ #define DEL_FOR_SYMLINK 	(1<<5) /* making room for a replacement symlink */
+ #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_NO_DELETIONS	(1<<9) /* just check for renames w/o deleting */
+ 
+ #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
  
-@@ -136,11 +140,121 @@ static int is_backup_file(char *fn)
+@@ -142,11 +146,121 @@ static int is_backup_file(char *fn)
  	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
  }
  
@@ -297,18 +307,18 @@ TODO:
 + *
 + * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
   */
- static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+ static enum delret delete_item(char *fbuf, int mode, int flags)
  {
-@@ -162,6 +276,8 @@ static enum delret delete_item(char *fbu
+@@ -171,6 +285,8 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
  			goto check_ret;
  		/* OK: try to delete the directory. */
  	}
 +	if (flags & DEL_NO_DELETIONS)
 +		return DR_SUCCESS;
  
- 	if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
+ 	if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete)
  		return DR_AT_LIMIT;
-@@ -208,6 +324,8 @@ static enum delret delete_item(char *fbu
+@@ -226,6 +342,8 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
   * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
   * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
   * buffer is used for recursion, but returned unchanged.)
@@ -317,7 +327,7 @@ TODO:
   */
  static enum delret delete_dir_contents(char *fname, int flags)
  {
-@@ -227,7 +345,9 @@ static enum delret delete_dir_contents(c
+@@ -245,7 +363,9 @@ static enum delret delete_dir_contents(char *fname, int flags)
  	save_filters = push_local_filters(fname, dlen);
  
  	non_perishable_cnt = 0;
@@ -327,16 +337,17 @@ TODO:
  	ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
  
  	if (!dirlist->used)
-@@ -264,6 +384,8 @@ static enum delret delete_dir_contents(c
- 		if (S_ISDIR(fp->mode)
- 		 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
- 			ret = DR_NOT_EMPTY;
-+		if (detect_renamed && S_ISREG(fp->mode))
+@@ -288,7 +408,8 @@ static enum delret delete_dir_contents(char *fname, int flags)
+ 				do_chmod(fname, fp->mode |= S_IWUSR);
+ 			if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
+ 				ret = DR_NOT_EMPTY;
+-		}
++		} else if (detect_renamed && S_ISREG(fp->mode))
 +			look_for_rename(fp, fname);
- 		if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+ 		if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)
  			ret = DR_NOT_EMPTY;
  	}
-@@ -416,13 +538,18 @@ static void do_delayed_deletions(char *d
+@@ -449,13 +570,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
@@ -359,7 +370,7 @@ TODO:
  
  	if (!fbuf) {
  		change_local_filter_dir(NULL, 0, 0);
-@@ -432,21 +559,28 @@ static void delete_in_dir(char *fbuf, st
+@@ -465,21 +591,28 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  	if (verbose > 2)
  		rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
  
@@ -393,7 +404,7 @@ TODO:
  	if (one_file_system) {
  		if (file->flags & FLAG_TOP_DIR)
  			filesystem_dev = *fs_dev;
-@@ -456,6 +590,14 @@ static void delete_in_dir(char *fbuf, st
+@@ -489,6 +622,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  
  	dirlist = get_dirlist(fbuf, dlen, 0);
  
@@ -408,7 +419,7 @@ TODO:
  	/* If an item in dirlist is not found in flist, delete it
  	 * from the filesystem. */
  	for (i = dirlist->used; i--; ) {
-@@ -468,16 +610,25 @@ static void delete_in_dir(char *fbuf, st
+@@ -501,18 +642,26 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  					f_name(fp, NULL));
  			continue;
  		}
@@ -417,15 +428,19 @@ TODO:
 +			look_for_rename(fp, fbuf);
 +		}
  		if (flist_find(cur_flist, fp) < 0) {
+-			int flags = DEL_RECURSE
+-				  | (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0);
++			int own_flag = (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0);
  			f_name(fp, delbuf);
 -			if (delete_during == 2) {
+-				if (!remember_delete(fp, delbuf, flags))
 +			if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) {
- 				if (!remember_delete(fp, delbuf))
++				if (!remember_delete(fp, delbuf, own_flag | flags))
  					break;
  			} else
--				delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+-				delete_item(delbuf, fp->mode, flags);
 -		}
-+				delete_item(delbuf, fp->mode, NULL, flags);
++				delete_item(delbuf, fp->mode, own_flag | flags);
 +		} else if (detect_renamed && S_ISDIR(fp->mode))
 +			unexplored_dirs++;
  	}
@@ -437,7 +452,7 @@ TODO:
  	flist_free(dirlist);
  }
  
-@@ -507,9 +658,9 @@ static void do_delete_pass(void)
+@@ -542,9 +691,9 @@ static void do_delete_pass(void)
  		 || !S_ISDIR(st.st_mode))
  			continue;
  
@@ -449,7 +464,7 @@ TODO:
  
  	if (do_progress && !am_server)
  		rprintf(FINFO, "                    \r");
-@@ -1106,6 +1257,7 @@ static void list_file_entry(struct file_
+@@ -1170,6 +1319,7 @@ static void list_file_entry(struct file_struct *f)
  	}
  }
  
@@ -457,7 +472,7 @@ TODO:
  static int phase = 0;
  static int dflt_perms;
  
-@@ -1350,8 +1502,12 @@ static void recv_generator(char *fname, 
+@@ -1415,8 +1565,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  			}
  		}
  		else if (delete_during && f_out != -1 && !phase && dry_run < 2
@@ -472,7 +487,7 @@ TODO:
  		goto cleanup;
  	}
  
-@@ -1629,8 +1785,14 @@ static void recv_generator(char *fname, 
+@@ -1694,8 +1848,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  			goto cleanup;
  		}
  #endif
@@ -485,10 +500,10 @@ TODO:
 +			}
  			goto notify_others;
 +		}
- 		rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+ 		rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
  			full_fname(fname));
  		goto cleanup;
-@@ -1966,6 +2128,12 @@ void generate_files(int f_out, const cha
+@@ -2038,6 +2198,12 @@ void generate_files(int f_out, const char *local_name)
  	if (verbose > 2)
  		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
@@ -501,7 +516,7 @@ TODO:
  	if (delete_before && !solo_file && cur_flist->used > 0)
  		do_delete_pass();
  	if (delete_during == 2) {
-@@ -1976,7 +2144,7 @@ void generate_files(int f_out, const cha
+@@ -2048,7 +2214,7 @@ void generate_files(int f_out, const char *local_name)
  	}
  	do_progress = 0;
  
@@ -510,7 +525,7 @@ TODO:
  		whole_file = 0;
  	if (verbose >= 2) {
  		rprintf(FINFO, "delta-transmission %s\n",
-@@ -2014,7 +2182,7 @@ void generate_files(int f_out, const cha
+@@ -2086,7 +2252,7 @@ void generate_files(int f_out, const char *local_name)
  						dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
  					} else
  						dirdev = MAKEDEV(0, 0);
@@ -519,7 +534,7 @@ TODO:
  				}
  			}
  		}
-@@ -2059,7 +2227,21 @@ void generate_files(int f_out, const cha
+@@ -2129,7 +2295,21 @@ void generate_files(int f_out, const char *local_name)
  	} while ((cur_flist = cur_flist->next) != NULL);
  
  	if (delete_during)
@@ -542,9 +557,10 @@ TODO:
  	phase++;
  	if (verbose > 2)
  		rprintf(FINFO, "generate_files phase=%d\n", phase);
---- old/options.c
-+++ new/options.c
-@@ -80,6 +80,7 @@ int am_generator = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -81,6 +81,7 @@ int am_generator = 0;
  int am_starting_up = 1;
  int relative_paths = -1;
  int implied_dirs = 1;
@@ -552,7 +568,7 @@ TODO:
  int numeric_ids = 0;
  int allow_8bit_chars = 0;
  int force_delete = 0;
-@@ -383,6 +384,7 @@ void usage(enum logcode F)
+@@ -386,6 +387,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");
@@ -560,7 +576,7 @@ TODO:
    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");
-@@ -561,6 +563,7 @@ static struct poptOption long_options[] 
+@@ -564,6 +566,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 },
@@ -568,7 +584,7 @@ TODO:
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
    {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
-@@ -1532,7 +1535,7 @@ int parse_arguments(int *argc_p, const c
+@@ -1542,7 +1545,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  		inplace = 1;
  	}
  
@@ -577,7 +593,7 @@ TODO:
  		partial_dir = tmp_partialdir;
  
  	if (inplace) {
-@@ -1541,6 +1544,7 @@ int parse_arguments(int *argc_p, const c
+@@ -1551,6 +1554,7 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			snprintf(err_buf, sizeof err_buf,
  				 "--%s cannot be used with --%s\n",
  				 append_mode ? "append" : "inplace",
@@ -585,7 +601,7 @@ TODO:
  				 delay_updates ? "delay-updates" : "partial-dir");
  			return 0;
  		}
-@@ -1885,6 +1889,8 @@ void server_options(char **args, int *ar
+@@ -1897,6 +1901,8 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = "--super";
  		if (size_only)
  			args[ac++] = "--size-only";
@@ -594,9 +610,10 @@ TODO:
  	} else {
  		if (skip_compress) {
  			if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -384,6 +384,7 @@ to the detailed description below for a 
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -385,6 +385,7 @@ to the detailed description below for a complete description.  verb(
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
@@ -604,7 +621,7 @@ TODO:
       --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
-@@ -1430,6 +1431,21 @@ Note that the use of the bf(--delete) op
+@@ -1467,6 +1468,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.
  
@@ -626,9 +643,10 @@ TODO:
  dit(bf(--compare-dest=DIR)) This option instructs rsync to use em(DIR) on
  the destination machine as an additional hierarchy to compare destination
  files against doing transfers (if the files are missing in the destination
---- old/util.c
-+++ new/util.c
-@@ -1030,6 +1030,32 @@ int handle_partial_dir(const char *fname
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -1019,6 +1019,32 @@ int handle_partial_dir(const char *fname, int create)
  	return 1;
  }