-/* -*- c-file-style: "linux" -*-
-
- Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/*
+ * The startup routines, including main(), for rsync.
+ *
+ * Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
#include "rsync.h"
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
extern int verbose;
extern int dry_run;
extern int do_stats;
extern int log_got_error;
extern int module_id;
-extern int orig_umask;
extern int copy_links;
+extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
-extern int fuzzy_basis;
extern int relative_paths;
+extern int sanitize_paths;
+extern int curr_dir_depth;
+extern int module_id;
extern int rsync_port;
-extern int inplace;
-extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
+extern struct filter_list_struct server_filter_list;
int local_server = 0;
+mode_t orig_umask = 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
-****************************************************************************/
-void wait_process(pid_t pid, int *status)
+/* Works like waitpid(), but if we already harvested the child pid in our
+ * remember_children(), 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 remember_children(). */
+ 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
return;
if (am_daemon) {
- log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender)
return;
}
/* this is the client */
- if (!am_sender) {
+ if (f < 0 && !am_sender) /* e.g. when we got an empty file list. */
+ ;
+ else if (!am_sender) {
/* Read the first two in opposite order because the meaning of
* read/write swaps when switching from sender to receiver. */
total_written = read_longint(f);
write_longint(batch_fd, stats.flist_xfertime);
}
}
+}
+static void output_summary(void)
+{
if (do_stats) {
- rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
+ rprintf(FCLIENT, "\n");
+ rprintf(FINFO,"Number 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));
}
- fflush(stdout);
- fflush(stderr);
-}
-
-static void output_summary(void)
-{
if (verbose || do_stats) {
+ rprintf(FCLIENT, "\n");
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,
+ "sent %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));
}
mi = mallinfo();
- rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
+ rprintf(FCLIENT, "\n");
+ rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
getpid(), am_server ? "server " : "",
am_daemon ? "daemon " : "", who_am_i());
rprintf(FINFO, " arena: %10ld (bytes from sbrk)\n",
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 - 100) {
+ 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(FCLIENT, "cmd[%d]=%s ", i, args[i]);
+ rprintf(FCLIENT, "\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 receives any number of files into a destination directory,
+ * 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.
+ * For mode 1, we change into the destination directory and return NULL.
+ * For mode 2, we change into the directory containing the destination
+ * file (if we aren't already there) and return the local-name. */
+static char *get_local_name(struct file_list *flist, char *dest_path)
{
STRUCT_STAT st;
- int e;
+ int statret;
+ 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 || list_only)
return NULL;
- if (do_stat(name,&st) == 0) {
+ /* See what currently exists at the destination. */
+ if ((statret = safe_stat(dest_path, &st)) == 0) {
+ /* If the destination is a dir, enter it and use mode 1. */
if (S_ISDIR(st.st_mode)) {
- if (!push_dir(name)) {
+ if (sanitize_paths)
+ die_on_unsafe_path(dest_path, 0);
+ 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 (sanitize_paths && S_ISLNK(st.st_mode))
+ die_on_unsafe_path(dest_path, 0);
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;
+ /* Caution: flist->count could be 0! */
+ if (flist->count == 1 && S_ISDIR(flist->files[0]->mode)) {
+ rprintf(FERROR,
+ "ERROR: cannot overwrite non-directory"
+ " with a directory\n");
+ exit_cleanup(RERR_FILESELECT);
+ }
+ } else if (errno != ENOENT) {
+ /* If we don't know what's at the destination, fail. */
+ rsyserr(FERROR, errno, "ERROR: cannot stat destination %s",
+ full_fname(dest_path));
+ exit_cleanup(RERR_FILESELECT);
}
- 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 we need a destination directory because the transfer is not
+ * of a single non-directory or the user has requested one via a
+ * destination path ending in a slash, create one and use mode 1. */
+ if (flist->count > 1 || (cp && !cp[1])) {
+ /* Lop off the final slash (if any). */
+ if (cp && !cp[1])
+ *cp = '\0';
+
+ if (statret == 0) {
+ rprintf(FERROR,
+ "ERROR: destination path is not a directory\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
+ if (mkdir_defmode(dest_path) != 0) {
+ rsyserr(FERROR, errno, "mkdir %s failed",
+ full_fname(dest_path));
+ exit_cleanup(RERR_FILEIO);
+ }
+
+ 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 (sanitize_paths)
+ die_on_unsafe_path(dest_path, 0);
+ 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 (sanitize_paths)
+ die_on_unsafe_path(dest_path, 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[])
{
- int i;
struct file_list *flist;
char *dir = argv[0];
return;
}
- if (!relative_paths && !push_dir(dir)) {
- rsyserr(FERROR, errno, "push_dir#3 %s failed",
- full_fname(dir));
- exit_cleanup(RERR_FILESELECT);
+ if (!relative_paths) {
+ if (sanitize_paths)
+ die_on_unsafe_path(dir, 0);
+ if (!push_dir(dir)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dir));
+ exit_cleanup(RERR_FILESELECT);
+ }
}
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
* points to an identical file won't be replaced by the referent. */
- copy_links = 0;
+ copy_links = copy_dirlinks = 0;
if (preserve_hard_links)
init_hard_links();
am_generator = 1;
close_multiplexing_in();
- if (write_batch)
+ if (write_batch && !am_server)
stop_write_batch();
close(error_pipe[1]);
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]);
+
+ /* Now that we know what our destination directory turned out to be,
+ * we can sanitize the --link-/copy-/compare-dest args correctly. */
+ if (sanitize_paths) {
+ char **dir;
+ for (dir = basis_dir; *dir; dir++) {
+ *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL);
+ die_on_unsafe_path(*dir, 0);
+ }
+ if (partial_dir) {
+ partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL);
+ /* A relative path gets this checked at every dir change. */
+ if (*partial_dir == '/')
+ die_on_unsafe_path(partial_dir, 0);
+ }
}
+ if (server_filter_list.head) {
+ char **dir;
+ struct filter_list_struct *elp = &server_filter_list;
- status = do_recv(f_in,f_out,flist,local_name);
- exit_cleanup(status);
+ for (dir = basis_dir; *dir; dir++) {
+ if (check_filter(elp, *dir, 1) < 0)
+ goto options_rejected;
+ }
+ if (partial_dir && *partial_dir == '/'
+ && check_filter(elp, partial_dir, 1) < 0) {
+ options_rejected:
+ rprintf(FERROR,
+ "Your options have been rejected by the server.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+ }
+
+ 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;
+ 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 (filesfrom_host)
filesfrom_fd = f_in;
- if (write_batch)
+ if (write_batch && !am_server)
start_write_batch(f_out);
flist = send_file_list(f_out, argc, argv);
set_msg_fd_in(-1);
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);
}
- io_flush(FULL_FLUSH);
output_summary();
- exit_cleanup(status);
+ io_flush(FULL_FLUSH);
+ exit_cleanup(exit_code);
}
if (need_messages_from_generator && !read_batch)
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) {
- rprintf(FINFO, "client: nothing to do: "
- "perhaps you need to specify some filenames or "
- "the --recursive option?\n");
- exit_cleanup(0);
- }
the_file_list = flist;
- local_name = get_local_name(flist,argv[0]);
+ 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 (pid != -1) {
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[])
return rc;
if (!read_batch) { /* for read_batch, NO source is specified */
- 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) {
} else { /* source is local, check dest arg */
am_sender = 1;
- if (argc < 1) { /* destination required */
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
+ if (argc > 1)
+ p = argv[--argc];
+ else {
+ p = ".";
+ list_only = 1;
}
- shell_path = check_for_hostspec(argv[argc], &shell_machine, &rsync_port);
+ shell_path = check_for_hostspec(p, &shell_machine, &rsync_port);
if (shell_path && filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
exit_cleanup(RERR_SYNTAX);
}
shell_machine = NULL;
- shell_path = argv[argc];
+ shell_path = p;
} else if (rsync_port) {
if (!shell_cmd) {
return start_socket_client(shell_machine,
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))
_exit(0);
}
-static RETSIGTYPE sigchld_handler(UNUSED(int val))
+RETSIGTYPE remember_children(UNUSED(int val))
{
#ifdef WNOHANG
int cnt, status;
* 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, remember_children);
+#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, remember_children);
#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);
/* we set a 0 umask so that correct file permissions can be
* carried across */
- orig_umask = (int)umask(0);
+ orig_umask = 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
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);
+ SIGACTION(SIGPIPE, SIG_IGN);
+#ifdef SIGXFSZ
+ SIGACTION(SIGXFSZ, SIG_IGN);
+#endif
/* Initialize push_dir here because on some old systems getcwd
* (implemented by forking "pwd" and reading its output) doesn't
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 (read_batch)
read_stream_flags(batch_fd);
}
+ if (write_batch < 0)
+ dry_run = 1;
if (am_daemon && !am_server)
return daemon_main();