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
Handle EINTR in a couple places where we handle the --file-from I/O.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b64c031
..
f1b6a46
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-521,10
+521,10
@@
int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
return 0;
if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
return 0;
- if (am_root && preserve_uid && sxp->st.st_uid !=
F_UID
(file))
+ if (am_root && preserve_uid && sxp->st.st_uid !=
(uid_t)F_OWNER
(file))
return 0;
return 0;
- if (preserve_gid &&
F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID
(file))
+ if (preserve_gid &&
!(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP
(file))
return 0;
#ifdef SUPPORT_ACLS
return 0;
#ifdef SUPPORT_ACLS
@@
-565,10
+565,10
@@
void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root &&
F_UID
(file) != sxp->st.st_uid)
+ if (preserve_uid && am_root &&
(uid_t)F_OWNER
(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid &&
F_GID(file) != GID_NONE
- && sxp->st.st_gid !=
F_GID
(file))
+ if (preserve_gid &&
!(file->flags & FLAG_SKIP_GROUP)
+ && sxp->st.st_gid !=
(gid_t)F_GROUP
(file))
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
@@
-1720,9
+1720,10
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
static void touch_up_dirs(struct file_list *flist, int ndx)
{
static void touch_up_dirs(struct file_list *flist, int ndx)
{
+ static int counter = 0;
struct file_struct *file;
char *fname;
struct file_struct *file;
char *fname;
- int i,
j,
start, end;
+ int i, start, end;
if (ndx < 0) {
start = 0;
if (ndx < 0) {
start = 0;
@@
-1732,8
+1733,13
@@
static void touch_up_dirs(struct file_list *flist, int ndx)
/* Fix any directory permissions that were modified during the
* transfer and/or re-set any tweaked modified-time values. */
/* Fix any directory permissions that were modified during the
* transfer and/or re-set any tweaked modified-time values. */
- for (i = start
, j = 0; i <= end; i
++) {
+ for (i = start
; i <= end; i++, counter
++) {
file = flist->files[i];
file = flist->files[i];
+ if (verbose > 3) {
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
+ NS(fname), i);
+ }
if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode)
|| file->flags & FLAG_MISSING_DIR)
continue;
if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode)
|| file->flags & FLAG_MISSING_DIR)
continue;
@@
-1744,9
+1750,9
@@
static void touch_up_dirs(struct file_list *flist, int ndx)
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
set_modtime(fname, file->modtime, file->mode);
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
set_modtime(fname, file->modtime, file->mode);
- if (allowed_lull && !(
++j
% lull_mod))
+ if (allowed_lull && !(
counter
% lull_mod))
maybe_send_keepalive();
maybe_send_keepalive();
- else if (!(
j % 200
))
+ else if (!(
counter & 0xFF
))
maybe_flush_socket(0);
}
}
maybe_flush_socket(0);
}
}
@@
-1942,7
+1948,7
@@
void generate_files(int f_out, const char *local_name)
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
- else if (!(i
% 200
))
+ else if (!(i
& 0xFF
))
maybe_flush_socket(0);
}
maybe_flush_socket(0);
}