X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/590329e57985753d7ff895d6a95dbf314e4dd905..a68c3b2e13a76a42ccd938d8c23995b610ad01b5:/xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index 9d474e1..4af1c38 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -100,9 +100,20 @@ TODO:
  
  	/* Check to see if this is a device file, or link */
  	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+--- old/compat.c
++++ new/compat.c
+@@ -52,6 +52,8 @@ void setup_protocol(int f_out,int f_in)
+ 		preserve_gid = ++file_extra_cnt;
+ 	if (preserve_acls && !am_sender)
+ 		preserve_acls = ++file_extra_cnt;
++	if (preserve_xattrs && !am_sender)
++		preserve_xattrs = ++file_extra_cnt;
+ 
+ 	if (remote_protocol == 0) {
+ 		if (!read_batch)
 --- old/configure.in
 +++ new/configure.in
-@@ -878,6 +878,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+@@ -883,6 +883,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
    AC_MSG_RESULT(no)
  )
  
@@ -153,7 +164,7 @@ TODO:
  extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
-@@ -806,6 +807,10 @@ static struct file_struct *recv_file_ent
+@@ -812,6 +813,10 @@ static struct file_struct *recv_file_ent
  	if (preserve_acls)
  		receive_acl(file, f);
  #endif
@@ -164,8 +175,8 @@ TODO:
  
  	return file;
  }
-@@ -1076,7 +1081,7 @@ static struct file_struct *send_file_nam
- 					  unsigned short flags)
+@@ -1082,7 +1087,7 @@ static struct file_struct *send_file_nam
+ 					  int flags)
  {
  	struct file_struct *file;
 -#ifdef SUPPORT_ACLS
@@ -173,7 +184,7 @@ TODO:
  	statx sx;
  #endif
  
-@@ -1096,6 +1101,13 @@ static struct file_struct *send_file_nam
+@@ -1102,6 +1107,13 @@ static struct file_struct *send_file_nam
  			return NULL;
  	}
  #endif
@@ -187,7 +198,7 @@ TODO:
  
  	maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -1107,6 +1119,10 @@ static struct file_struct *send_file_nam
+@@ -1113,6 +1125,10 @@ static struct file_struct *send_file_nam
  		if (preserve_acls)
  			send_acl(&sx, f);
  #endif
@@ -375,7 +386,7 @@ TODO:
  int preserve_perms = 0;
  int preserve_executability = 0;
  int preserve_devices = 0;
-@@ -201,6 +202,7 @@ static void print_rsync_version(enum log
+@@ -200,6 +201,7 @@ static void print_rsync_version(enum log
  	char const *have_inplace = "no ";
  	char const *hardlinks = "no ";
  	char const *acls = "no ";
@@ -383,7 +394,7 @@ TODO:
  	char const *links = "no ";
  	char const *ipv6 = "no ";
  	STRUCT_STAT *dumstat;
-@@ -220,7 +222,9 @@ static void print_rsync_version(enum log
+@@ -219,7 +221,9 @@ static void print_rsync_version(enum log
  #ifdef SUPPORT_ACLS
  	acls = "";
  #endif
@@ -394,7 +405,7 @@ TODO:
  #ifdef SUPPORT_LINKS
  	links = "";
  #endif
-@@ -239,8 +243,8 @@ static void print_rsync_version(enum log
+@@ -238,8 +242,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);
@@ -405,7 +416,7 @@ TODO:
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -286,7 +290,7 @@ void usage(enum logcode F)
+@@ -285,7 +289,7 @@ void usage(enum logcode F)
    rprintf(F," -q, --quiet                 suppress non-error messages\n");
    rprintf(F,"     --no-motd               suppress daemon-mode MOTD (see manpage caveat)\n");
    rprintf(F," -c, --checksum              skip based on checksum, not mod-time & size\n");
@@ -414,7 +425,7 @@ TODO:
    rprintf(F,"     --no-OPTION             turn off an implied OPTION (e.g. --no-D)\n");
    rprintf(F," -r, --recursive             recurse into directories\n");
    rprintf(F," -R, --relative              use relative path names\n");
-@@ -311,6 +315,9 @@ void usage(enum logcode F)
+@@ -310,6 +314,9 @@ void usage(enum logcode F)
  #ifdef SUPPORT_ACLS
    rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
  #endif
@@ -424,7 +435,7 @@ TODO:
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F,"     --devices               preserve device files (super-user only)\n");
-@@ -434,6 +441,9 @@ static struct poptOption long_options[] 
+@@ -433,6 +440,9 @@ static struct poptOption long_options[] 
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
    {"no-A",             0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
@@ -434,7 +445,7 @@ TODO:
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1116,6 +1126,17 @@ int parse_arguments(int *argc, const cha
+@@ -1115,6 +1125,17 @@ int parse_arguments(int *argc, const cha
  			return 0;
  #endif
  
@@ -452,16 +463,7 @@ TODO:
  
  		default:
  			/* A large opt value means that set_refuse_options()
-@@ -1255,6 +1276,8 @@ int parse_arguments(int *argc, const cha
- 		preserve_gid = ++flist_extra_cnt;
- 	if (preserve_acls)
- 		preserve_acls = ++flist_extra_cnt;
-+	if (preserve_xattrs)
-+		preserve_xattrs = ++flist_extra_cnt;
- 
- 	*argv = poptGetArgs(pc);
- 	*argc = count_args(*argv);
-@@ -1570,6 +1593,10 @@ void server_options(char **args,int *arg
+@@ -1562,6 +1583,10 @@ void server_options(char **args,int *arg
  	if (preserve_acls)
  		argstr[x++] = 'A';
  #endif
@@ -495,7 +497,7 @@ TODO:
  	 * will enable owner-writability using chmod, if necessary.
 --- old/rsync.h
 +++ new/rsync.h
-@@ -516,6 +516,10 @@ struct idev_node {
+@@ -540,6 +540,10 @@ struct idev_node {
  #define ACLS_NEED_MASK 1
  #endif
  
@@ -506,15 +508,23 @@ TODO:
  #define GID_NONE ((gid_t)-1)
  
  union file_extras {
-@@ -568,6 +572,7 @@ extern int preserve_gid;
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
+@@ -560,6 +564,7 @@ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -593,6 +598,7 @@ extern int preserve_acls;
+ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
  #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
 +#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->unum
  
  /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
-@@ -744,6 +749,9 @@ typedef struct {
+ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
+@@ -768,6 +774,9 @@ typedef struct {
      struct rsync_acl *acc_acl; /* access ACL */
      struct rsync_acl *def_acl; /* default ACL */
  #endif
@@ -557,7 +567,7 @@ TODO:
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,415 @@
+@@ -0,0 +1,413 @@
 +/*
 + * Extended Attribute support for rsync.
 + * Written by Jay Fenlason, vaguely based on the ACLs patch.
@@ -589,8 +599,6 @@ TODO:
 +extern int am_root;
 +extern int read_only;
 +extern int list_only;
-+extern int preserve_xattrs;
-+extern unsigned int file_struct_len;
 +
 +#define RSYNC_XAL_INITIAL 5
 +#define RSYNC_XAL_LIST_INITIAL 100