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
added the --safe-links option to disallow symlinks outside the
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
217ddf4
..
1717c53
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-63,29
+63,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
+172,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
+202,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)) {
@@
-250,6
+255,10
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
exit_cleanup(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();
@@
-278,12
+287,11
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
close(recv_pipe[0]);
if (f_in != f_out) close(f_out);
close(recv_pipe[0]);
if (f_in != f_out) close(f_out);
+ set_nonblocking(f_in);
+
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);
}
@@
-291,6
+299,11
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
close(recv_pipe[1]);
io_close_input(f_in);
if (f_in != f_out) close(f_in);
close(recv_pipe[1]);
io_close_input(f_in);
if (f_in != f_out) close(f_in);
+
+ set_nonblocking(f_out);
+
+ io_start_buffering(f_out);
+
generate_files(f_out,flist,local_name,recv_pipe[0]);
io_flush();
generate_files(f_out,flist,local_name,recv_pipe[0]);
io_flush();
@@
-381,6
+394,11
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
+
+ set_nonblocking(f_out);
+ if (f_in != f_out)
+ set_nonblocking(f_in);
+
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
@@
-497,11
+515,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);