Some argc-based actions in parse_arguments() shouldn't happen on

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index d1e1ff6..0ad26f8 100644 (file)
--- a/options.c
+++ b/options.c
@@ -30,7 +30,7 @@ extern int sanitize_paths;
 extern int daemon_over_rsh;
 extern unsigned int module_dirlen;
 extern struct filter_list_struct filter_list;
-extern struct filter_list_struct server_filter_list;
+extern struct filter_list_struct daemon_filter_list;
 
 int make_backups = 0;
 
@@ -475,6 +475,8 @@ static struct poptOption long_options[] = {
   {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
   {"no-dirs",          0,  POPT_ARG_VAL,    &xfer_dirs, 0, 0, 0 },
   {"no-d",             0,  POPT_ARG_VAL,    &xfer_dirs, 0, 0, 0 },
+  {"old-dirs",         0,  POPT_ARG_VAL,    &xfer_dirs, 4, 0, 0 },
+  {"old-d",            0,  POPT_ARG_VAL,    &xfer_dirs, 4, 0, 0 },
   {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
   {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
   {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -902,8 +904,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                set_refuse_options(ref);
        if (am_daemon) {
                set_refuse_options("log-file*");
+#ifdef ICONV_OPTION
                if (!*lp_charset(module_id))
                        set_refuse_options("iconv");
+#endif
        }
 
 #ifdef ICONV_OPTION
@@ -1030,8 +1034,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                case OPT_INCLUDE_FROM:
                        arg = poptGetOptArg(pc);
                        if (sanitize_paths)
-                               arg = sanitize_path(NULL, arg, NULL, 0);
-                       if (server_filter_list.head) {
+                               arg = sanitize_path(NULL, arg, NULL, 0, SP_DEFAULT);
+                       if (daemon_filter_list.head) {
                                int rej;
                                char *dir, *cp = strdup(arg);
                                if (!cp)
@@ -1040,7 +1044,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                                        goto options_rejected;
                                dir = cp + (*cp == '/' ? module_dirlen : 0);
                                clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
-                               rej = check_filter(&server_filter_list, dir, 0) < 0;
+                               rej = check_filter(&daemon_filter_list, FLOG, dir, 0) < 0;
                                free(cp);
                                if (rej)
                                        goto options_rejected;
@@ -1271,7 +1275,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
 
-       if (human_readable && argc == 2) {
+       if (human_readable && argc == 2 && !am_server) {
                /* Allow the old meaning of 'h' (--help) on its own. */
                usage(FINFO);
                exit_cleanup(0);
@@ -1293,6 +1297,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        if (protect_args == 1 && am_server)
                return 1;
 
+       *argv_p = argv = poptGetArgs(pc);
+       *argc_p = argc = count_args(argv);
+
 #ifndef SUPPORT_LINKS
        if (preserve_links && !am_sender) {
                snprintf(err_buf, sizeof err_buf,
@@ -1380,8 +1387,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        xfer_dirs = 1;
        }
 
-       if (xfer_dirs < 1)
-               xfer_dirs = recurse || list_only;
+       if (argc < 2 && !read_batch && !am_server)
+               list_only |= 1;
+
+       if (xfer_dirs >= 4) {
+               parse_rule(&filter_list, "- /*/*", 0, 0);
+               recurse = xfer_dirs = 1;
+       } else if (recurse)
+               xfer_dirs = 1;
+       else if (xfer_dirs < 0)
+               xfer_dirs = list_only ? 1 : 0;
 
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
@@ -1430,27 +1445,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                need_messages_from_generator = 1;
        }
 
-       *argv_p = argv = poptGetArgs(pc);
-       *argc_p = argc = count_args(argv);
-
        if (sanitize_paths) {
                int i;
                for (i = argc; i-- > 0; )
-                       argv[i] = sanitize_path(NULL, argv[i], "", 0);
+                       argv[i] = sanitize_path(NULL, argv[i], "", 0, SP_KEEP_DOT_DIRS);
                if (tmpdir)
-                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
+                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
                if (backup_dir)
-                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
+                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
        }
-       if (server_filter_list.head && !am_sender) {
-               struct filter_list_struct *elp = &server_filter_list;
+       if (daemon_filter_list.head && !am_sender) {
+               struct filter_list_struct *elp = &daemon_filter_list;
                if (tmpdir) {
                        char *dir;
                        if (!*tmpdir)
                                goto options_rejected;
                        dir = tmpdir + (*tmpdir == '/' ? module_dirlen : 0);
                        clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
-                       if (check_filter(elp, dir, 1) < 0)
+                       if (check_filter(elp, FLOG, dir, 1) < 0)
                                goto options_rejected;
                }
                if (backup_dir) {
@@ -1459,7 +1471,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                                goto options_rejected;
                        dir = backup_dir + (*backup_dir == '/' ? module_dirlen : 0);
                        clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
-                       if (check_filter(elp, dir, 1) < 0)
+                       if (check_filter(elp, FLOG, dir, 1) < 0)
                                goto options_rejected;
                }
        }
@@ -1648,14 +1660,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        }
                } else {
                        if (sanitize_paths)
-                               files_from = sanitize_path(NULL, files_from, NULL, 0);
-                       if (server_filter_list.head) {
+                               files_from = sanitize_path(NULL, files_from, NULL, 0, SP_DEFAULT);
+                       if (daemon_filter_list.head) {
                                char *dir;
                                if (!*files_from)
                                        goto options_rejected;
                                dir = files_from + (*files_from == '/' ? module_dirlen : 0);
                                clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
-                               if (check_filter(&server_filter_list, dir, 0) < 0)
+                               if (check_filter(&daemon_filter_list, FLOG, dir, 0) < 0)
                                        goto options_rejected;
                        }
                        filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
@@ -1725,8 +1737,8 @@ void server_options(char **args, int *argc_p)
                argstr[x++] = 'n';
        if (preserve_links)
                argstr[x++] = 'l';
-       if ((list_only && !recurse) || xfer_dirs > 1
-        || (xfer_dirs && !recurse && delete_mode && am_sender))
+       if ((xfer_dirs >= 2 && xfer_dirs < 4)
+        || (xfer_dirs && !recurse && (list_only || (delete_mode && am_sender))))
                argstr[x++] = 'd';
        if (am_sender) {
                if (keep_dirlinks)