X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/d997cb77c2c50c4c712286f22fa6baacec7988d7..a302c04819c87d365481d9a8b516d3c20df8bf46:/acls.diff?ds=sidebyside
diff --git a/acls.diff b/acls.diff
index a5644cf..c86aa66 100644
--- a/acls.diff
+++ b/acls.diff
@@ -21,9 +21,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ lib/permstring.o lib/pool_alloc.o lib/sysacls.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
+ fileio.o batch.o clientname.o chmod.o acls.o
OBJS3=progress.o pipe.o
@@ -31,7 +31,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,1098 @@
+@@ -0,0 +1,1093 @@
+/*
+ * Handle passing Access Control Lists between systems.
+ *
@@ -63,8 +63,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+extern int read_only;
+extern int list_only;
+extern int orig_umask;
-+extern int preserve_acls;
-+extern unsigned int file_struct_len;
+
+/* === ACL structures === */
+
@@ -549,7 +547,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ free_acl(sxp);
+ return -1;
+ }
-+ } else if (errno == ENOTSUP) {
++ } else if (errno == ENOTSUP || errno == ENOSYS) {
+ /* ACLs are not supported, so pretend we have a basic ACL. */
+ if (type == SMB_ACL_TYPE_ACCESS)
+ rsync_acl_fake_perms(racl, sxp->st.st_mode);
@@ -645,10 +643,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ sxp->def_acl = racl;
+ }
+
-+ /* Avoid sending values that can be inferred from other data,
-+ * but only when preserve_acls == 1 (it is 2 when we must be
-+ * backward compatible with older acls.diff versions). */
-+ if (type == SMB_ACL_TYPE_ACCESS && preserve_acls == 1)
++ /* Avoid sending values that can be inferred from other data. */
++ if (type == SMB_ACL_TYPE_ACCESS)
+ rsync_acl_strip_perms(racl);
+ if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
+ write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
@@ -767,14 +763,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+{
+ SMB_ACL_TYPE_T type;
+ item_list *racl_list;
-+ char *ndx_ptr;
+
+ if (S_ISLNK(file->mode))
+ return;
+
+ type = SMB_ACL_TYPE_ACCESS;
+ racl_list = &access_acl_list;
-+ ndx_ptr = (char*)file + file_struct_len;
+ do {
+ char tag = read_byte(f);
+ int ndx;
@@ -811,9 +805,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ exit_cleanup(RERR_STREAMIO);
+ }
+ }
-+ SIVAL(ndx_ptr, 0, ndx);
++ if (type == SMB_ACL_TYPE_ACCESS)
++ F_ACL(file) = ndx;
++ else
++ F_DEF_ACL(file) = ndx;
+ racl_list = &default_acl_list;
-+ ndx_ptr += 4;
+ } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
+}
+
@@ -824,7 +820,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ SMB_ACL_TYPE_T type;
+ rsync_acl *racl;
+ item_list *racl_list;
-+ char *ndx_ptr;
+ int ndx;
+
+ if (S_ISLNK(file->mode))
@@ -833,7 +828,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ type = SMB_ACL_TYPE_ACCESS;
+ racl = sxp->acc_acl;
+ racl_list = &access_acl_list;
-+ ndx_ptr = (char*)file + file_struct_len;
+ do {
+ if (!racl)
+ ndx = -1;
@@ -845,10 +839,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ new_duo->sacl = NULL;
+ *racl = empty_rsync_acl;
+ }
-+ SIVAL(ndx_ptr, 0, ndx);
++ if (type == SMB_ACL_TYPE_ACCESS)
++ F_ACL(file) = ndx;
++ else
++ F_DEF_ACL(file) = ndx;
+ racl = sxp->def_acl;
+ racl_list = &default_acl_list;
-+ ndx_ptr += 4;
+ } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
+
+ free_acl(sxp);
@@ -922,7 +918,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
+ /* Ensure that chmod() will be called to restore any lost setid bits. */
+ if (old_mode & (S_ISUID | S_ISGID | S_ISVTX)
-+ && (old_mode & CHMOD_BITS) == (mode & CHMOD_BITS))
++ && BITS_EQUAL(old_mode, mode, CHMOD_BITS))
+ old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
+#endif
+
@@ -942,7 +938,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+{
+ int unchanged = 1;
+ SMB_ACL_TYPE_T type;
-+ char *ndx_ptr;
+
+ if (!dry_run && (read_only || list_only)) {
+ errno = EROFS;
@@ -953,15 +948,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ return 1;
+
+ type = SMB_ACL_TYPE_ACCESS;
-+ ndx_ptr = (char*)file + file_struct_len;
+ do {
+ acl_duo *duo_item;
++ int32 ndx;
+ BOOL eq;
-+ int32 ndx = IVAL(ndx_ptr, 0);
-+
-+ ndx_ptr += 4;
+
+ if (type == SMB_ACL_TYPE_ACCESS) {
++ ndx = F_ACL(file);
+ if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
+ continue;
+ duo_item = access_acl_list.items;
@@ -969,6 +962,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ eq = sxp->acc_acl
+ && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
+ } else {
++ ndx = F_DEF_ACL(file);
+ if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
+ continue;
+ duo_item = default_acl_list.items;
@@ -1093,7 +1087,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ /* Couldn't get an ACL. Darn. */
+ switch (errno) {
+ case ENOTSUP:
-+ /* ACLs are disabled. We could yell at the user to turn them on, but... */
++ case ENOSYS:
++ /* No ACLs are available. */
+ break;
+ case ENOENT:
+ if (dry_run) {
@@ -1132,15 +1127,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#endif /* SUPPORT_ACLS */
--- old/backup.c
+++ new/backup.c
-@@ -29,6 +29,7 @@ extern char *backup_suffix;
- extern char *backup_dir;
+@@ -23,6 +23,7 @@
+ extern int verbose;
extern int am_root;
+extern int preserve_acls;
extern int preserve_devices;
extern int preserve_specials;
extern int preserve_links;
-@@ -94,7 +95,8 @@ path
+@@ -93,7 +94,8 @@ path
****************************************************************************/
static int make_bak_dir(char *fullpath)
{
@@ -1150,7 +1145,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
char *rel = fullpath + backup_dir_len;
char *end = rel + strlen(rel);
char *p = end;
-@@ -126,15 +128,24 @@ static int make_bak_dir(char *fullpath)
+@@ -125,15 +127,24 @@ static int make_bak_dir(char *fullpath)
if (p >= rel) {
/* Try to transfer the directory settings of the
* actual dir that the files are coming from. */
@@ -1179,9 +1174,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
}
*p = '/';
-@@ -172,15 +183,18 @@ static int robust_move(char *src, char *
+@@ -171,15 +182,18 @@ static int robust_move(const char *src,
* We will move the file to be deleted into a parallel directory tree. */
- static int keep_backup(char *fname)
+ static int keep_backup(const char *fname)
{
- STRUCT_STAT st;
+ statx sx;
@@ -1200,9 +1195,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
-@@ -188,6 +202,13 @@ static int keep_backup(char *fname)
- if (!(buf = get_backup_name(fname)))
+@@ -189,6 +203,13 @@ static int keep_backup(const char *fname
return 0;
+ }
+#ifdef SUPPORT_ACLS
+ if (preserve_acls) {
@@ -1214,7 +1209,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* Check to see if this is a device file, or link */
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
|| (preserve_specials && IS_SPECIAL(file->mode))) {
-@@ -256,7 +277,7 @@ static int keep_backup(char *fname)
+@@ -260,7 +281,7 @@ static int keep_backup(const char *fname
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
full_fname(fname), buf);
@@ -1223,9 +1218,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* If someone has hard-linked the file into the backup
* dir, rename() might return success but do nothing! */
robust_unlink(fname); /* Just in case... */
+--- old/compat.c
++++ new/compat.c
+@@ -50,6 +50,8 @@ void setup_protocol(int f_out,int f_in)
+ preserve_uid = ++file_extra_cnt;
+ if (preserve_gid)
+ preserve_gid = ++file_extra_cnt;
++ if (preserve_acls && !am_sender)
++ preserve_acls = ++file_extra_cnt;
+
+ if (remote_protocol == 0) {
+ if (!read_batch)
--- old/configure.in
+++ new/configure.in
-@@ -537,6 +537,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -542,6 +542,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
fi
@@ -1237,7 +1243,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
dnl At the moment we don't test for a broken memcmp(), because all we
dnl need to do is test for equality, not comparison, and it seems that
dnl every platform has a memcmp that can do at least that.
-@@ -801,6 +806,78 @@ AC_SUBST(OBJ_RESTORE)
+@@ -806,6 +811,78 @@ AC_SUBST(OBJ_RESTORE)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
@@ -1318,7 +1324,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
--- old/flist.c
+++ new/flist.c
-@@ -40,6 +40,7 @@ extern int filesfrom_fd;
+@@ -41,6 +41,7 @@ extern int filesfrom_fd;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
@@ -1326,55 +1332,30 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
-@@ -135,6 +136,8 @@ static void list_file_entry(struct file_
-
+@@ -147,6 +148,8 @@ static void list_file_entry(struct file_
permstring(permbuf, f->mode);
+ len = F_LENGTH(f);
+ /* TODO: indicate '+' if the entry has an ACL. */
+
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -496,6 +499,9 @@ 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
-+ int xtra_len;
-+#endif
- OFF_T file_length;
- char *basename, *dirname, *bp;
- struct file_struct *file;
-@@ -599,13 +605,27 @@ static struct file_struct *receive_file_
-
- sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+@@ -662,6 +665,12 @@ static struct file_struct *recv_file_ent
+ }
+ #endif
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
-+ xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
-+ else
-+ xtra_len = 0;
++ extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
+#endif
+
- alloc_len = file_struct_len + dirname_len + basename_len
-+#ifdef SUPPORT_ACLS
-+ + xtra_len
-+#endif
- + linkname_len + sum_len;
- bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
+ if (always_checksum && S_ISREG(mode))
+ extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
- file = (struct file_struct *)bp;
- memset(bp, 0, file_struct_len);
- bp += file_struct_len;
-+#ifdef SUPPORT_ACLS
-+ bp += xtra_len;
-+#endif
-
- file->modtime = modtime;
- file->length = file_length;
-@@ -700,6 +720,11 @@ static struct file_struct *receive_file_
- read_buf(f, sum, checksum_len);
+@@ -799,6 +808,11 @@ static struct file_struct *recv_file_ent
+ read_buf(f, bp, checksum_len);
}
+#ifdef SUPPORT_ACLS
@@ -1385,8 +1366,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return file;
}
-@@ -957,6 +982,9 @@ static struct file_struct *send_file_nam
- unsigned short flags)
+@@ -1068,6 +1082,9 @@ static struct file_struct *send_file_nam
+ int flags)
{
struct file_struct *file;
+#ifdef SUPPORT_ACLS
@@ -1395,7 +1376,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
file = make_file(fname, flist, stp, flags,
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -966,6 +994,15 @@ static struct file_struct *send_file_nam
+@@ -1077,12 +1094,26 @@ static struct file_struct *send_file_nam
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
@@ -1411,22 +1392,18 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
-@@ -973,6 +1010,15 @@ static struct file_struct *send_file_nam
- if (file->basename[0]) {
- flist->files[flist->count++] = file;
- send_file_entry(file, f);
+ flist->files[flist->count++] = file;
+- if (f >= 0)
++ if (f >= 0) {
+ send_file_entry(file, f, flist->count - 1);
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && f >= 0)
++ if (preserve_acls)
+ send_acl(&sx, f);
+#endif
-+ } else {
-+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && f >= 0)
-+ free_acl(&sx);
-+#endif
- }
++ }
return file;
}
+
--- old/generator.c
+++ new/generator.c
@@ -35,6 +35,7 @@ extern int do_progress;
@@ -1437,32 +1414,31 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern int preserve_links;
extern int preserve_devices;
extern int preserve_specials;
-@@ -85,6 +86,7 @@ extern long block_size; /* "long" becaus
- extern int max_delete;
- extern int force_delete;
+@@ -87,6 +88,7 @@ extern int force_delete;
extern int one_file_system;
-+extern mode_t orig_umask;
extern struct stats stats;
extern dev_t filesystem_dev;
++extern mode_t orig_umask;
extern char *backup_dir;
-@@ -445,22 +447,27 @@ static void do_delete_pass(struct file_l
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+@@ -518,21 +520,26 @@ static void do_delete_pass(struct file_l
rprintf(FINFO, " \r");
}
-int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+int unchanged_attrs(struct file_struct *file, statx *sxp)
{
- if (preserve_perms
-- && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
-+ && (sxp->st.st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+- if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
++ if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
return 0;
-- if (am_root && preserve_uid && st->st_uid != file->uid)
-+ if (am_root && preserve_uid && sxp->st.st_uid != file->uid)
+- if (am_root && preserve_uid && st->st_uid != F_UID(file))
++ if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
return 0;
-- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
-+ if (preserve_gid && file->gid != GID_NONE && sxp->st.st_gid != file->gid)
+- if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
++ if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
return 0;
+#ifdef SUPPORT_ACLS
@@ -1478,12 +1454,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
int32 iflags, uchar fnamecmp_type, const char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
-@@ -468,20 +475,24 @@ void itemize(struct file_struct *file, i
+@@ -540,20 +547,24 @@ void itemize(struct file_struct *file, i
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
-- if (S_ISREG(file->mode) && file->length != st->st_size)
-+ if (S_ISREG(file->mode) && file->length != sxp->st.st_size)
+- if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
++ if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
iflags |= ITEM_REPORT_SIZE;
if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
&& !(iflags & ITEM_MATCHED)
@@ -1491,15 +1467,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
- || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
-- if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
-+ if ((file->mode & CHMOD_BITS) != (sxp->st.st_mode & CHMOD_BITS))
+- if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
++ if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
-- if (preserve_uid && am_root && file->uid != st->st_uid)
-+ if (preserve_uid && am_root && file->uid != sxp->st.st_uid)
+- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
++ if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && file->gid != GID_NONE
-- && st->st_gid != file->gid)
-+ && sxp->st.st_gid != file->gid)
+ if (preserve_gid && F_GID(file) != GID_NONE
+- && st->st_gid != F_GID(file))
++ && sxp->st.st_gid != F_GID(file))
iflags |= ITEM_REPORT_GROUP;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && set_acl(NULL, file, sxp) == 0)
@@ -1508,16 +1484,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
} else
iflags |= ITEM_IS_NEW;
-@@ -734,7 +745,7 @@ void check_for_finished_hlinks(int itemi
+@@ -808,7 +819,7 @@ void check_for_finished_hlinks(int itemi
* handling the file, -1 if no dest-linking occurred, or a non-negative
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
- char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+ char *cmpbuf, statx *sxp, int itemizing,
- int maybe_ATTRS_REPORT, enum logcode code)
+ enum logcode code)
{
int best_match = -1;
-@@ -743,7 +754,7 @@ static int try_dests_reg(struct file_str
+@@ -817,7 +828,7 @@ static int try_dests_reg(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1526,7 +1502,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
switch (match_level) {
case 0:
-@@ -751,16 +762,20 @@ static int try_dests_reg(struct file_str
+@@ -825,16 +836,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
@@ -1550,7 +1526,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
best_match = j;
match_level = 3;
-@@ -775,7 +790,7 @@ static int try_dests_reg(struct file_str
+@@ -849,7 +864,7 @@ static int try_dests_reg(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1559,16 +1535,21 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return -1;
}
-@@ -783,7 +798,7 @@ static int try_dests_reg(struct file_str
- #ifdef SUPPORT_HARD_LINKS
- if (link_dest) {
- int i = itemizing && (verbose > 1 || stdout_format_has_i > 1);
-- if (hard_link_one(file, ndx, fname, 0, stp,
-+ if (hard_link_one(file, ndx, fname, 0, sxp,
- cmpbuf, 1, i, code) < 0)
+@@ -859,16 +874,25 @@ static int try_dests_reg(struct file_str
+ if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
- if (preserve_hard_links && file->link_u.links) {
-@@ -793,8 +808,13 @@ static int try_dests_reg(struct file_str
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, stp, itemizing, code, j);
++ finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+- itemize(file, ndx, 1, stp,
++#ifdef SUPPORT_ACLS
++ if (preserve_acls && !ACL_READY(*sxp))
++ get_acl(fname, sxp);
++#endif
++ itemize(file, ndx, 1, sxp,
+ ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+ 0, "");
}
} else
#endif
@@ -1581,10 +1562,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#endif
+ itemize(file, ndx, 0, sxp, 0, 0, NULL);
+ }
- if (verbose > 1 && maybe_ATTRS_REPORT) {
+ if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
- }
-@@ -810,8 +830,13 @@ static int try_dests_reg(struct file_str
+ return -2;
+@@ -885,8 +909,13 @@ static int try_dests_reg(struct file_str
}
return -1;
}
@@ -1600,16 +1581,25 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
set_file_attrs(fname, file, NULL, 0);
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
-@@ -832,7 +857,7 @@ static int try_dests_reg(struct file_str
+@@ -897,7 +926,7 @@ static int try_dests_reg(struct file_str
+ }
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, stp, itemizing, code, -1);
++ finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
+ #endif
+ return -2;
+ }
+@@ -909,7 +938,7 @@ static int try_dests_reg(struct file_str
* handling the file, or -1 if no dest-linking occurred, or a non-negative
* value if we found an alternate basis file. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
- char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+ char *cmpbuf, statx *sxp, int itemizing,
- int maybe_ATTRS_REPORT, enum logcode code)
+ enum logcode code)
{
char lnk[MAXPATHLEN];
-@@ -864,24 +889,24 @@ static int try_dests_non(struct file_str
+@@ -942,24 +971,24 @@ static int try_dests_non(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1639,16 +1629,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
break;
#endif
-@@ -895,7 +920,7 @@ static int try_dests_non(struct file_str
- break;
+@@ -974,7 +1003,7 @@ static int try_dests_non(struct file_str
case TYPE_SPECIAL:
case TYPE_DEVICE:
-- if (stp->st_rdev != file->u.rdev)
-+ if (sxp->st.st_rdev != file->u.rdev)
+ devp = F_RDEV_P(file);
+- if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
++ if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
continue;
break;
#ifdef SUPPORT_LINKS
-@@ -912,7 +937,11 @@ static int try_dests_non(struct file_str
+@@ -991,7 +1020,11 @@ static int try_dests_non(struct file_str
match_level = 2;
best_match = j;
}
@@ -1661,7 +1651,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
match_level = 3;
best_match = j;
break;
-@@ -925,7 +954,7 @@ static int try_dests_non(struct file_str
+@@ -1004,7 +1037,7 @@ static int try_dests_non(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1670,7 +1660,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return -1;
}
-@@ -956,7 +985,15 @@ static int try_dests_non(struct file_str
+@@ -1035,7 +1068,15 @@ static int try_dests_non(struct file_str
: ITEM_LOCAL_CHANGE
+ (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
char *lp = match_level == 3 ? "" : NULL;
@@ -1687,7 +1677,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s%s is uptodate\n",
-@@ -969,6 +1006,7 @@ static int try_dests_non(struct file_str
+@@ -1048,6 +1089,7 @@ static int try_dests_non(struct file_str
}
static int phase = 0;
@@ -1695,7 +1685,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
* make sure it exists, and has the right permissions/timestamp info. For
-@@ -990,7 +1028,8 @@ static void recv_generator(char *fname,
+@@ -1068,7 +1110,8 @@ static void recv_generator(char *fname,
static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
@@ -1705,7 +1695,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
struct file_struct *back_file = NULL;
int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
-@@ -1046,6 +1085,9 @@ static void recv_generator(char *fname,
+@@ -1124,6 +1167,9 @@ static void recv_generator(char *fname,
} else if (!dry_run)
return;
}
@@ -1715,7 +1705,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
-@@ -1053,7 +1095,7 @@ static void recv_generator(char *fname,
+@@ -1131,7 +1177,7 @@ static void recv_generator(char *fname,
const char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
@@ -1724,7 +1714,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
-@@ -1065,6 +1107,10 @@ static void recv_generator(char *fname,
+@@ -1143,6 +1189,10 @@ static void recv_generator(char *fname,
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
@@ -1735,7 +1725,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
parent_dirname = dn;
-@@ -1074,7 +1120,7 @@ static void recv_generator(char *fname,
+@@ -1152,7 +1202,7 @@ static void recv_generator(char *fname,
need_fuzzy_dirlist = 0;
}
@@ -1744,7 +1734,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
}
-@@ -1092,8 +1138,9 @@ static void recv_generator(char *fname,
+@@ -1170,8 +1220,9 @@ static void recv_generator(char *fname,
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = statret == 0
@@ -1756,7 +1746,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (S_ISDIR(file->mode)) {
-@@ -1102,8 +1149,8 @@ static void recv_generator(char *fname,
+@@ -1180,8 +1231,8 @@ static void recv_generator(char *fname,
* file of that name and it is *not* a directory, then
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
@@ -1767,7 +1757,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return;
statret = -1;
}
-@@ -1112,14 +1159,14 @@ static void recv_generator(char *fname,
+@@ -1190,14 +1241,14 @@ static void recv_generator(char *fname,
dry_run++;
}
real_ret = statret;
@@ -1781,10 +1771,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (statret != 0 && basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
itemizing = 0;
-@@ -1128,7 +1175,11 @@ static void recv_generator(char *fname,
+@@ -1206,7 +1257,11 @@ static void recv_generator(char *fname,
statret = 1;
}
if (itemizing && f_out != -1) {
@@ -1797,7 +1787,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -1148,21 +1199,21 @@ static void recv_generator(char *fname,
+@@ -1226,21 +1281,21 @@ static void recv_generator(char *fname,
return;
}
}
@@ -1809,23 +1799,23 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
- real_st.st_dev = filesystem_dev;
+ real_sx.st.st_dev = filesystem_dev;
if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
+ && (file->flags & FLAG_XFER_DIR))
- delete_in_dir(the_file_list, fname, file, &real_st);
- return;
+ delete_in_dir(the_file_list, fname, file, &real_sx.st);
+ goto cleanup;
}
- if (preserve_hard_links && file->link_u.links
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_CHECK_MASTER))
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+- && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
- return;
++ && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
+ goto cleanup;
+ #endif
if (preserve_links && S_ISLNK(file->mode)) {
- #ifdef SUPPORT_LINKS
-@@ -1180,15 +1231,15 @@ static void recv_generator(char *fname,
+@@ -1260,17 +1315,17 @@ static void recv_generator(char *fname,
char lnk[MAXPATHLEN];
int len;
@@ -1833,18 +1823,21 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ if (!S_ISLNK(sx.st.st_mode))
statret = -1;
else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
- && strncmp(lnk, file->u.link, len) == 0
- && file->u.link[len] == '\0') {
+ && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
/* The link is pointing to the right place. */
if (itemizing)
- itemize(file, ndx, 0, &st, 0, 0, NULL);
- set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+ itemize(file, ndx, 0, &sx, 0, 0, NULL);
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, &st, itemizing, code, -1);
++ finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
+ #endif
if (remove_source_files == 1)
-@@ -1197,10 +1248,10 @@ static void recv_generator(char *fname,
+ goto return_with_success;
+@@ -1278,10 +1333,10 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
@@ -1854,19 +1847,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
-@@ -1216,7 +1267,7 @@ static void recv_generator(char *fname,
- statret = 1;
- }
- if (preserve_hard_links && file->link_u.links
-- && hard_link_check(file, ndx, fname, -1, &st,
-+ && hard_link_check(file, ndx, fname, -1, &sx,
- itemizing, code, HL_SKIP))
- return;
- if (do_symlink(file->u.link, fname) != 0) {
-@@ -1225,7 +1276,7 @@ static void recv_generator(char *fname,
+@@ -1306,7 +1361,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@ -1875,7 +1859,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -1247,31 +1298,36 @@ static void recv_generator(char *fname,
+@@ -1332,33 +1387,38 @@ static void recv_generator(char *fname,
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
@@ -1890,10 +1874,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
t = "special file";
}
if (statret == 0
-- && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
-- && st.st_rdev == file->u.rdev) {
-+ && (sx.st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
-+ && sx.st.st_rdev == file->u.rdev) {
+- && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
+- && st.st_rdev == rdev) {
++ && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
++ && sx.st.st_rdev == rdev) {
/* The device or special file is identical. */
- if (itemizing)
- itemize(file, ndx, 0, &st, 0, 0, NULL);
@@ -1906,8 +1890,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ itemize(file, ndx, 0, &sx, 0, 0, NULL);
+ }
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, &st, itemizing, code, -1);
++ finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
+ #endif
if (remove_source_files == 1)
goto return_with_success;
- return;
@@ -1919,19 +1906,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
-@@ -1287,7 +1343,7 @@ static void recv_generator(char *fname,
- statret = 1;
- }
- if (preserve_hard_links && file->link_u.links
-- && hard_link_check(file, ndx, fname, -1, &st,
-+ && hard_link_check(file, ndx, fname, -1, &sx,
- itemizing, code, HL_SKIP))
- return;
- if (verbose > 2) {
-@@ -1300,7 +1356,11 @@ static void recv_generator(char *fname,
+@@ -1388,7 +1448,11 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@ -1944,7 +1922,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -1310,7 +1370,7 @@ static void recv_generator(char *fname,
+@@ -1400,7 +1464,7 @@ static void recv_generator(char *fname,
if (remove_source_files == 1)
goto return_with_success;
}
@@ -1953,7 +1931,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!S_ISREG(file->mode)) {
-@@ -1344,7 +1404,7 @@ static void recv_generator(char *fname,
+@@ -1434,7 +1498,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
@@ -1962,7 +1940,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -1353,20 +1413,20 @@ static void recv_generator(char *fname,
+@@ -1443,20 +1507,20 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
@@ -1978,7 +1956,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (statret != 0 && basis_dir[0] != NULL) {
- int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
+ int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, maybe_ATTRS_REPORT, code);
+ itemizing, code);
if (j == -2) {
if (remove_source_files == 1)
goto return_with_success;
@@ -1987,7 +1965,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
-@@ -1376,7 +1436,7 @@ static void recv_generator(char *fname,
+@@ -1466,7 +1530,7 @@ static void recv_generator(char *fname,
}
real_ret = statret;
@@ -1996,30 +1974,21 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
-@@ -1395,7 +1455,7 @@ static void recv_generator(char *fname,
+@@ -1485,7 +1549,7 @@ static void recv_generator(char *fname,
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
-- st.st_size = fuzzy_file->length;
-+ sx.st.st_size = fuzzy_file->length;
+- st.st_size = F_LENGTH(fuzzy_file);
++ sx.st.st_size = F_LENGTH(fuzzy_file);
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1404,7 +1464,7 @@ static void recv_generator(char *fname,
-
- if (statret != 0) {
- if (preserve_hard_links && file->link_u.links
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_SKIP))
- return;
- if (stat_errno == ENOENT)
-@@ -1414,39 +1474,52 @@ static void recv_generator(char *fname,
+@@ -1504,36 +1568,41 @@ static void recv_generator(char *fname,
return;
}
-- if (append_mode && st.st_size > file->length)
-+ if (append_mode && sx.st.st_size > file->length)
+- if (append_mode && st.st_size > F_LENGTH(file))
++ if (append_mode && sx.st.st_size > F_LENGTH(file))
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
@@ -2032,37 +2001,28 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
- if (itemizing) {
-- itemize(file, ndx, real_ret, &real_st,
-+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && real_ret == 0)
-+ get_acl(fnamecmp, &real_sx);
-+#endif
-+ itemize(file, ndx, real_ret, &real_sx,
- 0, 0, NULL);
+- if (itemizing)
+- itemize(file, ndx, statret, &st, 0, 0, NULL);
+- set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
++ if (itemizing) {
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls) {
-+ if (fnamecmp_type == FNAMECMP_FNAME) {
-+ sx.acc_acl = real_sx.acc_acl;
-+ sx.def_acl = real_sx.def_acl;
-+ } else
-+ free_acl(&real_sx);
-+ }
++ if (preserve_acls && statret == 0)
++ get_acl(fnamecmp, &sx);
+#endif
- }
-- set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
++ itemize(file, ndx, statret, &sx, 0, 0, NULL);
++ }
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, &st, itemizing, code, -1);
++ finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
+ #endif
if (remove_source_files != 1)
- return;
+ goto cleanup;
return_with_success:
- if (!dry_run) {
- char numbuf[4];
- SIVAL(numbuf, 0, ndx);
- send_msg(MSG_SUCCESS, numbuf, 4);
- }
+ if (!dry_run)
+ send_msg_int(MSG_SUCCESS, ndx);
- return;
+ goto cleanup;
}
@@ -2074,15 +2034,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -1470,17 +1543,21 @@ static void recv_generator(char *fname,
- pretend_missing:
+@@ -1558,16 +1627,20 @@ static void recv_generator(char *fname,
/* pretend the file didn't exist */
- if (preserve_hard_links && file->link_u.links
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_SKIP))
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
- return;
+ goto cleanup;
+ #endif
statret = real_ret = -1;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && ACL_READY(sx))
@@ -2099,18 +2057,18 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -1491,7 +1568,7 @@ static void recv_generator(char *fname,
+@@ -1578,7 +1651,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
- return;
+ goto cleanup;
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -1499,14 +1576,14 @@ static void recv_generator(char *fname,
+@@ -1586,14 +1659,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
- free(back_file);
+ unmake_file(back_file);
close(fd);
- return;
+ goto cleanup;
@@ -2125,7 +2083,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (verbose > 2)
-@@ -1524,24 +1601,32 @@ static void recv_generator(char *fname,
+@@ -1615,26 +1688,34 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
@@ -2143,8 +2101,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!do_xfers) {
- if (preserve_hard_links && file->link_u.links)
- hard_link_cluster(file, ndx, itemizing, code);
+ #ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links && F_IS_HLINKED(file))
+- finish_hard_link(file, fname, &st, itemizing, code, -1);
++ finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
+ #endif
- return;
+ goto cleanup;
}
@@ -2163,7 +2124,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (f_copy >= 0) {
close(f_copy);
-@@ -1554,6 +1639,13 @@ static void recv_generator(char *fname,
+@@ -1647,6 +1728,13 @@ static void recv_generator(char *fname,
}
close(fd);
@@ -2177,7 +2138,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1615,6 +1707,8 @@ void generate_files(int f_out, struct fi
+@@ -1713,6 +1801,8 @@ void generate_files(int f_out, struct fi
* notice that and let us know via the redo pipe (or its closing). */
ignore_timeout = 1;
@@ -2188,30 +2149,30 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
--- old/hlink.c
+++ new/hlink.c
-@@ -26,6 +26,7 @@
- extern int verbose;
+@@ -27,6 +27,7 @@ extern int verbose;
+ extern int dry_run;
extern int do_xfers;
extern int link_dest;
+extern int preserve_acls;
extern int make_backups;
+ extern int protocol_version;
extern int remove_source_files;
- extern int stdout_format_has_i;
-@@ -146,15 +147,19 @@ void init_hard_links(void)
+@@ -268,15 +269,19 @@ void match_hard_links(void)
+ }
- #ifdef SUPPORT_HARD_LINKS
static int maybe_hard_link(struct file_struct *file, int ndx,
-- char *fname, int statret, STRUCT_STAT *st,
-+ char *fname, int statret, statx *sxp,
- char *toname, STRUCT_STAT *to_st,
- int itemizing, enum logcode code)
+- const char *fname, int statret, STRUCT_STAT *stp,
++ const char *fname, int statret, statx *sxp,
+ const char *oldname, STRUCT_STAT *old_stp,
+ const char *realname, int itemizing, enum logcode code)
{
if (statret == 0) {
-- if (st->st_dev == to_st->st_dev
-- && st->st_ino == to_st->st_ino) {
-+ if (sxp->st.st_dev == to_st->st_dev
-+ && sxp->st.st_ino == to_st->st_ino) {
+- if (stp->st_dev == old_stp->st_dev
+- && stp->st_ino == old_stp->st_ino) {
++ if (sxp->st.st_dev == old_stp->st_dev
++ && sxp->st.st_ino == old_stp->st_ino) {
if (itemizing) {
-- itemize(file, ndx, statret, st,
+- itemize(file, ndx, statret, stp,
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !ACL_READY(*sxp))
+ get_acl(fname, sxp);
@@ -2220,105 +2181,133 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
-@@ -169,13 +174,13 @@ static int maybe_hard_link(struct file_s
- return -1;
- }
- }
-- return hard_link_one(file, ndx, fname, statret, st, toname,
-+ return hard_link_one(file, ndx, fname, statret, sxp, toname,
- 0, itemizing, code);
- }
- #endif
+@@ -297,7 +302,11 @@ static int maybe_hard_link(struct file_s
- int hard_link_check(struct file_struct *file, int ndx, char *fname,
-- int statret, STRUCT_STAT *st, int itemizing,
+ if (hard_link_one(file, fname, oldname, 0)) {
+ if (itemizing) {
+- itemize(file, ndx, statret, stp,
++#ifdef SUPPORT_ACLS
++ if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
++ get_acl(fname, sxp);
++#endif
++ itemize(file, ndx, statret, sxp,
+ ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
+ realname);
+ }
+@@ -311,7 +320,7 @@ static int maybe_hard_link(struct file_s
+ /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
+ * 0 = process the file, 1 = skip the file, -1 = error occurred. */
+ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
+- int statret, STRUCT_STAT *stp, int itemizing,
+ int statret, statx *sxp, int itemizing,
- enum logcode code, int skip)
+ enum logcode code)
{
- #ifdef SUPPORT_HARD_LINKS
-@@ -216,7 +221,7 @@ int hard_link_check(struct file_struct *
- || st2.st_ino != st3.st_ino)
- continue;
- statret = 1;
-- st = &st3;
-+ sxp->st = st3;
- if (verbose < 2 || !stdout_format_has_i) {
- itemizing = 0;
- code = FNONE;
-@@ -226,12 +231,16 @@ int hard_link_check(struct file_struct *
- if (!unchanged_file(cmpbuf, file, &st3))
- continue;
- statret = 1;
-- st = &st3;
-- if (unchanged_attrs(file, &st3))
-+ sxp->st = st3;
+ STRUCT_STAT prev_st;
+@@ -362,18 +371,20 @@ int hard_link_check(struct file_struct *
+ if (statret < 0 && basis_dir[0] != NULL) {
+ /* If we match an alt-dest item, we don't output this as a change. */
+ char cmpbuf[MAXPATHLEN];
+- STRUCT_STAT alt_st;
++ statx alt_sx;
+ int j = 0;
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls)
-+ get_acl(cmpbuf, sxp);
++ alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
-+ if (unchanged_attrs(file, sxp))
- break;
- } while (basis_dir[++j] != NULL);
+ do {
+ pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+- if (link_stat(cmpbuf, &alt_st, 0) < 0)
++ if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
+ continue;
+ if (link_dest) {
+- if (prev_st.st_dev != alt_st.st_dev
+- || prev_st.st_ino != alt_st.st_ino)
++ if (prev_st.st_dev != alt_sx.st.st_dev
++ || prev_st.st_ino != alt_sx.st.st_ino)
+ continue;
+ statret = 1;
+- *stp = alt_st;
+ if (verbose < 2 || !stdout_format_has_i) {
+ itemizing = 0;
+ code = FNONE;
+@@ -382,16 +393,36 @@ int hard_link_check(struct file_struct *
+ }
+ break;
}
-- maybe_hard_link(file, ndx, fname, statret, st,
-+ maybe_hard_link(file, ndx, fname, statret, sxp,
- toname, &st2, itemizing, code);
- if (remove_source_files == 1 && do_xfers) {
- char numbuf[4];
-@@ -249,7 +258,7 @@ int hard_link_check(struct file_struct *
-
- #ifdef SUPPORT_HARD_LINKS
- int hard_link_one(struct file_struct *file, int ndx, char *fname,
-- int statret, STRUCT_STAT *st, char *toname, int terse,
-+ int statret, statx *sxp, char *toname, int terse,
- int itemizing, enum logcode code)
- {
- if (do_link(toname, fname)) {
-@@ -265,7 +274,11 @@ int hard_link_one(struct file_struct *fi
- }
-
- if (itemizing) {
-- itemize(file, ndx, statret, st,
+- if (!unchanged_file(cmpbuf, file, &alt_st))
++ if (!unchanged_file(cmpbuf, file, &alt_sx.st))
+ continue;
+ statret = 1;
+- *stp = alt_st;
+- if (unchanged_attrs(file, &alt_st))
++#ifdef SUPPORT_ACLS
++ if (preserve_acls)
++ get_acl(cmpbuf, &alt_sx);
++#endif
++ if (unchanged_attrs(file, &alt_sx))
+ break;
+ } while (basis_dir[++j] != NULL);
++ if (statret == 1) {
++ sxp->st = alt_sx.st;
++#ifdef SUPPORT_ACLS
++ if (preserve_acls) {
++ if (!ACL_READY(*sxp))
++ get_acl(cmpbuf, sxp);
++ else {
++ sxp->acc_acl = alt_sx.acc_acl;
++ sxp->def_acl = alt_sx.def_acl;
++ }
++ }
++#endif
++ }
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
-+ get_acl(fname, sxp);
++ else if (preserve_acls)
++ free_acl(&alt_sx);
+#endif
-+ itemize(file, ndx, statret, sxp,
- ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
- terse ? "" : toname);
}
-@@ -282,11 +295,12 @@ void hard_link_cluster(struct file_struc
- #ifdef SUPPORT_HARD_LINKS
- char hlink1[MAXPATHLEN];
- char *hlink2;
-- STRUCT_STAT st1, st2;
-+ statx sx;
+
+- if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
++ if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
+ realname, itemizing, code) < 0)
+ return -1;
+
+@@ -426,7 +457,8 @@ void finish_hard_link(struct file_struct
+ STRUCT_STAT *stp, int itemizing, enum logcode code,
+ int alt_dest)
+ {
+- STRUCT_STAT st, prev_st;
++ statx prev_sx;
+ STRUCT_STAT st;
- int statret, ndx = master;
+ char alt_name[MAXPATHLEN], *prev_name;
+ const char *our_name;
+ int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
+@@ -450,14 +482,24 @@ void finish_hard_link(struct file_struct
+ } else
+ our_name = fname;
- file->F_HLINDEX = FINISHED_LINK;
-- if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
-+ if (link_stat(f_name(file, hlink1), &st, 0) < 0)
- return;
- if (!(file->flags & FLAG_HLINK_TOL)) {
- while (!(file->flags & FLAG_HLINK_EOL)) {
-@@ -300,9 +314,13 @@ void hard_link_cluster(struct file_struc
- if (file->F_HLINDEX != SKIPPED_LINK)
- continue;
- hlink2 = f_name(file, NULL);
-- statret = link_stat(hlink2, &st2, 0);
-- maybe_hard_link(file, ndx, hlink2, statret, &st2,
-- hlink1, &st1, itemizing, code);
-+ statret = link_stat(hlink2, &sx.st, 0);
-+ maybe_hard_link(file, ndx, hlink2, statret, &sx,
-+ hlink1, &st, itemizing, code);
++#ifdef SUPPORT_ACLS
++ prev_sx.acc_acl = prev_sx.def_acl = NULL;
++#endif
++
+ while ((ndx = prev_ndx) >= 0) {
++ int val;
+ file = FPTR(ndx);
+ file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
+ prev_ndx = F_HL_PREV(file);
+ prev_name = f_name(file, NULL);
+- prev_statret = link_stat(prev_name, &prev_st, 0);
+- if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
+- our_name, stp, fname, itemizing, code) < 0)
++ prev_statret = link_stat(prev_name, &prev_sx.st, 0);
++ val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
++ our_name, stp, fname, itemizing, code);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
-+ free_acl(&sx);
++ free_acl(&prev_sx);
+#endif
- if (remove_source_files == 1 && do_xfers) {
- char numbuf[4];
- SIVAL(numbuf, 0, ndx);
++ if (val < 0)
+ continue;
+ if (remove_source_files == 1 && do_xfers)
+ send_msg_int(MSG_SUCCESS, ndx);
--- old/lib/sysacls.c
+++ new/lib/sysacls.c
@@ -0,0 +1,3251 @@
@@ -5618,7 +5607,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#endif /* SUPPORT_ACLS */
--- old/log.c
+++ new/log.c
-@@ -614,8 +614,10 @@ static void log_formatted(enum logcode c
+@@ -625,8 +625,10 @@ static void log_formatted(enum logcode c
c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -5641,7 +5630,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
int preserve_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
-@@ -199,6 +200,7 @@ static void print_rsync_version(enum log
+@@ -198,6 +199,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
@@ -5649,7 +5638,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -215,6 +217,10 @@ static void print_rsync_version(enum log
+@@ -214,6 +216,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
@@ -5660,31 +5649,18 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -227,17 +233,16 @@ static void print_rsync_version(enum log
- RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
- rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
- rprintf(f, "\n");
-- rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-- "%shard links, %ssymlinks, batchfiles,\n",
-- (int) (sizeof (OFF_T) * 8),
-- got_socketpair, hardlinks, links);
-+ rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, %shard links, %ssymlinks,\n",
-+ (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links);
-+
-+ rprintf(f, " batchfiles, %sinplace, %sIPv6, %sACLs,\n",
-+ have_inplace, ipv6, acls);
+@@ -232,8 +238,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\n",
+- have_inplace);
++ rprintf(f, " %sappend, %sACLs\n",
++ have_inplace, acls);
- /* Note that this field may not have type ino_t. It depends
- * on the complicated interaction between largefile feature
- * macros. */
-- rprintf(f, " %sinplace, %sIPv6, "
-- "%d-bit system inums, %d-bit internal inums\n",
-- have_inplace, ipv6,
-+ rprintf(f, " %d-bit system inums, %d-bit internal inums\n",
- (int) (sizeof dumstat->st_ino * 8),
- (int) (sizeof (int64) * 8));
#ifdef MAINTAINER_MODE
-@@ -284,7 +289,7 @@ void usage(enum logcode F)
+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
+@@ -279,7 +285,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");
@@ -5693,7 +5669,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
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");
-@@ -306,6 +311,9 @@ void usage(enum logcode F)
+@@ -301,6 +307,9 @@ void usage(enum logcode F)
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -E, --executability preserve the file's executability\n");
rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
@@ -5703,7 +5679,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
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");
-@@ -426,6 +434,9 @@ static struct poptOption long_options[]
+@@ -421,6 +430,9 @@ static struct poptOption long_options[]
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
@@ -5713,13 +5689,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
{"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 },
-@@ -1091,6 +1102,24 @@ int parse_arguments(int *argc, const cha
+@@ -1086,6 +1098,24 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
+ case 'A':
+#ifdef SUPPORT_ACLS
-+ preserve_acls++;
++ preserve_acls = 1;
+ preserve_perms = 1;
+ break;
+#else
@@ -5738,7 +5714,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1533,6 +1562,10 @@ void server_options(char **args,int *arg
+@@ -1528,6 +1558,10 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
@@ -5759,7 +5735,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern struct stats stats;
extern char *stdout_format;
extern char *tmpdir;
-@@ -350,6 +351,10 @@ int recv_files(int f_in, struct file_lis
+@@ -347,6 +348,10 @@ int recv_files(int f_in, struct file_lis
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
@@ -5767,10 +5743,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#ifdef SUPPORT_ACLS
+ const char *parent_dirname = "";
+#endif
- int i, recv_ok;
+ int ndx, recv_ok;
if (verbose > 2)
-@@ -553,7 +558,16 @@ int recv_files(int f_in, struct file_lis
+@@ -545,7 +550,16 @@ int recv_files(int f_in, struct file_lis
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = fd1 != -1;
@@ -5798,15 +5774,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
-@@ -47,7 +48,6 @@ extern int preserve_gid;
+@@ -48,7 +49,6 @@ extern int preserve_gid;
extern int inplace;
extern int keep_dirlinks;
extern int make_backups;
-extern mode_t orig_umask;
extern struct stats stats;
+ extern struct file_list *the_file_list;
extern struct chmod_mode_struct *daemon_chmod_modes;
-
-@@ -100,7 +100,8 @@ void free_sums(struct sum_struct *s)
+@@ -153,7 +153,8 @@ void free_sums(struct sum_struct *s)
/* This is only called when we aren't preserving permissions. Figure out what
* the permissions should be and return them merged back into the mode. */
@@ -5816,7 +5792,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
{
int new_mode;
/* If the file already exists, we'll return the local permissions,
-@@ -117,56 +118,65 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -170,56 +171,65 @@ mode_t dest_mode(mode_t flist_mode, mode
new_mode |= (new_mode & 0444) >> 2;
}
} else {
@@ -5886,37 +5862,37 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
updated = 1;
}
-- change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-+ change_uid = am_root && preserve_uid && sxp->st.st_uid != file->uid;
- change_gid = preserve_gid && file->gid != GID_NONE
-- && st->st_gid != file->gid;
-+ && sxp->st.st_gid != file->gid;
+- change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
++ change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
+ change_gid = preserve_gid && F_GID(file) != GID_NONE
+- && st->st_gid != F_GID(file);
++ && sxp->st.st_gid != F_GID(file);
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
- if (S_ISLNK(st->st_mode))
+ if (S_ISLNK(sxp->st.st_mode))
;
else
#endif
-@@ -176,45 +186,57 @@ int set_file_attrs(char *fname, struct f
+@@ -229,45 +239,57 @@ int set_file_attrs(char *fname, struct f
rprintf(FINFO,
"set uid of %s from %ld to %ld\n",
fname,
-- (long)st->st_uid, (long)file->uid);
-+ (long)sxp->st.st_uid, (long)file->uid);
+- (long)st->st_uid, (long)F_UID(file));
++ (long)sxp->st.st_uid, (long)F_UID(file));
}
if (change_gid) {
rprintf(FINFO,
"set gid of %s from %ld to %ld\n",
fname,
-- (long)st->st_gid, (long)file->gid);
-+ (long)sxp->st.st_gid, (long)file->gid);
+- (long)st->st_gid, (long)F_GID(file));
++ (long)sxp->st.st_gid, (long)F_GID(file));
}
}
if (do_lchown(fname,
-- change_uid ? file->uid : st->st_uid,
-- change_gid ? file->gid : st->st_gid) != 0) {
-+ change_uid ? file->uid : sxp->st.st_uid,
-+ change_gid ? file->gid : sxp->st.st_gid) != 0) {
+- change_uid ? F_UID(file) : st->st_uid,
+- change_gid ? F_GID(file) : st->st_gid) != 0) {
++ change_uid ? F_UID(file) : sxp->st.st_uid,
++ change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
* unless have the privilege */
rsyserr(FERROR, errno, "%s %s failed",
@@ -5953,8 +5929,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#endif
+
#ifdef HAVE_CHMOD
-- if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
-+ if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+- if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
++ if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
int ret = do_chmod(fname, new_mode);
if (ret < 0) {
rsyserr(FERROR, errno,
@@ -5965,7 +5941,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (ret == 0) /* ret == 1 if symlink could not be set */
updated = 1;
-@@ -227,6 +249,11 @@ int set_file_attrs(char *fname, struct f
+@@ -280,6 +302,11 @@ int set_file_attrs(char *fname, struct f
else
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
@@ -5979,7 +5955,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
--- old/rsync.h
+++ new/rsync.h
-@@ -493,6 +493,14 @@ struct idev {
+@@ -532,6 +532,14 @@ struct idev_node {
#define IN_LOOPBACKNET 127
#endif
@@ -5993,8 +5969,29 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+
#define GID_NONE ((gid_t)-1)
- #define HL_CHECK_MASTER 0
-@@ -656,6 +664,17 @@ struct stats {
+ union file_extras {
+@@ -551,6 +559,7 @@ struct file_struct {
+ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_acls;
+
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -583,10 +592,12 @@ extern int preserve_gid;
+ /* When the associated option is on, all entries will have these present: */
+ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
++#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
+
+ /* These items are per-entry optional and mutally exclusive: */
+ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
+ #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
++#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
+
+ /* This optional item might follow an F_HL_*() item.
+ * (Note: a device doesn't need to check LEN64_BUMP(f).) */
+@@ -722,6 +733,17 @@ struct stats {
struct chmod_mode_struct;
@@ -6012,7 +6009,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -674,6 +693,16 @@ struct chmod_mode_struct;
+@@ -740,6 +762,16 @@ struct chmod_mode_struct;
#define NORETURN __attribute__((__noreturn__))
#endif
@@ -6074,7 +6071,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
dit(bf(-E, --executability)) This option causes rsync to preserve the
executability (or non-executability) of regular files when bf(--perms) is
-@@ -805,6 +810,15 @@ quote(itemization(
+@@ -805,6 +810,14 @@ quote(itemization(
If bf(--perms) is enabled, this option is ignored.
@@ -6082,15 +6079,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+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).
+
-+Note also that an optimization of the ACL-sending protocol used by this
-+version makes it incompatible with sending files to an older ACL-enabled
-+rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This
-+doubling is not needed when pulling files from an older rsync.
++The ACL-sending protocol used by this version was first introduced in
++the patch that was shipped with 2.6.8. Sending ACLs to an older version
++of the ACL patch is not supported.
+
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
-@@ -1402,8 +1416,8 @@ if the receiving rsync is at least versi
+@@ -1402,8 +1415,8 @@ if the receiving rsync is at least versi
with older versions of rsync, but that also turns on the output of other
verbose messages).
@@ -6101,7 +6097,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1452,7 +1466,11 @@ quote(itemization(
+@@ -1452,7 +1465,11 @@ quote(itemization(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
@@ -6710,7 +6706,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
-@@ -186,15 +186,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
+@@ -185,15 +185,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
| tee "$outfile"
filter_outfile
cat <"$chkfile"
@@ -6735,9 +6731,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
-@@ -236,14 +236,14 @@ filter_outfile
- # TODO fix really-old problem when combining -H with --compare-dest:
- # missing output for foo/extra hard-link (and it might not be updated)!
+@@ -233,15 +233,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
+ | tee "$outfile"
+ filter_outfile
cat <"$chkfile"
-cd ./
-cd bar/
@@ -6746,6 +6742,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
-cd foo/
-.f foo/config1
-.f foo/config2
+-.f foo/extra
-.L foo/sym -> ../bar/baz/rsync
+cd ./
+cd bar/
@@ -6754,6 +6751,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+cd foo/
+.f foo/config1
+.f foo/config2
++.f foo/extra
+.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
@@ -6768,16 +6766,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern int numeric_ids;
extern int am_root;
-@@ -273,7 +274,7 @@ void send_uid_list(int f)
- if (numeric_ids)
- return;
+@@ -270,7 +271,7 @@ void send_uid_list(int f)
+ {
+ struct idlist *list;
- if (preserve_uid) {
+ if (preserve_uid || preserve_acls) {
int len;
/* we send sequences of uid/byte-length/name */
for (list = uidlist; list; list = list->next) {
-@@ -290,7 +291,7 @@ void send_uid_list(int f)
+@@ -287,7 +288,7 @@ void send_uid_list(int f)
write_int(f, 0);
}
@@ -6786,7 +6784,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
int len;
for (list = gidlist; list; list = list->next) {
if (!list->name)
-@@ -311,7 +312,7 @@ void recv_uid_list(int f, struct file_li
+@@ -308,7 +309,7 @@ void recv_uid_list(int f, struct file_li
int id, i;
char *name;
@@ -6795,7 +6793,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* read the uid list */
while ((id = read_int(f)) != 0) {
int len = read_byte(f);
-@@ -323,7 +324,7 @@ void recv_uid_list(int f, struct file_li
+@@ -320,7 +321,7 @@ void recv_uid_list(int f, struct file_li
}
}
@@ -6804,7 +6802,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* read the gid list */
while ((id = read_int(f)) != 0) {
int len = read_byte(f);
-@@ -335,6 +336,16 @@ void recv_uid_list(int f, struct file_li
+@@ -332,6 +333,16 @@ void recv_uid_list(int f, struct file_li
}
}
@@ -6823,7 +6821,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
for (i = 0; i < flist->count; i++)
--- old/util.c
+++ new/util.c
-@@ -1468,3 +1468,31 @@ int bitbag_next_bit(struct bitbag *bb, i
+@@ -1467,3 +1467,31 @@ int bitbag_next_bit(struct bitbag *bb, i
return -1;
}