-/* -*- 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-2007 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 3 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, visit the http://fsf.org website.
+ */
#include "rsync.h"
+#include "io.h"
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
-time_t starttime = 0;
-
-extern struct stats stats;
-extern char *files_from;
-extern int filesfrom_fd;
-extern char *remote_filesfrom_file;
+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 inc_recurse;
+extern int blocking_io;
+extern int remove_source_files;
+extern int daemon_over_rsh;
+extern int need_messages_from_generator;
+extern int kluge_around_eof;
+extern int do_stats;
+extern int log_got_error;
+extern int module_id;
+extern int copy_links;
+extern int copy_dirlinks;
+extern int keep_dirlinks;
+extern int preserve_hard_links;
extern int protocol_version;
-
-/* there's probably never more than at most 2 outstanding child processes,
- * but set it higher just in case.
- */
-#define MAXCHILDPROCS 5
+extern int file_total;
+extern int recurse;
+extern int relative_paths;
+extern int sanitize_paths;
+extern int curr_dir_depth;
+extern int curr_dir_len;
+extern int module_id;
+extern int rsync_port;
+extern int whole_file;
+extern int read_batch;
+extern int write_batch;
+extern int batch_fd;
+extern int filesfrom_fd;
+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;
+extern char *password_file;
+extern char curr_dir[MAXPATHLEN];
+extern struct filter_list_struct server_filter_list;
+
+int local_server = 0;
+int new_root_dir = 0;
+mode_t orig_umask = 0;
+int batch_gen_fd = -1;
+
+/* There's probably never more than at most 2 outstanding child processes,
+ * but set it higher, just in case. */
+#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 int64 total_read, total_written;
+
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();
- }
-
- 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++) {
+
+ do {
+ waited_pid = waitpid(pid, status_ptr, flags);
+ } while (waited_pid == -1 && errno == EINTR);
+
+ if (waited_pid == -1 && errno == ECHILD) {
+ /* 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);
}
-static void report(int f)
+/* This function gets called from all 3 processes. We want the client side
+ * to actually output the text, but the sender is the only process that has
+ * all the stats we need. So, if we're a client sender, we do the report.
+ * If we're a server sender, we write the stats on the supplied fd. If
+ * we're the client receiver we read the stats from the supplied fd and do
+ * 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 handle_stats(int f)
{
- time_t t = time(NULL);
- extern int do_stats;
- int send_stats;
+ endtime = time(NULL);
+
+ /* Cache two stats because the read/write code can change it. */
+ total_read = stats.total_read;
+ total_written = stats.total_written;
if (do_stats && verbose > 1) {
/* These come out from every process */
show_flist_stats();
}
+ if (am_generator)
+ return;
+
if (am_daemon) {
- log_exit(0, __FILE__, __LINE__);
- if (f == -1 || !am_sender) return;
+ if (f == -1 || !am_sender)
+ return;
}
- send_stats = verbose || protocol_version >= 20;
if (am_server) {
- if (am_sender && send_stats) {
- int64 w;
- /* store total_written in a temporary
- * because write_longint changes it */
- w = stats.total_written;
- write_longint(f,stats.total_read);
- write_longint(f,w);
- write_longint(f,stats.total_size);
+ if (am_sender) {
+ write_varlong30(f, total_read, 3);
+ write_varlong30(f, total_written, 3);
+ write_varlong30(f, stats.total_size, 3);
+ if (protocol_version >= 29) {
+ write_varlong30(f, stats.flist_buildtime, 3);
+ write_varlong30(f, stats.flist_xfertime, 3);
+ }
}
return;
}
/* this is the client */
- if (!am_sender && send_stats) {
- int64 r;
- stats.total_written = read_longint(f);
- /* store total_read in a temporary, read_longint changes it */
- r = read_longint(f);
- stats.total_size = read_longint(f);
- stats.total_read = r;
+ 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_varlong30(f, 3);
+ total_read = read_varlong30(f, 3);
+ stats.total_size = read_varlong30(f, 3);
+ if (protocol_version >= 29) {
+ stats.flist_buildtime = read_varlong30(f, 3);
+ stats.flist_xfertime = read_varlong30(f, 3);
+ }
+ } else if (write_batch) {
+ /* The --read-batch process is going to be a client
+ * receiver, so we need to give it the stats. */
+ write_varlong30(batch_fd, total_read, 3);
+ write_varlong30(batch_fd, total_written, 3);
+ write_varlong30(batch_fd, stats.total_size, 3);
+ if (protocol_version >= 29) {
+ write_varlong30(batch_fd, stats.flist_buildtime, 3);
+ write_varlong30(batch_fd, stats.flist_xfertime, 3);
+ }
}
+}
+static void output_summary(void)
+{
if (do_stats) {
- if (!am_sender && !send_stats) {
- /* missing the bytes written by the generator */
- rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
- rprintf(FINFO, "Use --stats -v to show stats\n");
- return;
- }
- 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,"File list size: %d\n", stats.flist_size);
- rprintf(FINFO,"Total bytes written: %.0f\n",
- (double)stats.total_written);
- rprintf(FINFO,"Total bytes read: %.0f\n",
- (double)stats.total_read);
+ 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: %s\n",
+ human_num(stats.flist_size));
+ if (stats.flist_buildtime) {
+ rprintf(FINFO,
+ "File list generation time: %.3f seconds\n",
+ (double)stats.flist_buildtime / 1000);
+ rprintf(FINFO,
+ "File list transfer time: %.3f seconds\n",
+ (double)stats.flist_xfertime / 1000);
+ }
+ 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,"\nwrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
- rprintf(FINFO,"total size is %.0f speedup is %.2f\n",
- (double)stats.total_size,
- (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+ rprintf(FCLIENT, "\n");
+ rprintf(FINFO,
+ "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));
}
fflush(stdout);
mi = mallinfo();
- rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
- getpid(),
- am_server ? "server " : "",
- am_daemon ? "daemon " : "",
- am_sender ? "sender" : "receiver");
- rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena);
- rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks);
- rprintf(FINFO, " smblks: %10d\n", mi.smblks);
- rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks);
- rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd);
- rprintf(FINFO, " usmblks: %10d\n", mi.usmblks);
- rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks);
- rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks);
- rprintf(FINFO, " fordblks: %10d (bytes free)\n", mi.fordblks);
- rprintf(FINFO, " keepcost: %10d (bytes in releasable chunk)\n", mi.keepcost);
+ 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",
+ (long)mi.arena);
+ rprintf(FINFO, " ordblks: %10ld (chunks not in use)\n",
+ (long)mi.ordblks);
+ rprintf(FINFO, " smblks: %10ld\n",
+ (long)mi.smblks);
+ rprintf(FINFO, " hblks: %10ld (chunks from mmap)\n",
+ (long)mi.hblks);
+ rprintf(FINFO, " hblkhd: %10ld (bytes from mmap)\n",
+ (long)mi.hblkhd);
+ rprintf(FINFO, " allmem: %10ld (bytes from sbrk + mmap)\n",
+ (long)mi.arena + mi.hblkhd);
+ rprintf(FINFO, " usmblks: %10ld\n",
+ (long)mi.usmblks);
+ rprintf(FINFO, " fsmblks: %10ld\n",
+ (long)mi.fsmblks);
+ rprintf(FINFO, " uordblks: %10ld (bytes used)\n",
+ (long)mi.uordblks);
+ rprintf(FINFO, " fordblks: %10ld (bytes free)\n",
+ (long)mi.fordblks);
+ rprintf(FINFO, " keepcost: %10ld (bytes in releasable chunk)\n",
+ (long)mi.keepcost);
#endif /* HAVE_MALLINFO */
}
/* Start the remote shell. cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
+ int *f_in, int *f_out)
{
- char *args[100];
- int i,argc=0;
+ int i, argc = 0;
+ char *args[MAX_ARGS];
pid_t ret;
- char *tok,*dir=NULL;
+ char *dir = NULL;
int dash_l_set = 0;
- extern int local_server;
- extern char *rsync_path;
- extern int blocking_io;
- extern int daemon_over_rsh;
- extern int read_batch;
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," ")) {
- args[argc++] = tok;
+ 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++] = 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
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)) {
}
server_options(args,&argc);
+
+ if (argc >= MAX_ARGS - 2) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
}
args[argc++] = ".";
args[argc] = NULL;
if (verbose > 3) {
- rprintf(FINFO,"cmd=");
- for (i=0;i<argc;i++)
- rprintf(FINFO,"%s ",args[i]);
- rprintf(FINFO,"\n");
+ for (i = 0; i < argc; i++)
+ rprintf(FCLIENT, "cmd[%d]=%s ", i, args[i]);
+ rprintf(FCLIENT, "\n");
}
- if (local_server) {
- if (read_batch)
- create_flist_from_batch(); /* sets batch_flist */
+ if (read_batch) {
+ int from_gen_pipe[2];
+ if (fd_pair(from_gen_pipe) < 0) {
+ rsyserr(FERROR, errno, "pipe");
+ exit_cleanup(RERR_IPC);
+ }
+ batch_gen_fd = from_gen_pipe[0];
+ *f_out = from_gen_pipe[1];
+ *f_in = batch_fd;
+ ret = -1; /* no child pid */
+ } else if (local_server) {
+ /* If the user didn't request --[no-]whole-file, force
+ * it on, but only if we're not batch processing. */
+ if (whole_file < 0 && !write_batch)
+ whole_file = 1;
ret = local_child(argc, args, f_in, f_out, child_main);
- } else {
+ } else
ret = piped_child(args,f_in,f_out);
- }
- if (dir) free(dir);
+ if (dir)
+ free(dir);
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;
- extern int orig_umask;
+ 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",
+ file_total, 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 = do_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, 0)) {
- rprintf(FERROR, "push_dir %s failed: %s (1)\n",
- full_fname(name), strerror(errno));
+ if (!push_dir(dest_path, 0)) {
+ rsyserr(FERROR, errno, "push_dir#1 %s failed",
+ 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");
+ if (file_total > 1) {
+ rprintf(FERROR,
+ "ERROR: destination must be a directory when"
+ " copying more than 1 file\n");
+ exit_cleanup(RERR_FILESELECT);
+ }
+ if (file_total == 1 && S_ISDIR(flist->files[0]->mode)) {
+ rprintf(FERROR,
+ "ERROR: cannot overwrite non-directory"
+ " with a directory\n");
exit_cleanup(RERR_FILESELECT);
}
- return name;
+ } 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) {
- rprintf(FERROR, "mkdir %s failed: %s\n",
- full_fname(name), strerror(errno));
- exit_cleanup(RERR_FILEIO);
- } else {
- if (verbose > 0)
- rprintf(FINFO,"created directory %s\n",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 (file_total > 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);
+ }
+
+ new_root_dir = 1;
+
+ if (verbose)
+ rprintf(FINFO, "created directory %s\n", dest_path);
+
+ if (dry_run) {
+ /* Indicate that dest dir doesn't really exist. */
+ dry_run++;
+ }
+
+ if (!push_dir(dest_path, dry_run > 1)) {
+ rsyserr(FERROR, errno, "push_dir#2 %s failed",
+ full_fname(dest_path));
+ exit_cleanup(RERR_FILESELECT);
+ }
+
+ return NULL;
}
- if (!push_dir(name, 0)) {
- rprintf(FERROR, "push_dir %s failed: %s (2)\n",
- full_fname(name), strerror(errno));
+ /* 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, 0)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
+ *cp = '/';
- return NULL;
+ return cp + 1;
}
+/* Call this if the destination dir (which is assumed to be in curr_dir)
+ * does not yet exist and we can't create it due to being in dry-run
+ * mode. We'll fix dirs that can be relative to the non-existent dir. */
+static void fix_basis_dirs(void)
+{
+ char **dir, *new, *slash;
+ int len;
+ if (dry_run <= 1)
+ return;
+ slash = strrchr(curr_dir, '/');
+
+ for (dir = basis_dir; *dir; dir++) {
+ if (**dir == '/')
+ continue;
+ len = curr_dir_len + 1 + strlen(*dir) + 1;
+ if (!(new = new_array(char, len)))
+ out_of_memory("fix_basis_dirs");
+ if (slash && strncmp(*dir, "../", 3) == 0) {
+ /* We want to remove only one leading "../" prefix for
+ * the directory we couldn't create in dry-run mode:
+ * this ensures that any other ".." references get
+ * evaluated the same as they would for a live copy. */
+ *slash = '\0';
+ pathjoin(new, len, curr_dir, *dir + 3);
+ *slash = '/';
+ } else
+ pathjoin(new, len, curr_dir, *dir);
+ *dir = new;
+ }
+}
-static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
+/* This is only called by the sender. */
+static void read_final_goodbye(int f_in)
+{
+ int i, iflags, xlen;
+ uchar fnamecmp_type;
+ char xname[MAXPATHLEN];
+
+ if (protocol_version < 29)
+ i = read_int(f_in);
+ else {
+ i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
+ }
+
+ if (i != NDX_DONE) {
+ 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;
struct file_list *flist;
char *dir = argv[0];
- extern int relative_paths;
- extern int recurse;
- if (verbose > 2)
- rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
+ if (verbose > 2) {
+ rprintf(FINFO, "server_sender starting pid=%ld\n",
+ (long)getpid());
+ }
- if (!relative_paths && !push_dir(dir, 0)) {
- rprintf(FERROR, "push_dir %s failed: %s (3)\n",
- full_fname(dir), strerror(errno));
- exit_cleanup(RERR_FILESELECT);
+ if (am_daemon && lp_write_only(module_id)) {
+ rprintf(FERROR, "ERROR: module is write only\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
+ if (am_daemon && lp_read_only(module_id) && remove_source_files) {
+ rprintf(FERROR,
+ "ERROR: --remove-%s-files cannot be used with a read-only module\n",
+ remove_source_files == 1 ? "source" : "sent");
+ exit_cleanup(RERR_SYNTAX);
+ return;
}
- 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 (!relative_paths) {
+ if (!push_dir(dir, 0)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dir));
+ exit_cleanup(RERR_FILESELECT);
+ }
}
+ argc--;
+ argv++;
- if (argc == 0 && recurse) {
- argc=1;
+ if (argc == 0 && (recurse || list_only)) {
+ argc = 1;
argv--;
argv[0] = ".";
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0) {
+ if (!flist || flist->used == 0)
exit_cleanup(0);
- }
io_start_buffering_in(f_in);
- io_start_buffering_out(f_out);
- send_files(flist,f_out,f_in);
- io_flush();
- report(f_out);
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
- io_flush();
+
+ send_files(f_in, f_out);
+ io_flush(FULL_FLUSH);
+ handle_stats(f_out);
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in);
+ io_flush(FULL_FLUSH);
exit_cleanup(0);
}
-static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+static int do_recv(int f_in, int f_out, char *local_name)
{
int pid;
- int status=0;
- int recv_pipe[2];
+ int exit_code = 0;
int error_pipe[2];
- extern int preserve_hard_links;
- extern int delete_after;
- extern int recurse;
- extern int delete_mode;
+ /* 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 = copy_dirlinks = 0;
+
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
- init_hard_links(flist);
+ match_hard_links();
+#endif
- if (!delete_after) {
- /* I moved this here from recv_files() to prevent a race condition */
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
+ if (fd_pair(error_pipe) < 0) {
+ rsyserr(FERROR, errno, "pipe failed in do_recv");
+ exit_cleanup(RERR_IPC);
}
- if (fd_pair(recv_pipe) < 0) {
- rprintf(FERROR,"pipe failed in do_recv\n");
- exit_cleanup(RERR_SOCKETIO);
- }
+ io_flush(NORMAL_FLUSH);
- if (fd_pair(error_pipe) < 0) {
- rprintf(FERROR,"error pipe failed in do_recv\n");
- exit_cleanup(RERR_SOCKETIO);
+ if ((pid = do_fork()) == -1) {
+ rsyserr(FERROR, errno, "fork failed in do_recv");
+ exit_cleanup(RERR_IPC);
}
- io_flush();
-
- if ((pid=do_fork()) == 0) {
- close(recv_pipe[0]);
+ if (pid == 0) {
close(error_pipe[0]);
- if (f_in != f_out) close(f_out);
+ if (f_in != f_out)
+ close(f_out);
/* we can't let two processes write to the socket at one time */
- io_multiplexing_close();
+ io_end_multiplex_out();
/* set place to send errors */
- set_error_fd(error_pipe[1]);
-
- recv_files(f_in,flist,local_name,recv_pipe[1]);
- io_flush();
- report(f_in);
-
- write_int(recv_pipe[1],1);
- close(recv_pipe[1]);
- io_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! */
- while (msleep(20))
- ;
+ set_msg_fd_out(error_pipe[1]);
+ io_start_buffering_out(error_pipe[1]);
+
+ recv_files(f_in, local_name);
+ io_flush(FULL_FLUSH);
+ handle_stats(f_in);
+
+ send_msg(MSG_DONE, "", 1, 0);
+ write_varlong(error_pipe[1], stats.total_read, 3);
+ io_flush(FULL_FLUSH);
+
+ /* Handle any keep-alive packets from the post-processing work
+ * that the generator does. */
+ if (protocol_version >= 29) {
+ int iflags, xlen;
+ uchar fnamecmp_type;
+ char xname[MAXPATHLEN];
+
+ kluge_around_eof = -1;
+
+ /* This should only get stopped via a USR2 signal. */
+ read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
+
+ 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);
}
- close(recv_pipe[1]);
+ am_generator = 1;
+
+ io_end_multiplex_in();
+ if (write_batch && !am_server)
+ stop_write_batch();
+
close(error_pipe[1]);
- if (f_in != f_out) close(f_in);
+ if (f_in != f_out)
+ close(f_in);
io_start_buffering_out(f_out);
- io_set_error_fd(error_pipe[0]);
+ set_msg_fd_in(error_pipe[0]);
+ io_start_buffering_in(error_pipe[0]);
- generate_files(f_out,flist,local_name,recv_pipe[0]);
+ generate_files(f_out, local_name);
- read_int(recv_pipe[0]);
- close(recv_pipe[0]);
+ handle_stats(-1);
+ io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out, -1);
+ write_ndx(f_out, NDX_DONE);
}
- io_flush();
+ io_flush(FULL_FLUSH);
- io_set_error_fd(-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[])
+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 *local_name = NULL;
char *dir = NULL;
- extern int delete_mode;
- extern int delete_excluded;
- extern int module_id;
- extern int read_batch;
- extern struct file_list *batch_flist;
+ int save_verbose = verbose;
- if (verbose > 2)
- rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+ if (filesfrom_fd >= 0) {
+ /* We can't mix messages with files-from data on the socket,
+ * so temporarily turn off verbose messages. */
+ verbose = 0;
+ }
+
+ if (verbose > 2) {
+ rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+ argc, (long)getpid());
+ }
- if (am_daemon && lp_read_only(module_id) && !am_sender) {
+ if (am_daemon && lp_read_only(module_id)) {
rprintf(FERROR,"ERROR: module is read only\n");
exit_cleanup(RERR_SYNTAX);
return;
}
-
if (argc > 0) {
dir = argv[0];
argc--;
argv++;
if (!am_daemon && !push_dir(dir, 0)) {
- rprintf(FERROR, "push_dir %s failed: %s (4)\n",
- full_fname(dir), strerror(errno));
+ rsyserr(FERROR, errno, "push_dir#4 %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
}
- io_start_buffering_in(f_in);
- if (delete_mode && !delete_excluded)
- recv_exclude_list(f_in);
+ if (protocol_version >= 30)
+ io_start_multiplex_in();
+ else
+ io_start_buffering_in(f_in);
+ recv_filter_list(f_in);
if (filesfrom_fd >= 0) {
- /* We're receiving the file info from the sender, so we need
- * the IO routines to automatically write out the names onto
- * our f_out socket as we read the list info from the sender.
- * This avoids both deadlock and extra delays/buffers. */
+ /* We need to send the files-from names to the sender at the
+ * same time that we receive the file-list from them, so we
+ * need the IO routines to automatically write out the names
+ * onto our f_out socket as we read the file-list. This
+ * avoids both deadlock and extra delays/buffers. */
io_set_filesfrom_fds(filesfrom_fd, f_out);
filesfrom_fd = -1;
}
- if (read_batch)
- flist = batch_flist;
- else
- flist = recv_file_list(f_in);
+ flist = recv_file_list(f_in);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
+ if (inc_recurse && file_total == 1)
+ recv_additional_file_list(f_in);
+ verbose = save_verbose;
- 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);
+ }
+ if (partial_dir) {
+ partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL);
+ }
+ }
+ fix_basis_dirs();
+
+ if (server_filter_list.head) {
+ char **dir;
+ struct filter_list_struct *elp = &server_filter_list;
+
+ 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);
+ }
}
- status = do_recv(f_in,f_out,flist,local_name);
- exit_cleanup(status);
+ exit_code = do_recv(f_in, f_out, local_name);
+ exit_cleanup(exit_code);
}
void start_server(int f_in, int f_out, int argc, char *argv[])
{
- extern int cvs_exclude;
- extern int read_batch;
-
- setup_protocol(f_out, f_in);
-
set_nonblocking(f_in);
set_nonblocking(f_out);
+ io_set_sock_fds(f_in, f_out);
+ setup_protocol(f_out, f_in);
+#ifdef ICONV_CONST
+ setup_iconv();
+#endif
+
if (protocol_version >= 23)
- io_start_multiplex_out(f_out);
+ io_start_multiplex_out();
if (am_sender) {
- if (!read_batch) {
- recv_exclude_list(f_in);
- if (cvs_exclude)
- add_cvs_excludes();
- }
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
+ if (need_messages_from_generator)
+ io_start_multiplex_in();
+ recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
- } else {
+ } else
do_server_recv(f_in, f_out, argc, argv);
- }
exit_cleanup(0);
}
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;
- extern pid_t cleanup_child_pid;
- extern int write_batch;
- extern int read_batch;
- extern struct file_list *batch_flist;
cleanup_child_pid = pid;
- if (read_batch)
- flist = batch_flist;
-
- set_nonblocking(f_in);
- set_nonblocking(f_out);
+ if (!read_batch) {
+ set_nonblocking(f_in);
+ set_nonblocking(f_out);
+ }
+ io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
+#ifdef ICONV_CONST
+ setup_iconv();
+#endif
- if (protocol_version >= 23)
- io_start_multiplex_in(f_in);
+ /* We set our stderr file handle to blocking because ssh might have
+ * set it to non-blocking. This can be particularly troublesome if
+ * stderr is a clone of stdout, because ssh would have set our stdout
+ * to non-blocking at the same time (which can easily cause us to lose
+ * output from our print statements). This kluge shouldn't cause ssh
+ * any problems for how we use it. Note also that we delayed setting
+ * this until after the above protocol setup so that we know for sure
+ * that ssh is done twiddling its file descriptors. */
+ set_blocking(STDERR_FILENO);
if (am_sender) {
- extern int cvs_exclude;
- extern int delete_mode;
- extern int delete_excluded;
- io_start_buffering_out(f_out);
- if (cvs_exclude)
- add_cvs_excludes();
- if (delete_mode && !delete_excluded)
- send_exclude_list(f_out);
- if (remote_filesfrom_file)
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
+ if (protocol_version >= 30)
+ io_start_multiplex_out();
+ else
+ io_start_buffering_out(f_out);
+ if (!filesfrom_host)
+ set_msg_fd_in(f_in);
+ send_filter_list(f_out);
+ if (filesfrom_host)
filesfrom_fd = f_in;
- if (!read_batch) /* don't write to pipe */
- flist = send_file_list(f_out,argc,argv);
+
+ 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,"file list sent\n");
- io_flush();
- io_start_buffering_out(f_out);
- send_files(flist,f_out,f_in);
- io_flush();
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
+ if (protocol_version >= 23)
+ io_start_multiplex_in();
+
+ io_flush(NORMAL_FLUSH);
+ send_files(f_in, f_out);
+ io_flush(FULL_FLUSH);
+ handle_stats(-1);
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
- io_flush();
- wait_process(pid, &status);
+ io_flush(FULL_FLUSH);
+ wait_process_with_flush(pid, &exit_code);
}
- report(-1);
- io_flush();
- exit_cleanup(status);
+ output_summary();
+ io_flush(FULL_FLUSH);
+ exit_cleanup(exit_code);
}
- if (argc == 0) {
- extern int list_only;
- list_only = 1;
+ if (!read_batch) {
+ if (protocol_version >= 23)
+ io_start_multiplex_in();
+ if (need_messages_from_generator)
+ io_start_multiplex_out();
}
- if (!write_batch)
- send_exclude_list(f_out);
+ if (argc == 0)
+ list_only |= 1;
+
+ 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 && !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);
- }
+ if (inc_recurse && file_total == 1)
+ recv_additional_file_list(f_in);
- local_name = get_local_name(flist,argv[0]);
+ if (flist && flist->used > 0) {
+ local_name = get_local_name(flist, argv[0]);
- status2 = do_recv(f_in,f_out,flist,local_name);
+ fix_basis_dirs();
+
+ exit_code2 = do_recv(f_in, f_out, 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();
- wait_process(pid, &status);
+ io_flush(FULL_FLUSH);
+ wait_process_with_flush(pid, &exit_code);
}
- return MAX(status, status2);
+ return MAX(exit_code, exit_code2);
}
-static int copy_argv (char *argv[])
+static int copy_argv(char *argv[])
{
int i;
int ret;
pid_t pid;
int f_in,f_out;
- extern int local_server;
- extern char *shell_cmd;
- extern int rsync_port;
- extern int daemon_over_rsh;
- extern int read_batch;
int rc;
/* Don't clobber argv[] so that ps(1) can still show the right
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) {
- char *host, *path;
-
- host = argv[0] + strlen(URL_PREFIX);
- p = strchr(host,'/');
- if (p) {
- *p = 0;
- path = p+1;
- } else {
- path = "";
- }
- 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) {
- p = find_colon(argv[0]);
- if (p) {
- if (remote_filesfrom_file
- && remote_filesfrom_file != files_from + 1
- && strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
+ if (!read_batch) { /* for read_batch, NO source is specified */
+ 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) {
rprintf(FERROR,
- "--files-from hostname is not transfer hostname\n");
+ "--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) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
-
am_sender = 0;
- *p = 0;
- shell_machine = argv[0];
- shell_path = p+1;
- argc--;
- argv++;
- } else {
+ } 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 = "";
- }
- p = strchr(host,':');
- if (p) {
- rsync_port = atoi(p+1);
- *p = 0;
- }
- return start_socket_client(host, path, argc-1, argv);
+ if (argc > 1)
+ p = argv[--argc];
+ else {
+ p = ".";
+ list_only = 1;
}
- p = find_colon(argv[argc-1]);
- 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(p, &shell_machine, &rsync_port);
+ if (shell_path && filesfrom_host && *filesfrom_host
+ && strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
- "--files-from hostname is not transfer hostname\n");
+ "--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (!p) {
+ 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 is remote but transfer is local\n");
+ "--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 = p;
+ } 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 {
- am_sender = 1;
+ } else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];
+ 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 (password_file && !daemon_over_rsh) {
+ rprintf(FERROR, "The --password-file option may only be "
+ "used when accessing an rsync daemon.\n");
+ exit_cleanup(RERR_SYNTAX);
}
if (shell_machine) {
- p = strchr(shell_machine,'@');
+ p = strrchr(shell_machine,'@');
if (p) {
*p = 0;
shell_user = shell_machine;
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 ? shell_cmd : "",
+ shell_machine ? shell_machine : "",
+ shell_user ? shell_user : "",
+ shell_path ? shell_path : "");
}
+ /* for remote source, only single dest arg can remain ... */
if (!am_sender && argc > 1) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- if (argc == 0 && !am_sender) {
- extern int list_only;
- list_only = 1;
- }
+ /* ... or no dest at all */
+ if (!am_sender && argc == 0)
+ list_only |= 1;
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,
&f_in,&f_out);
static RETSIGTYPE sigusr1_handler(UNUSED(int val))
{
- exit_cleanup(RERR_SIGNAL);
+ exit_cleanup(RERR_SIGNAL1);
}
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
- extern int log_got_error;
- if (log_got_error) _exit(RERR_PARTIAL);
+ if (!am_server)
+ output_summary();
+ close_all();
+ if (log_got_error)
+ _exit(RERR_PARTIAL);
_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
}
char cmd_buf[300];
int ret;
- sprintf(cmd_buf, get_panic_action(),
- getpid(), getpid());
+ snprintf(cmd_buf, sizeof cmd_buf, get_panic_action(),
+ getpid(), getpid());
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */
int main(int argc,char *argv[])
{
- extern int am_root;
- extern int orig_umask;
- extern int dry_run;
int ret;
- extern int write_batch;
- int orig_argc;
- char **orig_argv;
-
- orig_argc = argc;
- orig_argv = argv;
-
- signal(SIGUSR1, sigusr1_handler);
- signal(SIGUSR2, sigusr2_handler);
- signal(SIGCHLD, sigchld_handler);
+ int orig_argc = argc;
+ char **orig_argv = argv;
+#ifdef HAVE_SIGACTION
+# ifdef HAVE_SIGPROCMASK
+ sigset_t sigmask;
+
+ 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 = (getuid() == 0);
+ am_root = (MY_UID() == 0);
memset(&stats, 0, sizeof(stats));
/* 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
* work when there are other child processes. Also, on all systems
* that implement getcwd that way "pwd" can't be found after chroot. */
- push_dir(NULL,0);
+ push_dir(NULL, 0);
+
+ init_flist();
+
+ if ((write_batch || read_batch) && !am_server) {
+ if (write_batch)
+ write_batch_shell_file(orig_argc, orig_argv, argc);
+
+ if (read_batch && strcmp(batch_name, "-") == 0)
+ batch_fd = STDIN_FILENO;
+ else {
+ batch_fd = do_open(batch_name,
+ write_batch ? O_WRONLY | O_CREAT | O_TRUNC
+ : O_RDONLY, S_IRUSR | S_IWUSR);
+ }
+ if (batch_fd < 0) {
+ rsyserr(FERROR, errno, "Batch file %s open error",
+ full_fname(batch_name));
+ exit_cleanup(RERR_FILEIO);
+ }
+ if (read_batch)
+ read_stream_flags(batch_fd);
+ else
+ write_stream_flags(batch_fd);
- if (write_batch && !am_server) {
- write_batch_argvs_file(orig_argc, orig_argv);
}
+ 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);
-
-#ifndef SUPPORT_LINKS
- if (!am_server && preserve_links) {
- rprintf(FERROR,"ERROR: symbolic links not supported\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
-#endif
-
if (am_server) {
set_nonblocking(STDIN_FILENO);
set_nonblocking(STDOUT_FILENO);