Extended the protocol-30 info-passing code at startup, and use it to

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 5a24dd2..a1cdda2 100644 (file)
--- a/options.c
+++ b/options.c
@@ -202,7 +202,7 @@ static int itemize_changes = 0;
 static int refused_delete, refused_archive_part, refused_compress;
 static int refused_partial, refused_progress, refused_delete_before;
 static int refused_delete_during;
-static int refused_inplace;
+static int refused_inplace, refused_no_iconv;
 static char *max_size_arg, *min_size_arg;
 static char tmp_partialdir[] = ".~tmp~";
 
@@ -218,6 +218,7 @@ static void print_rsync_version(enum logcode f)
        char const *got_socketpair = "no ";
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
+       char const *symtimes = "no ";
        char const *acls = "no ";
        char const *xattrs = "no ";
        char const *links = "no ";
@@ -252,6 +253,9 @@ static void print_rsync_version(enum logcode f)
 #ifdef ICONV_OPTION
        iconv = "";
 #endif
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+       symtimes = "";
+#endif
 
        rprintf(f, "%s  version %s  protocol version %d%s\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
@@ -265,8 +269,8 @@ static void print_rsync_version(enum logcode f)
                (int)(sizeof (int64) * 8));
        rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                got_socketpair, hardlinks, links, ipv6, have_inplace);
-       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv\n",
-               have_inplace, acls, xattrs, iconv);
+       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n",
+               have_inplace, acls, xattrs, iconv, symtimes);
 
 #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
@@ -441,7 +445,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_NO_D, OPT_APPEND,
+      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV,
       OPT_SERVER, OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
@@ -524,6 +528,8 @@ static struct poptOption long_options[] = {
   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
   {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
+  {"no-one-file-system",'x',POPT_ARG_VAL,   &one_file_system, 0, 0, 0 },
+  {"no-x",            'x', POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
   {"ignore-non-existing",0,POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
@@ -612,6 +618,7 @@ static struct poptOption long_options[] = {
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
 #ifdef ICONV_OPTION
   {"iconv",            0,  POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
+  {"no-iconv",         0,  POPT_ARG_NONE,   0, OPT_NO_ICONV, 0, 0 },
 #endif
   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
@@ -758,6 +765,8 @@ static void set_refuse_options(char *bp)
                                                refused_progress = op->val;
                                        else if (wildmatch("inplace", op->longName))
                                                refused_inplace = op->val;
+                                       else if (wildmatch("no-iconv", op->longName))
+                                               refused_no_iconv = op->val;
                                        break;
                                }
                                if (!is_wild)
@@ -878,8 +887,11 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 
        if (ref && *ref)
                set_refuse_options(ref);
-       if (am_daemon)
+       if (am_daemon) {
                set_refuse_options("log-file*");
+               if (!*lp_charset(module_id))
+                       set_refuse_options("iconv");
+       }
 
 #ifdef ICONV_OPTION
        if (!am_daemon && !protect_args && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
@@ -1127,6 +1139,10 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
                        read_batch = 1;
                        break;
 
+               case OPT_NO_ICONV:
+                       iconv_opt = NULL;
+                       break;
+
                case OPT_MAX_SIZE:
                        if ((max_size = parse_size_arg(&max_size_arg, 'b')) <= 0) {
                                snprintf(err_buf, sizeof err_buf,
@@ -1254,6 +1270,10 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
                else
                        need_unsorted_flist = 1;
        }
+       if (refused_no_iconv && !iconv_opt) {
+               create_refuse_error(refused_no_iconv);
+               return 0;
+       }
 #endif
 
        if (protect_args == 1) {
@@ -1761,24 +1781,24 @@ void server_options(char **args, int *argc_p)
                argstr[x++] = 'z';
 
        /* We make use of the -e option to let the server know about any
-        * pre-release protocol version && our allow_inc_recurse status. */
-       set_allow_inc_recurse();
+        * pre-release protocol version && some behavior flags. */
+       argstr[x++] = 'e';
 #if SUBPROTOCOL_VERSION != 0
        if (protocol_version == PROTOCOL_VERSION) {
                x += snprintf(argstr+x, sizeof argstr - x,
-                             "e%d.%d%s", PROTOCOL_VERSION, SUBPROTOCOL_VERSION,
-                             allow_inc_recurse ? "i" : "");
+                             "%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
        } else
 #endif
-       if (allow_inc_recurse) {
-               argstr[x++] = 'e';
+               argstr[x++] = '.';
+       set_allow_inc_recurse();
+       if (allow_inc_recurse)
                argstr[x++] = 'i';
-       }
-
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+       argstr[x++] = 'L';
+#endif
        argstr[x] = '\0';
 
-       if (x != 1)
-               args[ac++] = argstr;
+       args[ac++] = argstr;
 
 #ifdef ICONV_OPTION
        if (iconv_opt) {