1 Depends-On-Patch: acls.diff
3 After applying this patch, run these commands for a successful build:
6 ./configure --enable-acl-support --enable-xattr-support
11 - This patch needs to be rewritten to more efficiently handle large xattrs.
13 - We need to affect the itemized output to know when xattrs are being updated.
15 - We need to affect the --link-dest option to avoid hard-linking two files
16 that differ in their xattrs (when --xattrs was specified).
18 - Mac OS X support should probably escape names that don't begin with "user."
19 or "system." so that the xattr names can be stored on non-macs.
23 @@ -28,13 +28,13 @@ VERSION=@VERSION@
25 HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
26 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
27 - lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
28 + lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattr.o @LIBOBJS@
29 ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
30 zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
31 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
32 main.o checksum.o match.o syscall.o log.o backup.o
33 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
34 - fileio.o batch.o clientname.o chmod.o acls.o
35 + fileio.o batch.o clientname.o chmod.o acls.o xattr.o
36 OBJS3=progress.o pipe.o
37 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
38 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
41 @@ -29,6 +29,7 @@ extern int am_root;
43 extern int orig_umask;
44 extern int preserve_acls;
45 +extern int preserve_xattrs;
46 extern unsigned int file_struct_len;
48 /* === ACL structures === */
49 @@ -740,6 +741,10 @@ void receive_acl(struct file_struct *fil
50 type = SMB_ACL_TYPE_ACCESS;
51 racl_list = &access_acl_list;
52 ndx_ptr = (char*)file + file_struct_len;
53 +#ifdef SUPPORT_XATTRS
54 + if (preserve_xattrs)
58 char tag = read_byte(f);
60 @@ -799,6 +804,10 @@ void cache_acl(struct file_struct *file,
62 racl_list = &access_acl_list;
63 ndx_ptr = (char*)file + file_struct_len;
64 +#ifdef SUPPORT_XATTRS
65 + if (preserve_xattrs)
71 @@ -914,6 +923,10 @@ int set_acl(const char *fname, const str
73 type = SMB_ACL_TYPE_ACCESS;
74 ndx_ptr = (char*)file + file_struct_len;
75 +#ifdef SUPPORT_XATTRS
76 + if (preserve_xattrs)
84 @@ -30,6 +30,7 @@ extern char *backup_dir;
87 extern int preserve_acls;
88 +extern int preserve_xattrs;
89 extern int preserve_devices;
90 extern int preserve_specials;
91 extern int preserve_links;
92 @@ -136,6 +137,9 @@ static int make_bak_dir(char *fullpath)
94 sx.acc_acl = sx.def_acl = NULL;
96 +#ifdef SUPPORT_XATTRS
99 if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
102 @@ -144,6 +148,12 @@ static int make_bak_dir(char *fullpath)
103 cache_acl(file, &sx);
106 +#ifdef SUPPORT_XATTRS
107 + if (preserve_xattrs) {
108 + get_xattr(rel, &sx);
109 + cache_xattr(file, &sx);
112 set_file_attrs(fullpath, file, NULL, 0);
115 @@ -195,6 +205,9 @@ static int keep_backup(char *fname)
117 sx.acc_acl = sx.def_acl = NULL;
119 +#ifdef SUPPORT_XATTRS
123 if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
124 return 1; /* the file could have disappeared */
125 @@ -208,6 +221,12 @@ static int keep_backup(char *fname)
126 cache_acl(file, &sx);
129 +#ifdef SUPPORT_XATTRS
130 + if (preserve_xattrs) {
131 + get_xattr(fname, &sx);
132 + cache_xattr(file, &sx);
136 /* Check to see if this is a device file, or link */
137 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
140 @@ -856,6 +856,35 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
144 +AC_CHECK_HEADERS(attr/xattr.h)
145 +AC_CHECK_HEADERS(sys/xattr.h)
146 +AC_MSG_CHECKING(whether to support extended attributes)
147 +AC_ARG_ENABLE(xattr-support,
148 +AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
149 +[ case "$enableval" in
153 + AC_MSG_RESULT(Using Linux xattrs)
154 + AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
157 + AC_MSG_RESULT(Using OS X xattrs)
158 + AC_DEFINE(HAVE_OSX_XATTRS, 1, [True if you have Mac OS X xattrs])
161 + AC_MSG_RESULT(Xattrs requested but not Linux or OS X. Good luck...)
167 + AC_DEFINE(HAVE_NA_XATTRS, 1, [True if you don't have extended attributes])
170 + AC_DEFINE(HAVE_NO_XATTRL, 1, [True if you don't have extended attributes])
173 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
178 @@ -41,6 +41,7 @@ extern int one_file_system;
179 extern int copy_dirlinks;
180 extern int keep_dirlinks;
181 extern int preserve_acls;
182 +extern int preserve_xattrs;
183 extern int preserve_links;
184 extern int preserve_hard_links;
185 extern int preserve_devices;
186 @@ -498,7 +499,7 @@ static struct file_struct *receive_file_
187 char thisname[MAXPATHLEN];
188 unsigned int l1 = 0, l2 = 0;
189 int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
191 +#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
195 @@ -610,10 +611,16 @@ static struct file_struct *receive_file_
196 xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
199 +#elif defined SUPPORT_XATTRS
202 +#ifdef SUPPORT_XATTRS
203 + if (preserve_xattrs)
207 alloc_len = file_struct_len + dirname_len + basename_len
209 +#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
212 + linkname_len + sum_len;
213 @@ -622,7 +629,7 @@ static struct file_struct *receive_file_
214 file = (struct file_struct *)bp;
215 memset(bp, 0, file_struct_len);
216 bp += file_struct_len;
218 +#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
222 @@ -723,6 +730,10 @@ static struct file_struct *receive_file_
224 receive_acl(file, f);
226 +#ifdef SUPPORT_XATTRS
227 + if (preserve_xattrs)
228 + receive_xattr(file, f );
233 @@ -994,6 +1005,13 @@ static struct file_struct *send_file_nam
237 +#ifdef SUPPORT_XATTRS
238 + if (preserve_xattrs) {
240 + if (get_xattr(fname, &sx) < 0)
245 maybe_emit_filelist_progress(flist->count + flist_count_offset);
247 @@ -1006,11 +1024,19 @@ static struct file_struct *send_file_nam
251 +#ifdef SUPPORT_XATTRS
252 + if (preserve_xattrs)
253 + send_xattr(&sx, f);
260 +#ifdef SUPPORT_XATTRS
261 + if (preserve_xattrs)
267 --- old/lib/sysxattr.c
268 +++ new/lib/sysxattr.c
271 + * Extended attribute support for rsync.
273 + * Copyright (C) 2004 Red Hat, Inc.
274 + * Written by Jay Fenlason.
276 + * This program is free software; you can redistribute it and/or modify
277 + * it under the terms of the GNU General Public License as published by
278 + * the Free Software Foundation; either version 2 of the License, or
279 + * (at your option) any later version.
281 + * This program is distributed in the hope that it will be useful,
282 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
283 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
284 + * GNU General Public License for more details.
286 + * You should have received a copy of the GNU General Public License along
287 + * with this program; if not, write to the Free Software Foundation, Inc.,
288 + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
292 +#include "sysxattr.h"
294 +#if defined HAVE_LINUX_XATTRS
296 +ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
298 + return lgetxattr(path, name, value, size);
301 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
303 + return lsetxattr(path, name, value, size, flags);
306 +ssize_t sys_llistxattr(const char *path, char *list, size_t size)
308 + return llistxattr(path, list, size);
311 +#elif HAVE_OSX_XATTRS
313 +ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
315 + return getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
318 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
320 + return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW | flags);
323 +ssize_t sys_llistxattr(const char *path, char *list, size_t size)
325 + return listxattr(path, list, size, XATTR_NOFOLLOW);
330 +#endif /* No xattrs */
331 --- old/lib/sysxattr.h
332 +++ new/lib/sysxattr.h
334 +#ifdef SUPPORT_XATTRS
335 +#if defined HAVE_ATTR_XATTR_H
336 +#include <attr/xattr.h>
337 +#elif defined HAVE_SYS_XATTR_H
338 +#include <sys/xattr.h>
342 +#if defined HAVE_LINUX_XATTRS || defined HAVE_OSX_XATTRS
344 +ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
345 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
346 +ssize_t sys_llistxattr(const char *path, char *list, size_t size);
355 @@ -48,6 +48,7 @@ int copy_links = 0;
356 int preserve_links = 0;
357 int preserve_hard_links = 0;
358 int preserve_acls = 0;
359 +int preserve_xattrs = 0;
360 int preserve_perms = 0;
361 int preserve_executability = 0;
362 int preserve_devices = 0;
363 @@ -201,6 +202,7 @@ static void print_rsync_version(enum log
364 char const *have_inplace = "no ";
365 char const *hardlinks = "no ";
366 char const *acls = "no ";
367 + char const *xattrs = "no ";
368 char const *links = "no ";
369 char const *ipv6 = "no ";
370 STRUCT_STAT *dumstat;
371 @@ -220,7 +222,9 @@ static void print_rsync_version(enum log
376 +#ifdef SUPPORT_XATTRS
382 @@ -234,9 +238,9 @@ static void print_rsync_version(enum log
383 rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
384 rprintf(f, "<http://rsync.samba.org/>\n");
385 rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
386 - "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
387 + "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
388 (int) (sizeof (OFF_T) * 8),
389 - got_socketpair, hardlinks, acls, links);
390 + got_socketpair, hardlinks, acls, xattrs, links);
392 /* Note that this field may not have type ino_t. It depends
393 * on the complicated interaction between largefile feature
394 @@ -290,7 +294,7 @@ void usage(enum logcode F)
395 rprintf(F," -q, --quiet suppress non-error messages\n");
396 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
397 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
398 - rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
399 + rprintf(F," -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)\n");
400 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
401 rprintf(F," -r, --recursive recurse into directories\n");
402 rprintf(F," -R, --relative use relative path names\n");
403 @@ -315,6 +319,9 @@ void usage(enum logcode F)
405 rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
407 +#ifdef SUPPORT_XATTRS
408 + rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
410 rprintf(F," -o, --owner preserve owner (super-user only)\n");
411 rprintf(F," -g, --group preserve group\n");
412 rprintf(F," --devices preserve device files (super-user only)\n");
413 @@ -437,6 +444,9 @@ static struct poptOption long_options[]
414 {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
415 {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
416 {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
417 + {"xattrs", 'X', POPT_ARG_NONE, 0, 'X', 0, 0 },
418 + {"no-xattrs", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
419 + {"no-X", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
420 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
421 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
422 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
423 @@ -1118,6 +1128,17 @@ int parse_arguments(int *argc, const cha
428 +#ifdef SUPPORT_XATTRS
429 + preserve_xattrs = 1;
430 + preserve_perms = 1;
433 + snprintf(err_buf,sizeof(err_buf),
434 + "extended attributes are not supported on this %s\n",
435 + am_server ? "server" : "client");
437 +#endif /* SUPPORT_XATTRS */
440 /* A large opt value means that set_refuse_options()
441 @@ -1564,6 +1585,10 @@ void server_options(char **args,int *arg
445 +#ifdef SUPPORT_XATTRS
446 + if (preserve_xattrs)
457 extern int preserve_acls;
458 +extern int preserve_xattrs;
459 extern int preserve_perms;
460 extern int preserve_executability;
461 extern int preserve_times;
462 @@ -229,6 +230,10 @@ int set_file_attrs(char *fname, struct f
463 if (preserve_acls && set_acl(fname, file, sxp) == 0)
466 +#ifdef SUPPORT_XATTRS
467 + if (preserve_xattrs && set_xattr(fname, file, sxp) == 0)
472 if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
475 @@ -501,6 +501,10 @@ struct idev {
476 #define ACLS_NEED_MASK 1
479 +#if defined HAVE_LINUX_XATTRS || defined HAVE_OSX_XATTRS
480 +#define SUPPORT_XATTRS 1
483 #define GID_NONE ((gid_t)-1)
485 #define HL_CHECK_MASTER 0
486 @@ -695,6 +699,9 @@ typedef struct {
487 struct rsync_acl *acc_acl; /* access ACL */
488 struct rsync_acl *def_acl; /* default ACL */
490 +#ifdef SUPPORT_XATTRS
495 #define ACL_READY(sx) ((sx).acc_acl != NULL)
498 @@ -301,7 +301,7 @@ to the detailed description below for a
499 -q, --quiet suppress non-error messages
500 --no-motd suppress daemon-mode MOTD (see caveat)
501 -c, --checksum skip based on checksum, not mod-time & size
502 - -a, --archive archive mode; same as -rlptgoD (no -H, -A)
503 + -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)
504 --no-OPTION turn off an implied OPTION (e.g. --no-D)
505 -r, --recursive recurse into directories
506 -R, --relative use relative path names
507 @@ -324,6 +324,7 @@ to the detailed description below for a
508 -E, --executability preserve executability
509 --chmod=CHMOD affect file and/or directory permissions
510 -A, --acls preserve ACLs (implies -p) [non-standard]
511 + -X, --xattrs preserve extended attrs (implies -p) [n.s.]
512 -o, --owner preserve owner (super-user only)
513 -g, --group preserve group
514 --devices preserve device files (super-user only)
515 @@ -818,6 +819,11 @@ version makes it incompatible with sendi
516 rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This
517 doubling is not needed when pulling files from an older rsync.
519 +dit(bf(-X, --xattrs)) This option causes rsync to update the remote
520 +extended attributes to be the same as the local ones. This will work
521 +only if the remote machine's rsync supports this option also. This is
522 +a non-standard option.
524 dit(bf(--chmod)) This option tells rsync to apply one or more
525 comma-separated "chmod" strings to the permission of the files in the
526 transfer. The resulting value is treated as though it was the permissions
531 + * Extended Attribute support for rsync.
532 + * Written by Jay Fenlason, vaguely based on the ACLs patch.
534 + * Copyright (C) 2004 Red Hat, Inc.
535 + * Copyright (C) 2006 Wayne Davison
537 + * This program is free software; you can redistribute it and/or modify
538 + * it under the terms of the GNU General Public License as published by
539 + * the Free Software Foundation; either version 2 of the License, or
540 + * (at your option) any later version.
542 + * This program is distributed in the hope that it will be useful,
543 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
544 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
545 + * GNU General Public License for more details.
547 + * You should have received a copy of the GNU General Public License along
548 + * with this program; if not, write to the Free Software Foundation, Inc.,
549 + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
553 +#include "lib/sysxattr.h"
555 +#ifdef SUPPORT_XATTRS
558 +extern unsigned int file_struct_len;
560 +#define RSYNC_XAL_INITIAL 5
561 +#define RSYNC_XAL_LIST_INITIAL 100
570 +static size_t namebuf_len = 0;
571 +static char *namebuf = NULL;
573 +static item_list empty_xattr = EMPTY_ITEM_LIST;
574 +static item_list rsync_xal_l = EMPTY_ITEM_LIST;
576 +/* ------------------------------------------------------------------------- */
578 +static void rsync_xal_free(item_list *xalp)
581 + rsync_xa *rxas = xalp->items;
583 + for (i = 0; i < xalp->count; i++) {
584 + free(rxas[i].name);
585 + /* free(rxas[i].value); */
590 +void free_xattr(statx *sxp)
592 + rsync_xal_free(sxp->xattr);
597 +static int rsync_xal_compare_names(const void *x1, const void *x2)
599 + const rsync_xa *xa1 = x1;
600 + const rsync_xa *xa2 = x2;
601 + return strcmp(xa1->name, xa2->name);
604 +static int rsync_xal_get(const char *fname, item_list *xalp)
607 + ssize_t datum_size;
614 + namebuf_len = 1024;
615 + namebuf = new_array(char, namebuf_len);
617 + out_of_memory("rsync_xal_get");
620 + /* The length returned includes all the '\0' terminators. */
621 + name_size = sys_llistxattr(fname, namebuf, namebuf_len);
622 + if (name_size > (ssize_t)namebuf_len) {
626 + if (name_size < 0) {
627 + if (errno == ENOTSUP)
629 + if (errno == ERANGE) {
630 + name_size = sys_llistxattr(fname, NULL, 0);
631 + if (name_size < 0) {
632 + rsyserr(FERROR, errno, "%s: rsync_xal_get: llistxattr",
636 + namebuf = realloc_array(namebuf, char, name_size + 1024);
638 + out_of_memory("rsync_xal_get");
639 + namebuf_len = name_size + 1024;
640 + name_size = sys_llistxattr(fname, namebuf, namebuf_len);
641 + if (name_size < 0) {
642 + rsyserr(FERROR, errno,
643 + "%s: rsync_xal_get: re-llistxattr failed",
648 + rsyserr(FERROR, errno,
649 + "%s: rsync_xal_get: llistxattr failed:",
654 + if (name_size == 0)
656 + for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
657 + rsync_xa *rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
659 + len = strlen(name) + 1;
660 + datum_size = sys_lgetxattr(fname, name, NULL, 0);
661 + if (datum_size < 0) {
662 + if (errno == ENOTSUP)
664 + rsyserr(FERROR, errno,
665 + "%s: rsync_xal_get: lgetxattr %s failed",
669 + ptr = new_array(char, len + datum_size);
671 + out_of_memory("rsync_xal_get");
672 + memcpy(ptr, name, len);
673 + rxas->name_len = len;
675 + rxas->datum_len = datum_size;
676 + rxas->datum = ptr + len;
678 + ssize_t size = sys_lgetxattr(fname, name, rxas->datum, datum_size);
679 + if (size != datum_size) {
681 + rsyserr(FERROR, errno,
682 + "rsync_xal_get: lgetxattr(%s,%s)"
683 + " failed", fname, name);
686 + "rsync_xal_get: lgetxattr(%s,%s)"
687 + " returned %d instead of %d\n",
688 + fname, name, size, datum_size);
694 + if (xalp->count > 1)
695 + qsort(xalp->items, xalp->count, sizeof (rsync_xa), rsync_xal_compare_names);
699 +/* Read the xattr(s) for this filename. */
700 +int get_xattr(const char *fname, statx *sxp)
702 + sxp->xattr = new(item_list);
703 + *sxp->xattr = empty_xattr;
704 + if (rsync_xal_get(fname, sxp->xattr) < 0) {
711 +static int find_matching_xattr(item_list *xalp)
714 + item_list *lst = rsync_xal_l.items;
716 + for (i = 0; i < rsync_xal_l.count; i++) {
717 + rsync_xa *rxas1 = lst[i].items;
718 + rsync_xa *rxas2 = xalp->items;
720 + /* Wrong number of elements? */
721 + if (lst[i].count != xalp->count)
723 + /* any elements different? */
724 + for (j = 0; j < xalp->count; j++) {
725 + if (rxas1[j].name_len != rxas2[j].name_len
726 + || rxas1[j].datum_len != rxas2[j].datum_len
727 + || strcmp(rxas1[j].name, rxas2[j].name)
728 + || memcmp(rxas1[j].datum, rxas2[j].datum, rxas2[j].datum_len))
731 + /* no differences found. This is The One! */
732 + if (j == xalp->count)
739 +/* Store *xalp on the end of rsync_xal_l */
740 +static void rsync_xal_store(item_list *xalp)
742 + item_list *new_lst = EXPAND_ITEM_LIST(&rsync_xal_l, item_list, RSYNC_XAL_LIST_INITIAL);
743 + /* Since the following call starts a new list, we know it will hold the
744 + * entire initial-count, not just enough space for one new item. */
745 + *new_lst = empty_xattr;
746 + (void)EXPAND_ITEM_LIST(new_lst, rsync_xa, xalp->count);
747 + memcpy(new_lst->items, xalp->items, xalp->count * sizeof (rsync_xa));
748 + new_lst->count = xalp->count;
752 +/* Send the make_xattr()-generated xattr list for this flist entry. */
753 +void send_xattr(statx *sxp, int f)
755 + int ndx = find_matching_xattr(sxp->xattr);
757 + write_byte(f, 'x');
759 + rsync_xal_free(sxp->xattr);
762 + int count = sxp->xattr->count;
763 + write_byte(f, 'X');
764 + write_int(f, count);
765 + for (rxa = sxp->xattr->items; count--; rxa++) {
766 + write_int(f, rxa->name_len);
767 + write_int(f, rxa->datum_len);
768 + write_buf(f, rxa->name, rxa->name_len);
769 + write_buf(f, rxa->datum, rxa->datum_len);
771 + rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
776 +/* ------------------------------------------------------------------------- */
778 +/* receive and build the rsync_xattr_lists */
779 +void receive_xattr(struct file_struct *file, int f)
781 + static item_list temp_xattr = EMPTY_ITEM_LIST;
782 + int tag = read_byte(f);
783 + char *ndx_ptr = (char*)file + file_struct_len;
787 + int i, count = read_int(f);
788 + for (i = 0; i < count; i++) {
791 + size_t name_len = read_int(f);
792 + size_t datum_len = read_int(f);
793 + if (name_len + datum_len < name_len)
794 + out_of_memory("receive_xattr"); /* overflow */
795 + rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
796 + ptr = new_array(char, name_len + datum_len);
798 + out_of_memory("receive_xattr");
799 + read_buf(f, ptr, name_len);
800 + read_buf(f, ptr + name_len, datum_len);
801 + rxa->name_len = name_len;
802 + rxa->datum_len = datum_len;
804 + rxa->datum = ptr + name_len;
806 + ndx = rsync_xal_l.count; /* pre-incremented count */
807 + rsync_xal_store(&temp_xattr); /* adds item to rsync_xal_l */
808 + } else if (tag == 'x') {
810 + if (ndx < 0 || (size_t)ndx >= rsync_xal_l.count) {
811 + rprintf(FERROR, "%s: receive_xattr: xa index %d out of range\n",
812 + f_name(file, NULL), ndx);
813 + exit_cleanup(RERR_STREAMIO);
817 + "%s: receive_xattr: unknown extended attribute type tag: %c\n",
818 + f_name(file, NULL), tag);
819 + exit_cleanup(RERR_STREAMIO);
820 + ndx = 0; /* silence a compiler warning... */
823 + SIVAL(ndx_ptr, 0, ndx);
826 +/* Turn the xattr data in statx into cached xattr data, setting the index
827 + * values in the file struct. */
828 +void cache_xattr(struct file_struct *file, statx *sxp)
830 + char *ndx_ptr = (char*)file + file_struct_len;
836 + ndx = find_matching_xattr(sxp->xattr);
838 + rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
841 + SIVAL(ndx_ptr, 0, ndx);
844 +static int rsync_xal_set(const char *fname, item_list *xalp)
846 + rsync_xa *rxas = xalp->items;
850 + for (i = 0; i < xalp->count; i++) {
851 + int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len, 0);
853 + rsyserr(FERROR, errno, "%s: rsync_xal_set: lsetxattr %s failed",
854 + fname, rxas[i].name);
861 +/* Set extended attributes on indicated filename. */
862 +int set_xattr(const char *fname, const struct file_struct *file, UNUSED(statx *sxp))
865 + char *ndx_ptr = (char*)file + file_struct_len;
866 + item_list *lst = rsync_xal_l.items;
869 + return 1; /* FIXME: --dry-run needs to compute this value */
871 + ndx = IVAL(ndx_ptr, 0);
872 + return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
875 +#endif /* SUPPORT_XATTRS */