Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3381b77
)
Complain if the user combines --read-batch with --files-from.
author
Wayne Davison
<wayned@samba.org>
Wed, 21 Jul 2004 22:50:11 +0000
(22:50 +0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 21 Jul 2004 22:50:11 +0000
(22:50 +0000)
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
27457f0
..
d60f54e
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-651,7
+651,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (write_batch && read_batch) {
rprintf(FERROR,
if (write_batch && read_batch) {
rprintf(FERROR,
- "
write-batch and
read-batch can not be used together\n");
+ "
--write-batch and --
read-batch can not be used together\n");
exit_cleanup(RERR_SYNTAX);
}
if (write_batch || read_batch) {
exit_cleanup(RERR_SYNTAX);
}
if (write_batch || read_batch) {
@@
-672,6
+672,11
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
batch_name = NULL;
}
}
batch_name = NULL;
}
}
+ if (read_batch && files_from) {
+ rprintf(FERROR,
+ "--read-batch cannot be used with --files-from\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
rprintf(FERROR,
"the batch-file name must be %d characters or less.\n",
if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
rprintf(FERROR,
"the batch-file name must be %d characters or less.\n",