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
Last of the cleanup before the patching starts.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
6deafd0
..
67349ac
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-707,9
+707,9
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
backup_dir_buf[backup_dir_len++] = '/';
backup_dir_buf[backup_dir_len] = '\0';
}
backup_dir_buf[backup_dir_len++] = '/';
backup_dir_buf[backup_dir_len] = '\0';
}
- if (verbose > 1)
+ if (verbose > 1
&& !am_sender
)
rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
- } else if (!backup_suffix_len) {
+ } else if (!backup_suffix_len
&& (!am_server || !am_sender)
) {
rprintf(FERROR,
"--suffix cannot be a null string without --backup-dir\n");
exit_cleanup(RERR_SYNTAX);
rprintf(FERROR,
"--suffix cannot be a null string without --backup-dir\n");
exit_cleanup(RERR_SYNTAX);
@@
-720,7
+720,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (files_from) {
char *colon;
if (files_from) {
char *colon;
- if (*argc != 2) {
+ if (*argc != 2
&& !(am_server && am_sender && *argc == 1)
) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}