In read_batch mode, we read ints from the new batch_gen_fd pipe and

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 5e04efe..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,
-                       "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",
@@ -767,7 +772,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                keep_partial = 0;
 #else
                snprintf(err_buf, sizeof err_buf,
-                        "inplace is not supported on this %s\n",
+                        "--inplace is not supported on this %s\n",
                         am_server ? "server" : "client");
                return 0;
 #endif