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
- Renamed log_format -> stdout_format.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
c11672f
..
8bdabde
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-27,7
+27,7
@@
extern int verbose;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
extern int dry_run;
extern int do_xfers;
extern int log_format_has_i;
-extern int
daemon_log
_format_has_i;
+extern int
logfile
_format_has_i;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_server;
extern int am_daemon;
@@
-607,14
+607,13
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
int maybe_ATTRS_REPORT, enum logcode code)
{
int save_ignore_times = ignore_times;
int maybe_ATTRS_REPORT, enum logcode code)
{
int save_ignore_times = ignore_times;
- int save_size_only = size_only;
int best_match = -1;
int match_level = 0;
int j = 0;
int best_match = -1;
int match_level = 0;
int j = 0;
- /* We can't let
these send-affecting options affect our checking
- *
for identical files in the alternate basis dir
s. */
- ignore_times =
size_only =
0;
+ /* We can't let
ignore_times affect the unchanged_file() test in
+ *
an alternate-dest dir or we will never find any matche
s. */
+ ignore_times = 0;
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@
-634,7
+633,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
case 2:
if (!unchanged_attrs(file, stp))
continue;
case 2:
if (!unchanged_attrs(file, stp))
continue;
- if (always_checksum
+ if (always_checksum
&& preserve_times
&& cmp_time(stp->st_mtime, file->modtime))
continue;
best_match = j;
&& cmp_time(stp->st_mtime, file->modtime))
continue;
best_match = j;
@@
-645,7
+644,6
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
} while (basis_dir[++j] != NULL);
ignore_times = save_ignore_times;
} while (basis_dir[++j] != NULL);
ignore_times = save_ignore_times;
- size_only = save_size_only;
if (!match_level)
return -1;
if (!match_level)
return -1;
@@
-672,7
+670,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
@@
-694,7
+692,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
@@
-770,7
+768,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code =
daemon_log
_format_has_i || dry_run
+ code =
logfile
_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
@@
-1339,9
+1337,9
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
- code =
daemon_log
_format_has_i ? 0 : FLOG;
+ code =
logfile
_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
} else if (am_daemon) {
- itemizing =
daemon_log
_format_has_i && do_xfers;
+ itemizing =
logfile
_format_has_i && do_xfers;
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
maybe_ATTRS_REPORT = ATTRS_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {