Got rid of kluged value for am_sender, and instead added a new

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index a02e618..dbf5012 100644 (file)
--- a/options.c
+++ b/options.c
@@ -65,15 +65,16 @@ int protocol_version = PROTOCOL_VERSION;
 int sparse_files = 0;
 int do_compression = 0;
 int am_root = 0;
+int am_server = 0;
+int am_sender = 0;
+int am_generator = 0;
+int am_starting_up = 1;
 int orig_umask = 0;
 int relative_paths = -1;
 int implied_dirs = 1;
 int numeric_ids = 0;
 int force_delete = 0;
 int io_timeout = 0;
-int am_server = 0;
-int am_sender = -1;
-int am_generator = 0;
 char *files_from = NULL;
 int filesfrom_fd = -1;
 char *remote_filesfrom_file = NULL;
@@ -142,7 +143,6 @@ char *backup_dir = NULL;
 char backup_dir_buf[MAXPATHLEN];
 int rsync_port = 0;
 int compare_dest = 0;
-int copy_dest = 0;
 int link_dest = 0;
 int basis_dir_cnt = 0;
 
@@ -317,7 +317,6 @@ void usage(enum logcode F)
   rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
   rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
   rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-  rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
   rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
   rprintf(F," -z, --compress              compress file data during the transfer\n");
   rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
@@ -356,7 +355,7 @@ void usage(enum logcode F)
 }
 
 enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-      OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
+      OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
       OPT_REFUSED_BASE = 9000};
@@ -407,7 +406,7 @@ static struct poptOption long_options[] = {
   {"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 },
-  {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },
+  {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 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 },
@@ -425,7 +424,6 @@ static struct poptOption long_options[] = {
   {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
   {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
-  {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
   {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
   {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
   /* TODO: Should this take an optional int giving the compression level? */
@@ -698,6 +696,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        }
                        *argv = poptGetArgs(pc);
                        *argc = count_args(*argv);
+                       am_starting_up = 0;
                        daemon_opt = 0;
                        am_daemon = 1;
                        return 1;
@@ -839,11 +838,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        return 0;
 #endif
 
-               case OPT_COPY_DEST:
-                       copy_dest = 1;
-                       dest_option = "--copy-dest";
-                       goto set_dest_dir;
-
                case OPT_COMPARE_DEST:
                        compare_dest = 1;
                        dest_option = "--compare-dest";
@@ -875,9 +869,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                }
        }
 
-       if (am_sender < 0)
-               am_sender = 0;
-
 #ifndef SUPPORT_LINKS
        if (preserve_links && !am_sender) {
                snprintf(err_buf, sizeof err_buf,
@@ -937,9 +928,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                return 0;
        }
 
-       if (compare_dest + copy_dest + link_dest > 1) {
+       if (compare_dest + link_dest > 1) {
                snprintf(err_buf, sizeof err_buf,
-                       "You may not mix --compare-dest, --copy-dest, and --link-dest.\n");
+                       "You may not mix --compare-dest and --link-dest.\n");
                return 0;
        }
 
@@ -1088,6 +1079,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
+       if (make_backups && !backup_dir)
+               omit_dir_times = 1;
 
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
@@ -1200,6 +1193,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                }
        }
 
+       am_starting_up = 0;
+
        return 1;
 }
 
@@ -1272,7 +1267,7 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
-       if (omit_dir_times && am_sender)
+       if (omit_dir_times == 2 && am_sender)
                argstr[x++] = 'O';
        if (preserve_perms)
                argstr[x++] = 'p';