Now that whole_file and no_whole_file are separate variables, have the

--whole-file and --no-whole-file options set/reset both variables so if
more than one option is specified the last one will be the one honored.

diff --git a/generator.c b/generator.c
index da2feac..fd3dac1 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -144,9 +144,7 @@ static BOOL disable_deltas_p(void)
 
        assert(whole_file == 0 || whole_file == 1);
 
-       /* OK, we don't explicitly handle both whole_file and
-        * no_whole_file; perhaps somebody will care to add an
-        * error. */
+       /* whole_file and no_whole_file are never both on at the same time */
 
        if (whole_file)
                return True;

diff --git a/options.c b/options.c
index 32ab9ec..22d332c 100644 (file)
--- a/options.c
+++ b/options.c
@@ -286,7 +286,7 @@ enum {OPT_VERSION = 1000, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE,
       OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
       OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, 
       OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO,
-      OPT_NO_BLOCKING_IO, OPT_NO_WHOLE_FILE,
+      OPT_NO_BLOCKING_IO, OPT_WHOLE_FILE, OPT_NO_WHOLE_FILE,
       OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING};
 
 static struct poptOption long_options[] = {
@@ -319,8 +319,8 @@ static struct poptOption long_options[] = {
   {"update",          'u', POPT_ARG_NONE,   &update_only , 0, 0, 0 },
   {"links",           'l', POPT_ARG_NONE,   &preserve_links , 0, 0, 0 },
   {"copy-links",      'L', POPT_ARG_NONE,   &copy_links , 0, 0, 0 },
-  {"whole-file",      'W', POPT_ARG_NONE,   &whole_file , 0, 0, 0 },
-  {"no-whole-file",    0,  POPT_ARG_NONE,   &no_whole_file , 0, 0, 0 },
+  {"whole-file",      'W', POPT_ARG_NONE,   0,              OPT_WHOLE_FILE, 0, 0 },
+  {"no-whole-file",    0,  POPT_ARG_NONE,   0,              OPT_NO_WHOLE_FILE, 0, 0 },
   {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links , 0, 0, 0 },
   {"perms",           'p', POPT_ARG_NONE,   &preserve_perms , 0, 0, 0 },
   {"owner",           'o', POPT_ARG_NONE,   &preserve_uid , 0, 0, 0 },
@@ -484,6 +484,16 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        add_exclude_file(poptGetOptArg(pc), 1, 1);
                        break;
 
+               case OPT_WHOLE_FILE:
+                       whole_file = 1;
+                       no_whole_file = 0;
+                       break;
+
+               case OPT_NO_WHOLE_FILE:
+                       no_whole_file = 1;
+                       whole_file = 0;
+                       break;
+
                case OPT_NO_BLOCKING_IO:
                        blocking_io = 0;
                        break;