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
Reordered the usage lines to cover push, then pull (which has a
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
81be989
..
c6bf54d
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,8
+20,9
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
-
-time_t starttime = 0;
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
extern int verbose;
extern int dry_run;
extern int verbose;
extern int dry_run;
@@
-45,11
+46,8
@@
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
-extern int fuzzy_basis;
extern int relative_paths;
extern int rsync_port;
extern int relative_paths;
extern int rsync_port;
-extern int inplace;
-extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int whole_file;
extern int read_batch;
extern int write_batch;
@@
-59,8
+57,6
@@
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
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 *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
@@
-77,6
+73,9
@@
struct pid_status {
int status;
} pid_stat_table[MAXCHILDPROCS];
int status;
} pid_stat_table[MAXCHILDPROCS];
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
static void show_malloc_stats(void);
/****************************************************************************
static void show_malloc_stats(void);
/****************************************************************************
@@
-121,12
+120,13
@@
void wait_process(pid_t pid, int *status)
* 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). */
* 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
report
(int f)
+static void
handle_stats
(int f)
{
{
+ endtime = time(NULL);
+
/* Cache two stats because the read/write code can change it. */
/* Cache two stats because the read/write code can change it. */
- int64 total_read = stats.total_read;
- int64 total_written = stats.total_written;
- time_t t = time(NULL);
+ total_read = stats.total_read;
+ total_written = stats.total_written;
if (do_stats && verbose > 1) {
/* These come out from every process */
if (do_stats && verbose > 1) {
/* These come out from every process */
@@
-158,7
+158,9
@@
static void report(int f)
/* this is the client */
/* 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);
/* 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);
@@
-179,7
+181,10
@@
static void report(int f)
write_longint(batch_fd, stats.flist_xfertime);
}
}
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(FINFO,"Number of files transferred: %d\n",
if (do_stats) {
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
@@
-211,7
+216,7
@@
static void report(int f)
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
(double)total_written, (double)total_read,
rprintf(FINFO,
"\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n",
(double)total_written, (double)total_read,
- (total_written + total_read)/(0.5 + (
t
- starttime)));
+ (total_written + total_read)/(0.5 + (
endtime
- starttime)));
rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
(double)stats.total_size,
(double)stats.total_size / (total_written+total_read));
rprintf(FINFO, "total size is %.0f speedup is %.2f\n",
(double)stats.total_size,
(double)stats.total_size / (total_written+total_read));
@@
-283,7
+288,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* Comparison leaves rooms for server_options(). */
for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
/* 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);
}
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
@@
-455,7
+460,6
@@
static void read_final_goodbye(int f_in, int f_out)
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];
struct file_list *flist;
char *dir = argv[0];
@@
-484,14
+488,6
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
argc--;
argv++;
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--;
if (argc == 0 && (recurse || list_only)) {
argc = 1;
argv--;
@@
-509,7
+505,7
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
-
report
(f_out);
+
handle_stats
(f_out);
if (protocol_version >= 24)
read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
if (protocol_version >= 24)
read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
@@
-555,7
+551,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
recv_files(f_in, flist, local_name);
io_flush(FULL_FLUSH);
recv_files(f_in, flist, local_name);
io_flush(FULL_FLUSH);
-
report
(f_in);
+
handle_stats
(f_in);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
@@
-583,7
+579,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
am_generator = 1;
close_multiplexing_in();
am_generator = 1;
close_multiplexing_in();
- if (write_batch)
+ if (write_batch
&& !am_server
)
stop_write_batch();
close(error_pipe[1]);
stop_write_batch();
close(error_pipe[1]);
@@
-596,7
+592,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
generate_files(f_out, flist, local_name);
generate_files(f_out, flist, local_name);
-
report
(-1);
+
handle_stats
(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
@@
-669,14
+665,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
the_file_list = flist;
}
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]);
local_name = get_local_name(flist,argv[0]);
- }
status = do_recv(f_in,f_out,flist,local_name);
exit_cleanup(status);
status = do_recv(f_in,f_out,flist,local_name);
exit_cleanup(status);
@@
-756,7
+746,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (filesfrom_host)
filesfrom_fd = f_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);
start_write_batch(f_out);
flist = send_file_list(f_out, argc, argv);
set_msg_fd_in(-1);
@@
-767,6
+757,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
+ handle_stats(-1);
if (protocol_version >= 24)
read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (protocol_version >= 24)
read_final_goodbye(f_in, f_out);
if (pid != -1) {
@@
-775,7
+766,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_flush(FULL_FLUSH);
wait_process(pid, &status);
}
io_flush(FULL_FLUSH);
wait_process(pid, &status);
}
-
report(-1
);
+
output_summary(
);
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
@@
-793,20
+784,19
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
- if (write_batch)
+ if (write_batch
&& !am_server
)
start_write_batch(f_in);
flist = recv_file_list(f_in);
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;
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);
+ status2 = do_recv(f_in, f_out, flist, local_name);
+ } else {
+ handle_stats(-1);
+ output_summary();
+ }
if (pid != -1) {
if (verbose > 3)
if (pid != -1) {
if (verbose > 3)
@@
-862,6
+852,13
@@
static int start_client(int argc, char *argv[])
argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
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) {
argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
@@
-977,8
+974,11
@@
static RETSIGTYPE sigusr1_handler(UNUSED(int val))
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
+ if (!am_server)
+ output_summary();
close_all();
close_all();
- if (log_got_error) _exit(RERR_PARTIAL);
+ if (log_got_error)
+ _exit(RERR_PARTIAL);
_exit(0);
}
_exit(0);
}
@@
-1103,6
+1103,10
@@
int main(int argc,char *argv[])
* see the EPIPE. */
signal(SIGPIPE, SIG_IGN);
* see the EPIPE. */
signal(SIGPIPE, SIG_IGN);
+#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
+ setlocale(LC_CTYPE, "");
+#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
/* 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
@@
-1111,7
+1115,7
@@
int main(int argc,char *argv[])
init_flist();
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 (write_batch)
write_batch_shell_file(orig_argc, orig_argv, argc);
@@
-1130,6
+1134,8
@@
int main(int argc,char *argv[])
if (read_batch)
read_stream_flags(batch_fd);
}
if (read_batch)
read_stream_flags(batch_fd);
}
+ if (write_batch < 0)
+ dry_run = 1;
if (am_daemon && !am_server)
return daemon_main();
if (am_daemon && !am_server)
return daemon_main();