Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some patch fuzz.
[rsync/rsync-patches.git]
/
acls.diff
diff --git
a/acls.diff
b/acls.diff
index
f1ea47d
..
c86aa66
100644
(file)
--- 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
+ 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
- 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
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,109
6
@@
+@@ -0,0 +1,109
3
@@
+/*
+ * Handle passing Access Control Lists between systems.
+ *
+/*
+ * Handle passing Access Control Lists between systems.
+ *
@@
-63,9
+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 read_only;
+extern int list_only;
+extern int orig_umask;
-+extern int preserve_acls;
-+extern int flist_extra_ndx;
-+extern unsigned int file_struct_len;
+
+/* === ACL structures === */
+
+
+/* === ACL structures === */
+
@@
-921,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)
+#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
+
+ old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
+#endif
+
@@
-1221,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... */
/* 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
--- old/configure.in
+++ new/configure.in
-@@ -5
37,6 +537
,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -5
42,6 +542
,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CHECK_LIB(resolv, strcasecmp)
fi
AC_CHECK_LIB(resolv, strcasecmp)
fi
@@
-1235,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.
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.
-@@ -80
1,6 +806
,78 @@ AC_SUBST(OBJ_RESTORE)
+@@ -80
6,6 +811
,78 @@ AC_SUBST(OBJ_RESTORE)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
AC_SUBST(CC_SHOBJ_FLAG)
AC_SUBST(BUILD_POPT)
@@
-1316,7
+1324,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -4
0,6 +40
,7 @@ extern int filesfrom_fd;
+@@ -4
1,6 +41
,7 @@ extern int filesfrom_fd;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
@@
-1333,21
+1341,21
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -6
24,6 +627
,12 @@ static struct file_struct *recv_file_ent
+@@ -6
62,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)
}
#endif
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
-+ extra_len += (S_ISDIR(mode) ? 2 : 1) *
sizeof (union flist_extras)
;
++ extra_len += (S_ISDIR(mode) ? 2 : 1) *
EXTRA_LEN
;
+#endif
+
if (always_checksum && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
+#endif
+
if (always_checksum && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
-@@ -7
36,6 +745
,11 @@ static struct file_struct *recv_file_ent
- read_buf(f, bp, checksum_len);
+@@ -7
99,6 +808
,11 @@ static struct file_struct *recv_file_ent
+
read_buf(f, bp, checksum_len);
}
+#ifdef SUPPORT_ACLS
}
+#ifdef SUPPORT_ACLS
@@
-1358,8
+1366,8
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return file;
}
return file;
}
-@@ -
996,6 +1010
,9 @@ static struct file_struct *send_file_nam
-
unsigned shor
t flags)
+@@ -
1068,6 +1082
,9 @@ static struct file_struct *send_file_nam
+
in
t flags)
{
struct file_struct *file;
+#ifdef SUPPORT_ACLS
{
struct file_struct *file;
+#ifdef SUPPORT_ACLS
@@
-1368,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);
file = make_file(fname, flist, stp, flags,
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -10
05,11 +1022,24
@@ static struct file_struct *send_file_nam
+@@ -10
77,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);
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
@@
-1385,11
+1393,14
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
flist_expand(flist);
flist->files[flist->count++] = file;
flist_expand(flist);
flist->files[flist->count++] = file;
- send_file_entry(file, f);
+- if (f >= 0)
++ if (f >= 0) {
+ send_file_entry(file, f, flist->count - 1);
+#ifdef SUPPORT_ACLS
+#ifdef SUPPORT_ACLS
-+
if (preserve_acls && f >= 0
)
-+ send_acl(&sx, f);
++
if (preserve_acls
)
++
send_acl(&sx, f);
+#endif
+#endif
++ }
return file;
}
return file;
}
@@
-1411,16
+1422,15
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
-@@ -518,2
2 +520,27
@@ static void do_delete_pass(struct file_l
+@@ -518,2
1 +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)
{
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
-- && (unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
-+ && (unsigned)(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 != F_UID(file))
return 0;
- if (am_root && preserve_uid && st->st_uid != F_UID(file))
@@
-1444,7
+1454,7
@@
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! */
int32 iflags, uchar fnamecmp_type, const char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
-@@ -54
1,20 +548
,24 @@ void itemize(struct file_struct *file, i
+@@ -54
0,20 +547
,24 @@ void itemize(struct file_struct *file, i
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
@@
-1457,8
+1467,8
@@
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;
- || (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 (
(unsigned)(st->st_mode & CHMOD_BITS) != (file->mode &
CHMOD_BITS))
-+ if (
(unsigned)(sxp->st.st_mode & CHMOD_BITS) != (file->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 && F_UID(file) != st->st_uid)
+ if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
+ if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
@@
-1474,7
+1484,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
} else
iflags |= ITEM_IS_NEW;
} else
iflags |= ITEM_IS_NEW;
-@@ -80
9,7 +820
,7 @@ void check_for_finished_hlinks(int itemi
+@@ -80
8,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,
* 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,
@@
-1483,7
+1493,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
enum logcode code)
{
int best_match = -1;
enum logcode code)
{
int best_match = -1;
-@@ -81
8,7 +829
,7 @@ static int try_dests_reg(struct file_str
+@@ -81
7,7 +828
,7 @@ static int try_dests_reg(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-1492,7
+1502,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
switch (match_level) {
case 0:
continue;
switch (match_level) {
case 0:
-@@ -82
6,16 +837
,20 @@ static int try_dests_reg(struct file_str
+@@ -82
5,16 +836
,20 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
match_level = 1;
/* FALL THROUGH */
case 1:
@@
-1516,7
+1526,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
best_match = j;
match_level = 3;
continue;
best_match = j;
match_level = 3;
-@@ -8
50,7 +865
,7 @@ static int try_dests_reg(struct file_str
+@@ -8
49,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);
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-1525,7
+1535,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return -1;
}
return -1;
}
-@@ -8
60,16 +875
,25 @@ static int try_dests_reg(struct file_str
+@@ -8
59,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 && F_IS_HLINKED(file))
if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
if (preserve_hard_links && F_IS_HLINKED(file))
@@
-1555,7
+1565,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
return -2;
if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
return -2;
-@@ -88
6,8 +910
,13 @@ static int try_dests_reg(struct file_str
+@@ -88
5,8 +909
,13 @@ static int try_dests_reg(struct file_str
}
return -1;
}
}
return -1;
}
@@
-1571,7
+1581,7
@@
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)
set_file_attrs(fname, file, NULL, 0);
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
-@@ -89
8,7 +927
,7 @@ static int try_dests_reg(struct file_str
+@@ -89
7,7 +926
,7 @@ static int try_dests_reg(struct file_str
}
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
}
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
@@
-1580,7
+1590,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#endif
return -2;
}
#endif
return -2;
}
-@@ -9
10,7 +939
,7 @@ static int try_dests_reg(struct file_str
+@@ -9
09,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,
* 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,
@@
-1589,7
+1599,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
enum logcode code)
{
char lnk[MAXPATHLEN];
enum logcode code)
{
char lnk[MAXPATHLEN];
-@@ -94
3,24 +972
,24 @@ static int try_dests_non(struct file_str
+@@ -94
2,24 +971
,24 @@ static int try_dests_non(struct file_str
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-1619,7
+1629,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
break;
#endif
continue;
break;
#endif
-@@ -97
5,7 +1004
,7 @@ static int try_dests_non(struct file_str
+@@ -97
4,7 +1003
,7 @@ static int try_dests_non(struct file_str
case TYPE_SPECIAL:
case TYPE_DEVICE:
devp = F_RDEV_P(file);
case TYPE_SPECIAL:
case TYPE_DEVICE:
devp = F_RDEV_P(file);
@@
-1628,7
+1638,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
continue;
break;
#ifdef SUPPORT_LINKS
continue;
break;
#ifdef SUPPORT_LINKS
-@@ -99
2,7 +1021
,11 @@ static int try_dests_non(struct file_str
+@@ -99
1,7 +1020
,11 @@ static int try_dests_non(struct file_str
match_level = 2;
best_match = j;
}
match_level = 2;
best_match = j;
}
@@
-1641,7
+1651,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
match_level = 3;
best_match = j;
break;
match_level = 3;
best_match = j;
break;
-@@ -100
5,7 +1038
,7 @@ static int try_dests_non(struct file_str
+@@ -100
4,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);
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-1650,7
+1660,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return -1;
}
return -1;
}
-@@ -103
6,7 +1069
,15 @@ static int try_dests_non(struct file_str
+@@ -103
5,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;
: ITEM_LOCAL_CHANGE
+ (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
char *lp = match_level == 3 ? "" : NULL;
@@
-1667,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",
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s%s is uptodate\n",
-@@ -104
9,6 +1090
,7 @@ static int try_dests_non(struct file_str
+@@ -104
8,6 +1089
,7 @@ static int try_dests_non(struct file_str
}
static int phase = 0;
}
static int phase = 0;
@@
-1675,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
/* 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
-@@ -106
9,7 +1111
,8 @@ static void recv_generator(char *fname,
+@@ -106
8,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;
static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
@@
-1685,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;
struct file_struct *back_file = NULL;
int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
-@@ -112
5,6 +1168
,9 @@ static void recv_generator(char *fname,
+@@ -112
4,6 +1167
,9 @@ static void recv_generator(char *fname,
} else if (!dry_run)
return;
}
} else if (!dry_run)
return;
}
@@
-1695,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;
if (dry_run > 1) {
statret = -1;
stat_errno = ENOENT;
-@@ -113
2,7 +1178
,7 @@ static void recv_generator(char *fname,
+@@ -113
1,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
const char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
@@
-1704,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",
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
-@@ -114
4,6 +1190
,10 @@ static void recv_generator(char *fname,
+@@ -114
3,6 +1189
,10 @@ static void recv_generator(char *fname,
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
}
if (fuzzy_basis)
need_fuzzy_dirlist = 1;
@@
-1715,7
+1725,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
parent_dirname = dn;
}
parent_dirname = dn;
-@@ -115
3,7 +1203
,7 @@ static void recv_generator(char *fname,
+@@ -115
2,7 +1202
,7 @@ static void recv_generator(char *fname,
need_fuzzy_dirlist = 0;
}
need_fuzzy_dirlist = 0;
}
@@
-1724,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;
}
keep_dirlinks && S_ISDIR(file->mode));
stat_errno = errno;
}
-@@ -117
1,8 +1221
,9 @@ static void recv_generator(char *fname,
+@@ -117
0,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
* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {
int exists = statret == 0
@@
-1736,7
+1746,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (S_ISDIR(file->mode)) {
}
if (S_ISDIR(file->mode)) {
-@@ -118
1,8 +1232
,8 @@ static void recv_generator(char *fname,
+@@ -118
0,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. */
* 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. */
@@
-1747,7
+1757,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
return;
statret = -1;
}
return;
statret = -1;
}
-@@ -119
1,14 +1242
,14 @@ static void recv_generator(char *fname,
+@@ -119
0,14 +1241
,14 @@ static void recv_generator(char *fname,
dry_run++;
}
real_ret = statret;
dry_run++;
}
real_ret = statret;
@@
-1764,7
+1774,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
itemizing, code);
if (j == -2) {
itemizing = 0;
itemizing, code);
if (j == -2) {
itemizing = 0;
-@@ -120
7,7 +1258
,11 @@ static void recv_generator(char *fname,
+@@ -120
6,7 +1257
,11 @@ static void recv_generator(char *fname,
statret = 1;
}
if (itemizing && f_out != -1) {
statret = 1;
}
if (itemizing && f_out != -1) {
@@
-1777,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) {
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -122
7,21 +1282
,21 @@ static void recv_generator(char *fname,
+@@ -122
6,21 +1281
,21 @@ static void recv_generator(char *fname,
return;
}
}
return;
}
}
@@
-1797,7
+1807,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
#ifdef SUPPORT_HARD_LINKS
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_FIRST(file)
+ 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))
- && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
- return;
+ && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
@@
-1805,7
+1815,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#endif
if (preserve_links && S_ISLNK(file->mode)) {
#endif
if (preserve_links && S_ISLNK(file->mode)) {
-@@ -126
1,17 +1316
,17 @@ static void recv_generator(char *fname,
+@@ -126
0,17 +1315
,17 @@ static void recv_generator(char *fname,
char lnk[MAXPATHLEN];
int len;
char lnk[MAXPATHLEN];
int len;
@@
-1827,7
+1837,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#endif
if (remove_source_files == 1)
goto return_with_success;
#endif
if (remove_source_files == 1)
goto return_with_success;
-@@ -127
9,10 +1334
,10 @@ static void recv_generator(char *fname,
+@@ -127
8,10 +1333
,10 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
}
/* Not the right symlink (or not a symlink), so
* delete it. */
@@
-1840,7
+1850,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
-@@ -130
7,7 +1362
,7 @@ static void recv_generator(char *fname,
+@@ -130
6,7 +1361
,7 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@
-1849,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)
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -133
3,33 +1388
,38 @@ static void recv_generator(char *fname,
+@@ -133
2,33 +1387
,38 @@ static void recv_generator(char *fname,
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
if (statret == 0) {
char *t;
if (IS_DEVICE(file->mode)) {
@@
-1864,9
+1874,9
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
t = "special file";
}
if (statret == 0
t = "special file";
}
if (statret == 0
-- &&
(unsigned)(st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS
)
+- &&
BITS_EQUAL(st.st_mode, file->mode, _S_IFMT
)
- && st.st_rdev == rdev) {
- && st.st_rdev == rdev) {
-+ &&
(unsigned)(sx.st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS
)
++ &&
BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT
)
+ && sx.st.st_rdev == rdev) {
/* The device or special file is identical. */
- if (itemizing)
+ && sx.st.st_rdev == rdev) {
/* The device or special file is identical. */
- if (itemizing)
@@
-1899,7
+1909,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
-@@ -138
9,7 +1449
,11 @@ static void recv_generator(char *fname,
+@@ -138
8,7 +1448
,11 @@ static void recv_generator(char *fname,
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
} else {
set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
@@
-1912,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)
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code != FNONE && verbose)
-@@ -140
1,7 +1465
,7 @@ static void recv_generator(char *fname,
+@@ -140
0,7 +1464
,7 @@ static void recv_generator(char *fname,
if (remove_source_files == 1)
goto return_with_success;
}
if (remove_source_files == 1)
goto return_with_success;
}
@@
-1921,7
+1931,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (!S_ISREG(file->mode)) {
}
if (!S_ISREG(file->mode)) {
-@@ -143
5,7 +1499
,7 @@ static void recv_generator(char *fname,
+@@ -143
4,7 +1498
,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
}
if (update_only && statret == 0
@@
-1930,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;
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
-@@ -144
4,20 +1508
,20 @@ static void recv_generator(char *fname,
+@@ -144
3,20 +1507
,20 @@ static void recv_generator(char *fname,
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
@@
-1955,7
+1965,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
}
if (j >= 0) {
fnamecmp = fnamecmpbuf;
-@@ -146
7,7 +1531
,7 @@ static void recv_generator(char *fname,
+@@ -146
6,7 +1530
,7 @@ static void recv_generator(char *fname,
}
real_ret = statret;
}
real_ret = statret;
@@
-1964,7
+1974,7
@@
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
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
-@@ -148
6,7 +1550
,7 @@ static void recv_generator(char *fname,
+@@ -148
5,7 +1549
,7 @@ static void recv_generator(char *fname,
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
}
@@
-1973,7
+1983,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
-@@ -150
5,38 +1569,52
@@ static void recv_generator(char *fname,
+@@ -150
4,36 +1568,41
@@ static void recv_generator(char *fname,
return;
}
return;
}
@@
-1991,26
+2001,16
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
- if (itemizing) {
-- itemize(file, ndx, statret, &st,
+- 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 && statret == 0)
+ get_acl(fnamecmp, &sx);
+#endif
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && statret == 0)
+ get_acl(fnamecmp, &sx);
+#endif
-+ 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);
-+ //}
-+ assert(fnamecmp_type == FNAMECMP_FNAME);
-+#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);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
+ set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
@@
-2034,10
+2034,10
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
-@@ -15
61,16 +1639
,20 @@ static void recv_generator(char *fname,
+@@ -15
58,16 +1627
,20 @@ static void recv_generator(char *fname,
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
- return;
+ goto cleanup;
#endif
- return;
+ goto cleanup;
#endif
@@
-2057,7
+2057,7
@@
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);
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
-@@ -15
81,7 +1663
,7 @@ static void recv_generator(char *fname,
+@@ -15
78,7 +1651
,7 @@ static void recv_generator(char *fname,
full_fname(backupptr));
unmake_file(back_file);
close(fd);
full_fname(backupptr));
unmake_file(back_file);
close(fd);
@@
-2066,7
+2066,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
}
if ((f_copy = do_open(backupptr,
O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -158
9,14 +1671
,14 @@ static void recv_generator(char *fname,
+@@ -158
6,14 +1659
,14 @@ static void recv_generator(char *fname,
full_fname(backupptr));
unmake_file(back_file);
close(fd);
full_fname(backupptr));
unmake_file(back_file);
close(fd);
@@
-2083,7
+2083,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
}
if (verbose > 2)
}
if (verbose > 2)
-@@ -161
8,26 +1700
,34 @@ static void recv_generator(char *fname,
+@@ -161
5,26 +1688
,34 @@ static void recv_generator(char *fname,
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
@@
-2093,7
+2093,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+ get_acl(fnamecmp, &real_sx);
+#endif
+ itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
+ get_acl(fnamecmp, &real_sx);
+#endif
+ itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
- fuzzy_file ?
F_BASENAME(fuzzy_file)
: NULL);
+ fuzzy_file ?
fuzzy_file->basename
: NULL);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
+ free_acl(&real_sx);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
+ free_acl(&real_sx);
@@
-2124,7
+2124,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (f_copy >= 0) {
close(f_copy);
if (f_copy >= 0) {
close(f_copy);
-@@ -16
50,6 +1740
,13 @@ static void recv_generator(char *fname,
+@@ -16
47,6 +1728
,13 @@ static void recv_generator(char *fname,
}
close(fd);
}
close(fd);
@@
-2138,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)
}
void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -171
6,6 +1813
,8 @@ void generate_files(int f_out, struct fi
+@@ -171
3,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;
* notice that and let us know via the redo pipe (or its closing). */
ignore_timeout = 1;
@@
-2155,9
+2155,9
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
extern int link_dest;
+extern int preserve_acls;
extern int make_backups;
extern int link_dest;
+extern int preserve_acls;
extern int make_backups;
+ extern int protocol_version;
extern int remove_source_files;
extern int remove_source_files;
- extern int stdout_format_has_i;
-@@ -119,15 +120,19 @@ void match_hard_links(void)
+@@ -268,15 +269,19 @@ void match_hard_links(void)
}
static int maybe_hard_link(struct file_struct *file, int ndx,
}
static int maybe_hard_link(struct file_struct *file, int ndx,
@@
-2181,7
+2181,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
-@@ -
148,7 +153
,11 @@ static int maybe_hard_link(struct file_s
+@@ -
297,7 +302
,11 @@ static int maybe_hard_link(struct file_s
if (hard_link_one(file, fname, oldname, 0)) {
if (itemizing) {
if (hard_link_one(file, fname, oldname, 0)) {
if (itemizing) {
@@
-2194,7
+2194,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
realname);
}
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
realname);
}
-@@ -
162,7 +171
,7 @@ static int maybe_hard_link(struct file_s
+@@ -
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,
/* 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,
@@
-2203,7
+2203,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
enum logcode code)
{
STRUCT_STAT prev_st;
enum logcode code)
{
STRUCT_STAT prev_st;
-@@ -
213,18 +222
,20 @@ int hard_link_check(struct file_struct *
+@@ -
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];
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];
@@
-2229,7
+2229,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
if (verbose < 2 || !stdout_format_has_i) {
itemizing = 0;
code = FNONE;
if (verbose < 2 || !stdout_format_has_i) {
itemizing = 0;
code = FNONE;
-@@ -
233,16 +244
,36 @@ int hard_link_check(struct file_struct *
+@@ -
382,16 +393
,36 @@ int hard_link_check(struct file_struct *
}
break;
}
}
break;
}
@@
-2270,7
+2270,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
realname, itemizing, code) < 0)
return -1;
realname, itemizing, code) < 0)
return -1;
-@@ -
277,7 +308
,8 @@ void finish_hard_link(struct file_struct
+@@ -
426,7 +457
,8 @@ void finish_hard_link(struct file_struct
STRUCT_STAT *stp, int itemizing, enum logcode code,
int alt_dest)
{
STRUCT_STAT *stp, int itemizing, enum logcode code,
int alt_dest)
{
@@
-2280,7
+2280,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
char alt_name[MAXPATHLEN], *prev_name;
const char *our_name;
int prev_statret, ndx, prev_ndx = F_HL_PREV(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
+@@ -
450,14 +482
,24 @@ void finish_hard_link(struct file_struct
} else
our_name = fname;
} else
our_name = fname;
@@
-5630,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;
int preserve_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
-@@ -19
9,6 +200
,7 @@ static void print_rsync_version(enum log
+@@ -19
8,6 +199
,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
@@
-5638,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;
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -21
5,6 +217
,10 @@ static void print_rsync_version(enum log
+@@ -21
4,6 +216
,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
hardlinks = "";
#endif
@@
-5649,7
+5649,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#ifdef SUPPORT_LINKS
links = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -23
3,8 +239
,8 @@ static void print_rsync_version(enum log
+@@ -23
2,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);
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
@@
-5660,7
+5660,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -2
80,7 +286
,7 @@ void usage(enum logcode F)
+@@ -2
79,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");
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");
@@
-5669,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");
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");
-@@ -30
2,6 +308
,9 @@ void usage(enum logcode F)
+@@ -30
1,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");
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");
@@
-5679,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");
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");
-@@ -42
2,6 +431
,9 @@ static struct poptOption long_options[]
+@@ -42
1,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 },
{"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 },
@@
-5689,7
+5689,7
@@
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 },
{"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 },
-@@ -108
7,6 +1099
,24 @@ int parse_arguments(int *argc, const cha
+@@ -108
6,6 +1098
,24 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
usage(FINFO);
exit_cleanup(0);
@@
-5714,16
+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. */
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1223,6 +1253,8 @@ int parse_arguments(int *argc, const cha
- preserve_uid = ++flist_extra_cnt;
- if (preserve_gid)
- preserve_gid = ++flist_extra_cnt;
-+ if (preserve_acls)
-+ preserve_acls = ++flist_extra_cnt;
-
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
-@@ -1534,6 +1566,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';
if (preserve_hard_links)
argstr[x++] = 'H';
@@
-5938,8
+5929,8
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#endif
+
#ifdef HAVE_CHMOD
+#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,
int ret = do_chmod(fname, new_mode);
if (ret < 0) {
rsyserr(FERROR, errno,
@@
-5964,7
+5955,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
--- old/rsync.h
+++ new/rsync.h
--- old/rsync.h
+++ new/rsync.h
-@@ -5
00,6 +500,14 @@ struct idev
{
+@@ -5
32,6 +532,14 @@ struct idev_node
{
#define IN_LOOPBACKNET 127
#endif
#define IN_LOOPBACKNET 127
#endif
@@
-5978,21
+5969,29
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+
#define GID_NONE ((gid_t)-1)
+
#define GID_NONE ((gid_t)-1)
- struct file_struct {
-@@ -548,10 +556,12 @@ extern int preserve_gid;
+ 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: */
/* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->u
id
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->
gid
+ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->u
num
+ #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_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
/* These items are per-entry optional and mutally exclusive: */
- #define F_HL_
IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+ #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).) */
#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).) */
-@@ -
687,6 +697
,17 @@ struct stats {
+@@ -
722,6 +733
,17 @@ struct stats {
struct chmod_mode_struct;
struct chmod_mode_struct;
@@
-6010,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"
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -7
05,6 +726
,16 @@ struct chmod_mode_struct;
+@@ -7
40,6 +762
,16 @@ struct chmod_mode_struct;
#define NORETURN __attribute__((__noreturn__))
#endif
#define NORETURN __attribute__((__noreturn__))
#endif
@@
-6072,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
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,1
5
@@ quote(itemization(
+@@ -805,6 +810,1
4
@@ quote(itemization(
If bf(--perms) is enabled, this option is ignored.
If bf(--perms) is enabled, this option is ignored.
@@
-6080,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).
+
+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
+
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 +141
6
,8 @@ if the receiving rsync is at least versi
+@@ -1402,8 +141
5
,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).
with older versions of rsync, but that also turns on the output of other
verbose messages).
@@
-6099,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.
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 +146
6
,11 @@ quote(itemization(
+@@ -1452,7 +146
5
,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).
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).
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff