*/
#include "rsync.h"
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
-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_excluded;
+extern int remove_sent_files;
extern int daemon_over_rsh;
+extern int need_messages_from_generator;
+extern int kluge_around_eof;
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 inplace;
+extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int batch_gen_fd;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
-extern char *files_from;
-extern char *remote_filesfrom_file;
+extern struct stats stats;
+extern char *filesfrom_host;
extern char *partial_dir;
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;
+struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
int status;
} pid_stat_table[MAXCHILDPROCS];
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
static void show_malloc_stats(void);
/****************************************************************************
* the report. All processes might also generate a set of debug stats, if
* the verbose level is high enough (this is the only thing that the
* generator process and the server receiver ever do here). */
-static void report(int f)
+static void handle_stats(int f)
{
+ endtime = time(NULL);
+
/* Cache two stats because the read/write code can change it. */
- int64 total_read = stats.total_read;
- int64 total_written = stats.total_written;
- time_t t = time(NULL);
+ total_read = stats.total_read;
+ total_written = stats.total_written;
if (do_stats && verbose > 1) {
/* These come out from every process */
stats.flist_buildtime = read_longint(f);
stats.flist_xfertime = read_longint(f);
}
- } else if (write_batch) {
+ } else if (write_batch && !am_server) {
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
write_longint(batch_fd, total_read);
(double)total_read);
}
+ fflush(stdout);
+ fflush(stderr);
+}
+
+static void output_summary(void)
+{
if (verbose || do_stats) {
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
(double)total_written, (double)total_read,
- (total_written + total_read)/(0.5 + (t - starttime)));
+ (total_written + total_read)/(0.5 + (endtime - starttime)));
rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
(double)stats.total_size,
(double)stats.total_size / (total_written+total_read));
**/
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++;
}
+/* This is only called by the sender. */
+static void read_final_goodbye(int f_in, int f_out)
+{
+ int i;
+
+ if (protocol_version < 29)
+ i = read_int(f_in);
+ else {
+ while ((i = read_int(f_in)) == the_file_list->count
+ && read_shortint(f_in) == ITEM_IS_NEW) {
+ /* Forward the keep-alive (no-op) to the receiver. */
+ write_int(f_out, the_file_list->count);
+ write_shortint(f_out, ITEM_IS_NEW);
+ }
+ }
+
+ if (i != -1) {
+ rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
+ i, who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
+}
+
+
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
int i;
exit_cleanup(RERR_SYNTAX);
return;
}
+ if (am_daemon && lp_read_only(module_id) && remove_sent_files) {
+ rprintf(FERROR,
+ "ERROR: --remove-sent-files cannot be used with a read-only module\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
if (!relative_paths && !push_dir(dir)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
+ the_file_list = flist;
io_start_buffering_in();
io_start_buffering_out();
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
- report(f_out);
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
+ handle_stats(f_out);
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
{
int pid;
int status = 0;
- int error_pipe[2], name_pipe[2];
- BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
+ int error_pipe[2];
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
copy_links = 0;
if (preserve_hard_links)
- init_hard_links(flist);
-
- if (delete_before && !local_name && flist->count > 0) {
- /* Moved here from recv_files() to prevent a race condition */
- delete_files(flist);
- }
+ init_hard_links();
- if (fd_pair(error_pipe) < 0
- || (need_name_pipe && fd_pair(name_pipe) < 0)) {
+ if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_IPC);
}
if (pid == 0) {
close(error_pipe[0]);
- if (need_name_pipe) {
- close(name_pipe[1]);
- set_blocking(name_pipe[0]);
- } else
- name_pipe[0] = -1;
if (f_in != f_out)
close(f_out);
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
- recv_files(f_in, flist, local_name, name_pipe[0]);
+ recv_files(f_in, flist, local_name);
io_flush(FULL_FLUSH);
- report(f_in);
+ handle_stats(f_in);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
- /* finally we go to sleep until our parent kills us
- * with a USR2 signal. We sleep for a short time as on
- * some OSes a signal won't interrupt a sleep! */
+
+ /* Handle any keep-alive packets from the post-processing work
+ * that the generator does. */
+ if (protocol_version >= 29) {
+ kluge_around_eof = -1;
+
+ /* This should only get stopped via a USR2 signal. */
+ while (read_int(f_in) == flist->count
+ && read_shortint(f_in) == ITEM_IS_NEW) {}
+
+ rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+ who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
+ /* Finally, we go to sleep until our parent kills us with a
+ * USR2 signal. We sleep for a short time, as on some OSes
+ * a signal won't interrupt a sleep! */
while (1)
msleep(20);
}
am_generator = 1;
close_multiplexing_in();
- if (write_batch)
+ if (write_batch && !am_server)
stop_write_batch();
close(error_pipe[1]);
- if (need_name_pipe) {
- close(name_pipe[0]);
- set_nonblocking(name_pipe[1]);
- } else
- name_pipe[1] = -1;
if (f_in != f_out)
close(f_in);
set_msg_fd_in(error_pipe[0]);
- generate_files(f_out, flist, local_name, name_pipe[1]);
+ generate_files(f_out, flist, local_name);
- report(-1);
+ handle_stats(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
}
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
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
+ the_file_list = flist;
if (argc > 0) {
if (strcmp(dir,".")) {
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
+ if (need_messages_from_generator)
+ io_start_multiplex_in();
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);
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out();
- if (!remote_filesfrom_file)
+ if (!filesfrom_host)
set_msg_fd_in(f_in);
- if (cvs_exclude)
- add_cvs_excludes();
- if (delete_mode && !delete_excluded)
- send_filter_list(f_out);
- if (remote_filesfrom_file)
+ send_filter_list(f_out);
+ if (filesfrom_host)
filesfrom_fd = f_in;
- if (write_batch)
+ if (write_batch && !am_server)
start_write_batch(f_out);
- if (!read_batch) /* don't write to pipe */
- flist = send_file_list(f_out,argc,argv);
+ flist = send_file_list(f_out, argc, argv);
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
+ the_file_list = flist;
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
+ handle_stats(-1);
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush(FULL_FLUSH);
wait_process(pid, &status);
}
- report(-1);
+ output_summary();
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
+ if (need_messages_from_generator && !read_batch)
+ io_start_multiplex_out();
+
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);
filesfrom_fd = -1;
}
- if (write_batch)
+ if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
"the --recursive option?\n");
exit_cleanup(0);
}
+ the_file_list = flist;
local_name = get_local_name(flist,argv[0]);
if ((rc = copy_argv(argv)))
return rc;
- /* rsync:// always uses rsync server over direct socket connection */
- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0
- && !read_batch) {
- char *host, *path;
-
- host = argv[0] + strlen(URL_PREFIX);
- p = strchr(host,'/');
- if (p) {
- *p = '\0';
- path = p+1;
- } else
- path = "";
- if (*host == '[' && (p = strchr(host, ']')) != NULL) {
- host++;
- *p++ = '\0';
- if (*p != ':')
- p = NULL;
- } else
- p = strchr(host, ':');
- if (p) {
- rsync_port = atoi(p+1);
- *p = '\0';
- }
- return start_socket_client(host, path, argc-1, argv+1);
- }
-
if (!read_batch) { /* for read_batch, NO source is specified */
- p = find_colon(argv[0]);
- if (p) { /* source is remote */
- if (remote_filesfrom_file
- && remote_filesfrom_file != files_from + 1
- && strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
+ argc--;
+ shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
+ if (shell_path) { /* source is remote */
+ argv++;
+ if (filesfrom_host && *filesfrom_host
+ && strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
"--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (p[1] == ':') { /* double colon */
- *p = 0;
+ if (rsync_port) {
if (!shell_cmd) {
- return start_socket_client(argv[0], p+2,
- argc-1, argv+1);
+ return start_socket_client(shell_machine,
+ shell_path,
+ argc, argv);
}
- p++;
daemon_over_rsh = 1;
}
- if (argc < 1) { /* destination required */
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
-
am_sender = 0;
- *p = 0;
- shell_machine = argv[0];
- shell_path = p+1;
- argv++;
- } else { /* source is local */
+ } else { /* source is local, check dest arg */
am_sender = 1;
- /* rsync:// destination uses rsync server over direct socket */
- if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) {
- char *host, *path;
-
- host = argv[argc-1] + strlen(URL_PREFIX);
- p = strchr(host,'/');
- if (p) {
- *p = '\0';
- path = p+1;
- } else
- path = "";
- if (*host == '[' && (p = strchr(host, ']')) != NULL) {
- host++;
- *p++ = '\0';
- if (*p != ':')
- p = NULL;
- } else
- p = strchr(host, ':');
- if (p) {
- rsync_port = atoi(p+1);
- *p = '\0';
- }
- return start_socket_client(host, path, argc-1, argv);
+ if (argc < 1) { /* destination required */
+ usage(FERROR);
+ exit_cleanup(RERR_SYNTAX);
}
- p = find_colon(argv[argc-1]); /* look in dest arg */
- if (p && remote_filesfrom_file
- && remote_filesfrom_file != files_from + 1
- && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
+ shell_path = check_for_hostspec(argv[argc], &shell_machine, &rsync_port);
+ if (shell_path && filesfrom_host && *filesfrom_host
+ && strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
"--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (!p) { /* no colon found, so src & dest are local */
+ if (!shell_path) { /* no hostspec found, so src & dest are local */
local_server = 1;
- if (remote_filesfrom_file) {
+ if (filesfrom_host) {
rprintf(FERROR,
"--files-from cannot be remote when the transfer is local\n");
exit_cleanup(RERR_SYNTAX);
}
- } else if (p[1] == ':') { /* double colon */
- *p = 0;
+ shell_machine = NULL;
+ shell_path = argv[argc];
+ } else if (rsync_port) {
if (!shell_cmd) {
- return start_socket_client(argv[argc-1], p+2,
- argc-1, argv);
+ return start_socket_client(shell_machine,
+ shell_path,
+ argc, argv);
}
- p++;
daemon_over_rsh = 1;
}
-
- if (argc < 2) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
-
- if (local_server) {
- shell_machine = NULL;
- shell_path = argv[argc-1];
- } else {
- *p = 0;
- shell_machine = argv[argc-1];
- shell_path = p+1;
- }
}
- argc--;
} else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];
- if (find_colon(shell_path)) {
+ if (check_for_hostspec(shell_path, &shell_machine, &rsync_port)) {
rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
exit_cleanup(RERR_SYNTAX);
}
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 ... */
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
- if (log_got_error) _exit(RERR_PARTIAL);
+ if (!am_server)
+ output_summary();
+ close_all();
+ if (log_got_error)
+ _exit(RERR_PARTIAL);
_exit(0);
}
* see the EPIPE. */
signal(SIGPIPE, SIG_IGN);
+#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
+ setlocale(LC_CTYPE, "");
+#endif
+
/* Initialize push_dir here because on some old systems getcwd
* (implemented by forking "pwd" and reading its output) doesn't
* work when there are other child processes. Also, on all systems
init_flist();
- if (write_batch || read_batch) {
+ if ((write_batch || read_batch) && !am_server) {
if (write_batch)
write_batch_shell_file(orig_argc, orig_argv, argc);
}
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)
read_stream_flags(batch_fd);
}
+ if (write_batch < 0)
+ dry_run = 1;
if (am_daemon && !am_server)
return daemon_main();
exit_cleanup(RERR_SYNTAX);
}
- if (dry_run)
- verbose = MAX(verbose,1);
-
if (am_server) {
set_nonblocking(STDIN_FILENO);
set_nonblocking(STDOUT_FILENO);
git.samba.org / rsync.git / blobdiff