extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
-extern int always_checksum;
extern int recurse;
extern int relative_paths;
extern int rsync_port;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
-extern char curr_dir[MAXPATHLEN];
int local_server = 0;
-int pre_checksum = 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. */
-#define MAXCHILDPROCS 5
+#define MAXCHILDPROCS 7
+
+#ifdef HAVE_SIGACTION
+# ifdef HAVE_SIGPROCMASK
+# define SIGACTMASK(n,h) SIGACTION(n,h), sigaddset(&sigmask,(n))
+# else
+# define SIGACTMASK(n,h) SIGACTION(n,h)
+# endif
+static struct sigaction sigact;
+#endif
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
-****************************************************************************/
-static void wait_process(pid_t pid, int *code_ptr)
+/* 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, status;
-
- 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) {
- waited_pid = 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 they know something went wrong. */
- if (waited_pid < 0)
- *code_ptr = RERR_WAITCHILD;
- else if (!WIFEXITED(status)) {
+ if (waited_pid < 0) {
+ rsyserr(FERROR, errno, "waitpid");
+ *exit_code_ptr = RERR_WAITCHILD;
+ } else if (!WIFEXITED(status)) {
#ifdef WCOREDUMP
if (WCOREDUMP(status))
- *code_ptr = RERR_CRASHED;
+ *exit_code_ptr = RERR_CRASHED;
else
#endif
if (WIFSIGNALED(status))
- *code_ptr = RERR_TERMINATED;
+ *exit_code_ptr = RERR_TERMINATED;
else
- *code_ptr = RERR_WAITCHILD;
+ *exit_code_ptr = RERR_WAITCHILD;
} else
- *code_ptr = WEXITSTATUS(status);
+ *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, args[i]);
+ rprintf(FINFO, "\n");
}
if (read_batch) {
return ret;
-oom:
+ oom:
out_of_memory("do_cmd");
return 0; /* not reached */
}
-
-static char *get_local_name(struct file_list *flist,char *name)
+/* The receiving side operates in one of two modes:
+ *
+ * 1. it enters a directory and receives one or more files, placing them
+ * according to their names in the file-list.
+ *
+ * 2. it receives a single file and saves it using the name in the
+ * destination path instead of its file-list name. This requires a
+ * "local name" for writing out the destination file.
+ *
+ * So, our task is to figure out what mode/local-name we need and return
+ * either a NULL for mode 1, or the local-name for mode 2. We also
+ * change directory if there are any path components in dest_path. */
+static char *get_local_name(struct file_list *flist, char *dest_path)
{
STRUCT_STAT st;
- int e;
+ char *cp;
- if (verbose > 2)
- rprintf(FINFO,"get_local_name count=%d %s\n",
- flist->count, NS(name));
+ if (verbose > 2) {
+ rprintf(FINFO, "get_local_name count=%d %s\n",
+ flist->count, NS(dest_path));
+ }
- if (!name)
+ if (!dest_path)
return NULL;
- if (do_stat(name,&st) == 0) {
+ /* If the destination path refers to an existing directory, enter
+ * it and use mode 1. If there is something other than a directory
+ * at the destination path, we must be transferring one file
+ * (anything at the destination will be overwritten). */
+ if (do_stat(dest_path, &st) == 0) {
if (S_ISDIR(st.st_mode)) {
- if (!push_dir(name)) {
+ if (!push_dir(dest_path)) {
rsyserr(FERROR, errno, "push_dir#1 %s failed",
- full_fname(name));
+ full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
return NULL;
}
if (flist->count > 1) {
- rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+ rprintf(FERROR,
+ "ERROR: destination must be a directory when"
+ " copying more than 1 file\n");
exit_cleanup(RERR_FILESELECT);
}
- return name;
}
- if (flist->count <= 1 && ((e = strlen(name)) <= 1 || name[e-1] != '/'))
- return name;
+ cp = strrchr(dest_path, '/');
- if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
- exit_cleanup(RERR_FILEIO);
- }
- if (verbose > 0)
- rprintf(FINFO, "created directory %s\n", safe_fname(name));
+ /* If the destination path ends in a slash or we are transferring
+ * multiple files, create a directory at the destination path,
+ * enter the new directory, and use mode 1. */
+ if (flist->count > 1 || (cp && !cp[1])) {
+ /* Lop off the final slash (if any). */
+ if (cp && !cp[1])
+ *cp = '\0';
+
+ umask(orig_umask);
+ if (do_mkdir(dest_path, 0777) != 0) {
+ rsyserr(FERROR, errno, "mkdir %s failed",
+ full_fname(dest_path));
+ exit_cleanup(RERR_FILEIO);
+ }
+ umask(0);
+
+ if (verbose)
+ rprintf(FINFO, "created directory %s\n", dest_path);
+
+ if (dry_run) {
+ /* Indicate that the destination directory doesn't
+ * really exist and return mode 1. */
+ dry_run++;
+ return NULL;
+ }
+
+ if (!push_dir(dest_path)) {
+ rsyserr(FERROR, errno, "push_dir#2 %s failed",
+ full_fname(dest_path));
+ exit_cleanup(RERR_FILESELECT);
+ }
- if (dry_run) {
- dry_run++;
return NULL;
}
- if (!push_dir(name)) {
- rsyserr(FERROR, errno, "push_dir#2 %s failed",
- full_fname(name));
+ /* Otherwise, we are writing a single file, possibly on top of an
+ * existing non-directory. Change to the item's parent directory
+ * (if it has a path component), return the basename of the
+ * destination file as the local name, and use mode 2. */
+ if (!cp)
+ return dest_path;
+
+ if (cp == dest_path)
+ dest_path = "/";
+
+ *cp = '\0';
+ if (!push_dir(dest_path)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
+ *cp = '/';
- return NULL;
+ return cp + 1;
}
}
-static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
+static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
char *dir = argv[0];
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;
- char olddir[sizeof curr_dir];
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
return;
}
-
if (argc > 0) {
dir = argv[0];
argc--;
filesfrom_fd = -1;
}
- strlcpy(olddir, curr_dir, sizeof olddir);
- if (always_checksum && argc > 0)
- pre_checksum = push_dir(argv[0]);
-
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
}
the_file_list = flist;
- if (pre_checksum)
- pop_dir(olddir);
-
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);
}
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+ setup_iconv();
+#endif
if (protocol_version >= 23)
io_start_multiplex_out();
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;
- char olddir[sizeof curr_dir];
+ int exit_code = 0, exit_code2 = 0;
char *local_name = NULL;
cleanup_child_pid = pid;
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+ setup_iconv();
+#endif
if (protocol_version >= 23 && !read_batch)
io_start_multiplex_in();
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)
filesfrom_fd = -1;
}
- strlcpy(olddir, curr_dir, sizeof olddir);
- if (always_checksum)
- pre_checksum = push_dir(argv[0]);
-
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
the_file_list = flist;
- if (pre_checksum)
- pop_dir(olddir);
-
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[])
if (verbose > 3) {
rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
- shell_cmd ? safe_fname(shell_cmd) : "",
- shell_machine ? safe_fname(shell_machine) : "",
- shell_user ? safe_fname(shell_user) : "",
- shell_path ? safe_fname(shell_path) : "");
+ shell_cmd ? shell_cmd : "",
+ shell_machine ? shell_machine : "",
+ shell_user ? shell_user : "",
+ shell_path ? shell_path : "");
}
/* for remote source, only single dest arg can remain ... */
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
+#ifndef HAVE_SIGACTION
+ signal(SIGCHLD, sigchld_handler);
+#endif
}
int ret;
int orig_argc = argc;
char **orig_argv = argv;
+#ifdef HAVE_SIGACTION
+# ifdef HAVE_SIGPROCMASK
+ sigset_t sigmask;
- signal(SIGUSR1, sigusr1_handler);
- signal(SIGUSR2, sigusr2_handler);
- signal(SIGCHLD, sigchld_handler);
+ sigemptyset(&sigmask);
+# endif
+ sigact.sa_flags = SA_NOCLDSTOP;
+#endif
+ SIGACTMASK(SIGUSR1, sigusr1_handler);
+ SIGACTMASK(SIGUSR2, sigusr2_handler);
+ SIGACTMASK(SIGCHLD, sigchld_handler);
#ifdef MAINTAINER_MODE
- signal(SIGSEGV, rsync_panic_handler);
- signal(SIGFPE, rsync_panic_handler);
- signal(SIGABRT, rsync_panic_handler);
- signal(SIGBUS, rsync_panic_handler);
-#endif /* def MAINTAINER_MODE */
+ SIGACTMASK(SIGSEGV, rsync_panic_handler);
+ SIGACTMASK(SIGFPE, rsync_panic_handler);
+ SIGACTMASK(SIGABRT, rsync_panic_handler);
+ SIGACTMASK(SIGBUS, rsync_panic_handler);
+#endif
starttime = time(NULL);
am_root = (MY_UID() == 0);
* carried across */
orig_umask = (int)umask(0);
+#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
+ setlocale(LC_CTYPE, "");
+#endif
+
if (!parse_arguments(&argc, (const char ***) &argv, 1)) {
/* FIXME: We ought to call the same error-handling
* code here, rather than relying on getopt. */
exit_cleanup(RERR_SYNTAX);
}
- signal(SIGINT,SIGNAL_CAST sig_int);
- signal(SIGHUP,SIGNAL_CAST sig_int);
- signal(SIGTERM,SIGNAL_CAST sig_int);
+ SIGACTMASK(SIGINT, sig_int);
+ SIGACTMASK(SIGHUP, sig_int);
+ SIGACTMASK(SIGTERM, sig_int);
+#if defined HAVE_SIGACTION && HAVE_SIGPROCMASK
+ sigprocmask(SIG_UNBLOCK, &sigmask, NULL);
+#endif
/* Ignore SIGPIPE; we consistently check error codes and will
* see the EPIPE. */
- signal(SIGPIPE, SIG_IGN);
-
-#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
- setlocale(LC_CTYPE, "");
-#endif
+ SIGACTION(SIGPIPE, SIG_IGN);
/* Initialize push_dir here because on some old systems getcwd
* (implemented by forking "pwd" and reading its output) doesn't