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 pid_t cleanup_child_pid;
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;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
-#define MAXCHILDPROCS 5
+#define MAXCHILDPROCS 7
struct pid_status {
pid_t pid;
- int status;
+ int status;
} pid_stat_table[MAXCHILDPROCS];
static time_t starttime, endtime;
static void show_malloc_stats(void);
-/****************************************************************************
-wait for a process to exit, calling io_flush while waiting
-****************************************************************************/
-void wait_process(pid_t pid, int *status)
+/* Works like waitpid(), but if we already harvested the child pid in our
+ * sigchld_handler(), we succeed instead of returning an error. */
+pid_t wait_process(pid_t pid, int *status_ptr, int flags)
{
- pid_t waited_pid;
- int cnt;
-
- while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) {
- msleep(20);
- io_flush(FULL_FLUSH);
- }
+ pid_t waited_pid = waitpid(pid, status_ptr, flags);
if (waited_pid == -1 && errno == ECHILD) {
- /* status of requested child no longer available.
- * check to see if it was processed by the sigchld_handler.
- */
- for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
+ /* Status of requested child no longer available: check to
+ * see if it was processed by sigchld_handler(). */
+ int cnt;
+ for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
if (pid == pid_stat_table[cnt].pid) {
- *status = pid_stat_table[cnt].status;
+ *status_ptr = pid_stat_table[cnt].status;
pid_stat_table[cnt].pid = 0;
- break;
+ return pid;
}
}
}
+ return waited_pid;
+}
+
+/* Wait for a process to exit, calling io_flush while waiting. */
+static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+{
+ pid_t waited_pid;
+ int status;
+
+ while ((waited_pid = wait_process(pid, &status, WNOHANG)) == 0) {
+ msleep(20);
+ io_flush(FULL_FLUSH);
+ }
+
/* TODO: If the child exited on a signal, then log an
* appropriate error message. Perhaps we should also accept a
* message describing the purpose of the child. Also indicate
- * this to the caller so that thhey know something went
- * wrong. */
- *status = WEXITSTATUS(*status);
+ * this to the caller so that they know something went wrong. */
+ if (waited_pid < 0) {
+ rsyserr(FERROR, errno, "waitpid");
+ *exit_code_ptr = RERR_WAITCHILD;
+ } else if (!WIFEXITED(status)) {
+#ifdef WCOREDUMP
+ if (WCOREDUMP(status))
+ *exit_code_ptr = RERR_CRASHED;
+ else
+#endif
+ if (WIFSIGNALED(status))
+ *exit_code_ptr = RERR_TERMINATED;
+ else
+ *exit_code_ptr = RERR_WAITCHILD;
+ } else
+ *exit_code_ptr = WEXITSTATUS(status);
}
/* This function gets called from all 3 processes. We want the client side
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
- rprintf(FINFO,"Total file size: %.0f bytes\n",
- (double)stats.total_size);
- rprintf(FINFO,"Total transferred file size: %.0f bytes\n",
- (double)stats.total_transferred_size);
- rprintf(FINFO,"Literal data: %.0f bytes\n",
- (double)stats.literal_data);
- rprintf(FINFO,"Matched data: %.0f bytes\n",
- (double)stats.matched_data);
+ rprintf(FINFO,"Total file size: %s bytes\n",
+ human_num(stats.total_size));
+ rprintf(FINFO,"Total transferred file size: %s bytes\n",
+ human_num(stats.total_transferred_size));
+ rprintf(FINFO,"Literal data: %s bytes\n",
+ human_num(stats.literal_data));
+ rprintf(FINFO,"Matched data: %s bytes\n",
+ human_num(stats.matched_data));
rprintf(FINFO,"File list size: %d\n", stats.flist_size);
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list transfer time: %.3f seconds\n",
(double)stats.flist_xfertime / 1000);
}
- rprintf(FINFO,"Total bytes sent: %.0f\n",
- (double)total_written);
- rprintf(FINFO,"Total bytes received: %.0f\n",
- (double)total_read);
+ rprintf(FINFO,"Total bytes sent: %s\n",
+ human_num(total_written));
+ rprintf(FINFO,"Total bytes received: %s\n",
+ human_num(total_read));
}
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 + (endtime - starttime)));
- rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
- (double)stats.total_size,
+ "\nsent %s bytes received %s bytes %s bytes/sec\n",
+ human_num(total_written), human_num(total_read),
+ human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
+ rprintf(FINFO, "total size is %s speedup is %.2f\n",
+ human_num(stats.total_size),
(double)stats.total_size / (total_written+total_read));
}
int i, argc = 0;
char *args[MAX_ARGS];
pid_t ret;
- char *tok, *dir = NULL;
+ char *dir = NULL;
int dash_l_set = 0;
if (!read_batch && !local_server) {
+ char *t, *f, in_quote = '\0';
char *rsh_env = getenv(RSYNC_RSH_ENV);
if (!cmd)
cmd = rsh_env;
if (!cmd)
goto oom;
- for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
+ for (t = f = cmd; *f; f++) {
+ if (*f == ' ')
+ continue;
/* Comparison leaves rooms for server_options(). */
if (argc >= MAX_ARGS - MAX_SERVER_ARGS) {
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
- args[argc++] = tok;
+ args[argc++] = t;
+ while (*f != ' ' || in_quote) {
+ if (!*f) {
+ if (in_quote) {
+ rprintf(FERROR,
+ "Missing trailing-%c in remote-shell command.\n",
+ in_quote);
+ exit_cleanup(RERR_SYNTAX);
+ }
+ f--;
+ break;
+ }
+ if (*f == '\'' || *f == '"') {
+ if (!in_quote) {
+ in_quote = *f++;
+ continue;
+ }
+ if (*f == in_quote && *++f != in_quote) {
+ in_quote = '\0';
+ continue;
+ }
+ }
+ *t++ = *f++;
+ }
+ *t++ = '\0';
}
/* check to see if we've already been given '-l user' in
args[argc] = NULL;
if (verbose > 3) {
- rprintf(FINFO,"cmd=");
for (i = 0; i < argc; i++)
- rprintf(FINFO, "%s ", safe_fname(args[i]));
- rprintf(FINFO,"\n");
+ rprintf(FINFO, "cmd[%d]=%s ", i, safe_fname(args[i]));
+ rprintf(FINFO, "\n");
}
if (read_batch) {
return ret;
-oom:
+ oom:
out_of_memory("do_cmd");
return 0; /* not reached */
}
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
- int i;
struct file_list *flist;
char *dir = argv[0];
argc--;
argv++;
- if (strcmp(dir,".")) {
- int l = strlen(dir);
- if (strcmp(dir,"/") == 0)
- l = 0;
- for (i = 0; i < argc; i++)
- argv[i] += l+1;
- }
-
if (argc == 0 && (recurse || list_only)) {
argc = 1;
argv--;
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
- int status = 0;
+ int exit_code = 0;
int error_pipe[2];
/* The receiving side mustn't obey this, or an existing symlink that
set_msg_fd_in(-1);
kill(pid, SIGUSR2);
- wait_process(pid, &status);
- return status;
+ wait_process_with_flush(pid, &exit_code);
+ return exit_code;
}
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
- int status;
+ int exit_code;
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
return;
}
-
if (argc > 0) {
dir = argv[0];
argc--;
}
the_file_list = flist;
- if (argc > 0) {
- if (strcmp(dir,".")) {
- argv[0] += strlen(dir);
- if (argv[0][0] == '/')
- argv[0]++;
- }
+ if (argc > 0)
local_name = get_local_name(flist,argv[0]);
- }
- status = do_recv(f_in,f_out,flist,local_name);
- exit_cleanup(status);
+ exit_code = do_recv(f_in,f_out,flist,local_name);
+ exit_cleanup(exit_code);
}
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
{
struct file_list *flist = NULL;
- int status = 0, status2 = 0;
+ int exit_code = 0, exit_code2 = 0;
char *local_name = NULL;
cleanup_child_pid = pid;
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush(FULL_FLUSH);
- wait_process(pid, &status);
+ wait_process_with_flush(pid, &exit_code);
}
output_summary();
io_flush(FULL_FLUSH);
- exit_cleanup(status);
+ exit_cleanup(exit_code);
}
if (need_messages_from_generator && !read_batch)
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
- status2 = do_recv(f_in, f_out, flist, local_name);
+ exit_code2 = do_recv(f_in, f_out, flist, local_name);
} else {
handle_stats(-1);
output_summary();
if (verbose > 3)
rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
io_flush(FULL_FLUSH);
- wait_process(pid, &status);
+ wait_process_with_flush(pid, &exit_code);
}
- return MAX(status, status2);
+ return MAX(exit_code, exit_code2);
}
static int copy_argv (char *argv[])
argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
+ char *dummy1;
+ int dummy2;
+ if (argc && check_for_hostspec(argv[argc], &dummy1, &dummy2)) {
+ rprintf(FERROR,
+ "The source and destination cannot both be remote.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
static RETSIGTYPE sigusr1_handler(UNUSED(int val))
{
- exit_cleanup(RERR_SIGNAL);
+ exit_cleanup(RERR_SIGNAL1);
}
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
* get him to explain why he put it in, so rather than taking it
* out we're instead saving the child exit statuses for later use.
* The waitpid() loop presumably eliminates all possibility of leaving
- * zombie children, maybe that's why he did it.
- */
+ * zombie children, maybe that's why he did it. */
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
/* save the child's exit status */
for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
}
}
#endif
+ signal(SIGCHLD, sigchld_handler);
}