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
More improvements for abnormal exits.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
11a7cb9
..
8038feb
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-91,7
+91,6
@@
extern int max_delete;
extern int force_delete;
extern int one_file_system;
extern int skipped_deletes;
extern int force_delete;
extern int one_file_system;
extern int skipped_deletes;
-extern struct stats stats;
extern dev_t filesystem_dev;
extern mode_t orig_umask;
extern uid_t our_uid;
extern dev_t filesystem_dev;
extern mode_t orig_umask;
extern uid_t our_uid;
@@
-417,7
+416,7
@@
int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fname, sxp);
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fname, sxp);
- if (set_acl(NULL, file, sxp
) == 0
)
+ if (set_acl(NULL, file, sxp
, file->mode)
)
return 0;
}
#endif
return 0;
}
#endif
@@
-476,7
+475,7
@@
void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fnamecmp, sxp);
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fnamecmp, sxp);
- if (set_acl(NULL, file, sxp
) == 0
)
+ if (set_acl(NULL, file, sxp
, file->mode)
)
iflags |= ITEM_REPORT_ACL;
}
#endif
iflags |= ITEM_REPORT_ACL;
}
#endif
@@
-516,7
+515,7
@@
void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
#endif
} else if (ndx >= 0) {
enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
#endif
} else if (ndx >= 0) {
enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
- log_item(code, file,
&stats,
iflags, xname);
+ log_item(code, file, iflags, xname);
}
}
}
}
}
}
@@
-1923,7
+1922,7
@@
static void touch_up_dirs(struct file_list *flist, int ndx)
STRUCT_STAT st;
if (link_stat(fname, &st, 0) == 0
&& cmp_time(st.st_mtime, file->modtime) != 0)
STRUCT_STAT st;
if (link_stat(fname, &st, 0) == 0
&& cmp_time(st.st_mtime, file->modtime) != 0)
- set_modtime(fname, file->modtime, file->mode);
+ set_modtime(fname, file->modtime,
F_MOD_NSEC(file),
file->mode);
}
if (counter >= loopchk_limit) {
if (allowed_lull)
}
if (counter >= loopchk_limit) {
if (allowed_lull)