Mention updated config files.

[rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index 805acc6fe2aab15422a3e6dcca77f24bf261cb4c..accc4c6e677b639fe870084d914a68a61684a4a1 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1999 Weiss
  * Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-2020 Wayne Davison
+ * Copyright (C) 2004-2022 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,13 +38,10 @@ extern int do_compression;
 extern int inplace;
 extern int append_mode;
 extern int write_batch;
-extern int xfersum_type;
 extern int protocol_version;
 extern int raw_argc, cooked_argc;
 extern char **raw_argv, **cooked_argv;
 extern char *batch_name;
-extern const char *checksum_choice;
-extern const char *compress_choice;
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 #endif
@@ -197,7 +194,7 @@ static int write_opt(const char *opt, const char *arg)
 {
        int len = strlen(opt);
        int err = write(batch_sh_fd, " ", 1) != 1;
-       err = write(batch_sh_fd, opt, len) != len ? 1 : 0; 
+       err = write(batch_sh_fd, opt, len) != len ? 1 : 0;
        if (arg) {
                err |= write(batch_sh_fd, "=", 1) != 1;
                err |= write_arg(arg);
@@ -269,14 +266,6 @@ void write_batch_shell_file(void)
                        err |= write_opt("--exclude-from", "-");
        }
 
-       /* We need to make sure that any protocol-based or negotiated choices get accurately
-        * reflected in the options we save AND that we avoid any need for --read-batch to
-        * do a string-based negotiation (since we don't write them into the file). */
-       if (do_compression)
-               err |= write_opt("--compress-choice", compress_choice);
-       if (strchr(checksum_choice, ',') || xfersum_type != parse_csum_name(NULL, -1))
-               err |= write_opt("--checksum-choice", checksum_choice);
-
        /* Elide the filename args from the option list, but scan for them in reverse. */
        for (i = raw_argc-1, j = cooked_argc-1; i > 0 && j >= 0; i--) {
                if (strcmp(raw_argv[i], cooked_argv[j]) == 0) {