- Use popt to better effect for the two options that can be both

  set and unset by the user.
- Even more whitespace cleanup.

diff --git a/options.c b/options.c
index 066dd4b..d600981 100644 (file)
--- a/options.c
+++ b/options.c
@@ -288,7 +288,7 @@ enum {OPT_VERSION = 1000, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE,
       OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LINK_DEST,
       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_NO_BLOCKING_IO, OPT_NO_WHOLE_FILE,
+      OPT_IGNORE_ERRORS, OPT_BWLIMIT,
       OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING};
 
 static struct poptOption long_options[] = {
@@ -297,76 +297,76 @@ static struct poptOption long_options[] = {
   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, OPT_SUFFIX, 0, 0 },
   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path,       0, 0, 0 },
   {"password-file",    0,  POPT_ARG_STRING, &password_file,    0, 0, 0 },
-  {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times , 0, 0, 0 },
-  {"size-only",        0,  POPT_ARG_NONE,   &size_only , 0, 0, 0 },
+  {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
+  {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
-  {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system , 0, 0, 0 },
-  {"delete",           0,  POPT_ARG_NONE,   &delete_mode , 0, 0, 0 },
-  {"existing",         0,  POPT_ARG_NONE,   &only_existing , 0, 0, 0 },
-  {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing , 0, 0, 0 },
+  {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
+  {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
+  {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
+  {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
   {"delete-after",     0,  POPT_ARG_NONE,   0,              OPT_DELETE_AFTER, 0, 0 },
   {"delete-excluded",  0,  POPT_ARG_NONE,   0,              OPT_DELETE_EXCLUDED, 0, 0 },
-  {"force",            0,  POPT_ARG_NONE,   &force_delete , 0, 0, 0 },
-  {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids , 0, 0, 0 },
+  {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
+  {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
   {"exclude",          0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE, 0, 0 },
   {"include",          0,  POPT_ARG_STRING, 0,              OPT_INCLUDE, 0, 0 },
   {"exclude-from",     0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE_FROM, 0, 0 },
   {"include-from",     0,  POPT_ARG_STRING, 0,              OPT_INCLUDE_FROM, 0, 0 },
-  {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks , 0, 0, 0 },
+  {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
   {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
-  {"backup",          'b', POPT_ARG_NONE,   &make_backups , 0, 0, 0 },
-  {"dry-run",         'n', POPT_ARG_NONE,   &dry_run , 0, 0, 0 },
-  {"sparse",          'S', POPT_ARG_NONE,   &sparse_files , 0, 0, 0 },
-  {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude , 0, 0, 0 },
-  {"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,   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 },
-  {"group",           'g', POPT_ARG_NONE,   &preserve_gid , 0, 0, 0 },
-  {"devices",         'D', POPT_ARG_NONE,   &preserve_devices , 0, 0, 0 },
-  {"times",           't', POPT_ARG_NONE,   &preserve_times , 0, 0, 0 },
-  {"checksum",        'c', POPT_ARG_NONE,   &always_checksum , 0, 0, 0 },
+  {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
+  {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
+  {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
+  {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
+  {"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_VAL,    &whole_file, 1, 0, 0 },
+  {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 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 },
+  {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
+  {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
+  {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
+  {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
   {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
   {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
   {"archive",         'a', POPT_ARG_NONE,   &archive_mode, 0, 0, 0 },
-  {"server",           0,  POPT_ARG_NONE,   &am_server , 0, 0, 0 },
+  {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
   {"sender",           0,  POPT_ARG_NONE,   0,              OPT_SENDER, 0, 0 },
-  {"recursive",       'r', POPT_ARG_NONE,   &recurse , 0, 0, 0 },
-  {"relative",        'R', POPT_ARG_NONE,   &relative_paths , 0, 0, 0 },
-  {"rsh",             'e', POPT_ARG_STRING, &shell_cmd , 0, 0, 0 },
-  {"block-size",      'B', POPT_ARG_INT,    &block_size , 0, 0, 0 },
-  {"max-delete",       0,  POPT_ARG_INT,    &max_delete , 0, 0, 0 },
-  {"timeout",          0,  POPT_ARG_INT,    &io_timeout , 0, 0, 0 },
-  {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir , 0, 0, 0 },
-  {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest , 0, 0, 0 },
+  {"recursive",       'r', POPT_ARG_NONE,   &recurse, 0, 0, 0 },
+  {"relative",        'R', POPT_ARG_NONE,   &relative_paths, 0, 0, 0 },
+  {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
+  {"block-size",      'B', POPT_ARG_INT,    &block_size, 0, 0, 0 },
+  {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
+  {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
+  {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+  {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
   {"link-dest",        0,  POPT_ARG_STRING, 0,              OPT_LINK_DEST, 0, 0 },
   /* TODO: Should this take an optional int giving the compression level? */
-  {"compress",        'z', POPT_ARG_NONE,   &do_compression , 0, 0, 0 },
-  {"daemon",           0,  POPT_ARG_NONE,   &am_daemon , 0, 0, 0 },
-  {"no-detach",        0,  POPT_ARG_NONE,   &no_detach , 0, 0, 0 },
-  {"stats",            0,  POPT_ARG_NONE,   &do_stats , 0, 0, 0 },
-  {"progress",         0,  POPT_ARG_NONE,   &do_progress , 0, 0, 0 },
-  {"partial",          0,  POPT_ARG_NONE,   &keep_partial , 0, 0, 0 },
-  {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors , 0, 0, 0 },
-  {"blocking-io",      0,  POPT_ARG_NONE,   &blocking_io , 0, 0, 0 },
-  {"no-blocking-io",   0,  POPT_ARG_NONE,   0,              OPT_NO_BLOCKING_IO, 0, 0 },
+  {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
+  {"daemon",           0,  POPT_ARG_NONE,   &am_daemon, 0, 0, 0 },
+  {"no-detach",        0,  POPT_ARG_NONE,   &no_detach, 0, 0, 0 },
+  {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
+  {"progress",         0,  POPT_ARG_NONE,   &do_progress, 0, 0, 0 },
+  {"partial",          0,  POPT_ARG_NONE,   &keep_partial, 0, 0, 0 },
+  {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
+  {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
+  {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
   {0,                 'P', POPT_ARG_NONE,   0,              'P', 0, 0 },
-  {"config",           0,  POPT_ARG_STRING, &config_file , 0, 0, 0 },
-  {"port",             0,  POPT_ARG_INT,    &rsync_port , 0, 0, 0 },
-  {"log-format",       0,  POPT_ARG_STRING, &log_format , 0, 0, 0 },
-  {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit , 0, 0, 0 },
+  {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
+  {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
+  {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
+  {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
-  {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir , 0, 0, 0 },
-  {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links , 0, 0, 0 },
+  {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
+  {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
   {"read-batch",       0,  POPT_ARG_STRING, &batch_prefix,  OPT_READ_BATCH, 0, 0 },
   {"write-batch",      0,  POPT_ARG_STRING, &batch_prefix,  OPT_WRITE_BATCH, 0, 0 },
 #ifdef INET6
-  {0,                '4', POPT_ARG_VAL,    &default_af_hint,   AF_INET , 0, 0 },
-  {0,                '6', POPT_ARG_VAL,    &default_af_hint,   AF_INET6 , 0, 0 },
+  {0,                '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+  {0,                '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
 #endif
   {0,0,0,0, 0, 0, 0}
 };
@@ -509,14 +509,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        add_exclude_file(poptGetOptArg(pc), 1, 1);
                        break;
 
-               case OPT_NO_WHOLE_FILE:
-                       whole_file = 0;
-                       break;
-
-               case OPT_NO_BLOCKING_IO:
-                       blocking_io = 0;
-                       break;
-
                case 'h':
                        usage(FINFO);
                        exit_cleanup(0);