- This patch needs to more efficiently handle large xattrs, especially when
they're unchanged.
- - Extraneous xattr values need to be removed from files that are not being
- recreated.
-
- We need to affect the itemized output to know when xattrs are being updated.
- We need to affect the --link-dest option to avoid hard-linking two files
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/backup.c
+++ new/backup.c
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
extern int verbose;
extern int am_root;
extern int preserve_acls;
extern int preserve_devices;
extern int preserve_specials;
extern int preserve_links;
-@@ -135,6 +136,9 @@ static int make_bak_dir(char *fullpath)
+@@ -134,6 +135,9 @@ static int make_bak_dir(char *fullpath)
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;
#endif
if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
continue;
#ifdef SUPPORT_ACLS
-@@ -143,6 +147,12 @@ static int make_bak_dir(char *fullpath)
+@@ -142,6 +146,12 @@ static int make_bak_dir(char *fullpath)
cache_acl(file, &sx);
}
#endif
set_file_attrs(fullpath, file, NULL, 0);
free(file);
}
-@@ -194,6 +204,9 @@ static int keep_backup(const char *fname
+@@ -193,6 +203,9 @@ static int keep_backup(const char *fname
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;
#endif
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
-@@ -209,6 +222,12 @@ static int keep_backup(const char *fname
+@@ -208,6 +221,12 @@ static int keep_backup(const char *fname
cache_acl(file, &sx);
}
#endif
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
--- old/compat.c
+++ new/compat.c
-@@ -58,6 +58,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -64,6 +64,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;
--- old/flist.c
+++ new/flist.c
-@@ -43,6 +43,7 @@ extern int one_file_system;
+@@ -42,6 +42,7 @@ extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_acls;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
-@@ -865,6 +866,10 @@ static struct file_struct *recv_file_ent
+@@ -864,6 +865,10 @@ static struct file_struct *recv_file_ent
if (preserve_acls)
receive_acl(file, f);
#endif
if (S_ISREG(mode) || S_ISLNK(mode))
stats.total_size += file_length;
-@@ -1137,7 +1142,7 @@ static struct file_struct *send_file_nam
+@@ -1136,7 +1141,7 @@ static struct file_struct *send_file_nam
int flags, int filter_flags)
{
struct file_struct *file;
statx sx;
#endif
-@@ -1156,6 +1161,13 @@ static struct file_struct *send_file_nam
+@@ -1155,6 +1160,13 @@ static struct file_struct *send_file_nam
return NULL;
}
#endif
maybe_emit_filelist_progress(flist->count + flist_count_offset);
-@@ -1167,6 +1179,10 @@ static struct file_struct *send_file_nam
+@@ -1166,6 +1178,10 @@ static struct file_struct *send_file_nam
if (preserve_acls)
send_acl(&sx, f);
#endif
+#endif
--- old/options.c
+++ new/options.c
-@@ -48,6 +48,7 @@ int copy_links = 0;
+@@ -47,6 +47,7 @@ int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
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 ";
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
#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);
#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");
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
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 },
{"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 },
-@@ -1122,6 +1132,17 @@ int parse_arguments(int *argc, const cha
+@@ -1121,6 +1131,17 @@ int parse_arguments(int *argc, const cha
return 0;
#endif
default:
/* A large opt value means that set_refuse_options()
-@@ -1590,6 +1611,10 @@ void server_options(char **args,int *arg
+@@ -1585,6 +1606,10 @@ void server_options(char **args,int *arg
if (preserve_acls)
argstr[x++] = 'A';
#endif
if (always_checksum)
--- old/rsync.c
+++ new/rsync.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
extern int verbose;
extern int dry_run;
extern int preserve_acls;
* will enable owner-writability using chmod, if necessary.
--- old/rsync.h
+++ new/rsync.h
-@@ -554,6 +554,10 @@ struct idev_node {
+@@ -555,6 +555,10 @@ struct idev_node {
#define ACLS_NEED_MASK 1
#endif
#define GID_NONE ((gid_t)-1)
union file_extras {
-@@ -574,6 +578,7 @@ extern int file_extra_cnt;
+@@ -575,6 +579,7 @@ extern int file_extra_cnt;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
#define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
#define EXTRA_LEN (sizeof (union file_extras))
-@@ -607,6 +612,7 @@ extern int preserve_acls;
+@@ -608,6 +613,7 @@ extern int preserve_acls;
#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
/* These items are per-entry optional and mutally exclusive: */
#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
-@@ -798,6 +804,9 @@ typedef struct {
+@@ -799,6 +805,9 @@ typedef struct {
struct rsync_acl *acc_acl; /* access ACL */
struct rsync_acl *def_acl; /* default ACL */
#endif
transfer. The resulting value is treated as though it was the permissions
--- old/xattr.c
+++ new/xattr.c
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,451 @@
+/*
+ * Extended Attribute support for rsync.
+ * Written by Jay Fenlason, vaguely based on the ACLs patch.
+ return strcmp(xa1->name, xa2->name);
+}
+
-+static int rsync_xal_get(const char *fname, item_list *xalp)
++static ssize_t rsync_xal_list(const char *fname)
+{
-+ ssize_t list_len, name_len, datum_len;
-+ char *name, *ptr;
++ ssize_t list_len;
+
+ if (!namebuf) {
+ namebuf_len = 1024;
+ namebuf = new_array(char, namebuf_len);
+ if (!namebuf)
-+ out_of_memory("rsync_xal_get");
++ out_of_memory("rsync_xal_list");
+ }
+
+ /* The length returned includes all the '\0' terminators. */
+ list_len = sys_llistxattr(fname, NULL, 0);
+ if (list_len < 0) {
+ rsyserr(FERROR, errno,
-+ "rsync_xal_get: llistxattr(\"%s\",0) failed",
++ "rsync_xal_list: llistxattr(\"%s\",0) failed",
+ fname);
+ return -1;
+ }
+ namebuf = realloc_array(namebuf, char, list_len + 1024);
+ if (!namebuf)
-+ out_of_memory("rsync_xal_get");
++ out_of_memory("rsync_xal_list");
+ namebuf_len = list_len + 1024;
+ list_len = sys_llistxattr(fname, namebuf, namebuf_len);
+ if (list_len < 0) {
+ rsyserr(FERROR, errno,
-+ "rsync_xal_get: llistxattr(\"%s\",%ld) failed",
++ "rsync_xal_list: llistxattr(\"%s\",%ld) failed",
+ fname, (long)namebuf_len);
+ return -1;
+ }
+ } else {
+ rsyserr(FERROR, errno,
-+ "rsync_xal_get: llistxattr(\"%s\",%ld) failed",
++ "rsync_xal_list: llistxattr(\"%s\",%ld) failed",
+ fname, (long)namebuf_len);
+ return -1;
+ }
+ }
+
++ return list_len;
++}
++
++static int rsync_xal_get(const char *fname, item_list *xalp)
++{
++ ssize_t list_len, name_len, datum_len;
++ char *name, *ptr;
++
++ /* This puts the name list into the "namebuf" buffer. */
++ if ((list_len = rsync_xal_list(fname)) < 0)
++ return -1;
++
+ for (name = namebuf; list_len > 0; name += name_len) {
+ rsync_xa *rxas;
+
+static int rsync_xal_set(const char *fname, item_list *xalp)
+{
+ rsync_xa *rxas = xalp->items;
++ ssize_t list_len;
+ size_t i;
-+ int ret = 0;
++ char *name;
++ int name_len, ret = 0;
++
++ /* This puts the current name list into the "namebuf" buffer. */
++ if ((list_len = rsync_xal_list(fname)) < 0)
++ return -1;
+
+ for (i = 0; i < xalp->count; i++) {
+ int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len);
+ ret = -1;
+ }
+ }
++
++ /* Remove any extraneous names. */
++ for (name = namebuf; list_len > 0; name += name_len) {
++ name_len = strlen(name) + 1;
++ list_len -= name_len;
++
++ for (i = 0; i < xalp->count; i++) {
++ if (strcmp(name, rxas[i].name) == 0)
++ break;
++ }
++ if (i == xalp->count) {
++ int status = sys_lremovexattr(fname, name);
++ if (status < 0) {
++ rsyserr(FERROR, errno,
++ "rsync_xal_clear: lremovexattr(\"%s\",\"%s\") failed",
++ fname, name);
++ ret = -1;
++ }
++ }
++ }
++
+ return ret;
+}
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff