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;
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;
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 {
**/
static void show_malloc_stats(void)
{
-#if HAVE_MALLINFO
+#ifdef HAVE_MALLINFO
struct mallinfo mi;
mi = mallinfo();
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)) {
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");
}
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++;
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. */
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
}
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
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);
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;
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);
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 ... */
}
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)
exit_cleanup(RERR_SYNTAX);
}
- if (dry_run)
- verbose = MAX(verbose,1);
-
if (am_server) {
set_nonblocking(STDIN_FILENO);
set_nonblocking(STDOUT_FILENO);