* 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
+ * 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 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern int am_sender;
extern int am_generator;
extern int am_daemon;
+extern int inc_recurse;
extern int blocking_io;
extern int remove_source_files;
extern int daemon_over_rsh;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
+extern int file_total;
extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
-extern int batch_gen_fd;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern struct stats stats;
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;
+int batch_gen_fd = -1;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
if (verbose > 2) {
rprintf(FINFO, "get_local_name count=%d %s\n",
- flist->count, NS(dest_path));
+ file_total, NS(dest_path));
}
if (!dest_path || list_only)
}
return NULL;
}
- if (flist->count > 1) {
+ if (file_total > 1) {
rprintf(FERROR,
"ERROR: destination must be a directory when"
" copying more than 1 file\n");
exit_cleanup(RERR_FILESELECT);
}
- /* Caution: flist->count could be 0! */
- if (flist->count == 1 && S_ISDIR(flist->files[0]->mode)) {
+ if (file_total == 1 && S_ISDIR(flist->files[0]->mode)) {
rprintf(FERROR,
"ERROR: cannot overwrite non-directory"
" with a directory\n");
/* 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])) {
+ if (file_total > 1 || (cp && !cp[1])) {
/* Lop off the final slash (if any). */
if (cp && !cp[1])
*cp = '\0';
}
/* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out)
+static void read_final_goodbye(int f_in)
{
- int i;
+ int i, iflags, xlen;
+ uchar fnamecmp_type;
+ char xname[MAXPATHLEN];
if (protocol_version < 29)
i = read_int(f_in);
else {
- while ((i = read_int(f_in)) == the_file_list->count
- && read_shortint(f_in) == ITEM_IS_NEW) {
- /* Forward the keep-alive (no-op) to the receiver. */
- write_int(f_out, the_file_list->count);
- write_shortint(f_out, ITEM_IS_NEW);
- }
+ i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
}
if (i != NDX_DONE) {
flist = send_file_list(f_out,argc,argv);
if (!flist || flist->count == 0)
exit_cleanup(0);
- the_file_list = flist;
- io_start_buffering_in();
- io_start_buffering_out();
+ io_start_buffering_in(f_in);
- send_files(flist,f_out,f_in);
+ send_files(f_in, f_out);
io_flush(FULL_FLUSH);
handle_stats(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out);
+ 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 exit_code = 0;
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
- init_hard_links();
+ match_hard_links();
#endif
if (fd_pair(error_pipe) < 0) {
close(f_out);
/* we can't let two processes write to the socket at one time */
- close_multiplexing_out();
+ io_end_multiplex_out();
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
+ io_start_buffering_out(error_pipe[1]);
- recv_files(f_in, flist, local_name);
+ recv_files(f_in, local_name);
io_flush(FULL_FLUSH);
handle_stats(f_in);
- send_msg(MSG_DONE, "", 0);
+ send_msg(MSG_DONE, "", 1);
+ write_longint(error_pipe[1], stats.total_read);
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. */
- while (read_int(f_in) == flist->count
- && read_shortint(f_in) == ITEM_IS_NEW) {}
+ read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
rprintf(FERROR, "Invalid packet at end of run [%s]\n",
who_am_i());
}
am_generator = 1;
- close_multiplexing_in();
+
+ io_end_multiplex_in();
if (write_batch && !am_server)
stop_write_batch();
if (f_in != f_out)
close(f_in);
- io_start_buffering_out();
+ io_start_buffering_out(f_out);
set_msg_fd_in(error_pipe[0]);
+ io_start_buffering_in(error_pipe[0]);
- generate_files(f_out, flist, local_name);
+ generate_files(f_out, local_name);
handle_stats(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out, NDX_DONE);
+ write_ndx(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[])
+static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
{
int exit_code;
struct file_list *flist;
}
}
- io_start_buffering_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) {
}
flist = recv_file_list(f_in);
- verbose = save_verbose;
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
- the_file_list = flist;
+ if (inc_recurse && file_total == 1)
+ recv_additional_file_list(f_in);
+ verbose = save_verbose;
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
}
}
- exit_code = do_recv(f_in,f_out,flist,local_name);
+ exit_code = do_recv(f_in, f_out, local_name);
exit_cleanup(exit_code);
}
setup_iconv();
#endif
- if (protocol_version >= 23 && !read_batch)
- io_start_multiplex_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
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
- io_start_buffering_out();
+ 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);
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
- the_file_list = flist;
+
+ if (protocol_version >= 23)
+ io_start_multiplex_in();
io_flush(NORMAL_FLUSH);
- send_files(flist,f_out,f_in);
+ send_files(f_in, f_out);
io_flush(FULL_FLUSH);
handle_stats(-1);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out);
+ read_final_goodbye(f_in);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
exit_cleanup(exit_code);
}
- if (need_messages_from_generator && !read_batch)
- io_start_multiplex_out();
+ if (!read_batch) {
+ if (protocol_version >= 23)
+ io_start_multiplex_in();
+ if (need_messages_from_generator)
+ io_start_multiplex_out();
+ }
if (argc == 0)
list_only |= 1;
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
- the_file_list = flist;
+ if (inc_recurse && file_total == 1)
+ recv_additional_file_list(f_in);
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
fix_basis_dirs();
- exit_code2 = do_recv(f_in, f_out, flist, local_name);
+ exit_code2 = do_recv(f_in, f_out, local_name);
} else {
handle_stats(-1);
output_summary();
}
}
+ 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 = strrchr(shell_machine,'@');
if (p) {
}
if (read_batch)
read_stream_flags(batch_fd);
+ else
+ write_stream_flags(batch_fd);
+
}
if (write_batch < 0)
dry_run = 1;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff