SOURCES: rsync-xattr.patch (NEW) - xattr support
arekm
arekm at pld-linux.org
Thu Sep 22 09:14:22 CEST 2005
Author: arekm Date: Thu Sep 22 07:14:22 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- xattr support
---- Files affected:
SOURCES:
rsync-xattr.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/rsync-xattr.patch
diff -u /dev/null SOURCES/rsync-xattr.patch:1.1
--- /dev/null Thu Sep 22 09:14:22 2005
+++ SOURCES/rsync-xattr.patch Thu Sep 22 09:14:17 2005
@@ -0,0 +1,910 @@
+Common subdirectories: rsync-2.6.4pre2-prexattr/autom4te.cache and rsync-2.6.4pre2/autom4te.cache
+diff -u -N rsync-2.6.4pre2-prexattr/backup.c rsync-2.6.4pre2/backup.c
+--- rsync-2.6.4pre2-prexattr/backup.c 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/backup.c 2005-03-02 20:20:46.000000000 -0500
+@@ -136,6 +136,7 @@
+ 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 = '/';
+@@ -189,6 +190,7 @@
+ 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 (IS_DEVICE(file->mode)) {
+@@ -264,6 +266,7 @@
+ }
+ set_perms(buf, file, NULL, 0);
+ CLEANUP_KEEP_BACKUP_ACL();
++ CLEANUP_KEEP_BACKUP_XATTR();
+ free(file);
+
+ if (verbose > 1) {
+diff -u -N rsync-2.6.4pre2-prexattr/configure.in rsync-2.6.4pre2/configure.in
+--- rsync-2.6.4pre2-prexattr/configure.in 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/configure.in 2005-03-02 20:20:46.000000000 -0500
+@@ -789,6 +789,30 @@
+ AC_MSG_RESULT(no)
+ )
+
++AC_CHECK_HEADERS(attr/xattr.h)
+++AC_MSG_CHECKING(whether to support extended attributes)
++AC_ARG_WITH(xattr-support,
++[ --with-xattr-support Include extended attribute support (default=no)],
++[ case "$withval" 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
+
+diff -u -N rsync-2.6.4pre2-prexattr/options.c rsync-2.6.4pre2/options.c
+--- rsync-2.6.4pre2-prexattr/options.c 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/options.c 2005-03-02 20:31:22.000000000 -0500
+@@ -45,6 +45,7 @@
+ int preserve_links = 0;
+ int preserve_hard_links = 0;
+ int preserve_acls = 0;
++int preserve_xattrs = 0;
+ int preserve_perms = 0;
+ int preserve_devices = 0;
+ int preserve_uid = 0;
+@@ -180,6 +181,7 @@
+ 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;
+@@ -199,7 +201,9 @@
+ #ifdef SUPPORT_ACLS
+ acls = "";
+ #endif
+-
++#if SUPPORT_XATTRS
++ xattrs = "";
++#endif
+ #ifdef SUPPORT_LINKS
+ links = "";
+ #endif
+@@ -214,9 +218,9 @@
+ "Copyright (C) 1996-2005 by Andrew Tridgell 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
+@@ -287,6 +291,7 @@
+ rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
+ rprintf(F," -p, --perms preserve permissions\n");
+ rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
++ rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
+ rprintf(F," -o, --owner preserve owner (root only)\n");
+ rprintf(F," -g, --group preserve group\n");
+ rprintf(F," -D, --devices preserve devices (root only)\n");
+@@ -410,6 +415,7 @@
+ {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
+ {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
+ {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
++ {"xattrs", 'X', POPT_ARG_NONE, 0, 'X', 0, 0 },
+ {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
+ {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
+ {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
+@@ -879,6 +885,17 @@
+ #endif /* SUPPORT_ACLS */
+ break;
+
++ case 'X':
++#if SUPPORT_XATTRS
++ preserve_xattrs = 1;
++ preserve_perms = 1;
++#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 */
++ break;
+
+ default:
+ /* A large opt value means that set_refuse_options()
+@@ -1289,6 +1306,8 @@
+ argstr[x++] = 'H';
+ if (preserve_acls)
+ argstr[x++] = 'A';
++ if ( preserve_xattrs )
++ argstr[x++] = 'X';
+ if (preserve_uid)
+ argstr[x++] = 'o';
+ if (preserve_gid)
+Common subdirectories: rsync-2.6.4pre2-prexattr/packaging and rsync-2.6.4pre2/packaging
+Common subdirectories: rsync-2.6.4pre2-prexattr/patches and rsync-2.6.4pre2/patches
+Common subdirectories: rsync-2.6.4pre2-prexattr/popt and rsync-2.6.4pre2/popt
+diff -u -N rsync-2.6.4pre2-prexattr/rsync.c rsync-2.6.4pre2/rsync.c
+--- rsync-2.6.4pre2-prexattr/rsync.c 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/rsync.c 2005-03-02 20:31:22.000000000 -0500
+@@ -145,6 +145,14 @@
+ if (SET_ACL(fname, file) == 0)
+ updated = 1;
+ }
++ /* If this is a directory, SET_XATTR() will be called on the cleanup
++ * receive_generator() pass--if we called it here, we might clobber
++ * writability on the directory (SELinux security contexts are stored
++ * in xattrs). everything else is OK to do now. */
++ if (!S_ISDIR(st->st_mode)) {
++ if (SET_XATTR(fname, file) == 0)
++ updated = 1;
++ }
+
+ if (verbose > 1 && flags & PERMS_REPORT) {
+ enum logcode code = daemon_log_format_has_i || dry_run
+diff -u -N rsync-2.6.4pre2-prexattr/rsync.h rsync-2.6.4pre2/rsync.h
+--- rsync-2.6.4pre2-prexattr/rsync.h 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/rsync.h 2005-03-02 20:32:39.000000000 -0500
+@@ -662,6 +662,36 @@
+ #endif /* SUPPORT_ACLS */
+ #include "smb_acls.h"
+
++#define SUPPORT_XATTRS HAVE_LINUX_XATTRS
++
++#if 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) 0 /* 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) 0 /* checked return value */
++#endif /* SUPPORT_XATTRS */
++
+ #include "proto.h"
+
+ /* We have replacement versions of these if they're missing. */
+diff -u -N rsync-2.6.4pre2-prexattr/rsync.yo rsync-2.6.4pre2/rsync.yo
+--- rsync-2.6.4pre2-prexattr/rsync.yo 2005-03-02 20:15:48.000000000 -0500
++++ rsync-2.6.4pre2/rsync.yo 2005-03-02 20:33:53.000000000 -0500
+@@ -318,6 +318,7 @@
+ -K, --keep-dirlinks treat symlinked dir on receiver as dir
+ -p, --perms preserve permissions
+ -A, --acls preserve ACLs (implies -p) [local option]
++ -X, --xattrs preserve extended attributes (implies -p) [local option]
+ -o, --owner preserve owner (root only)
+ -g, --group preserve group
+ -D, --devices preserve devices (root only)
+@@ -630,6 +631,11 @@
+ remote machine's rsync supports this option also. This is a non-standard
+ option.
+
++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(-o, --owner)) This option causes rsync to set the owner of the
+ destination file to be the same as the source file. On most systems,
+ only the super-user can set file ownership. By default, the preservation
+Common subdirectories: rsync-2.6.4pre2-prexattr/support and rsync-2.6.4pre2/support
+diff -u -N rsync-2.6.4pre2-prexattr/lib/sysxattr.c rsync-2.6.4pre2/sysxattr.c
+--- rsync-2.6.4pre2-prexattr/lib/sysxattr.c 1969-12-31 19:00:00.000000000 -0500
++++ rsync-2.6.4pre2/lib/sysxattr.c 2005-03-02 20:34:10.000000000 -0500
+@@ -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 */
+Common subdirectories: rsync-2.6.4pre2-prexattr/testhelp and rsync-2.6.4pre2/testhelp
+Common subdirectories: rsync-2.6.4pre2-prexattr/testsuite and rsync-2.6.4pre2/testsuite
+diff -u -N rsync-2.6.4pre2-prexattr/xattr.c rsync-2.6.4pre2/xattr.c
+--- rsync-2.6.4pre2-prexattr/xattr.c 1969-12-31 19:00:00.000000000 -0500
++++ rsync-2.6.4pre2/xattr.c 2005-03-02 20:34:47.000000000 -0500
+@@ -0,0 +1,556 @@
++/* 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"
++
++#if 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 BOOL 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 = malloc ( 100 );
++ datumbuf_len = 100;
++ datumbuf = malloc ( 100 );
++ if ( ! namebuf || ! datumbuf ) {
++ rprintf(FERROR, "%s: rsync_xal_get: allocate intial buffers failed: %s\n",
++ fname, strerror(errno));
++ return False;
++ }
++ }
++
++ name_size = sys_llistxattr ( fname, namebuf, namebuf_len );
++ if ( name_size > namebuf_len ) {
++ name_size = -1;
++ errno = ERANGE;
++ }
++ if ( name_size < 0 ) {
++ if ( errno == ENOTSUP )
++ return False;
++ 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 False;
++ }
++ namebuf = realloc ( namebuf, name_size + 1 );
++ if ( ! namebuf ) {
++ rprintf ( FERROR, "%s: rsync_xal_get: reallocate namebuf to %lu failed: %s\n",
++ fname, (unsigned long)name_size, strerror(errno) );
++ return False;
++ }
++ 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 False;
++ }
++ } else {
++ rprintf(FERROR, "%s: rsync_xal_get: llistxattr failed: %s\n",
++ fname, strerror(errno));
++ return False;
++ }
++ }
++ rsync_xal_free ( x );
++ if ( name_size == 0 )
++ return True;
++ 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;
++ size_t new_size;
++ rsync_xa *new_rxas;
++
++ new_alloc = ( x->alloc < RSYNC_XAL_INITIAL ) ? RSYNC_XAL_INITIAL : x->alloc * 2;
++ new_size = new_alloc * sizeof(rsync_xa);
++ new_rxas = x->alloc ? realloc ( x->rxas, new_size ) : malloc ( new_size );
++ if ( new_rxas == NULL ) {
++ rprintf(FERROR, "%s: rsync_xal_get: allocate %lufailed: %s\n",
++ fname, (unsigned long)new_size, strerror(errno));
++ return False;
++ }
++ x->alloc = new_alloc;
++ x->rxas = new_rxas;
++ }
++ datum_size = sys_lgetxattr ( fname, name, datumbuf, datumbuf_len );
++ if ( datum_size > datumbuf_len ) {
++ datum_size = -1;
++ errno = ERANGE;
++ }
++ if ( datum_size < 0 ) {
++ if ( errno == ENOTSUP )
++ return False;
++ 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 False;
++ }
++ datumbuf = realloc ( datumbuf, datum_size + 1 );
++ if ( ! datumbuf ) {
++ rprintf(FERROR, "%s: rsync_xal_get: allocate %lu for datumbuf failed: %s\n",
++ fname, (unsigned long)(datum_size + 1), strerror(errno));
++ return False;
++ }
++ 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 False;
++ }
++ } else {
++ rprintf(FERROR, "%s: rsync_xal_get: lgetxattr %s failed: %s\n",
++ fname, name, strerror(errno));
++ return False;
++ }
++ }
++ ptr = malloc ( len + datum_size );
++ 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 True;
++}
++
++
++/* generate the xattr(s) for this flist entry;
++ * xattr(s) are either sent or cleaned-up by send_xattr() below */
++
++BOOL make_xattr(const struct file_struct *file, const char *fname)
++{
++ if (!preserve_xattrs)
++ return True;
++
++ rsync_xal_get ( fname, &curr_rsync_xal );
++ return True;
++}
++
++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;
++ }
++ /* 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;
++ size_t new_size;
++ void *new_xal;
++
++ new_alloc = ( rsync_xal_l.count < RSYNC_XAL_LIST_INITIAL ) ? RSYNC_XAL_LIST_INITIAL : rsync_xal_l.count * 2;
++ new_size = new_alloc * sizeof(rsync_xal);
++ new_xal = rsync_xal_l.count ? realloc ( rsync_xal_l.rxals, new_size ) : malloc ( new_size );
++ if ( new_xal == NULL ) {
++ rprintf ( FERROR, "rsync_xal_store: allocate %lu for new_xal failed\n", (unsigned long)new_size );
++ exit_cleanup(RERR_STREAMIO );
++ }
++ 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 )
++ return;
++
++ if (f == -1) {
++ rsync_xal_free ( &curr_rsync_xal );
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list