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;
struct file_list *the_file_list;
* 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 = waitpid(pid, status_ptr, flags);
+ pid_t waited_pid;
+
+ 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
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);
+ 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",
return NULL;
/* See what currently exists at the destination. */
- if ((statret = safe_stat(dest_path, &st)) == 0) {
+ 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 (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#1 %s failed",
full_fname(dest_path));
}
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"
exit_cleanup(RERR_FILEIO);
}
+ new_root_dir = 1;
+
if (verbose)
rprintf(FINFO, "created directory %s\n", dest_path);
dry_run++;
}
- if (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, dry_run > 1)) {
rsyserr(FERROR, errno, "push_dir#2 %s failed",
full_fname(dest_path));
dest_path = "/";
*cp = '\0';
- if (sanitize_paths)
- die_on_unsafe_path(dest_path, 0);
if (!push_dir(dest_path, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dest_path));
* mode. We'll fix dirs that can be relative to the non-existent dir. */
static void fix_basis_dirs(void)
{
- char **dir, *new;
+ 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");
- pathjoin(new, len, curr_dir, *dir);
- clean_fname(new, 1);
+ 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;
}
}
}
}
- if (i != -1) {
+ 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[])
{
struct file_list *flist;
}
if (!relative_paths) {
- if (sanitize_paths)
- die_on_unsafe_path(dir, 0);
if (!push_dir(dir, 0)) {
rsyserr(FERROR, errno, "push_dir#3 %s failed",
full_fname(dir));
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0) {
+ if (!flist || flist->count == 0)
exit_cleanup(0);
- }
the_file_list = flist;
io_start_buffering_in();
* 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();
+ match_hard_links();
+#endif
if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out, -1);
+ write_int(f_out, NDX_DONE);
}
io_flush(FULL_FLUSH);
return exit_code;
}
-
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
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 (dry_run > 1)
- fix_basis_dirs();
+ fix_basis_dirs();
if (server_filter_list.head) {
char **dir;
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);
}
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
- if (dry_run > 1)
- fix_basis_dirs();
+ fix_basis_dirs();
exit_code2 = do_recv(f_in, f_out, flist, local_name);
} else {
return MAX(exit_code, exit_code2);
}
-static int copy_argv (char *argv[])
+static int copy_argv(char *argv[])
{
int i;
}
}
+ if (password_file && !daemon_over_rsh) {
+ rprintf(FERROR, "The --password-file option is used for "
+ "talking to an rsync daemon.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {
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. */
}
if (read_batch)
read_stream_flags(batch_fd);
+ else
+ write_stream_flags(batch_fd);
+
}
if (write_batch < 0)
dry_run = 1;