-Depends-On-Patch: acls.diff
+This patch adds backward-compatibility support for the --xattrs option.
+Since the main release has never had xattr support, the trunk doesn't
+need this code. If you want to make rsync 3.0.x communicate with an
+older (patched) release, use this.
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
- autoconf
- autoheader
- ./configure --enable-acl-support --enable-xattr-support
- make proto
+ patch -p1 <patches/acls.diff
+ patch -p1 <patches/xattrs.diff
+ ./configure (optional if already run)
make
---- orig/Makefile.in 2005-11-07 04:31:05
-+++ Makefile.in 2005-11-07 04:38:36
-@@ -27,13 +27,13 @@ VERSION=@VERSION@
-
- HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
- LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
-- lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
-+ 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 \
-- 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 \
---- orig/backup.c 2004-10-06 00:13:09
-+++ backup.c 2005-03-03 01:20:46
-@@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath)
- do_lchown(fullpath, st.st_uid, st.st_gid);
- do_chmod(fullpath, st.st_mode);
- (void)DUP_ACL(end, fullpath, st.st_mode);
-+ (void)DUP_XATTR(end, fullpath );
- }
- }
- *p = '/';
-@@ -190,6 +191,7 @@ static int keep_backup(char *fname)
- return 0;
-
- PUSH_KEEP_BACKUP_ACL(file, fname, buf);
-+ PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
-
- /* Check to see if this is a device file, or link */
- if ((am_root && preserve_devices && IS_DEVICE(file->mode))
-@@ -267,6 +269,7 @@ static int keep_backup(char *fname)
- }
- set_file_attrs(buf, file, NULL, 0);
- CLEANUP_KEEP_BACKUP_ACL();
-+ CLEANUP_KEEP_BACKUP_XATTR();
- free(file);
-
- if (verbose > 1) {
---- orig/configure.in 2004-08-19 19:53:27
-+++ configure.in 2005-05-12 22:57:53
-@@ -827,6 +827,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
- AC_MSG_RESULT(no)
- )
-
-+AC_CHECK_HEADERS(attr/xattr.h)
-+AC_MSG_CHECKING(whether to support extended attributes)
-+AC_ARG_ENABLE(xattr-support,
-+AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
-+[ case "$enableval" in
-+ yes)
-+ case "$host_os" in
-+ *linux*)
-+ AC_MSG_RESULT(Using Linux xattrs)
-+ AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
-+ ;;
-+ *)
-+ AC_MSG_RESULT(Xattrs requested but not linux. Good luck)
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NA_XATTRS, 1, [True if you don't have extended attributes])
-+ esac ],
-+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NO_XATTRL, 1, [True if you don't have extended attributes])
-+)
-+
- AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
- AC_OUTPUT
-
---- orig/flist.c 2006-01-31 02:37:33
-+++ flist.c 2005-10-16 23:03:04
-@@ -969,6 +969,8 @@ static struct file_struct *send_file_nam
- return NULL;
- if (MAKE_ACL(file, fname) < 0)
- return NULL;
-+ if (MAKE_XATTR(file, fname) < 0)
-+ return NULL;
-
- if (chmod_modes && !S_ISLNK(file->mode))
- file->mode = tweak_mode(file->mode, chmod_modes);
-@@ -981,9 +983,11 @@ static struct file_struct *send_file_nam
- flist->files[flist->count++] = file;
- send_file_entry(file, f);
- SEND_ACL(file, f);
-+ SEND_XATTR(file, f);
- } else {
- /* Cleanup unsent ACL(s). */
- SEND_ACL(file, -1);
-+ SEND_XATTR(file, -1);
- }
- return file;
- }
-@@ -1373,6 +1377,7 @@ struct file_list *recv_file_list(int f)
- file = receive_file_entry(flist, flags, f);
-
- RECEIVE_ACL(file, f);
-+ RECEIVE_XATTR(file, f );
-
- if (S_ISREG(file->mode))
- stats.total_size += file->length;
-@@ -1397,6 +1402,7 @@ struct file_list *recv_file_list(int f)
- clean_flist(flist, relative_paths, 1);
-
- SORT_FILE_ACL_INDEX_LISTS();
-+ SORT_FILE_XATTR_INDEX_LISTS();
-
- if (f >= 0) {
- recv_uid_list(f, flist);
---- orig/generator.c 2006-02-03 05:44:04
-+++ generator.c 2005-05-12 23:21:08
-@@ -906,6 +906,10 @@ static void recv_generator(char *fname,
- if (f_out == -1)
- SET_ACL(fname, file);
- #endif
-+#ifdef SUPPORT_XATTRS
-+ if (f_out == -1)
-+ SET_XATTR(fname, file);
-+#endif
- if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
---- orig/lib/sysxattr.c 2005-05-12 23:23:15
-+++ lib/sysxattr.c 2005-05-12 23:23:15
-@@ -0,0 +1,41 @@
-+/* Extended attribute support for rsync. */
-+/* This file Copyright (C) 2004 Red Hat, Inc. */
-+/* Written by Jay Fenlason */
-+
-+/* This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#include "rsync.h"
-+
-+#if defined(HAVE_LINUX_XATTRS)
-+
-+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
-+{
-+ return lgetxattr(path, name, value, size);
-+}
-+
-+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
-+{
-+ return lsetxattr(path, name, value, size, flags);
-+}
-+
-+ssize_t sys_llistxattr(const char *path, char *list, size_t size)
-+{
-+ return llistxattr(path, list, size);
-+}
-+
-+#else
-+
-+#endif /* No xattrs */
---- orig/lib/sysxattr.h 2005-05-12 23:56:31
-+++ lib/sysxattr.h 2005-05-12 23:56:31
-@@ -0,0 +1,9 @@
-+#if defined(HAVE_LINUX_XATTRS)
-+
-+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
-+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
-+ssize_t sys_llistxattr(const char *path, char *list, size_t size);
-+
-+#else
-+
-+#endif /* No xattrs */
---- orig/options.c 2006-02-04 19:58:53
-+++ options.c 2006-02-04 20:05:35
-@@ -45,6 +45,7 @@ int copy_links = 0;
- int preserve_links = 0;
- int preserve_hard_links = 0;
- int preserve_acls = 0;
-+int preserve_xattrs = 0;
- int preserve_perms = 0;
- int preserve_executability = 0;
- int preserve_devices = 0;
-@@ -195,6 +196,7 @@ static void print_rsync_version(enum log
- char const *have_inplace = "no ";
- char const *hardlinks = "no ";
- char const *acls = "no ";
-+ char const *xattrs = "no ";
- char const *links = "no ";
- char const *ipv6 = "no ";
- STRUCT_STAT *dumstat;
-@@ -214,7 +216,9 @@ static void print_rsync_version(enum log
- #ifdef SUPPORT_ACLS
- acls = "";
- #endif
--
-+#ifdef SUPPORT_XATTRS
-+ xattrs = "";
-+#endif
- #ifdef SUPPORT_LINKS
- links = "";
- #endif
-@@ -228,9 +232,9 @@ static void print_rsync_version(enum log
- rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
- rprintf(f, "<http://rsync.samba.org/>\n");
- rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-- "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
-+ "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
- (int) (sizeof (OFF_T) * 8),
-- got_socketpair, hardlinks, acls, links);
-+ got_socketpair, hardlinks, acls, xattrs, links);
-
- /* Note that this field may not have type ino_t. It depends
- * on the complicated interaction between largefile feature
-@@ -302,6 +306,9 @@ void usage(enum logcode F)
- #ifdef SUPPORT_ACLS
- rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
- #endif
-+#ifdef SUPPORT_XATTRS
-+ rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
-+#endif
- rprintf(F," --chmod=CHMOD change destination permissions\n");
- rprintf(F," -o, --owner preserve owner (super-user only)\n");
- rprintf(F," -g, --group preserve group\n");
-@@ -421,6 +428,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 },
-+ {"xattrs", 'X', POPT_ARG_NONE, 0, 'X', 0, 0 },
-+ {"no-xattrs", 0, POPT_ARG_VAL, &preserve_xattrs, 0, 0, 0 },
-+ {"no-X", 0, POPT_ARG_VAL, &preserve_xattrs, 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 },
-@@ -1085,6 +1095,17 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
-
-+ case 'X':
-+#ifdef SUPPORT_XATTRS
-+ preserve_xattrs = 1;
-+ preserve_perms = 1;
-+ break;
-+#else
-+ snprintf(err_buf,sizeof(err_buf),
-+ "extended attributes are not supported on this %s\n",
-+ am_server ? "server" : "client");
-+ return 0;
-+#endif /* SUPPORT_XATTRS */
-
- default:
- /* A large opt value means that set_refuse_options()
-@@ -1530,6 +1551,10 @@ void server_options(char **args,int *arg
- if (preserve_acls)
- argstr[x++] = 'A';
- #endif
-+#ifdef SUPPORT_XATTRS
-+ if (preserve_xattrs)
-+ argstr[x++] = 'X';
-+#endif
- if (preserve_uid)
- argstr[x++] = 'o';
- if (preserve_gid)
---- orig/rsync.c 2006-02-04 19:53:13
-+++ rsync.c 2005-10-16 23:19:27
-@@ -169,12 +169,15 @@ int set_file_attrs(char *fname, struct f
- }
- #endif
-
-- /* If this is a directory, SET_ACL() will be called on the cleanup
-- * receive_generator() pass (if we called it here, we might clobber
-- * writability on the directory). Everything else is OK to do now. */
-+ /* If this is a directory, SET_ACL() and/or SET_XATTR() will be called
-+ * on the cleanup receive_generator() pass -- if we called it here, we
-+ * might clobber writability on the dir (SELinux security contexts are
-+ * stored in xattrs). Everything else is OK to do now. */
- if (!S_ISDIR(st->st_mode)) {
- if (SET_ACL(fname, file) == 0)
- updated = 1;
-+ if (SET_XATTR(fname, file) == 0)
-+ updated = 1;
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -187,13 +187,6 @@ void setup_protocol(int f_out,int f_in)
+ if (protocol_version < 30) {
+ if (append_mode == 1)
+ append_mode = 2;
+- if (preserve_xattrs && !local_server) {
+- rprintf(FERROR,
+- "--xattrs requires protocol 30 or higher"
+- " (negotiated %d).\n",
+- protocol_version);
+- exit_cleanup(RERR_PROTOCOL);
+- }
}
- if (verbose > 1 && flags & ATTRS_REPORT) {
---- orig/rsync.h 2006-01-31 19:27:00
-+++ rsync.h 2005-10-16 23:19:44
-@@ -695,6 +695,38 @@ struct chmod_mode_struct;
- #endif /* SUPPORT_ACLS */
- #include "smb_acls.h"
-
-+#ifdef HAVE_LINUX_XATTRS
-+#define SUPPORT_XATTRS 1
-+#endif
-+
-+#ifdef SUPPORT_XATTRS
-+#ifdef HAVE_ATTR_XATTR_H
-+#include <attr/xattr.h>
-+#endif
-+#define MAKE_XATTR(file, fname) make_xattr(file, fname)
-+#define SEND_XATTR(file, f) send_xattr(file, f)
-+#define RECEIVE_XATTR(file, f) receive_xattr(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS() sort_file_xattr_index_lists()
-+#define SET_XATTR(fname, file) set_xattr(fname, file)
-+#define NEXT_XATTR_UID() next_xattr_uid()
-+#define XATTR_UID_MAP(uid) xattr_uid_map(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest) \
-+ push_keep_backup_xattr(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR() cleanup_keep_backup_xattr()
-+#define DUP_XATTR(orig, dest) dup_xattr(orig, dest)
-+#else /* SUPPORT_XATTRS */
-+#define MAKE_XATTR(file, fname) 1 /* checked return value */
-+#define SEND_XATTR(file, f)
-+#define RECEIVE_XATTR(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS()
-+#define SET_XATTR(fname, file) 1 /* checked return value */
-+#define NEXT_XATTR_UID()
-+#define XATTR_UID_MAP(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR()
-+#define DUP_XATTR(src, orig) 1 /* checked return value */
-+#endif /* SUPPORT_XATTRS */
-+
- #include "proto.h"
-
- /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2006-01-31 03:14:05
-+++ rsync.yo 2006-01-31 03:16:46
-@@ -318,6 +318,7 @@ to the detailed description below for a
- -p, --perms preserve permissions
- -E, --executability preserve executability
- -A, --acls preserve ACLs (implies -p) [non-standard]
-+ -X, --xattrs preserve extended attrs (implies -p) [n.s.]
- --chmod=CHMOD change destination permissions
- -o, --owner preserve owner (super-user only)
- -g, --group preserve group
-@@ -727,6 +728,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
-+only if the remote machine's rsync supports this option also. This is
-+a non-standard option.
-+
- dit(bf(--chmod)) This option tells rsync to apply one or more
- comma-separated "chmod" strings to the permission of the files in the
- transfer. The resulting value is treated as though it was the permissions
---- orig/xattr.c 2005-10-16 23:25:12
-+++ xattr.c 2005-10-16 23:25:12
-@@ -0,0 +1,540 @@
-+/* Extended Attribute support for rsync */
-+/* Copyright (C) 2004 Red Hat, Inc */
-+/* Written by Jay Fenlason, vaguely based on the ACLs patch */
-+
-+/* This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#include "rsync.h"
-+#include "lib/sysxattr.h"
-+
-+#ifdef SUPPORT_XATTRS
-+
-+extern int preserve_xattrs;
-+extern int dry_run;
-+
-+#define RSYNC_XAL_INITIAL 5
-+#define RSYNC_XAL_LIST_INITIAL 100
-+
-+typedef struct {
-+ size_t name_len;
-+ char *name;
-+ size_t datum_len;
-+ char *datum;
-+} rsync_xa;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ rsync_xa *rxas;
-+} rsync_xal;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ rsync_xal *rxals;
-+} rsync_xal_list;
-+
-+static size_t namebuf_len = 0;
-+static char *namebuf = NULL;
-+
-+static size_t datumbuf_len = 0;
-+static char *datumbuf = NULL;
-+
-+static rsync_xal curr_rsync_xal = { 0, 0, NULL };
-+static rsync_xal_list rsync_xal_l = { 0, 0, NULL };
-+
-+
-+/* ------------------------------------------------------------------------- */
-+
-+/* the below stuff is only used by the receiver */
-+
-+/* structure to hold index to rsync_xal_l member corresponding to
-+ * flist->files[i] */
-+
-+typedef struct {
-+ const struct file_struct *file;
-+ int xalidx;
-+} file_xal_index;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ file_xal_index *filexalidxs;
-+} file_xal_index_list;
-+
-+static file_xal_index_list fxil = {0, 0, NULL };
-+
-+/* stuff for redirecting calls to set_acl() from set_perms()
-+ * for keep_backup() */
-+static const struct file_struct *backup_orig_file = NULL;
-+static const char null_string[] = "";
-+static const char *backup_orig_fname = null_string;
-+static const char *backup_dest_fname = null_string;
-+static rsync_xal backup_xal;
-+
-+/* ------------------------------------------------------------------------- */
-+
-+static void rsync_xal_free(rsync_xal *x)
-+{
-+ size_t i;
-+
-+ for (i = 0; i < x->count; i++) {
-+ free(x->rxas[i].name);
-+ /* free(x->rxas[i].value); */
-+ }
-+ x->count = 0;
-+}
-+
-+static int rsync_xal_compare_names(const void *x1, const void *x2)
-+{
-+ const rsync_xa *xa1;
-+ const rsync_xa *xa2;
-+
-+ xa1 = x1;
-+ xa2 = x2;
-+ return strcmp(xa1->name, xa2->name);
-+}
-+
-+static int rsync_xal_get(const char *fname, rsync_xal *x)
-+{
-+ ssize_t name_size;
-+ ssize_t datum_size;
-+ ssize_t left;
-+ char *name;
-+ size_t len;
-+ char *ptr;
-+
-+ if (!namebuf) {
-+ namebuf_len = 100;
-+ namebuf = new_array(char, namebuf_len);
-+ datumbuf_len = 100;
-+ datumbuf = new_array(char, datumbuf_len);
-+ if (!namebuf || !datumbuf)
-+ out_of_memory("rsync_xal_get");
-+ }
-+
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size > (ssize_t)namebuf_len) {
-+ name_size = -1;
-+ errno = ERANGE;
-+ }
-+ if (name_size < 0) {
-+ if (errno == ENOTSUP)
-+ return -1;
-+ if (errno == ERANGE) {
-+ name_size = sys_llistxattr(fname, NULL, 0);
-+ if (name_size < 0) {
-+ rprintf(FERROR, "%s: rsync_xal_get: llistxattr: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ namebuf = realloc_array(namebuf, char, name_size + 1);
-+ if (!namebuf)
-+ out_of_memory("rsync_xal_get");
-+ namebuf_len = name_size;
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: re-llistxattr failed: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ } else {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: llistxattr failed: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ }
-+ rsync_xal_free(x);
-+ if (name_size == 0)
-+ return 0;
-+ for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
-+ len = strlen(name) + 1;
-+
-+ if (x->count >= x->alloc) {
-+ size_t new_alloc;
-+ rsync_xa *new_rxas;
-+
-+ new_alloc = x->alloc < RSYNC_XAL_INITIAL ? RSYNC_XAL_INITIAL : x->alloc * 2;
-+ new_rxas = realloc_array(x->rxas, rsync_xa, new_alloc);
-+ if (!new_rxas)
-+ out_of_memory("rsync_xal_get");
-+ x->alloc = new_alloc;
-+ x->rxas = new_rxas;
-+ }
-+ datum_size = sys_lgetxattr(fname, name, datumbuf, datumbuf_len);
-+ if (datum_size > (ssize_t)datumbuf_len) {
-+ datum_size = -1;
-+ errno = ERANGE;
-+ }
-+ if (datum_size < 0) {
-+ if (errno == ENOTSUP)
-+ return -1;
-+ if (errno == ERANGE) {
-+ datum_size = sys_lgetxattr(fname, name, NULL, 0);
-+ if (datum_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: lgetxattr %s failed: %s\n",
-+ fname, name, strerror(errno));
-+ return -1;
-+ }
-+ datumbuf = realloc_array(datumbuf, char, datum_size + 1);
-+ if (!datumbuf)
-+ out_of_memory("rsync_xal_get");
-+ datumbuf_len = datum_size;
-+ datum_size = sys_lgetxattr(fname, name, datumbuf, datumbuf_len);
-+ if (datum_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: re-lgetxattr of %s failed: %s\n",
-+ name, fname, strerror(errno));
-+ return -1;
-+ }
-+ } else {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: lgetxattr %s failed: %s\n",
-+ fname, name, strerror(errno));
-+ return -1;
-+ }
-+ }
-+ ptr = new_array(char, len + datum_size);
-+ if (!ptr)
-+ out_of_memory("rsync_xal_get");
-+ strcpy(ptr, name);
-+ if (datum_size)
-+ memcpy(ptr + len, datumbuf, datum_size);
-+ x->rxas[curr_rsync_xal.count].name_len = len;
-+ x->rxas[curr_rsync_xal.count].name = ptr;
-+ x->rxas[curr_rsync_xal.count].datum_len = datum_size;
-+ x->rxas[curr_rsync_xal.count].datum = ptr + len;
-+ x->count++;
-+ }
-+ if (x->count > 1) {
-+ qsort(x->rxas, x->count, sizeof (rsync_xa), rsync_xal_compare_names);
-+ }
-+ return 0;
-+}
-+
-+
-+/* generate the xattr(s) for this flist entry;
-+ * xattr(s) are either sent or cleaned-up by send_xattr() below */
-+
-+int make_xattr(const struct file_struct *file, const char *fname)
-+{
-+ if (!preserve_xattrs || !file)
-+ return 1;
-+
-+ rsync_xal_get(fname, &curr_rsync_xal);
-+ return 0; /* TODO: This needs to return 1 if no xattrs changed! */
-+}
-+
-+static ssize_t rsync_xal_find_matching(void)
-+{
-+ size_t i;
-+ size_t j;
-+
-+ for (i = 0; i < rsync_xal_l.count; i++) {
-+ /* Wrong number of elements? */
-+ if (rsync_xal_l.rxals[i].count != curr_rsync_xal.count)
-+ continue;
-+ /* any elements different? */
-+ for (j = 0; j < curr_rsync_xal.count; j++) {
-+ if (rsync_xal_l.rxals[i].rxas[j].name_len != curr_rsync_xal.rxas[j].name_len
-+ || rsync_xal_l.rxals[i].rxas[j].datum_len != curr_rsync_xal.rxas[j].datum_len
-+ || strcmp(rsync_xal_l.rxals[i].rxas[j].name, curr_rsync_xal.rxas[j].name)
-+ || memcmp(rsync_xal_l.rxals[i].rxas[j].datum, curr_rsync_xal.rxas[j].datum, curr_rsync_xal.rxas[j].datum_len))
-+ break;
+ if (delete_mode && !(delete_before+delete_during+delete_after)) {
+diff --git a/xattrs.c b/xattrs.c
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -21,6 +21,7 @@
+
+ #include "rsync.h"
+ #include "ifuncs.h"
++#include "io.h"
+ #include "lib/sysxattrs.h"
+
+ #ifdef SUPPORT_XATTRS
+@@ -33,6 +34,7 @@ extern int read_only;
+ extern int list_only;
+ extern int preserve_xattrs;
+ extern int checksum_seed;
++extern int protocol_version;
+
+ #define RSYNC_XAL_INITIAL 5
+ #define RSYNC_XAL_LIST_INITIAL 100
+@@ -239,7 +241,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+ if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
+ return -1;
+
+- if (datum_len > MAX_FULL_DATUM) {
++ if (datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
+ /* For large datums, we store a flag and a checksum. */
+ name_offset = 1 + MAX_DIGEST_LEN;
+ sum_init(checksum_seed);
+@@ -307,7 +309,7 @@ static int find_matching_xattr(item_list *xalp)
+ || rxas1[j].datum_len != rxas2[j].datum_len
+ || strcmp(rxas1[j].name, rxas2[j].name))
+ break;
+- if (rxas1[j].datum_len > MAX_FULL_DATUM) {
++ if (rxas1[j].datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
+ if (memcmp(rxas1[j].datum + 1,
+ rxas2[j].datum + 1,
+ MAX_DIGEST_LEN) != 0)
+@@ -344,34 +346,43 @@ int send_xattr(stat_x *sxp, int f)
+ {
+ int ndx = find_matching_xattr(sxp->xattr);
+
+- /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
+- write_varint(f, ndx + 1);
++ if (protocol_version < 30) {
++ if (ndx < 0)
++ write_byte(f, 'X');
++ else {
++ write_byte(f, 'x');
++ write_int(f, ndx);
+ }
-+ /* no differences found. This is The One! */
-+ if (j == curr_rsync_xal.count)
-+ break;
-+ }
-+ if (i < rsync_xal_l.count)
-+ return i;
-+ return (ssize_t)-1;
-+}
-+
-+/* Store curr_rsync_xal on the end of rsync_xal_l */
-+static void rsync_xal_store(void)
-+{
-+ if (rsync_xal_l.count <= rsync_xal_l.alloc) {
-+ size_t new_alloc;
-+ void *new_xal;
-+
-+ new_alloc = rsync_xal_l.count < RSYNC_XAL_LIST_INITIAL ? RSYNC_XAL_LIST_INITIAL : rsync_xal_l.count * 2;
-+ new_xal = realloc_array(rsync_xal_l.rxals, rsync_xal, new_alloc);
-+ if (!new_xal)
-+ out_of_memory("rsync_xal_store");
-+ rsync_xal_l.alloc = new_alloc;
-+ rsync_xal_l.rxals = new_xal;
-+ }
-+ rsync_xal_l.rxals[rsync_xal_l.count] = curr_rsync_xal;
-+ rsync_xal_l.count++;
-+ curr_rsync_xal.count = 0;
-+ curr_rsync_xal.alloc = 0;
-+}
-+
-+/* send the make_xattr()-generated xattr list for this flist entry,
-+ * or clean up after an flist entry that's not being sent (f == -1) */
-+
-+void send_xattr(const struct file_struct *file, int f)
-+{
-+ ssize_t index;
-+
-+ if (!preserve_xattrs || !file)
-+ return;
-+
-+ if (f == -1) {
-+ rsync_xal_free(&curr_rsync_xal);
-+ return;
-+ }
-+ index = rsync_xal_find_matching();
-+ if (index != -1) {
-+ write_byte(f, 'x');
-+ write_int(f, index);
-+ rsync_xal_free(&curr_rsync_xal);
+ } else {
-+ rsync_xa *rxa;
-+ size_t count;
-+
-+ count = curr_rsync_xal.count;
-+ write_byte(f, 'X');
-+ write_int(f, count);
-+ for (rxa = curr_rsync_xal.rxas; count--; rxa++) {
-+ write_int(f, rxa->name_len);
-+ write_int(f, rxa->datum_len);
-+ write_buf(f, rxa->name, rxa->name_len);
-+ write_buf(f, rxa->datum, rxa->datum_len);
-+ }
-+ rsync_xal_store();
-+ }
-+}
-+
-+
-+/* ------------------------------------------------------------------------- */
-+/* receive and build the rsync_xattr_lists */
-+
-+void receive_xattr(struct file_struct *file, int f)
-+{
-+ char *fname;
-+ int tag;
-+
-+ if (!preserve_xattrs)
++ /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
++ write_varint(f, ndx + 1);
++ }
+
+ if (ndx < 0) {
+ rsync_xa *rxa;
+ int count = sxp->xattr->count;
+- write_varint(f, count);
++ write_varint30(f, count);
+ for (rxa = sxp->xattr->items; count--; rxa++) {
+ #ifdef HAVE_LINUX_XATTRS
+- write_varint(f, rxa->name_len);
+- write_varint(f, rxa->datum_len);
++ write_varint30(f, rxa->name_len);
++ write_varint30(f, rxa->datum_len);
+ write_buf(f, rxa->name, rxa->name_len);
+ #else
+ /* We strip the rsync prefix from disguised namespaces
+ * and put everything else in the user namespace. */
+ if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
+ && rxa->name[RPRE_LEN] != '%') {
+- write_varint(f, rxa->name_len - RPRE_LEN);
+- write_varint(f, rxa->datum_len);
++ write_varint30(f, rxa->name_len - RPRE_LEN);
++ write_varint30(f, rxa->datum_len);
+ write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
+ } else {
+- write_varint(f, rxa->name_len + UPRE_LEN);
+- write_varint(f, rxa->datum_len);
++ write_varint30(f, rxa->name_len + UPRE_LEN);
++ write_varint30(f, rxa->datum_len);
+ write_buf(f, USER_PREFIX, UPRE_LEN);
+ write_buf(f, rxa->name, rxa->name_len);
+ }
+ #endif
+- if (rxa->datum_len > MAX_FULL_DATUM)
++ if (rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30)
+ write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
+ else
+ write_buf(f, rxa->datum, rxa->datum_len);
+@@ -421,7 +432,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+ cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
+ if (cmp > 0)
+ same = 0;
+- else if (snd_rxa->datum_len > MAX_FULL_DATUM) {
++ else if (snd_rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
+ same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
+ && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
+ MAX_DIGEST_LEN) == 0;
+@@ -464,6 +475,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+ int cnt, prior_req = 0;
+ rsync_xa *rxa;
+
++ if (protocol_version < 30)
+ return;
-+ fname = f_name(file, NULL);
-+ tag = read_byte(f);
-+ if (tag != 'X' && tag != 'x') {
-+ rprintf(FERROR,
-+ "%s: receive_xattr: unknown extended attribute type tag: %c\n",
-+ fname, tag);
-+ exit_cleanup(RERR_STREAMIO);
-+ }
-+
-+ if (fxil.alloc <= fxil.count) {
-+ void *new_ptr;
-+ size_t new_alloc;
+
-+ if (fxil.count < RSYNC_XAL_LIST_INITIAL)
-+ new_alloc = fxil.alloc + RSYNC_XAL_LIST_INITIAL;
-+ else
-+ new_alloc = fxil.alloc * 2;
-+ new_ptr = realloc_array(fxil.filexalidxs, file_xal_index, new_alloc);
-+ if (!new_ptr)
-+ out_of_memory("receive_xattr");
-+ if (verbose >= 3) {
-+ rprintf(FINFO, "receive_xattr to %lu bytes, %s move\n",
-+ (unsigned long)(new_alloc * sizeof (file_xal_index)),
-+ fxil.filexalidxs == new_ptr ? "did not" : "did");
-+ }
-+
-+ fxil.filexalidxs = new_ptr;
-+ fxil.alloc = new_alloc;
-+ }
-+
-+ fxil.filexalidxs[fxil.count].file = file;
-+ if (tag == 'X') {
-+ size_t count;
-+ size_t i;
-+
-+ fxil.filexalidxs[fxil.count].xalidx = rsync_xal_l.count;
-+
-+ count = read_int(f);
-+ curr_rsync_xal.count = count;
-+ curr_rsync_xal.alloc = count;
-+ curr_rsync_xal.rxas = new_array(rsync_xa, count);
-+ if (!curr_rsync_xal.rxas)
-+ out_of_memory("receive_xattr");
-+ for (i = 0; i < count; i++) {
-+ size_t name_len;
-+ size_t datum_len;
-+ char *ptr;
-+
-+ name_len = read_int(f);
-+ datum_len = read_int(f);
-+ ptr = new_array(char, name_len + datum_len);
-+ if (!ptr)
-+ out_of_memory("receive_xattr");
-+ read_buf(f, ptr, name_len);
-+ read_buf(f, ptr + name_len, datum_len);
-+ curr_rsync_xal.rxas[i].name_len = name_len;
-+ curr_rsync_xal.rxas[i].datum_len = datum_len;
-+ curr_rsync_xal.rxas[i].name = ptr;
-+ curr_rsync_xal.rxas[i].datum = ptr + name_len;
-+ }
-+ rsync_xal_store();
-+ } else {
-+ size_t index;
+ lst += F_XATTR(file);
+ for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
+ if (rxa->datum_len <= MAX_FULL_DATUM)
+@@ -518,6 +532,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+ rsync_xa *rxa;
+ int rel_pos, cnt, num, got_xattr_data = 0;
+
++ if (protocol_version < 30)
++ return 0;
+
-+ index = read_int(f);
-+ if (index >= rsync_xal_l.count) {
-+ rprintf(FERROR, "%s: receive_xattr: xa index %lu out of range\n",
-+ fname, (unsigned long)index);
+ if (F_XATTR(file) < 0) {
+ rprintf(FERROR, "recv_xattr_request: internal data error!\n");
+ exit_cleanup(RERR_STREAMIO);
+@@ -574,7 +591,22 @@ void receive_xattr(struct file_struct *file, int f)
+ {
+ static item_list temp_xattr = EMPTY_ITEM_LIST;
+ int count, num;
+- int ndx = read_varint(f);
++ int ndx;
++
++ if (protocol_version >= 30)
++ ndx = read_varint(f);
++ else {
++ int tag = read_byte(f);
++ if (tag == 'x')
++ ndx = read_int(f) + 1;
++ else if (tag == 'X')
++ ndx = 0;
++ else {
++ rprintf(FERROR, "receive_xattr: unknown extended attribute"
++ " type tag (%02x) for %s\n", tag, f_name(file, NULL));
+ exit_cleanup(RERR_STREAMIO);
+ }
-+ fxil.filexalidxs[fxil.count].xalidx = index;
-+ }
-+ fxil.count++;
-+}
-+
-+static int rsync_xal_set(const char *fname, rsync_xal *x)
-+{
-+ size_t i;
-+ int ret = 0;
-+
-+ for (i = 0; i < x->count; i++) {
-+ int status = sys_lsetxattr(fname, x->rxas[i].name, x->rxas[i].datum, x->rxas[i].datum_len, 0);
-+ if (status < 0) {
-+ rprintf(FERROR, "%s: rsync_xal_set: lsetxattr %s failed: %s\n",
-+ fname, x->rxas[i].name, strerror(errno));
-+ ret = -1;
-+ }
+ }
-+ return ret;
-+}
-+
-+/* for duplicating xattrs on backups when using backup_dir */
-+
-+int dup_xattr(const char *orig, const char *bak)
-+{
-+ int ret;
-+
-+ if (!preserve_xattrs)
-+ return 1;
-+
-+ if (rsync_xal_get(orig, &backup_xal) < 0)
-+ ret = rsync_xal_set(bak, &backup_xal);
-+ else
-+ ret = 0;
-+ rsync_xal_free(&backup_xal);
-+ return ret;
-+}
-+
-+void push_keep_backup_xattr(const struct file_struct *file, const char *orig, const char *dest)
-+{
-+ if (!preserve_xattrs)
-+ return;
-+
-+ backup_orig_file = file;
-+ backup_orig_fname = orig;
-+ backup_dest_fname = dest;
-+ rsync_xal_get(orig, &backup_xal);
-+}
-+
-+static int set_keep_backup_xal(void)
-+{
-+ if (!preserve_xattrs)
-+ return 1;
-+ return rsync_xal_set(backup_dest_fname, &backup_xal);
-+}
-+
-+void cleanup_keep_backup_xattr(void)
-+{
-+ if (!preserve_xattrs)
-+ return;
-+
-+ backup_orig_file = NULL;
-+ backup_orig_fname = null_string;
-+ backup_dest_fname = null_string;
-+ rsync_xal_free(&backup_xal);
-+}
-+
-+static int file_xal_index_compare(const void *x1, const void *x2)
-+{
-+ const file_xal_index *xa1;
-+ const file_xal_index *xa2;
-+
-+ xa1 = x1;
-+ xa2 = x2;
-+ return xa1->file == xa2->file ? 0 : xa1->file < xa2->file ? -1 : 1;
-+}
-+
-+void sort_file_xattr_index_lists(void)
-+{
-+ if (!preserve_xattrs)
-+ return;
-+ qsort(fxil.filexalidxs, fxil.count, sizeof (file_xal_index), file_xal_index_compare);
-+}
-+
-+static int find_file_xal_index(const struct file_struct *file)
-+{
-+ int low = 0, high = fxil.count;
-+ const struct file_struct *file_mid;
-+
-+ if (!high--) {
-+ rprintf(FERROR, "find_file_xal_index: no entries\n");
-+ exit_cleanup(RERR_STREAMIO);
-+ return -1;
-+ }
-+ do {
-+ int mid = (high + low) / 2;
-+ file_mid = fxil.filexalidxs[mid].file;
-+ if (file_mid == file)
-+ return fxil.filexalidxs[mid].xalidx;
-+ if (file_mid > file)
-+ high = mid - 1;
-+ else
-+ low = mid + 1;
-+ } while (low < high);
-+ if (low == high) {
-+ file_mid = fxil.filexalidxs[low].file;
-+ if (file_mid == file)
-+ return fxil.filexalidxs[low].xalidx;
-+ }
-+ rprintf(FERROR,
-+ "find_file_xal_index: can't find entry for file in list\n");
-+ exit_cleanup(RERR_STREAMIO);
-+ return -1;
-+}
-+
-+/* set extended attributes on rsync-ed or keep_backup-ed file */
-+
-+int set_xattr(const char *fname, const struct file_struct *file)
-+{
-+ int xalidx;
-+ rsync_xal *x;
-+
-+ if (dry_run || !preserve_xattrs)
-+ return 1;
-+ if (file == backup_orig_file) {
-+ if (!strcmp(fname, backup_dest_fname))
-+ return set_keep_backup_xal();
-+ }
-+ xalidx = find_file_xal_index(file);
-+ x = &(rsync_xal_l.rxals[xalidx]);
-+ return rsync_xal_set(fname, x);
-+}
-+
-+#endif /* SUPPORT_XATTRS */
+
+ if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
+ rprintf(FERROR, "receive_xattr: xa index %d out of"
+@@ -587,7 +619,7 @@ void receive_xattr(struct file_struct *file, int f)
+ return;
+ }
+
+- if ((count = read_varint(f)) != 0) {
++ if ((count = read_varint30(f)) != 0) {
+ (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
+ temp_xattr.count = 0;
+ }
+@@ -595,9 +627,10 @@ void receive_xattr(struct file_struct *file, int f)
+ for (num = 1; num <= count; num++) {
+ char *ptr, *name;
+ rsync_xa *rxa;
+- size_t name_len = read_varint(f);
+- size_t datum_len = read_varint(f);
+- size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
++ size_t name_len = read_varint30(f);
++ size_t datum_len = read_varint30(f);
++ size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
++ ? 1 + MAX_DIGEST_LEN : datum_len;
+ size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
+ if (dget_len + extra_len < dget_len)
+ out_of_memory("receive_xattr"); /* overflow */
git.samba.org / rsync-patches.git / blobdiff