Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding the --fake-super option.
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
13c8643
..
1eda740
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-32,6
+32,7
@@
extern int verbose;
extern int dry_run;
extern int preserve_acls;
extern int verbose;
extern int dry_run;
extern int preserve_acls;
+extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
@@
-91,15
+92,13
@@
void setup_iconv()
}
#endif
}
#endif
-/* This is used by sender.c with a valid f_out, and by receive.c with
- * f_out = -1. */
-int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
- uchar *type_ptr, char *buf, int *len_ptr)
+int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
+ char *buf, int *len_ptr)
{
int len, iflags = 0;
struct file_list *flist;
uchar fnamecmp_type = FNAMECMP_FNAME;
{
int len, iflags = 0;
struct file_list *flist;
uchar fnamecmp_type = FNAMECMP_FNAME;
- int
verbose_save,
ndx;
+ int ndx;
read_loop:
while (1) {
read_loop:
while (1) {
@@
-125,8
+124,6
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
NDX_FLIST_OFFSET - dir_flist->count);
exit_cleanup(RERR_PROTOCOL);
}
NDX_FLIST_OFFSET - dir_flist->count);
exit_cleanup(RERR_PROTOCOL);
}
- verbose_save = verbose;
- verbose = 0; /* TODO allow verbose messages? */
/* Send everything read from f_in to msg_fd_out. */
send_msg_int(MSG_FLIST, ndx);
/* Send everything read from f_in to msg_fd_out. */
send_msg_int(MSG_FLIST, ndx);
@@
-134,8
+131,6
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
flist = recv_file_list(f_in);
flist->parent_ndx = ndx;
stop_flist_forward();
flist = recv_file_list(f_in);
flist->parent_ndx = ndx;
stop_flist_forward();
-
- verbose = verbose_save;
}
iflags = protocol_version >= 29 ? read_shortint(f_in)
}
iflags = protocol_version >= 29 ? read_shortint(f_in)
@@
-181,11
+176,6
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
ndx, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
ndx, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
- } else if (f_out >= 0) {
- if (inc_recurse)
- send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
- write_ndx_and_attrs(f_out, ndx, iflags,
- fnamecmp_type, buf, len);
}
*iflag_ptr = iflags;
}
*iflag_ptr = iflags;
@@
-228,8
+218,8
@@
mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
return new_mode;
}
return new_mode;
}
-int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
- int flags)
+int set_file_attrs(c
onst c
har *fname, struct file_struct *file, statx *sxp,
+
const char *fnamecmp,
int flags)
{
int updated = 0;
statx sx2;
{
int updated = 0;
statx sx2;
@@
-246,6
+236,9
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
}
#ifdef SUPPORT_ACLS
sx2.acc_acl = sx2.def_acl = NULL;
}
#ifdef SUPPORT_ACLS
sx2.acc_acl = sx2.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+ sx2.xattr = NULL;
#endif
if (!preserve_perms && S_ISDIR(new_mode)
&& sx2.st.st_mode & S_ISGID) {
#endif
if (!preserve_perms && S_ISDIR(new_mode)
&& sx2.st.st_mode & S_ISGID) {
@@
-261,6
+254,13
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
get_acl(fname, sxp);
#endif
get_acl(fname, sxp);
#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && fnamecmp)
+ set_xattr(fname, file, fnamecmp, sxp);
+ if (am_root < 0)
+ set_stat_xattr(fname, file);
+#endif
+
if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME)
if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME)
@@
-298,7
+298,9
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
(long)sxp->st.st_gid, (long)F_GID(file));
}
}
(long)sxp->st.st_gid, (long)F_GID(file));
}
}
- if (do_lchown(fname,
+ if (am_root < 0) {
+ ;
+ } else if (do_lchown(fname,
change_uid ? F_UID(file) : sxp->st.st_uid,
change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
change_uid ? F_UID(file) : sxp->st.st_uid,
change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
@@
-307,7
+309,7
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
change_uid ? "chown" : "chgrp",
full_fname(fname));
goto cleanup;
change_uid ? "chown" : "chgrp",
full_fname(fname));
goto cleanup;
- }
+ }
else
/* a lchown had been done - we have to re-stat if the
* destination had the setuid or setgid bits set due
* to the side effect of the chown call */
/* a lchown had been done - we have to re-stat if the
* destination had the setuid or setgid bits set due
* to the side effect of the chown call */
@@
-334,7
+336,7
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
#ifdef HAVE_CHMOD
if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
#ifdef HAVE_CHMOD
if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
- int ret = do_chmod(fname, new_mode);
+ int ret =
am_root < 0 ? 0 :
do_chmod(fname, new_mode);
if (ret < 0) {
rsyserr(FERROR, errno,
"failed to set permissions on %s",
if (ret < 0) {
rsyserr(FERROR, errno,
"failed to set permissions on %s",
@@
-353,10
+355,16
@@
int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
cleanup:
rprintf(FCLIENT, "%s is uptodate\n", fname);
}
cleanup:
+ if (sxp == &sx2) {
#ifdef SUPPORT_ACLS
#ifdef SUPPORT_ACLS
-
if (preserve_acls && sxp == &sx2
)
- free_acl(&sx2);
+
if (preserve_acls
)
+
free_acl(&sx2);
#endif
#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ free_xattr(&sx2);
+#endif
+ }
return updated;
}
return updated;
}
@@
-378,7
+386,8
@@
RETSIGTYPE sig_int(UNUSED(int val))
* attributes (e.g. permissions, ownership, etc.). If partialptr is not
* NULL and the robust_rename() call is forced to copy the temp file, we
* stage the file into the partial-dir and then rename it into place. */
* attributes (e.g. permissions, ownership, etc.). If partialptr is not
* NULL and the robust_rename() call is forced to copy the temp file, we
* stage the file into the partial-dir and then rename it into place. */
-void finish_transfer(char *fname, char *fnametmp, char *partialptr,
+void finish_transfer(const char *fname, const char *fnametmp,
+ const char *fnamecmp, const char *partialptr,
struct file_struct *file, int ok_to_set_time,
int overwriting_basis)
{
struct file_struct *file, int ok_to_set_time,
int overwriting_basis)
{
@@
-395,7
+404,7
@@
void finish_transfer(char *fname, char *fnametmp, char *partialptr,
return;
/* Change permissions before putting the file into place. */
return;
/* Change permissions before putting the file into place. */
- set_file_attrs(fnametmp, file, NULL,
+ set_file_attrs(fnametmp, file, NULL,
fnamecmp,
ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
/* move tmp file over real file */
ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
/* move tmp file over real file */
@@
-419,7
+428,7
@@
void finish_transfer(char *fname, char *fnametmp, char *partialptr,
fnametmp = partialptr ? partialptr : fname;
do_set_file_attrs:
fnametmp = partialptr ? partialptr : fname;
do_set_file_attrs:
- set_file_attrs(fnametmp, file, NULL,
+ set_file_attrs(fnametmp, file, NULL,
fnamecmp,
ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
if (partialptr) {
ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
if (partialptr) {