Improved --dirs/--no-dirs/--list-only option handling:

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 629f6d2..ad4fb0a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -902,9 +902,9 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
        if (sanitize_paths) {
                char **dir_p;
                for (dir_p = basis_dir; *dir_p; dir_p++)
-                       *dir_p = sanitize_path(NULL, *dir_p, NULL, curr_dir_depth);
+                       *dir_p = sanitize_path(NULL, *dir_p, NULL, curr_dir_depth, SP_DEFAULT);
                if (partial_dir)
-                       partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth);
+                       partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, SP_DEFAULT);
        }
        check_alt_basis_dirs();
 
@@ -1038,11 +1038,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                        io_start_multiplex_out();
        }
 
-       if (argc == 0) {
-               list_only |= 1;
-               xfer_dirs |= 1;
-       }
-
        send_filter_list(read_batch ? -1 : f_out);
 
        if (filesfrom_fd >= 0) {
@@ -1153,8 +1148,6 @@ static int start_client(int argc, char *argv[])
                                static char *dotarg[1] = { "." };
                                p = dotarg[0];
                                remote_argv = dotarg;
-                               list_only |= 1;
-                               xfer_dirs |= 1;
                        }
                        remote_argc = 1;
 
@@ -1226,10 +1219,6 @@ static int start_client(int argc, char *argv[])
                        }
                        remote_argv[i] = arg;
                }
-               if (argc == 0) {
-                       list_only |= 1;
-                       xfer_dirs |= 1;
-               }
        }
 
        if (daemon_over_rsh < 0)