Adding more calls to safe_fname().

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 8ba45a2..02bee6b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,16 +31,11 @@ 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;
@@ -66,10 +61,10 @@ extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
 
+int local_server = 0;
 
-/* there's probably never more than at most 2 outstanding child processes,
- * but set it higher just in case.
- */
+/* There's probably never more than at most 2 outstanding child processes,
+ * but set it higher, just in case. */
 #define MAXCHILDPROCS 5
 
 struct pid_status {
@@ -233,22 +228,30 @@ static void show_malloc_stats(void)
        mi = mallinfo();
 
        rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
-               getpid(),
-               am_server ? "server " : "",
-               am_daemon ? "daemon " : "",
-               who_am_i());
-       rprintf(FINFO, "  arena:     %10d   (bytes from sbrk)\n", mi.arena);
-       rprintf(FINFO, "  ordblks:   %10d   (chunks not in use)\n", mi.ordblks);
-       rprintf(FINFO, "  smblks:    %10d\n", mi.smblks);
-       rprintf(FINFO, "  hblks:     %10d   (chunks from mmap)\n", mi.hblks);
-       rprintf(FINFO, "  hblkhd:    %10d   (bytes from mmap)\n", mi.hblkhd);
-       rprintf(FINFO, "  allmem:    %10d   (bytes from sbrk + mmap)\n",
-           mi.arena + mi.hblkhd);
-       rprintf(FINFO, "  usmblks:   %10d\n", mi.usmblks);
-       rprintf(FINFO, "  fsmblks:   %10d\n", mi.fsmblks);
-       rprintf(FINFO, "  uordblks:  %10d   (bytes used)\n", mi.uordblks);
-       rprintf(FINFO, "  fordblks:  %10d   (bytes free)\n", mi.fordblks);
-       rprintf(FINFO, "  keepcost:  %10d   (bytes in releasable chunk)\n", mi.keepcost);
+               getpid(), am_server ? "server " : "",
+               am_daemon ? "daemon " : "", who_am_i());
+       rprintf(FINFO, "  arena:     %10ld   (bytes from sbrk)\n",
+               (long)mi.arena);
+       rprintf(FINFO, "  ordblks:   %10ld   (chunks not in use)\n",
+               (long)mi.ordblks);
+       rprintf(FINFO, "  smblks:    %10ld\n",
+               (long)mi.smblks);
+       rprintf(FINFO, "  hblks:     %10ld   (chunks from mmap)\n",
+               (long)mi.hblks);
+       rprintf(FINFO, "  hblkhd:    %10ld   (bytes from mmap)\n",
+               (long)mi.hblkhd);
+       rprintf(FINFO, "  allmem:    %10ld   (bytes from sbrk + mmap)\n",
+               (long)mi.arena + mi.hblkhd);
+       rprintf(FINFO, "  usmblks:   %10ld\n",
+               (long)mi.usmblks);
+       rprintf(FINFO, "  fsmblks:   %10ld\n",
+               (long)mi.fsmblks);
+       rprintf(FINFO, "  uordblks:  %10ld   (bytes used)\n",
+               (long)mi.uordblks);
+       rprintf(FINFO, "  fordblks:  %10ld   (bytes free)\n",
+               (long)mi.fordblks);
+       rprintf(FINFO, "  keepcost:  %10ld   (bytes in releasable chunk)\n",
+               (long)mi.keepcost);
 #endif /* HAVE_MALLINFO */
 }
 
@@ -494,10 +497,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
@@ -615,10 +617,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)
-               add_cvs_excludes();
+       recv_filter_list(f_in);
 
        if (filesfrom_fd >= 0) {
                /* We need to send the files-from names to the sender at the
@@ -673,8 +672,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);
@@ -720,10 +717,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;
 
@@ -756,10 +750,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);