extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
-@@ -144,6 +145,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);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -621,6 +624,12 @@ static struct file_struct *recv_file_ent
+@@ -624,6 +627,12 @@ static struct file_struct *recv_file_ent
}
#endif
if (always_checksum && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
-@@ -733,6 +742,11 @@ static struct file_struct *recv_file_ent
+@@ -736,6 +745,11 @@ static struct file_struct *recv_file_ent
read_buf(f, bp, checksum_len);
}
return file;
}
-@@ -993,6 +1007,9 @@ static struct file_struct *send_file_nam
+@@ -996,6 +1010,9 @@ static struct file_struct *send_file_nam
unsigned short flags)
{
struct file_struct *file;
file = make_file(fname, flist, stp, flags,
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -1002,11 +1019,24 @@ static struct file_struct *send_file_nam
+@@ -1005,11 +1022,24 @@ static struct file_struct *send_file_nam
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
-@@ -517,22 +519,27 @@ static void do_delete_pass(struct file_l
+@@ -518,22 +520,27 @@ static void do_delete_pass(struct file_l
rprintf(FINFO, " \r");
}
int32 iflags, uchar fnamecmp_type, const char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
-@@ -540,20 +547,24 @@ void itemize(struct file_struct *file, i
+@@ -541,20 +548,24 @@ void itemize(struct file_struct *file, i
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
} else
iflags |= ITEM_IS_NEW;
-@@ -807,7 +818,7 @@ void check_for_finished_hlinks(int itemi
+@@ -809,7 +820,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;
-@@ -816,7 +827,7 @@ static int try_dests_reg(struct file_str
+@@ -818,7 +829,7 @@ static int try_dests_reg(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
continue;
switch (match_level) {
case 0:
-@@ -824,16 +835,20 @@ static int try_dests_reg(struct file_str
+@@ -826,16 +837,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
continue;
best_match = j;
match_level = 3;
-@@ -848,7 +863,7 @@ static int try_dests_reg(struct file_str
+@@ -850,7 +865,7 @@ static int try_dests_reg(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
return -1;
}
-@@ -856,15 +871,20 @@ 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)
+@@ -860,16 +875,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 && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, j);
+- 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
- if (itemizing)
+#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);
- }
-@@ -880,8 +900,13 @@ static int try_dests_reg(struct file_str
+ return -2;
+@@ -886,8 +910,13 @@ static int try_dests_reg(struct file_str
}
return -1;
}
set_file_attrs(fname, file, NULL, 0);
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
-@@ -904,7 +929,7 @@ static int try_dests_reg(struct file_str
+@@ -898,7 +927,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;
+ }
+@@ -910,7 +939,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];
-@@ -937,24 +962,24 @@ static int try_dests_non(struct file_str
+@@ -943,24 +972,24 @@ static int try_dests_non(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
continue;
break;
#endif
-@@ -969,7 +994,7 @@ static int try_dests_non(struct file_str
+@@ -975,7 +1004,7 @@ static int try_dests_non(struct file_str
case TYPE_SPECIAL:
case TYPE_DEVICE:
devp = F_RDEV_P(file);
continue;
break;
#ifdef SUPPORT_LINKS
-@@ -986,7 +1011,11 @@ static int try_dests_non(struct file_str
+@@ -992,7 +1021,11 @@ static int try_dests_non(struct file_str
match_level = 2;
best_match = j;
}
match_level = 3;
best_match = j;
break;
-@@ -999,7 +1028,7 @@ static int try_dests_non(struct file_str
+@@ -1005,7 +1038,7 @@ static int try_dests_non(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
return -1;
}
-@@ -1030,7 +1059,15 @@ static int try_dests_non(struct file_str
+@@ -1036,7 +1069,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;
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s%s is uptodate\n",
-@@ -1043,6 +1080,7 @@ static int try_dests_non(struct file_str
+@@ -1049,6 +1090,7 @@ static int try_dests_non(struct file_str
}
static int phase = 0;
/* 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
-@@ -1064,7 +1102,8 @@ static void recv_generator(char *fname,
+@@ -1069,7 +1111,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;
struct file_struct *back_file = NULL;
int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
-@@ -1120,6 +1159,9 @@ static void recv_generator(char *fname,
+@@ -1125,6 +1168,9 @@ static void recv_generator(char *fname,
} else if (!dry_run)
return;
}
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
-@@ -1127,7 +1169,7 @@ static void recv_generator(char *fname,
+@@ -1132,7 +1178,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
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
-@@ -1139,6 +1181,10 @@ static void recv_generator(char *fname,
+@@ -1144,6 +1190,10 @@ static void recv_generator(char *fname,
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
}
parent_dirname = dn;
-@@ -1148,7 +1194,7 @@ static void recv_generator(char *fname,
+@@ -1153,7 +1203,7 @@ static void recv_generator(char *fname,
need_fuzzy_dirlist = 0;
}
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
}
-@@ -1166,8 +1212,9 @@ static void recv_generator(char *fname,
+@@ -1171,8 +1221,9 @@ static void recv_generator(char *fname,
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = statret == 0
}
if (S_ISDIR(file->mode)) {
-@@ -1176,8 +1223,8 @@ static void recv_generator(char *fname,
+@@ -1181,8 +1232,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. */
return;
statret = -1;
}
-@@ -1186,14 +1233,14 @@ static void recv_generator(char *fname,
+@@ -1191,14 +1242,14 @@ static void recv_generator(char *fname,
dry_run++;
}
real_ret = statret;
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;
-@@ -1202,7 +1249,11 @@ static void recv_generator(char *fname,
+@@ -1207,7 +1258,11 @@ static void recv_generator(char *fname,
statret = 1;
}
if (itemizing && f_out != -1) {
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -1222,22 +1273,22 @@ static void recv_generator(char *fname,
+@@ -1227,21 +1282,21 @@ static void recv_generator(char *fname,
return;
}
}
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_CHECK_MASTER))
+ if (preserve_hard_links && F_NOT_HLINK_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)) {
-@@ -1257,14 +1308,14 @@ static void recv_generator(char *fname,
+@@ -1261,17 +1316,17 @@ static void recv_generator(char *fname,
char lnk[MAXPATHLEN];
int len;
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
-@@ -1275,10 +1326,10 @@ static void recv_generator(char *fname,
+- 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;
+@@ -1279,10 +1334,10 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
} 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
-@@ -1295,7 +1346,7 @@ static void recv_generator(char *fname,
- }
- #ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
-- && hard_link_check(file, ndx, fname, -1, &st,
-+ && hard_link_check(file, ndx, fname, -1, &sx,
- itemizing, code, HL_SKIP))
- return;
- #endif
-@@ -1305,7 +1356,7 @@ static void recv_generator(char *fname,
+@@ -1307,7 +1362,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -1331,33 +1382,38 @@ static void recv_generator(char *fname,
+@@ -1333,33 +1388,38 @@ static void recv_generator(char *fname,
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+- 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;
} 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
-@@ -1374,7 +1430,7 @@ static void recv_generator(char *fname,
- }
- #ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
-- && hard_link_check(file, ndx, fname, -1, &st,
-+ && hard_link_check(file, ndx, fname, -1, &sx,
- itemizing, code, HL_SKIP))
- return;
- #endif
-@@ -1389,7 +1445,11 @@ static void recv_generator(char *fname,
+@@ -1389,7 +1449,11 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -1401,7 +1461,7 @@ static void recv_generator(char *fname,
+@@ -1401,7 +1465,7 @@ static void recv_generator(char *fname,
if (remove_source_files == 1)
goto return_with_success;
}
}
if (!S_ISREG(file->mode)) {
-@@ -1435,7 +1495,7 @@ static void recv_generator(char *fname,
+@@ -1435,7 +1499,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -1444,20 +1504,20 @@ static void recv_generator(char *fname,
+@@ -1444,20 +1508,20 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
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;
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
-@@ -1467,7 +1527,7 @@ static void recv_generator(char *fname,
+@@ -1467,7 +1531,7 @@ static void recv_generator(char *fname,
}
real_ret = statret;
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
-@@ -1486,7 +1546,7 @@ static void recv_generator(char *fname,
+@@ -1486,7 +1550,7 @@ static void recv_generator(char *fname,
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1496,7 +1556,7 @@ static void recv_generator(char *fname,
- if (statret != 0) {
- #ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_SKIP))
- return;
- #endif
-@@ -1507,38 +1567,51 @@ static void recv_generator(char *fname,
+@@ -1505,38 +1569,52 @@ static void recv_generator(char *fname,
return;
}
handle_partial_dir(partialptr, PDIR_DELETE);
}
if (itemizing) {
-- itemize(file, ndx, real_ret, &real_st,
+- itemize(file, ndx, statret, &st,
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && real_ret == 0)
-+ get_acl(fnamecmp, &real_sx);
++ if (preserve_acls && statret == 0)
++ get_acl(fnamecmp, &sx);
+#endif
-+ itemize(file, ndx, real_ret, &real_sx,
++ itemize(file, ndx, statret, &sx,
0, 0, NULL);
+#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) {
++ //if (fnamecmp_type == FNAMECMP_FNAME) {
++ //sx.acc_acl = real_sx.acc_acl;
++ //sx.def_acl = real_sx.def_acl;
++ //} else
++ //free_acl(&real_sx);
++ //}
++ assert(fnamecmp_type == FNAMECMP_FNAME);
+#endif
}
- set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+- 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;
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -1563,18 +1636,22 @@ static void recv_generator(char *fname,
+@@ -1561,16 +1639,20 @@ static void recv_generator(char *fname,
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_IS_HLINKED(file)
-- && hard_link_check(file, ndx, fname, statret, &st,
-+ && hard_link_check(file, ndx, fname, statret, &sx,
- itemizing, code, HL_SKIP))
+ if (preserve_hard_links && F_NOT_HLINK_LAST(file))
- return;
+ goto cleanup;
#endif
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -1585,7 +1662,7 @@ static void recv_generator(char *fname,
+@@ -1581,7 +1663,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
unmake_file(back_file);
close(fd);
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -1593,14 +1670,14 @@ static void recv_generator(char *fname,
+@@ -1589,14 +1671,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
unmake_file(back_file);
close(fd);
}
if (verbose > 2)
-@@ -1618,8 +1695,16 @@ static void recv_generator(char *fname,
+@@ -1618,26 +1700,34 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
}
if (!do_xfers) {
-@@ -1627,17 +1712,17 @@ static void recv_generator(char *fname,
+ #ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, -1);
+- finish_hard_link(file, fname, &st, itemizing, code, -1);
++ finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
#endif
- return;
+ goto cleanup;
if (f_copy >= 0) {
close(f_copy);
-@@ -1650,6 +1735,13 @@ static void recv_generator(char *fname,
+@@ -1650,6 +1740,13 @@ static void recv_generator(char *fname,
}
close(fd);
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1716,6 +1808,8 @@ void generate_files(int f_out, struct fi
+@@ -1716,6 +1813,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;
extern int make_backups;
extern int remove_source_files;
extern int stdout_format_has_i;
-@@ -150,15 +151,19 @@ void init_hard_links(void)
+@@ -119,15 +120,19 @@ void match_hard_links(void)
}
static int maybe_hard_link(struct file_struct *file, int ndx,
- const char *fname, int statret, STRUCT_STAT *stp,
+ const char *fname, int statret, statx *sxp,
- const char *toname, STRUCT_STAT *to_stp,
- int itemizing, enum logcode code)
+ const char *oldname, STRUCT_STAT *old_stp,
+ const char *realname, int itemizing, enum logcode code)
{
if (statret == 0) {
-- if (stp->st_dev == to_stp->st_dev
-- && stp->st_ino == to_stp->st_ino) {
-+ if (sxp->st.st_dev == to_stp->st_dev
-+ && sxp->st.st_ino == to_stp->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, stp,
+#ifdef SUPPORT_ACLS
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
-@@ -173,12 +178,12 @@ static int maybe_hard_link(struct file_s
- return -1;
- }
- }
-- return hard_link_one(file, ndx, fname, statret, stp, toname,
-+ return hard_link_one(file, ndx, fname, statret, sxp, toname,
- 0, itemizing, code);
- }
+@@ -148,7 +153,11 @@ static int maybe_hard_link(struct file_s
+ 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);
+ }
+@@ -162,7 +171,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)
{
- int head;
-@@ -221,7 +226,7 @@ int hard_link_check(struct file_struct *
- || st2.st_ino != st3.st_ino)
- continue;
- statret = 1;
-- stp = &st3;
-+ sxp->st = st3;
- if (verbose < 2 || !stdout_format_has_i) {
- itemizing = 0;
- code = FNONE;
-@@ -231,12 +236,16 @@ int hard_link_check(struct file_struct *
- if (!unchanged_file(cmpbuf, file, &st3))
- continue;
- statret = 1;
-- stp = &st3;
-- if (unchanged_attrs(file, &st3))
-+ sxp->st = st3;
+ STRUCT_STAT prev_st;
+@@ -213,18 +222,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;
+@@ -233,16 +244,36 @@ int hard_link_check(struct file_struct *
+ }
+ break;
}
-- maybe_hard_link(file, ndx, fname, statret, stp,
-+ maybe_hard_link(file, ndx, fname, statret, sxp,
- toname, &st2, itemizing, code);
- if (remove_source_files == 1 && do_xfers)
- send_msg_int(MSG_SUCCESS, ndx);
-@@ -249,7 +258,7 @@ int hard_link_check(struct file_struct *
- }
-
- int hard_link_one(struct file_struct *file, int ndx, const char *fname,
-- int statret, STRUCT_STAT *stp, const char *toname, int terse,
-+ int statret, statx *sxp, const 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, stp,
+- 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 && statret == 0 && !ACL_READY(*sxp))
-+ get_acl(fname, sxp);
++ 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
++ else if (preserve_acls)
++ free_acl(&alt_sx);
+#endif
-+ itemize(file, ndx, statret, sxp,
- ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
- terse ? "" : toname);
}
-@@ -279,14 +292,15 @@ void hard_link_cluster(struct file_struc
+
+- 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;
+
+@@ -277,7 +308,8 @@ void finish_hard_link(struct file_struct
+ STRUCT_STAT *stp, int itemizing, enum logcode code,
+ int alt_dest)
{
- char hlink1[MAXPATHLEN];
- char *hlink2;
-- STRUCT_STAT st1, st2;
-+ statx sx;
+- STRUCT_STAT st, prev_st;
++ statx prev_sx;
+ STRUCT_STAT st;
- int statret, ndx = master;
- struct hlist *hl = F_HL_LIST(file);
+ char alt_name[MAXPATHLEN], *prev_name;
+ const char *our_name;
+ int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
+@@ -301,14 +333,24 @@ void finish_hard_link(struct file_struct
+ } else
+ our_name = fname;
- hl->hlindex = FINISHED_LINK;
- if (dry_run)
- hl->dest_used = dest_used + 1;
-- 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_FIRST)) {
- while (!(file->flags & FLAG_HLINK_LAST)) {
-@@ -302,9 +316,13 @@ void hard_link_cluster(struct file_struc
- if (hl->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 (val < 0)
+ continue;
if (remove_source_files == 1 && do_xfers)
send_msg_int(MSG_SUCCESS, ndx);
- hl->hlindex = FINISHED_LINK;
--- old/lib/sysacls.c
+++ new/lib/sysacls.c
@@ -0,0 +1,3251 @@
int ndx, recv_ok;
if (verbose > 2)
-@@ -550,7 +555,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;
--- old/rsync.h
+++ new/rsync.h
-@@ -496,6 +496,14 @@ struct idev {
+@@ -500,6 +500,14 @@ struct idev {
#define IN_LOOPBACKNET 127
#endif
+
#define GID_NONE ((gid_t)-1)
- #define HL_CHECK_MASTER 0
-@@ -553,10 +561,12 @@ extern int preserve_gid;
+ struct file_struct {
+@@ -548,10 +556,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)->uid
#define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
/* These items are per-entry optional and mutally exclusive: */
#define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
- #define F_HL_LIST(f) OPT_EXTRA(f, LEN64_BUMP(f))->hlist
+ #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).) */
-@@ -694,6 +704,17 @@ struct stats {
+@@ -687,6 +697,17 @@ struct stats {
struct chmod_mode_struct;
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -712,6 +733,16 @@ struct chmod_mode_struct;
+@@ -705,6 +726,16 @@ struct chmod_mode_struct;
#define NORETURN __attribute__((__noreturn__))
#endif
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 <<EOT >"$chkfile"
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 <<EOT >"$chkfile"
-cd ./
-cd bar/
-cd foo/
-.f foo/config1
-.f foo/config2
+-.f foo/extra
-.L foo/sym -> ../bar/baz/rsync
+cd ./
+cd bar/
+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"
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff