Document how refusing "delete" affects --remove-sent-files.

[rsync.git] / main.c

diff --git a/main.c b/main.c
index b4cb90af2c66da57bb7dd6f5744fd9e4ce46f750..fb8b57fe0f6081a1c830b0428ded95191d836c1c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -23,24 +23,18 @@
 
 time_t starttime = 0;
 
-extern struct stats stats;
+extern int verbose;
+extern int dry_run;
+extern int list_only;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int am_daemon;
-extern int verbose;
 extern int blocking_io;
-extern int cvs_exclude;
-extern int delete_mode;
 extern int delete_before;
-extern int delete_after;
-extern int delete_excluded;
 extern int daemon_over_rsh;
 extern int do_stats;
-extern int dry_run;
-extern int list_only;
-extern int local_server;
 extern int log_got_error;
 extern int module_id;
 extern int orig_umask;
@@ -49,6 +43,7 @@ extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int protocol_version;
 extern int recurse;
+extern int fuzzy_basis;
 extern int relative_paths;
 extern int rsync_port;
 extern int whole_file;
@@ -58,6 +53,7 @@ extern int batch_fd;
 extern int batch_gen_fd;
 extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
+extern struct stats stats;
 extern char *files_from;
 extern char *remote_filesfrom_file;
 extern char *partial_dir;
@@ -65,7 +61,8 @@ extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
-extern struct filter_list_struct filter_list;
+
+int local_server = 0;
 
 /* There's probably never more than at most 2 outstanding child processes,
  * but set it higher, just in case. */
@@ -226,7 +223,7 @@ static void report(int f)
  **/
 static void show_malloc_stats(void)
 {
-#if HAVE_MALLINFO
+#ifdef HAVE_MALLINFO
        struct mallinfo mi;
 
        mi = mallinfo();
@@ -296,7 +293,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
                                dash_l_set = 1;
                }
 
-#if HAVE_REMSH
+#ifdef HAVE_REMSH
                /* remsh (on HPUX) takes the arguments the other way around */
                args[argc++] = machine;
                if (user && !(daemon_over_rsh && dash_l_set)) {
@@ -341,7 +338,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
        if (verbose > 3) {
                rprintf(FINFO,"cmd=");
                for (i = 0; i < argc; i++)
-                       rprintf(FINFO,"%s ",args[i]);
+                       rprintf(FINFO, "%s ", safe_fname(args[i]));
                rprintf(FINFO,"\n");
        }
 
@@ -411,7 +408,7 @@ static char *get_local_name(struct file_list *flist,char *name)
                exit_cleanup(RERR_FILEIO);
        }
        if (verbose > 0)
-               rprintf(FINFO, "created directory %s\n", name);
+               rprintf(FINFO, "created directory %s\n", safe_fname(name));
 
        if (dry_run) {
                dry_run++;
@@ -492,7 +489,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        int pid;
        int status = 0;
        int error_pipe[2], name_pipe[2];
-       BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
+       BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis)
+                           && !dry_run;
 
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
@@ -501,10 +499,9 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        if (preserve_hard_links)
                init_hard_links(flist);
 
-       if (delete_before) {
-               /* I moved this here from recv_files() to prevent a race condition */
-               if (recurse && !local_name && flist->count > 0)
-                       delete_files(flist);
+       if (delete_before && !local_name && flist->count > 0) {
+               /* Moved here from recv_files() to prevent a race condition */
+               delete_files(flist);
        }
 
        if (fd_pair(error_pipe) < 0
@@ -622,10 +619,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        }
 
        io_start_buffering_in();
-       if (delete_mode && !delete_excluded)
-               recv_filter_list(f_in);
-       if (cvs_exclude && protocol_version < 29)
-               add_filter(&filter_list, ":C", 0);
+       recv_filter_list(f_in);
 
        if (filesfrom_fd >= 0) {
                /* We need to send the files-from names to the sender at the
@@ -680,8 +674,6 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
                keep_dirlinks = 0; /* Must be disabled on the sender. */
 
                recv_filter_list(f_in);
-               if (cvs_exclude)
-                       add_cvs_excludes();
                do_server_sender(f_in, f_out, argc, argv);
        } else {
                do_server_recv(f_in, f_out, argc, argv);
@@ -727,10 +719,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                io_start_buffering_out();
                if (!remote_filesfrom_file)
                        set_msg_fd_in(f_in);
-               if (cvs_exclude)
-                       add_cvs_excludes();
-               if (delete_mode && !delete_excluded)
-                       send_filter_list(f_out);
+               send_filter_list(f_out);
                if (remote_filesfrom_file)
                        filesfrom_fd = f_in;
 
@@ -763,10 +752,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        if (argc == 0)
                list_only |= 1;
 
-       if (!read_batch)
-               send_filter_list(f_out);
-       if (cvs_exclude)
-               add_cvs_excludes();
+       send_filter_list(read_batch ? -1 : f_out);
 
        if (filesfrom_fd >= 0) {
                io_set_filesfrom_fds(filesfrom_fd, f_out);
@@ -981,10 +967,10 @@ static int start_client(int argc, char *argv[])
 
        if (verbose > 3) {
                rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
-                       shell_cmd?shell_cmd:"",
-                       shell_machine?shell_machine:"",
-                       shell_user?shell_user:"",
-                       shell_path?shell_path:"");
+                       shell_cmd ? safe_fname(shell_cmd) : "",
+                       shell_machine ? safe_fname(shell_machine) : "",
+                       shell_user ? safe_fname(shell_user) : "",
+                       shell_path ? safe_fname(shell_path) : "");
        }
 
        /* for remote source, only single dest arg can remain ... */
@@ -1172,7 +1158,7 @@ int main(int argc,char *argv[])
                }
                if (batch_fd < 0) {
                        rsyserr(FERROR, errno, "Batch file %s open error",
-                               batch_name);
+                               full_fname(batch_name));
                        exit_cleanup(RERR_FILEIO);
                }
                if (read_batch)
@@ -1187,9 +1173,6 @@ int main(int argc,char *argv[])
                exit_cleanup(RERR_SYNTAX);
        }
 
-       if (dry_run)
-               verbose = MAX(verbose,1);
-
        if (am_server) {
                set_nonblocking(STDIN_FILENO);
                set_nonblocking(STDOUT_FILENO);