We need to run our post-processing activities after the end of

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index ea35841..a9f4c2d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -143,8 +143,10 @@ 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;
+char *dest_option = NULL;
 
 int verbose = 0;
 int quiet = 0;
@@ -163,7 +165,6 @@ static int F_option_cnt = 0;
 static int modify_window_set;
 static int refused_delete, refused_archive_part;
 static int refused_partial, refused_progress, refused_delete_before;
-static char *dest_option = NULL;
 static char *max_size_arg;
 static char partialdir_for_delayupdate[] = ".~tmp~";
 
@@ -292,7 +293,7 @@ void usage(enum logcode F)
   rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
   rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
   rprintf(F," -e, --rsh=COMMAND           specify the remote shell to use\n");
-  rprintf(F,"     --rsync-path=PATH       specify path to rsync on the remote machine\n");
+  rprintf(F,"     --rsync-path=PROGRAM    specify the rsync to run on the remote machine\n");
   rprintf(F,"     --existing              only update files that already exist on receiver\n");
   rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
   rprintf(F,"     --remove-sent-files     sent files/symlinks are removed from sending side\n");
@@ -317,6 +318,7 @@ 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");
@@ -355,7 +357,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_LINK_DEST,
+      OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_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};
@@ -413,7 +415,7 @@ static struct poptOption long_options[] = {
   {"archive",         'a', POPT_ARG_NONE,   &archive_mode, 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_VAL,    &recurse, -1, 0, 0 },
+  {"recursive",       'r', POPT_ARG_NONE,   &recurse, 0, 0, 0 },
   {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
   {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
   {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
@@ -424,6 +426,7 @@ 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? */
@@ -838,6 +841,11 @@ 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";
@@ -928,9 +936,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                return 0;
        }
 
-       if (compare_dest + link_dest > 1) {
+       if (compare_dest + copy_dest + link_dest > 1) {
                snprintf(err_buf, sizeof err_buf,
-                       "You may not mix --compare-dest and --link-dest.\n");
+                       "You may not mix --compare-dest, --copy-dest, and --link-dest.\n");
                return 0;
        }
 
@@ -940,7 +948,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        return 0;
                }
                if (!files_from)
-                       recurse = -1; /* infinite recursion */
+                       recurse = 1;
 #ifdef SUPPORT_LINKS
                preserve_links = 1;
 #endif
@@ -1273,7 +1281,7 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'O';
        if (preserve_perms)
                argstr[x++] = 'p';
-       if (recurse < 0)
+       if (recurse)
                argstr[x++] = 'r';
        if (always_checksum)
                argstr[x++] = 'c';
@@ -1293,7 +1301,7 @@ void server_options(char **args,int *argc)
        /* This is a complete hack - blame Rusty.  FIXME!
         * This hack is only needed for older rsync versions that
         * don't understand the --list-only option. */
-       if (list_only == 1 && recurse >= 0)
+       if (list_only == 1 && recurse)
                argstr[x++] = 'r';
 
        argstr[x] = 0;
@@ -1490,17 +1498,16 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
                if (*s == '[' && (p = strchr(s, ']')) != NULL) {
                        s++;
                        hostlen = p - s;
-                       if (*p == ':')
-                               *port_ptr = atoi(p+1);
-                       else if (!*port_ptr)
-                               *port_ptr = RSYNC_PORT;
+                       if (p[1] == ':')
+                               *port_ptr = atoi(p+2);
                } else {
                        if ((p = strchr(s, ':')) != NULL) {
                                hostlen = p - s;
                                *port_ptr = atoi(p+1);
-                       } else if (!*port_ptr)
-                               *port_ptr = RSYNC_PORT;
+                       }
                }
+               if (!*port_ptr)
+                       *port_ptr = RSYNC_PORT;
                *host_ptr = new_array(char, hostlen + 1);
                strlcpy(*host_ptr, s, hostlen + 1);
                return path;
@@ -1513,6 +1520,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
                *p = ']';
                if (not_host)
                        return NULL;
+               p++;
        } else {
                if (!(p = strchr(s, ':')))
                        return NULL;