extern int preserve_links;
extern int preserve_devices;
extern int preserve_specials;
-@@ -84,6 +85,7 @@ extern long block_size; /* "long" becaus
+@@ -85,6 +86,7 @@ extern long block_size; /* "long" becaus
extern int max_delete;
extern int force_delete;
extern int one_file_system;
extern struct stats stats;
extern dev_t filesystem_dev;
extern char *backup_dir;
-@@ -316,22 +318,27 @@ static void do_delete_pass(struct file_l
+@@ -317,22 +319,27 @@ static void do_delete_pass(struct file_l
rprintf(FINFO, " \r");
}
int32 iflags, uchar fnamecmp_type, char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
-@@ -339,19 +346,23 @@ void itemize(struct file_struct *file, i
+@@ -340,19 +347,23 @@ void itemize(struct file_struct *file, i
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
} else
iflags |= ITEM_IS_NEW;
-@@ -604,7 +615,7 @@ void check_for_finished_hlinks(int itemi
+@@ -605,7 +616,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,
int maybe_ATTRS_REPORT, enum logcode code)
{
int best_match = -1;
-@@ -613,7 +624,7 @@ static int try_dests_reg(struct file_str
+@@ -614,7 +625,7 @@ static int try_dests_reg(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
continue;
switch (match_level) {
case 0:
-@@ -621,16 +632,20 @@ static int try_dests_reg(struct file_str
+@@ -622,16 +633,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
continue;
best_match = j;
match_level = 3;
-@@ -645,14 +660,14 @@ static int try_dests_reg(struct file_str
+@@ -646,14 +661,14 @@ static int try_dests_reg(struct file_str
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
cmpbuf, 1,
itemizing && verbose > 1,
code) < 0)
-@@ -661,8 +676,13 @@ static int try_dests_reg(struct file_str
- hard_link_cluster(file, ndx, itemizing, code);
+@@ -665,8 +680,13 @@ static int try_dests_reg(struct file_str
+ }
} else
#endif
- if (itemizing)
if (verbose > 1 && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
-@@ -678,8 +698,13 @@ static int try_dests_reg(struct file_str
+@@ -682,8 +702,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)
-@@ -703,13 +728,18 @@ static int try_dests_non(struct file_str
+@@ -707,13 +732,18 @@ static int try_dests_non(struct file_str
enum logcode code)
{
char fnamebuf[MAXPATHLEN];
continue;
if (S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
-@@ -722,10 +752,10 @@ static int try_dests_non(struct file_str
+@@ -726,10 +756,10 @@ static int try_dests_non(struct file_str
#endif
continue;
} else if (IS_SPECIAL(file->mode)) {
continue;
} else {
rprintf(FERROR,
-@@ -756,7 +786,15 @@ static int try_dests_non(struct file_str
+@@ -760,7 +790,15 @@ static int try_dests_non(struct file_str
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);
char *lp = link_dest ? "" : NULL;
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s is uptodate\n", fname);
-@@ -768,6 +806,7 @@ static int try_dests_non(struct file_str
+@@ -772,6 +810,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
-@@ -789,7 +828,8 @@ static void recv_generator(char *fname,
+@@ -793,7 +832,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;
-@@ -845,6 +885,9 @@ static void recv_generator(char *fname,
+@@ -849,6 +889,9 @@ static void recv_generator(char *fname,
} else if (!dry_run)
return;
}
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
-@@ -852,7 +895,7 @@ static void recv_generator(char *fname,
+@@ -856,7 +899,7 @@ static void recv_generator(char *fname,
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
-- && safe_stat(dn, &st) < 0
-+ && safe_stat(dn, &sx.st) < 0
+- && do_stat(dn, &st) < 0
++ && do_stat(dn, &sx.st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
-@@ -864,6 +907,10 @@ static void recv_generator(char *fname,
+@@ -868,6 +911,10 @@ static void recv_generator(char *fname,
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
}
parent_dirname = dn;
-@@ -872,7 +919,7 @@ static void recv_generator(char *fname,
+@@ -876,7 +923,7 @@ static void recv_generator(char *fname,
need_fuzzy_dirlist = 0;
}
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
}
-@@ -890,8 +937,9 @@ static void recv_generator(char *fname,
+@@ -894,8 +941,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)) {
-@@ -900,8 +948,8 @@ static void recv_generator(char *fname,
+@@ -904,8 +952,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;
}
-@@ -910,7 +958,11 @@ static void recv_generator(char *fname,
- dry_run++;
- }
- if (itemizing && f_out != -1) {
-- itemize(file, ndx, statret, &st,
+@@ -920,7 +968,11 @@ static void recv_generator(char *fname,
+ sr = -1;
+ new_root_dir = 0;
+ }
+- itemize(file, ndx, sr, &st,
+#ifdef SUPPORT_ACLS
-+ if (preserve_acls && statret == 0)
++ if (preserve_acls && sr == 0)
+ get_acl(fname, &sx);
+#endif
-+ itemize(file, ndx, statret, &sx,
- statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
++ itemize(file, ndx, sr, &sx,
+ sr ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -930,19 +982,19 @@ static void recv_generator(char *fname,
+@@ -940,19 +992,19 @@ static void recv_generator(char *fname,
return;
}
}
- if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
+ if (set_file_attrs(fname, file, statret ? NULL : &sx, 0)
- && verbose && code && f_out != -1)
+ && verbose && code != FNONE && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
-@@ -960,7 +1012,7 @@ static void recv_generator(char *fname,
+@@ -970,7 +1022,7 @@ static void recv_generator(char *fname,
char lnk[MAXPATHLEN];
int len;
&& (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
lnk[len] = 0;
/* A link already pointing to the
-@@ -968,10 +1020,10 @@ static void recv_generator(char *fname,
+@@ -978,10 +1030,10 @@ static void recv_generator(char *fname,
* required. */
if (strcmp(lnk, file->u.link) == 0) {
if (itemizing) {
maybe_ATTRS_REPORT);
if (preserve_hard_links
&& file->link_u.links) {
-@@ -986,9 +1038,9 @@ static void recv_generator(char *fname,
+@@ -996,9 +1048,9 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
statret = -1;
} else if (basis_dir[0] != NULL) {
if (try_dests_non(file, fname, ndx, itemizing,
-@@ -1004,7 +1056,7 @@ static void recv_generator(char *fname,
+@@ -1015,7 +1067,7 @@ static void recv_generator(char *fname,
}
}
if (preserve_hard_links && file->link_u.links
itemizing, code, HL_SKIP))
return;
if (do_symlink(file->u.link,fname) != 0) {
-@@ -1013,7 +1065,7 @@ static void recv_generator(char *fname,
+@@ -1024,7 +1076,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose) {
-@@ -1044,18 +1096,22 @@ static void recv_generator(char *fname,
- itemizing = code = 0;
+ if (code != FNONE && verbose) {
+@@ -1056,18 +1108,22 @@ static void recv_generator(char *fname,
+ code = FNONE;
}
}
+#ifdef SUPPORT_ACLS
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-@@ -1068,7 +1124,7 @@ static void recv_generator(char *fname,
+@@ -1080,7 +1136,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
+ itemize(file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose)
-@@ -1082,14 +1138,14 @@ static void recv_generator(char *fname,
+ if (code != FNONE && verbose)
+@@ -1094,14 +1150,14 @@ static void recv_generator(char *fname,
}
} else {
if (itemizing)
}
if (!S_ISREG(file->mode)) {
-@@ -1123,7 +1179,7 @@ static void recv_generator(char *fname,
+@@ -1135,7 +1191,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -1132,20 +1188,20 @@ static void recv_generator(char *fname,
+@@ -1144,20 +1200,20 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
-@@ -1155,7 +1211,7 @@ static void recv_generator(char *fname,
+@@ -1167,7 +1223,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
-@@ -1174,7 +1230,7 @@ static void recv_generator(char *fname,
+@@ -1186,7 +1242,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;
-@@ -1183,7 +1239,7 @@ static void recv_generator(char *fname,
+@@ -1195,7 +1251,7 @@ static void recv_generator(char *fname,
if (statret != 0) {
if (preserve_hard_links && file->link_u.links
itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
-@@ -1193,39 +1249,52 @@ static void recv_generator(char *fname,
+@@ -1205,39 +1261,52 @@ static void recv_generator(char *fname,
return;
}
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -1249,17 +1318,21 @@ static void recv_generator(char *fname,
+@@ -1261,17 +1330,21 @@ static void recv_generator(char *fname,
pretend_missing:
/* pretend the file didn't exist */
if (preserve_hard_links && file->link_u.links
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -1270,7 +1343,7 @@ static void recv_generator(char *fname,
+@@ -1282,7 +1355,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -1278,14 +1351,14 @@ static void recv_generator(char *fname,
+@@ -1290,14 +1363,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
free(back_file);
close(fd);
}
if (verbose > 2)
-@@ -1303,24 +1376,32 @@ static void recv_generator(char *fname,
+@@ -1315,24 +1388,32 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
if (f_copy >= 0) {
close(f_copy);
-@@ -1333,6 +1414,13 @@ static void recv_generator(char *fname,
+@@ -1345,6 +1426,13 @@ static void recv_generator(char *fname,
}
close(fd);
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1392,6 +1480,8 @@ void generate_files(int f_out, struct fi
+@@ -1404,6 +1492,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;
enum logcode code, int skip)
{
#ifdef SUPPORT_HARD_LINKS
-@@ -209,7 +214,7 @@ int hard_link_check(struct file_struct *
+@@ -215,7 +220,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 = code = 0;
- break;
-@@ -217,12 +222,16 @@ int hard_link_check(struct file_struct *
+ if (verbose < 2 || !stdout_format_has_i) {
+ itemizing = 0;
+ code = FNONE;
+@@ -225,12 +230,16 @@ int hard_link_check(struct file_struct *
if (!unchanged_file(cmpbuf, file, &st3))
continue;
statret = 1;
toname, &st2, itemizing, code);
if (remove_source_files == 1 && do_xfers) {
char numbuf[4];
-@@ -240,7 +249,7 @@ int hard_link_check(struct file_struct *
+@@ -248,7 +257,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 itemizing, enum logcode code)
{
if (do_link(toname, fname)) {
-@@ -256,7 +265,11 @@ int hard_link_one(struct file_struct *fi
+@@ -264,7 +273,11 @@ int hard_link_one(struct file_struct *fi
}
if (itemizing) {
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
-@@ -273,11 +286,12 @@ void hard_link_cluster(struct file_struc
+@@ -281,11 +294,12 @@ void hard_link_cluster(struct file_struc
#ifdef SUPPORT_HARD_LINKS
char hlink1[MAXPATHLEN];
char *hlink2;
return;
if (!(file->flags & FLAG_HLINK_TOL)) {
while (!(file->flags & FLAG_HLINK_EOL)) {
-@@ -291,9 +305,13 @@ void hard_link_cluster(struct file_struc
+@@ -299,9 +313,13 @@ void hard_link_cluster(struct file_struc
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
hlink2 = f_name(file, NULL);
+int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
--- old/log.c
+++ new/log.c
-@@ -609,8 +609,10 @@ static void log_formatted(enum logcode c
+@@ -615,8 +615,10 @@ static void log_formatted(enum logcode c
n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- old/mkproto.awk
-+++ new/mkproto.awk
-@@ -58,7 +58,7 @@ BEGIN {
- next;
- }
-
--!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
-+!/^OFF_T|^size_t|^off_t|^pid_t|^id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
- next;
- }
-
--- old/options.c
+++ new/options.c
@@ -47,6 +47,7 @@ int copy_dirlinks = 0;
@@ -304,6 +310,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 change the permissions of transferred files\n");
+ rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
+#ifdef SUPPORT_ACLS
+ rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
+#endif
{"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 },
-@@ -1084,6 +1096,24 @@ int parse_arguments(int *argc, const cha
+@@ -1082,6 +1094,24 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1529,6 +1559,10 @@ void server_options(char **args,int *arg
+@@ -1523,6 +1553,10 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
extern struct stats stats;
extern char *stdout_format;
extern char *tmpdir;
-@@ -349,6 +350,10 @@ int recv_files(int f_in, struct file_lis
+@@ -350,6 +351,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;
int i, recv_ok;
if (verbose > 2)
-@@ -549,7 +554,16 @@ int recv_files(int f_in, struct file_lis
+@@ -553,7 +558,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;
#define GID_NONE ((gid_t)-1)
#define HL_CHECK_MASTER 0
-@@ -652,6 +661,17 @@ struct stats {
+@@ -653,6 +662,17 @@ struct stats {
struct chmod_mode_struct;
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -667,6 +687,16 @@ struct chmod_mode_struct;
-
+@@ -669,6 +689,16 @@ struct chmod_mode_struct;
#define UNUSED(x) x __attribute__((__unused__))
+ #define NORETURN __attribute__((__noreturn__))
+typedef struct {
+ STRUCT_STAT st;
@@ -322,6 +322,7 @@ to the detailed description below for a
-p, --perms preserve permissions
-E, --executability preserve executability
- --chmod=CHMOD change the permissions of transferred files
+ --chmod=CHMOD affect file and/or directory permissions
+ -A, --acls preserve ACLs (implies -p) [non-standard]
-o, --owner preserve owner (super-user only)
-g, --group preserve group
--devices preserve device files (super-user only)
-@@ -747,7 +748,9 @@ quote(itemize(
+@@ -745,7 +746,9 @@ quote(itemization(
permissions, though the bf(--executability) option might change just
the execute permission for the file.
it() New files get their "normal" permission bits set to the source
their special permission bits disabled except in the case where a new
directory inherits a setgid bit from its parent directory.
))
-@@ -778,9 +781,11 @@ The preservation of the destination's se
+@@ -776,9 +779,11 @@ The preservation of the destination's se
directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
versions erroneously preserved the three special permission bits for
newly-created files when bf(--perms) was off, while overriding the
dit(bf(-E, --executability)) This option causes rsync to preserve the
executability (or non-executability) of regular files when bf(--perms) is
-@@ -798,6 +803,15 @@ quote(itemize(
+@@ -796,6 +801,15 @@ quote(itemization(
If bf(--perms) is enabled, this option is ignored.
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
-@@ -1383,8 +1397,8 @@ if the receiving rsync is at least versi
+@@ -1381,8 +1395,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).
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.
-@@ -1433,7 +1447,11 @@ quote(itemize(
+@@ -1431,7 +1445,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).
sed -e '/block2\.5/d' \
--- old/testsuite/itemize.test
+++ new/testsuite/itemize.test
-@@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
+@@ -29,15 +29,15 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
->f+++++++ bar/baz/rsync
->f+++++++ foo/config2
->f+++++++ foo/extra
-cL+++++++ foo/sym -> ../bar/baz/rsync
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+>f+++++++++ bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
-@@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2"
+@@ -49,10 +49,10 @@ chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
-@@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync"
+@@ -69,11 +69,11 @@ chmod 777 "$todir/bar/baz/rsync"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
-@@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
+@@ -98,15 +98,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
-@@ -124,8 +124,8 @@ touch "$todir/foo/config2"
+@@ -125,8 +125,8 @@ touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
-@@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
+@@ -135,15 +135,15 @@ $RSYNC -ivvplrtH --copy-dest=../ld "$fro
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cf bar/baz/rsync
-cf foo/config2
-hf foo/extra => foo/config1
-cL..T.... foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+cf bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
-@@ -150,11 +150,11 @@ rm -rf "$todir"
- $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
+@@ -151,11 +151,11 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --copy-dest=../ld "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
-hf foo/extra => foo/config1
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+cd+++++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
-@@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
+@@ -182,15 +182,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-hf bar/baz/rsync
-hf foo/config2
-hf foo/extra => foo/config1
-hL foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+hf bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
-@@ -197,10 +197,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+@@ -198,10 +198,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --dry-run --link-dest=../ld "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+cd+++++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
-@@ -228,14 +228,14 @@ filter_outfile
+@@ -209,10 +209,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cd+++++++ ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cd+++++++ foo/
++cd+++++++++ ./
++cd+++++++++ bar/
++cd+++++++++ bar/baz/
++cd+++++++++ foo/
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
+
+@@ -240,14 +240,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)!
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-.f bar/baz/rsync
-.f foo/config1
-.f foo/config2
-.L foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+.f bar/baz/rsync
+.f foo/config2
+.L foo/sym -> ../bar/baz/rsync
EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
-@@ -243,10 +243,10 @@ rm -rf "$todir"
+@@ -255,10 +255,10 @@ rm -rf "$todir"
$RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
-+.d..t...... ./
++cd+++++++++ ./
+cd+++++++++ bar/
+cd+++++++++ bar/baz/
+cd+++++++++ foo/
EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
--- old/uidlist.c
+++ new/uidlist.c
for (i = 0; i < flist->count; i++)
--- old/util.c
+++ new/util.c
-@@ -1550,3 +1550,31 @@ int bitbag_next_bit(struct bitbag *bb, i
+@@ -1468,3 +1468,31 @@ int bitbag_next_bit(struct bitbag *bb, i
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff