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
Changed a couple log_recv() calls back to log_send().
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
4c34deb
..
4bf8b8a
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-24,7
+24,7
@@
extern int verbose;
extern int dry_run;
extern int verbose;
extern int dry_run;
-extern int
itemize_changes
;
+extern int
daemon_log_format_has_i
;
extern int preserve_times;
extern int omit_dir_times;
extern int am_root;
extern int preserve_times;
extern int omit_dir_times;
extern int am_root;
@@
-231,10
+231,12
@@
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
#endif
if (verbose > 1 && flags & PERMS_REPORT) {
#endif
if (verbose > 1 && flags & PERMS_REPORT) {
+ enum logcode code = daemon_log_format_has_i || dry_run
+ ? FCLIENT : FINFO;
if (updated)
if (updated)
- rprintf(
FINFO
, "%s\n", safe_fname(fname));
+ rprintf(
code
, "%s\n", safe_fname(fname));
else
else
- rprintf(
FINFO
, "%s is uptodate\n", safe_fname(fname));
+ rprintf(
code
, "%s is uptodate\n", safe_fname(fname));
}
return updated;
}
}
return updated;
}