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
put the pid on each line of the log file to facilitate
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
3c4d99c
..
00ccd8e
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-36,10
+36,7
@@
static void report(int f)
extern int do_stats;
if (am_daemon) {
extern int do_stats;
if (am_daemon) {
- syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (double)stats.total_size);
+ log_exit(0);
if (f == -1 || !am_sender) return;
}
if (f == -1 || !am_sender) return;
}
@@
-63,29
+60,29
@@
static void report(int f)
}
if (do_stats) {
}
if (do_stats) {
-
printf(
"\nNumber of files: %d\n", stats.num_files);
-
printf(
"Number of files transferred: %d\n",
+
rprintf(FINFO,
"\nNumber of files: %d\n", stats.num_files);
+
rprintf(FINFO,
"Number of files transferred: %d\n",
stats.num_transferred_files);
stats.num_transferred_files);
-
printf(
"Total file size: %.0f bytes\n",
+
rprintf(FINFO,
"Total file size: %.0f bytes\n",
(double)stats.total_size);
(double)stats.total_size);
-
printf(
"Total transferred file size: %.0f bytes\n",
+
rprintf(FINFO,
"Total transferred file size: %.0f bytes\n",
(double)stats.total_transferred_size);
(double)stats.total_transferred_size);
-
printf(
"Literal data: %.0f bytes\n",
+
rprintf(FINFO,
"Literal data: %.0f bytes\n",
(double)stats.literal_data);
(double)stats.literal_data);
-
printf(
"Matched data: %.0f bytes\n",
+
rprintf(FINFO,
"Matched data: %.0f bytes\n",
(double)stats.matched_data);
(double)stats.matched_data);
-
printf(
"File list size: %d\n", stats.flist_size);
-
printf(
"Total bytes written: %.0f\n",
+
rprintf(FINFO,
"File list size: %d\n", stats.flist_size);
+
rprintf(FINFO,
"Total bytes written: %.0f\n",
(double)stats.total_written);
(double)stats.total_written);
-
printf(
"Total bytes read: %.0f\n\n",
+
rprintf(FINFO,
"Total bytes read: %.0f\n\n",
(double)stats.total_read);
}
(double)stats.total_read);
}
-
printf(
"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
+
rprintf(FINFO,
"wrote %.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)));
(double)stats.total_written,
(double)stats.total_read,
(stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
-
printf(
"total size is %.0f speedup is %.2f\n",
+
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));
(double)stats.total_size,
(1.0*stats.total_size)/(stats.total_written+stats.total_read));
@@
-172,6
+169,10
@@
static char *get_local_name(struct file_list *flist,char *name)
STRUCT_STAT st;
extern int orig_umask;
STRUCT_STAT st;
extern int orig_umask;
+ if (verbose > 2)
+ rprintf(FINFO,"get_local_name count=%d %s\n",
+ flist->count, name);
+
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name, 0)) {
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (!push_dir(name, 0)) {
@@
-198,7
+199,8
@@
static char *get_local_name(struct file_list *flist,char *name)
rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
exit_cleanup(1);
} else {
rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
exit_cleanup(1);
} else {
- rprintf(FINFO,"created directory %s\n",name);
+ if (verbose > 0)
+ rprintf(FINFO,"created directory %s\n",name);
}
if (!push_dir(name, 0)) {
}
if (!push_dir(name, 0)) {
@@
-245,15
+247,15
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
argv[0] = ".";
}
argv[0] = ".";
}
+ set_nonblocking(f_out);
+ if (f_in != f_out)
+ set_nonblocking(f_in);
+
flist = send_file_list(f_out,argc,argv);
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
flist = send_file_list(f_out,argc,argv);
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
- set_nonblocking(f_out);
- if (f_in != f_out)
- set_nonblocking(f_in);
-
send_files(flist,f_out,f_in);
report(f_out);
io_flush();
send_files(flist,f_out,f_in);
report(f_out);
io_flush();
@@
-283,13
+285,11
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (f_in != f_out) close(f_out);
set_nonblocking(f_in);
if (f_in != f_out) close(f_out);
set_nonblocking(f_in);
+ set_nonblocking(recv_pipe[1]);
recv_files(f_in,flist,local_name,recv_pipe[1]);
report(f_in);
recv_files(f_in,flist,local_name,recv_pipe[1]);
report(f_in);
- if (verbose > 3)
- rprintf(FINFO,"do_recv waiting on %d\n",pid);
-
io_flush();
_exit(0);
}
io_flush();
_exit(0);
}
@@
-299,6
+299,9
@@
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);
set_nonblocking(f_out);
if (f_in != f_out) close(f_in);
set_nonblocking(f_out);
+ set_nonblocking(recv_pipe[0]);
+
+ io_start_buffering(f_out);
generate_files(f_out,flist,local_name,recv_pipe[0]);
generate_files(f_out,flist,local_name,recv_pipe[0]);
@@
-358,8
+361,12
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
extern int cvs_exclude;
extern int am_sender;
extern int cvs_exclude;
extern int am_sender;
+ set_nonblocking(f_out);
+ if (f_in != f_out)
+ set_nonblocking(f_in);
+
setup_protocol(f_out, f_in);
setup_protocol(f_out, f_in);
-
+
if (am_sender) {
recv_exclude_list(f_in);
if (cvs_exclude)
if (am_sender) {
recv_exclude_list(f_in);
if (cvs_exclude)
@@
-428,6
+435,20
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
return status | status2;
}
return status | status2;
}
+static char *find_colon(char *s)
+{
+ char *p, *p2;
+
+ p = strchr(s,':');
+ if (!p) return NULL;
+
+ /* now check to see if there is a / in the string before the : - if there is then
+ discard the colon on the assumption that the : is part of a filename */
+ p2 = strchr(s,'/');
+ if (p2 && p2 < p) return NULL;
+
+ return p;
+}
static int start_client(int argc, char *argv[])
{
static int start_client(int argc, char *argv[])
{
@@
-441,7
+462,7
@@
static int start_client(int argc, char *argv[])
extern int am_sender;
extern char *shell_cmd;
extern int am_sender;
extern char *shell_cmd;
- p =
strchr(argv[0],':'
);
+ p =
find_colon(argv[0]
);
if (p) {
if (p[1] == ':') {
if (p) {
if (p[1] == ':') {
@@
-463,7
+484,7
@@
static int start_client(int argc, char *argv[])
} else {
am_sender = 1;
} else {
am_sender = 1;
- p =
strchr(argv[argc-1],':'
);
+ p =
find_colon(argv[argc-1]
);
if (!p) {
local_server = 1;
} else if (p[1] == ':') {
if (!p) {
local_server = 1;
} else if (p[1] == ':') {
@@
-511,11
+532,6
@@
static int start_client(int argc, char *argv[])
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
-#if HAVE_SETLINEBUF
- setlinebuf(stdout);
- setlinebuf(stderr);
-#endif
-
ret = client_run(f_in, f_out, pid, argc, argv);
fflush(stdout);
ret = client_run(f_in, f_out, pid, argc, argv);
fflush(stdout);
@@
-525,7
+541,7
@@
static int start_client(int argc, char *argv[])
}
}
-RETSIGTYPE sigusr1_handler(int val) {
+
static
RETSIGTYPE sigusr1_handler(int val) {
exit_cleanup(1);
}
exit_cleanup(1);
}
@@
-553,7
+569,9
@@
int main(int argc,char *argv[])
carried across */
orig_umask = (int)umask(0);
carried across */
orig_umask = (int)umask(0);
- parse_arguments(argc, argv);
+ if (!parse_arguments(argc, argv)) {
+ exit_cleanup(1);
+ }
argc -= optind;
argv += optind;
argc -= optind;
argv += optind;
@@
-563,6
+581,7
@@
int main(int argc,char *argv[])
signal(SIGINT,SIGNAL_CAST sig_int);
signal(SIGPIPE,SIGNAL_CAST sig_int);
signal(SIGHUP,SIGNAL_CAST sig_int);
signal(SIGINT,SIGNAL_CAST sig_int);
signal(SIGPIPE,SIGNAL_CAST sig_int);
signal(SIGHUP,SIGNAL_CAST sig_int);
+ signal(SIGTERM,SIGNAL_CAST sig_int);
if (am_daemon) {
return daemon_main();
if (am_daemon) {
return daemon_main();