X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7e27b6c06899304cb1f409a3cbecb0f94d4c8cd0..4306c620713a7980bb4de3f016d051dcb4c593ae:/flags.diff

diff --git a/flags.diff b/flags.diff
index 5edd0bd..348c5e9 100644
--- a/flags.diff
+++ b/flags.diff
@@ -12,7 +12,7 @@ TODO: fix --delete-delay to work with --flags option.
 
 --- old/compat.c
 +++ new/compat.c
-@@ -50,6 +50,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -56,6 +56,8 @@ void setup_protocol(int f_out,int f_in)
  		preserve_uid = ++file_extra_cnt;
  	if (preserve_gid)
  		preserve_gid = ++file_extra_cnt;
@@ -34,7 +34,7 @@ TODO: fix --delete-delay to work with --flags option.
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
 --- old/flist.c
 +++ new/flist.c
-@@ -45,6 +45,7 @@ extern int preserve_links;
+@@ -46,6 +46,7 @@ extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
  extern int preserve_specials;
@@ -42,7 +42,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_uid;
  extern int preserve_gid;
  extern int relative_paths;
-@@ -314,6 +315,9 @@ static void send_file_entry(struct file_
+@@ -347,6 +348,9 @@ static void send_file_entry(int f, struc
  {
  	static time_t modtime;
  	static mode_t mode;
@@ -52,7 +52,7 @@ TODO: fix --delete-delay to work with --flags option.
  	static int64 dev;
  	static dev_t rdev;
  	static uint32 rdev_major;
-@@ -333,6 +337,12 @@ static void send_file_entry(struct file_
+@@ -367,6 +371,12 @@ static void send_file_entry(int f, struc
  		flags |= XMIT_SAME_MODE;
  	else
  		mode = file->mode;
@@ -65,7 +65,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if ((preserve_devices && IS_DEVICE(mode))
  	 || (preserve_specials && IS_SPECIAL(mode))) {
  		if (protocol_version < 28) {
-@@ -434,6 +444,10 @@ static void send_file_entry(struct file_
+@@ -480,6 +490,10 @@ static void send_file_entry(int f, struc
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -74,9 +74,9 @@ TODO: fix --delete-delay to work with --flags option.
 +		write_int(f, (int)fileflags);
 +#endif
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- 		if (!numeric_ids)
- 			add_uid(uid);
-@@ -503,6 +517,9 @@ static struct file_struct *recv_file_ent
+ 		write_int(f, uid);
+ 		if (flags & XMIT_USER_NAME_FOLLOWS) {
+@@ -555,6 +569,9 @@ static struct file_struct *recv_file_ent
  {
  	static time_t modtime;
  	static mode_t mode;
@@ -86,7 +86,7 @@ TODO: fix --delete-delay to work with --flags option.
  	static int64 dev;
  	static dev_t rdev;
  	static uint32 rdev_major;
-@@ -610,9 +627,12 @@ static struct file_struct *recv_file_ent
+@@ -650,9 +667,12 @@ static struct file_struct *recv_file_ent
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -98,9 +98,9 @@ TODO: fix --delete-delay to work with --flags option.
 +		fileflags = (uint32)read_int(f);
 +#endif
  
- 	if (preserve_uid && !(flags & XMIT_SAME_UID))
+ 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		uid = (uid_t)read_int(f);
-@@ -696,6 +716,10 @@ static struct file_struct *recv_file_ent
+@@ -754,6 +774,10 @@ static struct file_struct *recv_file_ent
  		OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
  	}
  	file->mode = mode;
@@ -109,9 +109,9 @@ TODO: fix --delete-delay to work with --flags option.
 +		F_FFLAGS(file) = fileflags;
 +#endif
  	if (preserve_uid)
- 		F_UID(file) = uid;
+ 		F_OWNER(file) = uid;
  	if (preserve_gid)
-@@ -998,6 +1022,10 @@ struct file_struct *make_file(const char
+@@ -1051,6 +1075,10 @@ struct file_struct *make_file(const char
  		OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
  	}
  	file->mode = st.st_mode;
@@ -120,11 +120,11 @@ TODO: fix --delete-delay to work with --flags option.
 +		F_FFLAGS(file) = st.st_flags;
 +#endif
  	if (preserve_uid)
- 		F_UID(file) = st.st_uid;
+ 		F_OWNER(file) = st.st_uid;
  	if (preserve_gid)
 --- old/generator.c
 +++ new/generator.c
-@@ -103,6 +103,12 @@ static char *deldelay_buf = NULL;
+@@ -107,6 +107,12 @@ static char *deldelay_buf = NULL;
  static int deldelay_fd = -1;
  static BOOL solo_file = 0;
  
@@ -137,7 +137,7 @@ TODO: fix --delete-delay to work with --flags option.
  /* 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 */
-@@ -118,7 +124,6 @@ enum delret {
+@@ -122,7 +128,6 @@ enum delret {
  /* Forward declaration for delete_item(). */
  static enum delret delete_dir_contents(char *fname, int flags);
  
@@ -145,7 +145,7 @@ TODO: fix --delete-delay to work with --flags option.
  static int is_backup_file(char *fn)
  {
  	int k = strlen(fn) - backup_suffix_len;
-@@ -131,17 +136,20 @@ static int is_backup_file(char *fn)
+@@ -135,17 +140,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.)
   */
@@ -169,7 +169,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
  		ignore_perishable = 1;
  		/* If DEL_RECURSE is not set, this just reports emptiness. */
-@@ -253,7 +261,7 @@ static enum delret delete_dir_contents(c
+@@ -257,7 +265,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;
@@ -178,7 +178,7 @@ TODO: fix --delete-delay to work with --flags option.
  			ret = DR_NOT_EMPTY;
  	}
  
-@@ -309,8 +317,9 @@ static int remember_delete(struct file_s
+@@ -313,8 +321,9 @@ static int remember_delete(struct file_s
  	
  	while (1) {
  		len = snprintf(deldelay_buf + deldelay_cnt,
@@ -190,7 +190,7 @@ TODO: fix --delete-delay to work with --flags option.
  		if ((deldelay_cnt += len) <= deldelay_size)
  			break;
  		if (deldelay_fd < 0 && !start_delete_delay_temp())
-@@ -323,7 +332,7 @@ static int remember_delete(struct file_s
+@@ -327,7 +336,7 @@ static int remember_delete(struct file_s
  	return 1;
  }
  
@@ -199,7 +199,7 @@ TODO: fix --delete-delay to work with --flags option.
  {
  	static int read_pos = 0;
  	int j, len, mode;
-@@ -365,7 +374,7 @@ static int read_delay_line(char *buf)
+@@ -369,7 +378,7 @@ static int read_delay_line(char *buf)
  
  	bp = deldelay_buf + read_pos;
  
@@ -208,7 +208,7 @@ TODO: fix --delete-delay to work with --flags option.
  	  invalid_data:
  		rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
  		return -1;
-@@ -388,15 +397,15 @@ static int read_delay_line(char *buf)
+@@ -392,15 +401,15 @@ static int read_delay_line(char *buf)
  
  static void do_delayed_deletions(char *delbuf)
  {
@@ -227,7 +227,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (deldelay_fd >= 0)
  		close(deldelay_fd);
  }
-@@ -477,7 +486,7 @@ static void delete_in_dir(struct file_li
+@@ -468,7 +477,7 @@ static void delete_in_dir(struct file_li
  				if (!remember_delete(fp, delbuf))
  					break;
  			} else
@@ -236,7 +236,7 @@ TODO: fix --delete-delay to work with --flags option.
  		}
  	}
  
-@@ -1181,7 +1190,7 @@ static void recv_generator(char *fname, 
+@@ -1174,7 +1183,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)) {
@@ -245,7 +245,7 @@ TODO: fix --delete-delay to work with --flags option.
  				return;
  			statret = -1;
  		}
-@@ -1278,7 +1287,7 @@ static void recv_generator(char *fname, 
+@@ -1275,7 +1284,7 @@ static void recv_generator(char *fname, 
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
@@ -254,7 +254,7 @@ TODO: fix --delete-delay to work with --flags option.
  				return;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1355,7 +1364,7 @@ static void recv_generator(char *fname, 
+@@ -1352,7 +1361,7 @@ static void recv_generator(char *fname, 
  					goto return_with_success;
  				return;
  			}
@@ -263,7 +263,7 @@ TODO: fix --delete-delay to work with --flags option.
  				return;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1444,7 +1453,7 @@ static void recv_generator(char *fname, 
+@@ -1441,7 +1450,7 @@ static void recv_generator(char *fname, 
  	fnamecmp_type = FNAMECMP_FNAME;
  
  	if (statret == 0 && !S_ISREG(st.st_mode)) {
@@ -282,7 +282,7 @@ TODO: fix --delete-delay to work with --flags option.
  int preserve_executability = 0;
  int preserve_devices = 0;
  int preserve_specials = 0;
-@@ -200,6 +201,7 @@ static void print_rsync_version(enum log
+@@ -201,6 +202,7 @@ static void print_rsync_version(enum log
  	char const *hardlinks = "no ";
  	char const *links = "no ";
  	char const *ipv6 = "no ";
@@ -290,7 +290,7 @@ TODO: fix --delete-delay to work with --flags option.
  	STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -222,6 +224,10 @@ static void print_rsync_version(enum log
+@@ -223,6 +225,10 @@ static void print_rsync_version(enum log
  	ipv6 = "";
  #endif
  
@@ -301,7 +301,7 @@ TODO: fix --delete-delay to work with --flags option.
  	rprintf(f, "%s  version %s  protocol version %d\n",
  		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
  	rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -232,8 +238,8 @@ static void print_rsync_version(enum log
+@@ -233,8 +239,8 @@ static void print_rsync_version(enum log
  		(int)(sizeof (int64) * 8));
  	rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
  		got_socketpair, hardlinks, links, ipv6, have_inplace);
@@ -312,7 +312,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -299,6 +305,7 @@ void usage(enum logcode F)
+@@ -300,6 +306,7 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -320,7 +320,7 @@ TODO: fix --delete-delay to work with --flags option.
    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");
-@@ -420,6 +427,8 @@ static struct poptOption long_options[] 
+@@ -421,6 +428,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 },
@@ -329,7 +329,7 @@ TODO: fix --delete-delay to work with --flags option.
    {"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 },
-@@ -1125,6 +1134,15 @@ int parse_arguments(int *argc, const cha
+@@ -1132,6 +1141,15 @@ int parse_arguments(int *argc, const cha
  	}
  #endif
  
@@ -345,7 +345,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");
-@@ -1579,6 +1597,9 @@ void server_options(char **args,int *arg
+@@ -1595,6 +1613,9 @@ void server_options(char **args,int *arg
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
  
@@ -370,7 +370,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_executability;
  extern int preserve_times;
  extern int omit_dir_times;
-@@ -176,6 +179,41 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -226,6 +229,41 @@ mode_t dest_mode(mode_t flist_mode, mode
  	return new_mode;
  }
  
@@ -412,7 +412,7 @@ TODO: fix --delete-delay to work with --flags option.
  int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
  		   int flags)
  {
-@@ -274,6 +312,15 @@ int set_file_attrs(char *fname, struct f
+@@ -324,6 +362,15 @@ int set_file_attrs(char *fname, struct f
  	}
  #endif
  
@@ -428,7 +428,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (verbose > 1 && flags & ATTRS_REPORT) {
  		if (updated)
  			rprintf(FCLIENT, "%s\n", fname);
-@@ -321,6 +368,9 @@ void finish_transfer(char *fname, char *
+@@ -371,6 +418,9 @@ void finish_transfer(char *fname, char *
  	set_file_attrs(fnametmp, file, NULL,
  		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
  
@@ -438,7 +438,7 @@ TODO: fix --delete-delay to work with --flags option.
  	/* move tmp file over real file */
  	if (verbose > 2)
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-@@ -335,6 +385,9 @@ void finish_transfer(char *fname, char *
+@@ -385,6 +435,9 @@ void finish_transfer(char *fname, char *
  	}
  	if (ret == 0) {
  		/* The file was moved into place (not copied), so it's done. */
@@ -450,15 +450,15 @@ TODO: fix --delete-delay to work with --flags option.
  	/* The file was copied, so tweak the perms of the copied file.  If it
 --- old/rsync.h
 +++ new/rsync.h
-@@ -55,6 +55,7 @@
- #define XMIT_SAME_DEV_pre30 (1<<10)	/* protocols < 30 */
- #define XMIT_HLINK_FIRST (1<<10)	/* protocols >= 30 */
+@@ -57,6 +57,7 @@
  #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
-+#define XMIT_SAME_FLAGS (1<<12)
+ #define XMIT_USER_NAME_FOLLOWS (1<<12)	/* protocols >= 30 */
+ #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
++#define XMIT_SAME_FLAGS (1<<15)
  
  /* These flags are used in the live flist data. */
  
-@@ -374,6 +375,10 @@ enum msgcode {
+@@ -388,6 +389,10 @@ enum msgcode {
  #endif
  #endif
  
@@ -469,7 +469,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. */
-@@ -551,6 +556,7 @@ struct file_struct {
+@@ -565,6 +570,7 @@ struct file_struct {
  extern int file_extra_cnt;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -477,11 +477,11 @@ TODO: fix --delete-delay to work with --flags option.
  
  #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
  #define EXTRA_LEN (sizeof (union file_extras))
-@@ -583,6 +589,7 @@ extern int preserve_gid;
+@@ -597,6 +603,7 @@ extern int preserve_gid;
  /* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
-+#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).num
+ #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
++#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags).unum
  
  /* These items are per-entry optional and mutally exclusive: */
  #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num