Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweaked a comment.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
fccf627
..
0e765fb
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-4,11
+4,11
@@
* 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) 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
*
* 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
+ * 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,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-17,11
+17,11
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "io.h"
#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
#include <locale.h>
#endif
#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
#include <locale.h>
#endif
@@
-34,9
+34,9
@@
extern int am_server;
extern int am_sender;
extern int am_generator;
extern int am_daemon;
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 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 need_messages_from_generator;
extern int kluge_around_eof;
extern int do_stats;
@@
-47,6
+47,7
@@
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
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 recurse;
extern int relative_paths;
extern int sanitize_paths;
@@
-58,7
+59,6
@@
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
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 int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern struct stats stats;
@@
-74,8
+74,9
@@
extern struct filter_list_struct server_filter_list;
int local_server = 0;
int new_root_dir = 0;
int local_server = 0;
int new_root_dir = 0;
+int daemon_over_rsh = 0;
mode_t orig_umask = 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. */
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
@@
-190,12
+191,12
@@
static void handle_stats(int f)
if (am_server) {
if (am_sender) {
if (am_server) {
if (am_sender) {
- write_
longint(f, total_read
);
- write_
longint(f, total_written
);
- write_
longint(f, stats.total_size
);
+ write_
varlong30(f, total_read, 3
);
+ write_
varlong30(f, total_written, 3
);
+ write_
varlong30(f, stats.total_size, 3
);
if (protocol_version >= 29) {
if (protocol_version >= 29) {
- write_
longint(f, stats.flist_buildtime
);
- write_
longint(f, stats.flist_xfertime
);
+ write_
varlong30(f, stats.flist_buildtime, 3
);
+ write_
varlong30(f, stats.flist_xfertime, 3
);
}
}
return;
}
}
return;
@@
-208,22
+209,22
@@
static void handle_stats(int f)
else if (!am_sender) {
/* Read the first two in opposite order because the meaning of
* read/write swaps when switching from sender to receiver. */
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
);
- total_read = read_
longint(f
);
- stats.total_size = read_
longint(f
);
+ total_written = read_
varlong30(f, 3
);
+ total_read = read_
varlong30(f, 3
);
+ stats.total_size = read_
varlong30(f, 3
);
if (protocol_version >= 29) {
if (protocol_version >= 29) {
- stats.flist_buildtime = read_
longint(f
);
- stats.flist_xfertime = read_
longint(f
);
+ 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. */
}
} else if (write_batch) {
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
- write_
longint(batch_fd, total_read
);
- write_
longint(batch_fd, total_written
);
- write_
longint(batch_fd, stats.total_size
);
+ 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) {
if (protocol_version >= 29) {
- write_
longint(batch_fd, stats.flist_buildtime
);
- write_
longint(batch_fd, stats.flist_xfertime
);
+ write_
varlong30(batch_fd, stats.flist_buildtime, 3
);
+ write_
varlong30(batch_fd, stats.flist_xfertime, 3
);
}
}
}
}
}
}
@@
-476,7
+477,7
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
if (verbose > 2) {
rprintf(FINFO, "get_local_name count=%d %s\n",
if (verbose > 2) {
rprintf(FINFO, "get_local_name count=%d %s\n",
- f
list->count
, NS(dest_path));
+ f
ile_total
, NS(dest_path));
}
if (!dest_path || list_only)
}
if (!dest_path || list_only)
@@
-493,14
+494,13
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
}
return NULL;
}
}
return NULL;
}
- if (f
list->count
> 1) {
+ if (f
ile_total
> 1) {
rprintf(FERROR,
"ERROR: destination must be a directory when"
" copying more than 1 file\n");
exit_cleanup(RERR_FILESELECT);
}
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");
rprintf(FERROR,
"ERROR: cannot overwrite non-directory"
" with a directory\n");
@@
-518,7
+518,7
@@
static char *get_local_name(struct file_list *flist, char *dest_path)
/* 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 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 (f
list->count
> 1 || (cp && !cp[1])) {
+ if (f
ile_total
> 1 || (cp && !cp[1])) {
/* Lop off the final slash (if any). */
if (cp && !cp[1])
*cp = '\0';
/* Lop off the final slash (if any). */
if (cp && !cp[1])
*cp = '\0';
@@
-609,19
+609,17
@@
static void fix_basis_dirs(void)
}
/* This is only called by the sender. */
}
/* 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 {
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) {
}
if (i != NDX_DONE) {
@@
-671,24
+669,22
@@
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
}
flist = send_file_list(f_out,argc,argv);
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->
count
== 0)
+ if (!flist || flist->
used
== 0)
exit_cleanup(0);
exit_cleanup(0);
- the_file_list = flist;
- io_start_buffering_in();
- io_start_buffering_out();
+ io_start_buffering_in(f_in);
- send_files(f
list,f_out,f_in
);
+ send_files(f
_in, f_out
);
io_flush(FULL_FLUSH);
handle_stats(f_out);
if (protocol_version >= 24)
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);
}
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;
{
int pid;
int exit_code = 0;
@@
-721,26
+717,32
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
close(f_out);
/* we can't let two processes write to the socket at one time */
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]);
/* 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);
io_flush(FULL_FLUSH);
handle_stats(f_in);
- send_msg(MSG_DONE, "", 0);
+ 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) {
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. */
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());
rprintf(FERROR, "Invalid packet at end of run [%s]\n",
who_am_i());
@@
-755,7
+757,8
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
}
am_generator = 1;
}
am_generator = 1;
- close_multiplexing_in();
+
+ io_end_multiplex_in();
if (write_batch && !am_server)
stop_write_batch();
if (write_batch && !am_server)
stop_write_batch();
@@
-763,17
+766,18
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (f_in != f_out)
close(f_in);
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]);
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 */
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);
}
io_flush(FULL_FLUSH);
@@
-783,7
+787,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
return 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 exit_code;
struct file_list *flist;
{
int exit_code;
struct file_list *flist;
@@
-819,7
+823,10
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
}
}
}
- 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) {
recv_filter_list(f_in);
if (filesfrom_fd >= 0) {
@@
-833,12
+840,13
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
flist = recv_file_list(f_in);
}
flist = recv_file_list(f_in);
- verbose = save_verbose;
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
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]);
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
@@
-873,7
+881,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
}
}
}
- 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);
}
exit_cleanup(exit_code);
}
@@
-892,7
+900,7
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
-#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if
def ICONV_CONST
setup_iconv();
#endif
setup_iconv();
#endif
@@
-929,13
+937,10
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
-#if
defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if
def ICONV_CONST
setup_iconv();
#endif
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
/* 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
@@
-948,7
+953,10
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
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);
if (!filesfrom_host)
set_msg_fd_in(f_in);
send_filter_list(f_out);
@@
-961,14
+969,16
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
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);
io_flush(NORMAL_FLUSH);
- send_files(f
list,f_out,f_in
);
+ send_files(f
_in, f_out
);
io_flush(FULL_FLUSH);
handle_stats(-1);
if (protocol_version >= 24)
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);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
@@
-980,8
+990,12
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
exit_cleanup(exit_code);
}
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 (argc == 0)
list_only |= 1;
@@
-996,14
+1010,15
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
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) {
+ if (flist && flist->
used
> 0) {
local_name = get_local_name(flist, argv[0]);
fix_basis_dirs();
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();
} else {
handle_stats(-1);
output_summary();
@@
-1077,16
+1092,9
@@
static int start_client(int argc, char *argv[])
"--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
"--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (rsync_port) {
- if (!shell_cmd) {
- return start_socket_client(shell_machine,
- shell_path,
- argc, argv);
- }
- daemon_over_rsh = 1;
- }
-
am_sender = 0;
am_sender = 0;
+ if (rsync_port)
+ daemon_over_rsh = shell_cmd ? 1 : -1;
} else { /* source is local, check dest arg */
am_sender = 1;
} else { /* source is local, check dest arg */
am_sender = 1;
@@
-1113,14
+1121,8
@@
static int start_client(int argc, char *argv[])
}
shell_machine = NULL;
shell_path = p;
}
shell_machine = NULL;
shell_path = p;
- } else if (rsync_port) {
- if (!shell_cmd) {
- return start_socket_client(shell_machine,
- shell_path,
- argc, argv);
- }
- daemon_over_rsh = 1;
- }
+ } else if (rsync_port)
+ daemon_over_rsh = shell_cmd ? 1 : -1;
}
} else { /* read_batch */
local_server = 1;
}
} else { /* read_batch */
local_server = 1;
@@
-1131,9
+1133,18
@@
static int start_client(int argc, char *argv[])
}
}
}
}
+ /* for remote source, only single dest arg can remain ... */
+ if (!am_sender && argc > 1) {
+ usage(FERROR);
+ exit_cleanup(RERR_SYNTAX);
+ }
+
+ if (daemon_over_rsh < 0)
+ return start_socket_client(shell_machine, shell_path, argc, argv);
+
if (password_file && !daemon_over_rsh) {
if (password_file && !daemon_over_rsh) {
- rprintf(FERROR, "The --password-file option
is used for
"
- "
talking to
an rsync daemon.\n");
+ rprintf(FERROR, "The --password-file option
may only be
"
+ "
used when accessing
an rsync daemon.\n");
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
@@
-1154,12
+1165,6
@@
static int start_client(int argc, char *argv[])
shell_path ? shell_path : "");
}
shell_path ? shell_path : "");
}
- /* for remote source, only single dest arg can remain ... */
- if (!am_sender && argc > 1) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
-
/* ... or no dest at all */
if (!am_sender && argc == 0)
list_only |= 1;
/* ... or no dest at all */
if (!am_sender && argc == 0)
list_only |= 1;