X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c8a8b4a7fd58ee1ee8b055a1559c71c9921d8753..213d432823cbeee334102c839711184c9a98e469:/flags.diff

diff --git a/flags.diff b/flags.diff
index f5abff3..e60248c 100644
--- a/flags.diff
+++ b/flags.diff
@@ -8,8 +8,6 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-TODO: fix --delete-delay to work with --flags option.
-
 --- old/compat.c
 +++ new/compat.c
 @@ -44,6 +44,7 @@ extern int protocol_version;
@@ -29,7 +27,7 @@ TODO: fix --delete-delay to work with --flags option.
  #ifdef ICONV_OPTION
  int ic_ndx;
  
-@@ -112,6 +113,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -125,6 +126,8 @@ void setup_protocol(int f_out,int f_in)
  		uid_ndx = ++file_extra_cnt;
  	if (preserve_gid)
  		gid_ndx = ++file_extra_cnt;
@@ -40,13 +38,13 @@ TODO: fix --delete-delay to work with --flags option.
  	if (preserve_xattrs)
 --- old/configure.in
 +++ new/configure.in
-@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -557,7 +557,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 \
 -    strerror putenv iconv_open locale_charset nl_langinfo getxattr \
 +    chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
-     extattr_get_link sigaction sigprocmask)
+     extattr_get_link sigaction sigprocmask setattrlist)
  
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
 --- old/flist.c
@@ -66,10 +64,10 @@ TODO: fix --delete-delay to work with --flags option.
 +#ifdef SUPPORT_FLAGS
 +	static uint32 fileflags;
 +#endif
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
- 	static uint32 rdev_major;
-@@ -382,6 +386,12 @@ static void send_file_entry(int f, struc
+ #endif
+@@ -393,6 +397,12 @@ static void send_file_entry(int f, struc
  		xflags |= XMIT_SAME_MODE;
  	else
  		mode = file->mode;
@@ -80,9 +78,9 @@ TODO: fix --delete-delay to work with --flags option.
 +		fileflags = F_FFLAGS(file);
 +#endif
  
- 	if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR))
- 		xflags |= XMIT_NON_XFER_DIR;
-@@ -505,6 +515,10 @@ static void send_file_entry(int f, struc
+ 	if ((preserve_devices && IS_DEVICE(mode))
+ 	 || (preserve_specials && IS_SPECIAL(mode))) {
+@@ -513,6 +523,10 @@ static void send_file_entry(int f, struc
  	}
  	if (!(xflags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -93,17 +91,17 @@ TODO: fix --delete-delay to work with --flags option.
  	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
  			write_int(f, uid);
-@@ -593,6 +607,9 @@ static struct file_struct *recv_file_ent
+@@ -601,6 +615,9 @@ static struct file_struct *recv_file_ent
  {
  	static int64 modtime;
  	static mode_t mode;
 +#ifdef SUPPORT_FLAGS
 +	static uint32 fileflags;
 +#endif
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
- 	static uint32 rdev_major;
-@@ -722,9 +739,12 @@ static struct file_struct *recv_file_ent
+ #endif
+@@ -732,9 +749,12 @@ static struct file_struct *recv_file_ent
  	}
  	if (!(xflags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -117,7 +115,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
-@@ -844,6 +864,10 @@ static struct file_struct *recv_file_ent
+@@ -854,6 +874,10 @@ static struct file_struct *recv_file_ent
  		OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
  	}
  	file->mode = mode;
@@ -128,7 +126,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (uid_ndx)
  		F_OWNER(file) = uid;
  	if (gid_ndx) {
-@@ -1168,6 +1192,10 @@ struct file_struct *make_file(const char
+@@ -1182,6 +1206,10 @@ struct file_struct *make_file(const char
  		OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
  	}
  	file->mode = st.st_mode;
@@ -218,7 +216,7 @@ TODO: fix --delete-delay to work with --flags option.
  {
  	static int read_pos = 0;
  	int j, len, mode;
-@@ -376,7 +387,7 @@ static int read_delay_line(char *buf)
+@@ -376,12 +387,12 @@ static int read_delay_line(char *buf)
  
  	bp = deldelay_buf + read_pos;
  
@@ -227,6 +225,12 @@ TODO: fix --delete-delay to work with --flags option.
  	  invalid_data:
  		rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
  		return -1;
+ 	}
+-	past_space = strchr(bp, ' ') + 1;
++	past_space = strchr(strchr(bp, ' ') + 1, ' ') + 1;
+ 	len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+ 	read_pos = j + 1;
+ 
 @@ -399,15 +410,15 @@ static int read_delay_line(char *buf)
  
  static void do_delayed_deletions(char *delbuf)
@@ -255,7 +259,16 @@ TODO: fix --delete-delay to work with --flags option.
  		}
  	}
  
-@@ -1270,7 +1281,7 @@ static void recv_generator(char *fname, 
+@@ -1263,7 +1274,7 @@ static void recv_generator(char *fname, 
+ 			 * full later (right before we handle its contents). */
+ 			if (statret == 0
+ 			 && (S_ISDIR(sx.st.st_mode)
+-			  || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0))
++			  || delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0))
+ 				goto cleanup; /* Any errors get reported later. */
+ 			if (do_mkdir(fname, file->mode & 0700) == 0)
+ 				file->flags |= FLAG_DIR_CREATED;
+@@ -1275,7 +1286,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(sx.st.st_mode)) {
@@ -264,7 +277,7 @@ TODO: fix --delete-delay to work with --flags option.
  				goto skipping_dir_contents;
  			statret = -1;
  		}
-@@ -1399,7 +1410,7 @@ static void recv_generator(char *fname, 
+@@ -1404,7 +1415,7 @@ static void recv_generator(char *fname, 
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
@@ -273,7 +286,7 @@ TODO: fix --delete-delay to work with --flags option.
  				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1478,7 +1489,7 @@ static void recv_generator(char *fname, 
+@@ -1483,7 +1494,7 @@ static void recv_generator(char *fname, 
  					goto return_with_success;
  				goto cleanup;
  			}
@@ -282,7 +295,7 @@ TODO: fix --delete-delay to work with --flags option.
  				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1569,7 +1580,7 @@ static void recv_generator(char *fname, 
+@@ -1574,7 +1585,7 @@ static void recv_generator(char *fname, 
  	fnamecmp_type = FNAMECMP_FNAME;
  
  	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
@@ -347,7 +360,7 @@ TODO: fix --delete-delay to work with --flags option.
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
-@@ -1285,6 +1293,15 @@ int parse_arguments(int *argc_p, const c
+@@ -1284,6 +1292,15 @@ int parse_arguments(int *argc_p, const c
  	}
  #endif
  
@@ -363,7 +376,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (write_batch && read_batch) {
  		snprintf(err_buf, sizeof err_buf,
  			"--write-batch and --read-batch can not be used together\n");
-@@ -1796,6 +1813,9 @@ void server_options(char **args, int *ar
+@@ -1792,6 +1809,9 @@ void server_options(char **args, int *ar
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
  
@@ -419,7 +432,7 @@ TODO: fix --delete-delay to work with --flags option.
 +}
 +
 +/* Remove immutable flags from an object, so it can be altered/removed. */
-+void make_mutable(char *fname, mode_t mode, uint32 fileflags)
++void make_mutable(const char *fname, mode_t mode, uint32 fileflags)
 +{
 +	if (!preserve_fileflags && S_ISLNK(mode))
 +		return;
@@ -429,7 +442,7 @@ TODO: fix --delete-delay to work with --flags option.
 +}
 +
 +/* Undo a prior make_mutable() call. */
-+void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags)
++void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags)
 +{
 +	if (!preserve_fileflags && S_ISLNK(mode))
 +		return;
@@ -488,7 +501,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  /* These flags are used in the live flist data. */
  
-@@ -415,6 +416,10 @@ enum msgcode {
+@@ -435,6 +436,10 @@ typedef unsigned int size_t;
  #endif
  #endif
  
@@ -499,7 +512,7 @@ TODO: fix --delete-delay to work with --flags option.
  /* 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. */
-@@ -582,6 +587,7 @@ extern int file_extra_cnt;
+@@ -602,6 +607,7 @@ extern int file_extra_cnt;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -507,7 +520,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -619,6 +625,7 @@ extern int xattrs_ndx;
+@@ -639,6 +645,7 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
@@ -517,7 +530,7 @@ TODO: fix --delete-delay to work with --flags option.
  #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -339,6 +339,7 @@ to the detailed description below for a 
+@@ -338,6 +338,7 @@ to the detailed description below for a 
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -H, --hard-links            preserve hard links
   -p, --perms                 preserve permissions
@@ -525,7 +538,7 @@ TODO: fix --delete-delay to work with --flags option.
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
-@@ -540,7 +541,9 @@ specified, in which case bf(-r) is not i
+@@ -539,7 +540,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
@@ -536,7 +549,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  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-":
-@@ -895,6 +898,13 @@ super-user copies all namespaces except 
+@@ -900,6 +903,13 @@ super-user copies all namespaces except 
  the user.* namespace.  To be able to backup and restore non-user namespaces as
  a normal user, see the bf(--fake-super) option.
  
@@ -552,7 +565,7 @@ TODO: fix --delete-delay to work with --flags option.
  transfer.  The resulting value is treated as though it was the permissions
 --- old/syscall.c
 +++ new/syscall.c
-@@ -162,6 +162,15 @@ int do_chmod(const char *path, mode_t mo
+@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mo
  }
  #endif