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
Fixed a couple iconv loops to properly handle incomplete chars
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
5f6afd6
..
acf4b88
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-392,7
+392,7
@@
static void do_delete_pass(void)
int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
{
int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
{
-#if
!defined HAVE_LUTIMES || !defined HAVE_U
TIMES
+#if
ndef CAN_SET_SYMLINK_
TIMES
if (S_ISLNK(file->mode)) {
;
} else
if (S_ISLNK(file->mode)) {
;
} else
@@
-417,7
+417,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
@@
-440,7
+440,7
@@
void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
int keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? preserve_times > 1 :
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
int keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? preserve_times > 1 :
-#if
defined HAVE_LUTIMES && defined HAVE_U
TIMES
+#if
def CAN_SET_SYMLINK_
TIMES
1;
#else
!S_ISLNK(file->mode);
1;
#else
!S_ISLNK(file->mode);
@@
-476,7
+476,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
@@
-1923,7
+1923,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)