git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0607c30
)
Fixed the 'T' itemized output for a symlink the right way this time.
author
Wayne Davison
<wayned@samba.org>
Tue, 11 Mar 2008 21:50:21 +0000
(14:50 -0700)
committer
Wayne Davison
<wayned@samba.org>
Wed, 12 Mar 2008 00:35:49 +0000
(17:35 -0700)
generator.c
patch
|
blob
|
history
rsync.c
patch
|
blob
|
history
diff --git
a/generator.c
b/generator.c
index 2d5bd12848fc10d50c059103c1e2ba339d69b17c..b1634bd5edfdc060dd7885f92f21af57819c27e3 100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-27,7
+27,6
@@
extern int dry_run;
extern int do_xfers;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
extern int do_xfers;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
-extern int receiver_symlink_times;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_server;
extern int am_daemon;
@@
-2081,7
+2080,7
@@
void generate_files(int f_out, const char *local_name)
need_retouch_dir_times = preserve_times > 1;
lull_mod = allowed_lull * 5;
symlink_timeset_failed_flags = ITEM_REPORT_TIME
need_retouch_dir_times = preserve_times > 1;
lull_mod = allowed_lull * 5;
symlink_timeset_failed_flags = ITEM_REPORT_TIME
-
| (receiver_symlink_times ? ITEM_REPORT_TIMEFAIL : 0
);
+
| (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0
);
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
diff --git
a/rsync.c
b/rsync.c
index 827e8d8911f565538cfb61f3c5c205ef2ece0a4e..302971fc362dad863fcd2dde33aeb948f86ebbe9 100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-41,7
+41,6
@@
extern int am_generator;
extern int am_starting_up;
extern int allow_8bit_chars;
extern int protocol_version;
extern int am_starting_up;
extern int allow_8bit_chars;
extern int protocol_version;
-extern int receiver_symlink_times;
extern int uid_ndx;
extern int gid_ndx;
extern int inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
extern int inc_recurse;
@@
-400,7
+399,7
@@
int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
}
if (ret == 0) /* ret == 1 if symlink could not be set */
updated = 1;
}
if (ret == 0) /* ret == 1 if symlink could not be set */
updated = 1;
- else
if (receiver_symlink_times)
+ else
file->flags |= FLAG_TIME_FAILED;
}
file->flags |= FLAG_TIME_FAILED;
}