Tweaked the copyright message.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 57290df..9a7c423 100644 (file)
--- a/options.c
+++ b/options.c
@@ -55,6 +55,8 @@ int cvs_exclude = 0;
 int dry_run = 0;
 int do_xfers = 1;
 int ignore_times = 0;
+int saw_delete_opt = 0;
+int saw_delete_excluded_opt = 0;
 int delete_mode = 0;
 int delete_during = 0;
 int delete_before = 0;
@@ -213,7 +215,7 @@ static void print_rsync_version(enum logcode f)
 
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2006 by Wayne Davison, Andrew Tridgell, and others\n");
+       rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
                "%shard links, %ssymlinks, batchfiles, \n",
@@ -371,7 +373,7 @@ 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_HELP,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
-      OPT_REFUSED_BASE = 9000};
+      OPT_SERVER, OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
@@ -497,7 +499,7 @@ static struct poptOption long_options[] = {
   {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
   {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
-  {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
+  {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
   {"sender",           0,  POPT_ARG_NONE,   0, OPT_SENDER, 0, 0 },
   /* All the following options switch us into daemon-mode option-parsing. */
   {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
@@ -769,6 +771,25 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        print_rsync_version(FINFO);
                        exit_cleanup(0);
 
+               case OPT_SERVER:
+                       if (!am_server) {
+                               /* Disable popt aliases on the server side and
+                                * then start parsing the options again. */
+                               poptFreeContext(pc);
+                               pc = poptGetContext(RSYNC_NAME, *argc, *argv,
+                                                   long_options, 0);
+                               am_server = 1;
+                       }
+                       break;
+
+               case OPT_SENDER:
+                       if (!am_server) {
+                               usage(FERROR);
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       am_sender = 1;
+                       break;
+
                case OPT_DAEMON:
                        if (am_daemon) {
                                strcpy(err_buf, "Attempt to hack rsync thwarted!\n");
@@ -873,10 +894,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        preserve_devices = 1;
                        break;
 
-               case OPT_HELP:
-                       usage(FINFO);
-                       exit_cleanup(0);
-
                case 'i':
                        itemize_changes++;
                        break;
@@ -894,14 +911,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        one_file_system++;
                        break;
 
-               case OPT_SENDER:
-                       if (!am_server) {
-                               usage(FERROR);
-                               exit_cleanup(RERR_SYNTAX);
-                       }
-                       am_sender = 1;
-                       break;
-
                case 'F':
                        switch (++F_option_cnt) {
                        case 1:
@@ -1014,6 +1023,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        }
                        break;
 
+               case OPT_HELP:
+                       usage(FINFO);
+                       exit_cleanup(0);
+
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
@@ -1114,10 +1127,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        "You may not combine multiple --delete-WHEN options.\n");
                return 0;
        }
-       if (!xfer_dirs) {
-               delete_before = delete_during = delete_after = 0;
-               delete_mode = delete_excluded = 0;
-       } else if (delete_before || delete_during || delete_after)
+       if (delete_before || delete_during || delete_after)
                delete_mode = 1;
        else if (delete_mode || delete_excluded) {
                if (refused_delete_before) {
@@ -1126,6 +1136,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                }
                delete_mode = delete_before = 1;
        }
+       saw_delete_opt = delete_mode;
+       saw_delete_excluded_opt = delete_excluded;
+       if (!xfer_dirs) {
+               delete_before = delete_during = delete_after = 0;
+               delete_mode = delete_excluded = 0;
+       }
 
        if (delete_mode && refused_delete) {
                create_refuse_error(refused_delete);
@@ -1431,7 +1447,7 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'l';
        if (copy_links)
                argstr[x++] = 'L';
-       if (xfer_dirs > 1)
+       if (xfer_dirs > (recurse || !delete_mode || !am_sender))
                argstr[x++] = 'd';
        if (keep_dirlinks && am_sender)
                argstr[x++] = 'K';
@@ -1482,7 +1498,7 @@ void server_options(char **args,int *argc)
        if (list_only == 1 && !recurse)
                argstr[x++] = 'r';
 
-       argstr[x] = 0;
+       argstr[x] = '\0';
 
        if (x != 1)
                args[ac++] = argstr;
@@ -1490,6 +1506,11 @@ void server_options(char **args,int *argc)
        if (list_only > 1)
                args[ac++] = "--list-only";
 
+       /* This makes sure that the remote rsync can handle deleting with -d
+        * sans -r because the --no-r option was added at the same time. */
+       if (xfer_dirs && !recurse && delete_mode && am_sender)
+               args[ac++] = "--no-r";
+
        if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
                if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
                        goto oom;