From 361198935518a80e57e26f337c62c06d660dab6b Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 21 Jul 2004 22:50:11 +0000 Subject: [PATCH] Complain if the user combines --read-batch with --files-from. --- options.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/options.c b/options.c index 27457f09..d60f54ee 100644 --- 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, - "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) { @@ -672,6 +672,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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", -- 2.34.1