X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..5bafda3026f713e2e72b95a029bf12839d04e3cb:/flags.diff

diff --git a/flags.diff b/flags.diff
index dbbeea4..0f16462 100644
--- a/flags.diff
+++ b/flags.diff
@@ -8,9 +8,11 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
+TODO: fix --delete-delay to work with --flags option.
+
 --- old/configure.in
 +++ new/configure.in
-@@ -527,7 +527,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
@@ -29,7 +31,7 @@ To use this patch, run these commands for a successful build:
  extern int preserve_uid;
  extern int preserve_gid;
  extern int relative_paths;
-@@ -303,6 +304,9 @@ static void send_file_entry(struct file_
+@@ -305,6 +306,9 @@ static void send_file_entry(struct file_
  	unsigned short flags;
  	static time_t modtime;
  	static mode_t mode;
@@ -39,7 +41,7 @@ To use this patch, run these commands for a successful build:
  	static int64 dev;
  	static dev_t rdev;
  	static uint32 rdev_major;
-@@ -333,6 +337,12 @@ static void send_file_entry(struct file_
+@@ -335,6 +339,12 @@ static void send_file_entry(struct file_
  		flags |= XMIT_SAME_MODE;
  	else
  		mode = file->mode;
@@ -52,7 +54,7 @@ To use this patch, run these commands for a successful build:
  	if ((preserve_devices && IS_DEVICE(mode))
  	 || (preserve_specials && IS_SPECIAL(mode))) {
  		if (protocol_version < 28) {
-@@ -416,6 +426,10 @@ static void send_file_entry(struct file_
+@@ -418,6 +428,10 @@ static void send_file_entry(struct file_
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -63,7 +65,7 @@ To use this patch, run these commands for a successful build:
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -483,6 +497,9 @@ static struct file_struct *receive_file_
+@@ -485,6 +499,9 @@ static struct file_struct *receive_file_
  {
  	static time_t modtime;
  	static mode_t mode;
@@ -73,7 +75,7 @@ To use this patch, run these commands for a successful build:
  	static int64 dev;
  	static dev_t rdev;
  	static uint32 rdev_major;
-@@ -556,9 +573,12 @@ static struct file_struct *receive_file_
+@@ -558,9 +575,12 @@ static struct file_struct *receive_file_
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -87,7 +89,7 @@ To use this patch, run these commands for a successful build:
  
  	if (preserve_uid && !(flags & XMIT_SAME_UID))
  		uid = (uid_t)read_int(f);
-@@ -609,6 +629,9 @@ static struct file_struct *receive_file_
+@@ -611,6 +631,9 @@ static struct file_struct *receive_file_
  	file->modtime = modtime;
  	file->length = file_length;
  	file->mode = mode;
@@ -97,7 +99,7 @@ To use this patch, run these commands for a successful build:
  	file->uid = uid;
  	file->gid = gid;
  
-@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam
+@@ -871,6 +894,9 @@ struct file_struct *make_file(char *fnam
  	file->modtime = st.st_mtime;
  	file->length = st.st_size;
  	file->mode = st.st_mode;
@@ -109,9 +111,9 @@ To use this patch, run these commands for a successful build:
  
 --- old/generator.c
 +++ new/generator.c
-@@ -99,6 +99,12 @@ static int deletion_count = 0; /* used t
- #define DEL_FORCE_RECURSE	(1<<1) /* recurse even w/o --force */
- #define DEL_TERSE		(1<<3)
+@@ -99,6 +99,12 @@ int non_perishable_cnt = 0;
+ static int deletion_count = 0; /* used to implement --max-delete */
+ static FILE *delete_delay_fp = NULL;
  
 +#ifdef SUPPORT_FLAGS
 +#define FILEFLAGS(ff) ff
@@ -119,99 +121,96 @@ To use this patch, run these commands for a successful build:
 +#define FILEFLAGS(ff) 0
 +#endif
 +
+ /* For calling delete_item() and delete_dir_contents(). */
+ #define DEL_RECURSE		(1<<1) /* recurse */
+ #define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
+@@ -114,7 +120,6 @@ enum delret {
+ /* Forward declaration for delete_item(). */
+ static enum delret delete_dir_contents(char *fname, int flags);
  
+-
  static int is_backup_file(char *fn)
  {
-@@ -113,7 +119,7 @@ static int is_backup_file(char *fn)
-  * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
+ 	int k = strlen(fn) - backup_suffix_len;
+@@ -127,17 +132,20 @@ static int is_backup_file(char *fn)
+  * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
   * a directory! (The buffer is used for recursion, but returned unchanged.)
   */
--static int delete_item(char *fname, int mode, int flags)
-+static int delete_item(char *fname, int mode, uint32 fileflags, int flags)
+-static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
++static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags)
  {
- 	struct file_list *dirlist;
- 	int j, dlen, zap_dir, ok;
-@@ -124,6 +130,9 @@ static int delete_item(char *fname, int 
- 	if (!S_ISDIR(mode)) {
- 		if (max_delete && ++deletion_count > max_delete)
- 			return 0;
-+#ifdef SUPPORT_FLAGS
-+		make_mutable(fname, mode, fileflags);
-+#endif
- 		if (make_backups && (backup_dir || !is_backup_file(fname)))
- 			ok = make_backup(fname);
- 		else
-@@ -148,10 +157,17 @@ static int delete_item(char *fname, int 
- 		ok = 0;
- 		errno = ENOTEMPTY;
- 	} else if (make_backups && !backup_dir && !is_backup_file(fname)
--	    && !(flags & DEL_FORCE_RECURSE))
-+	    && !(flags & DEL_FORCE_RECURSE)) {
-+#ifdef SUPPORT_FLAGS
-+		make_mutable(fname, mode, fileflags);
-+#endif
- 		ok = make_backup(fname);
--	else
-+	} else {
+ 	enum delret ret;
+ 	char *what;
+ 	int ok;
+ 
+ 	if (verbose > 2) {
+-		rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
+-			fbuf, mode, flags);
++		rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n",
++			fbuf, mode, fileflags, flags);
+ 	}
+ 
 +#ifdef SUPPORT_FLAGS
-+		make_mutable(fname, mode, fileflags);
++	make_mutable(fbuf, mode, fileflags);
 +#endif
- 		ok = do_rmdir(fname) == 0;
-+	}
- 	if (ok) {
- 		if (!(flags & DEL_TERSE))
- 			log_delete(fname, mode);
-@@ -186,7 +202,7 @@ static int delete_item(char *fname, int 
- 			continue;
- 
- 		strlcpy(p, fp->basename, remainder);
--		delete_item(fname, fp->mode, flags & ~DEL_TERSE);
-+		delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), flags & ~DEL_TERSE);
+ 	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+ 		ignore_perishable = 1;
+ 		/* If DEL_RECURSE is not set, this just reports emptiness. */
+@@ -249,7 +257,7 @@ 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 (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
++		if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS)
+ 			ret = DR_NOT_EMPTY;
  	}
- 	flist_free(dirlist);
  
-@@ -276,7 +292,7 @@ static void delete_in_dir(struct file_li
- 			continue;
+@@ -401,10 +409,10 @@ static void delete_in_dir(struct file_li
+ 		}
  		if (flist_find(flist, fp) < 0) {
  			f_name(fp, delbuf);
--			delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE);
-+			delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), DEL_FORCE_RECURSE);
+-			if (delete_delay_fp)
++			if (delete_delay_fp) /* XXX need to output fileflags value here too */
+ 				fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
+ 			else
+-				delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
++				delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE);
  		}
  	}
  
-@@ -905,7 +921,7 @@ static void recv_generator(char *fname, 
+@@ -1103,7 +1111,7 @@ static void recv_generator(char *fname, 
  		 * we need to delete it.  If it doesn't exist, then
  		 * (perhaps recursively) create it. */
  		if (statret == 0 && !S_ISDIR(st.st_mode)) {
--			if (delete_item(fname, st.st_mode, del_opts) < 0)
-+			if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0)
+-			if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
++			if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "directory", del_opts) != 0)
  				return;
  			statret = -1;
  		}
-@@ -996,7 +1012,7 @@ static void recv_generator(char *fname, 
+@@ -1197,7 +1205,7 @@ static void recv_generator(char *fname, 
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
--			if (delete_item(fname, st.st_mode, del_opts) < 0)
-+			if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0)
+-			if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
++			if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "symlink", del_opts) != 0)
+ 				return;
+ 		} else if (basis_dir[0] != NULL) {
+ 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+@@ -1268,7 +1276,7 @@ static void recv_generator(char *fname, 
+ 					goto return_with_success;
  				return;
- 			if (!S_ISLNK(st.st_mode))
- 				statret = -1;
-@@ -1063,7 +1079,7 @@ static void recv_generator(char *fname, 
- 		 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
- 		 || st.st_rdev != file->u.rdev) {
- 			if (statret == 0
--			 && delete_item(fname, st.st_mode, del_opts) < 0)
-+			 && delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0)
+ 			}
+-			if (delete_item(fname, st.st_mode, t, del_opts) != 0)
++			if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), t, del_opts) != 0)
  				return;
- 			if (preserve_hard_links && file->link_u.links
- 			    && hard_link_check(file, ndx, fname, -1, &st,
-@@ -1148,7 +1164,7 @@ static void recv_generator(char *fname, 
+ 		} else if (basis_dir[0] != NULL) {
+ 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+@@ -1354,7 +1362,7 @@ static void recv_generator(char *fname, 
  	fnamecmp_type = FNAMECMP_FNAME;
  
  	if (statret == 0 && !S_ISREG(st.st_mode)) {
--		if (delete_item(fname, st.st_mode, del_opts) != 0)
-+		if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) != 0)
+-		if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
++		if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), "regular file", del_opts) != 0)
  			return;
  		statret = -1;
  		stat_errno = ENOENT;
@@ -264,7 +263,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
-@@ -424,6 +431,8 @@ static struct poptOption long_options[] 
+@@ -425,6 +432,8 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -273,7 +272,7 @@ To use this patch, run these commands for a successful build:
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1128,6 +1137,15 @@ int parse_arguments(int *argc, const cha
+@@ -1130,6 +1139,15 @@ int parse_arguments(int *argc, const cha
  	}
  #endif
  
@@ -289,7 +288,7 @@ To use this patch, run these commands for a successful build:
  	if (write_batch && read_batch) {
  		snprintf(err_buf, sizeof err_buf,
  			"--write-batch and --read-batch can not be used together\n");
-@@ -1581,6 +1599,9 @@ void server_options(char **args,int *arg
+@@ -1584,6 +1602,9 @@ void server_options(char **args,int *arg
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
  
@@ -402,7 +401,7 @@ To use this patch, run these commands for a successful build:
  
  /* These flags are used in the live flist data. */
  
-@@ -344,6 +345,10 @@ enum msgcode {
+@@ -345,6 +346,10 @@ enum msgcode {
  #define schar char
  #endif
  
@@ -413,7 +412,7 @@ To use this patch, run these commands for a successful build:
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -527,6 +532,9 @@ struct file_struct {
+@@ -528,6 +533,9 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -433,7 +432,7 @@ To use this patch, run these commands for a successful build:
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -o, --owner                 preserve owner (super-user only)
-@@ -509,7 +510,9 @@ specified, in which case bf(-r) is not i
+@@ -510,7 +511,9 @@ specified, in which case bf(-r) is not i
  
  Note that bf(-a) bf(does not preserve hardlinks), because
  finding multiply-linked files is expensive.  You must separately
@@ -444,7 +443,7 @@ To use this patch, run these commands for a successful build:
  
  dit(--no-OPTION) You may turn off one or more implied options by prefixing
  the option name with "no-".  Not all options may be prefixed with a "no-":
-@@ -804,6 +807,13 @@ quote(itemization(
+@@ -805,6 +808,13 @@ quote(itemization(
  
  If bf(--perms) is enabled, this option is ignored.
  
@@ -460,7 +459,7 @@ To use this patch, run these commands for a successful build:
  transfer.  The resulting value is treated as though it was the permissions
 --- old/syscall.c
 +++ new/syscall.c
-@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo
+@@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo
  }
  #endif