X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/bcecb5e31e51a5d737bf3d740d25c422c870c61f..37be07bf6af45e01658a76c1e59c706e39af21c3:/xattrs.diff diff --git a/xattrs.diff b/xattrs.diff index ceaacc5..3dfa510 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -18,9 +18,6 @@ TODO: - 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 @@ -36,68 +33,25 @@ TODO: + lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o - OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \ - main.o checksum.o match.o syscall.o log.o backup.o - OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ + OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ + util.o main.o checksum.o match.o syscall.o log.o backup.o + OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ - fileio.o batch.o clientname.o chmod.o acls.o + fileio.o batch.o clientname.o chmod.o acls.o xattr.o OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ ---- old/acls.c -+++ new/acls.c -@@ -30,6 +30,7 @@ extern int read_only; - extern int list_only; - extern int orig_umask; - extern int preserve_acls; -+extern int preserve_xattrs; - extern unsigned int file_struct_len; - - /* === ACL structures === */ -@@ -741,6 +742,10 @@ void receive_acl(struct file_struct *fil - type = SMB_ACL_TYPE_ACCESS; - racl_list = &access_acl_list; - ndx_ptr = (char*)file + file_struct_len; -+#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) -+ ndx_ptr += 4; -+#endif - do { - char tag = read_byte(f); - int ndx; -@@ -800,6 +805,10 @@ void cache_acl(struct file_struct *file, - racl = sxp->acc_acl; - racl_list = &access_acl_list; - ndx_ptr = (char*)file + file_struct_len; -+#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) -+ ndx_ptr += 4; -+#endif - do { - if (!racl) - ndx = -1; -@@ -920,6 +929,10 @@ int set_acl(const char *fname, const str - - type = SMB_ACL_TYPE_ACCESS; - ndx_ptr = (char*)file + file_struct_len; -+#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) -+ ndx_ptr += 4; -+#endif - do { - acl_duo *duo_item; - BOOL eq; --- old/backup.c +++ new/backup.c -@@ -30,6 +30,7 @@ extern char *backup_dir; - +@@ -23,6 +23,7 @@ + extern int verbose; extern int am_root; extern int preserve_acls; +extern int preserve_xattrs; extern int preserve_devices; extern int preserve_specials; extern int preserve_links; -@@ -136,6 +137,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 @@ -107,8 +61,8 @@ TODO: if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS))) continue; #ifdef SUPPORT_ACLS -@@ -144,6 +148,12 @@ static int make_bak_dir(char *fullpath) - cache_acl(file, &sx); +@@ -143,6 +147,12 @@ static int make_bak_dir(char *fullpath) + free_acl(&sx); } #endif +#ifdef SUPPORT_XATTRS @@ -120,7 +74,7 @@ TODO: set_file_attrs(fullpath, file, NULL, 0); free(file); } -@@ -195,6 +205,9 @@ static int keep_backup(char *fname) +@@ -194,6 +204,9 @@ static int keep_backup(const char *fname #ifdef SUPPORT_ACLS sx.acc_acl = sx.def_acl = NULL; #endif @@ -130,8 +84,8 @@ TODO: if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) return 1; /* the file could have disappeared */ -@@ -208,6 +221,12 @@ static int keep_backup(char *fname) - cache_acl(file, &sx); +@@ -210,6 +223,12 @@ static int keep_backup(const char *fname + free_acl(&sx); } #endif +#ifdef SUPPORT_XATTRS @@ -143,11 +97,22 @@ 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 +@@ -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; ++ if (preserve_xattrs && !am_sender) ++ preserve_xattrs = ++file_extra_cnt; + + if (remote_protocol == 0) { + if (!read_batch) --- old/configure.in +++ new/configure.in -@@ -856,6 +856,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_ - AC_MSG_RESULT(no) - ) +@@ -881,6 +881,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_ + esac + fi +AC_CHECK_HEADERS(attr/xattr.h) +AC_CHECK_HEADERS(sys/xattr.h) @@ -188,7 +153,7 @@ TODO: --- old/flist.c +++ new/flist.c -@@ -41,6 +41,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; @@ -196,44 +161,8 @@ TODO: extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; -@@ -498,7 +499,7 @@ static struct file_struct *receive_file_ - char thisname[MAXPATHLEN]; - unsigned int l1 = 0, l2 = 0; - int alloc_len, basename_len, dirname_len, linkname_len, sum_len; --#ifdef SUPPORT_ACLS -+#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS - int xtra_len; - #endif - OFF_T file_length; -@@ -610,10 +611,16 @@ static struct file_struct *receive_file_ - xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4; - else - xtra_len = 0; -+#elif defined SUPPORT_XATTRS -+ xtra_len = 0; -+#endif -+#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) -+ xtra_len += 4; - #endif - - alloc_len = file_struct_len + dirname_len + basename_len --#ifdef SUPPORT_ACLS -+#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS - + xtra_len - #endif - + linkname_len + sum_len; -@@ -622,7 +629,7 @@ static struct file_struct *receive_file_ - file = (struct file_struct *)bp; - memset(bp, 0, file_struct_len); - bp += file_struct_len; --#ifdef SUPPORT_ACLS -+#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS - bp += xtra_len; - #endif - -@@ -723,6 +730,10 @@ static struct file_struct *receive_file_ - if (preserve_acls) +@@ -864,6 +865,10 @@ static struct file_struct *recv_file_ent + if (preserve_acls && !S_ISLNK(mode)) receive_acl(file, f); #endif +#ifdef SUPPORT_XATTRS @@ -241,10 +170,10 @@ TODO: + receive_xattr(file, f ); +#endif - return file; - } -@@ -974,7 +985,7 @@ static struct file_struct *send_file_nam - unsigned short flags) + if (S_ISREG(mode) || S_ISLNK(mode)) + stats.total_size += file_length; +@@ -1136,7 +1141,7 @@ static struct file_struct *send_file_nam + int flags, int filter_flags) { struct file_struct *file; -#ifdef SUPPORT_ACLS @@ -252,12 +181,12 @@ TODO: statx sx; #endif -@@ -994,6 +1005,13 @@ static struct file_struct *send_file_nam +@@ -1155,6 +1160,13 @@ static struct file_struct *send_file_nam return NULL; } #endif +#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) { ++ if (preserve_xattrs && f >= 0) { + sx.xattr = NULL; + if (get_xattr(fname, &sx) < 0) + return NULL; @@ -266,22 +195,13 @@ TODO: maybe_emit_filelist_progress(flist->count + flist_count_offset); -@@ -1006,11 +1024,19 @@ static struct file_struct *send_file_nam - if (preserve_acls) - send_acl(&sx, f); - #endif -+#ifdef SUPPORT_XATTRS -+ if (preserve_xattrs) -+ send_xattr(&sx, f); -+#endif - } else { - #ifdef SUPPORT_ACLS - if (preserve_acls) +@@ -1168,6 +1180,10 @@ static struct file_struct *send_file_nam free_acl(&sx); + } #endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) -+ free_xattr(&sx); ++ send_xattr(&sx, f); +#endif } return file; @@ -455,7 +375,7 @@ TODO: +#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; @@ -463,7 +383,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 "; @@ -471,7 +391,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 @@ -482,18 +402,18 @@ TODO: #ifdef SUPPORT_LINKS links = ""; #endif -@@ -236,8 +240,8 @@ static void print_rsync_version(enum log - rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, %shard links, %ssymlinks,\n", - (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links); +@@ -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); +- rprintf(f, " %sappend, %sACLs\n", +- have_inplace, acls); ++ rprintf(f, " %sappend, %sACLs, %sxattrs\n", ++ have_inplace, acls, xattrs); -- rprintf(f, " batchfiles, %sinplace, %sIPv6, %sACLs,\n", -- have_inplace, ipv6, acls); -+ rprintf(f, " batchfiles, %sinplace, %sIPv6, %sACLs, %sxattrs,\n", -+ have_inplace, ipv6, acls, xattrs); - - /* Note that this field may not have type ino_t. It depends - * on the complicated interaction between largefile feature -@@ -289,7 +293,7 @@ void usage(enum logcode F) + #ifdef MAINTAINER_MODE + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); +@@ -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"); @@ -502,7 +422,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"); -@@ -314,6 +318,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 @@ -512,7 +432,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"); -@@ -436,6 +443,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 }, @@ -522,7 +442,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 }, -@@ -1117,6 +1127,17 @@ int parse_arguments(int *argc, const cha +@@ -1121,6 +1131,17 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -540,7 +460,7 @@ TODO: default: /* A large opt value means that set_refuse_options() -@@ -1563,6 +1584,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 @@ -548,12 +468,12 @@ TODO: + if (preserve_xattrs) + argstr[x++] = 'X'; +#endif - if (preserve_uid) - argstr[x++] = 'o'; - if (preserve_gid) + if (recurse) + argstr[x++] = 'r'; + 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; @@ -561,7 +481,7 @@ TODO: extern int preserve_perms; extern int preserve_executability; extern int preserve_times; -@@ -218,6 +219,10 @@ int set_file_attrs(char *fname, struct f +@@ -321,6 +322,10 @@ int set_file_attrs(char *fname, struct f if (daemon_chmod_modes && !S_ISLNK(new_mode)) new_mode = tweak_mode(new_mode, daemon_chmod_modes); @@ -574,7 +494,7 @@ TODO: * will enable owner-writability using chmod, if necessary. --- old/rsync.h +++ new/rsync.h -@@ -500,6 +500,10 @@ struct idev { +@@ -551,6 +551,10 @@ struct idev_node { #define ACLS_NEED_MASK 1 #endif @@ -584,8 +504,24 @@ TODO: + #define GID_NONE ((gid_t)-1) - #define HL_CHECK_MASTER 0 -@@ -694,6 +698,9 @@ typedef struct { + union file_extras { +@@ -571,6 +575,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)) +@@ -604,6 +609,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 ++#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->unum + + /* These items are per-entry optional and mutally exclusive: */ + #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num +@@ -795,6 +801,9 @@ typedef struct { struct rsync_acl *acc_acl; /* access ACL */ struct rsync_acl *def_acl; /* default ACL */ #endif @@ -609,14 +545,14 @@ TODO: @@ -324,6 +324,7 @@ to the detailed description below for a -E, --executability preserve executability --chmod=CHMOD affect file and/or directory permissions - -A, --acls preserve ACLs (implies -p) [non-standard] -+ -X, --xattrs preserve extended attrs (implies -p) [n.s.] + -A, --acls preserve ACLs (implies -p) ++ -X, --xattrs preserve extended attrs (implies -p) -o, --owner preserve owner (super-user only) -g, --group preserve group --devices preserve device files (super-user only) -@@ -818,6 +819,11 @@ version makes it incompatible with sendi - rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This - doubling is not needed when pulling files from an older rsync. +@@ -831,6 +832,11 @@ dit(bf(-A, --acls)) This option causes r + ACLs to be the same as the source ACLs. This nonstandard option only + works if the remote rsync also supports it. bf(--acls) implies bf(--perms). +dit(bf(-X, --xattrs)) This option causes rsync to update the remote +extended attributes to be the same as the local ones. This will work @@ -628,7 +564,7 @@ TODO: transfer. The resulting value is treated as though it was the permissions --- old/xattr.c +++ new/xattr.c -@@ -0,0 +1,417 @@ +@@ -0,0 +1,459 @@ +/* + * Extended Attribute support for rsync. + * Written by Jay Fenlason, vaguely based on the ACLs patch. @@ -660,7 +596,6 @@ TODO: +extern int am_root; +extern int read_only; +extern int list_only; -+extern unsigned int file_struct_len; + +#define RSYNC_XAL_INITIAL 5 +#define RSYNC_XAL_LIST_INITIAL 100 @@ -719,16 +654,15 @@ TODO: + 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. */ @@ -744,29 +678,41 @@ TODO: + 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; + @@ -919,7 +865,6 @@ TODO: +void receive_xattr(struct file_struct *file, int f) +{ + static item_list temp_xattr = EMPTY_ITEM_LIST; -+ char *ndx_ptr = (char*)file + file_struct_len; + int ndx, tag = read_byte(f); + + if (tag == 'X') { @@ -987,14 +932,13 @@ TODO: + exit_cleanup(RERR_STREAMIO); + } + -+ SIVAL(ndx_ptr, 0, ndx); ++ F_XATTR(file) = ndx; +} + +/* Turn the xattr data in statx into cached xattr data, setting the index + * values in the file struct. */ +void cache_xattr(struct file_struct *file, statx *sxp) +{ -+ char *ndx_ptr = (char*)file + file_struct_len; + int ndx; + + if (!sxp->xattr) @@ -1005,14 +949,20 @@ TODO: + rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */ + free_xattr(sxp); + -+ SIVAL(ndx_ptr, 0, ndx); ++ F_XATTR(file) = ndx; +} + +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); @@ -1023,6 +973,35 @@ TODO: + ret = -1; + } + } ++ ++ /* Remove any extraneous names. */ ++ for (name = namebuf; list_len > 0; name += name_len) { ++ name_len = strlen(name) + 1; ++ list_len -= name_len; ++ ++#ifdef HAVE_LINUX_XATTRS ++ /* We always ignore the system namespace, and non-root ++ * ignores everything but the user namespace. */ ++ if (am_root ? HAS_PREFIX(name, SYSTEM_PREFIX) ++ : !HAS_PREFIX(name, USER_PREFIX)) ++ continue; ++#endif ++ ++ 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; +} + @@ -1030,7 +1009,6 @@ TODO: +int set_xattr(const char *fname, const struct file_struct *file, UNUSED(statx *sxp)) +{ + int ndx; -+ char *ndx_ptr = (char*)file + file_struct_len; + item_list *lst = rsync_xal_l.items; + + if (dry_run) @@ -1041,7 +1019,7 @@ TODO: + return -1; + } + -+ ndx = IVAL(ndx_ptr, 0); ++ ndx = F_XATTR(file); + return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */ +} +