X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/11a5a3c704fd75325450ddae3fb2cb01f19b7111..17d31b380b7c748837b30e7e0c54ab17974f7ab6:/main.c diff --git a/main.c b/main.c index 146f1e53..2846f881 100644 --- a/main.c +++ b/main.c @@ -34,35 +34,47 @@ static void report(int f) extern int am_sender; extern int am_daemon; extern int do_stats; + extern int remote_version; + int send_stats; if (am_daemon) { - rprintf(FLOG,"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, __FILE__, __LINE__); if (f == -1 || !am_sender) return; } - if (!verbose) return; - - if (am_server && !am_sender) return; - - if (am_server && am_sender) { - write_longint(f,stats.total_read); - write_longint(f,stats.total_written); - write_longint(f,stats.total_size); + send_stats = verbose || + ((remote_version >= 20) && (PROTOCOL_VERSION >= 20)); + if (am_server) { + if (am_sender && send_stats) { + int64 w; + /* store total_written in a temporary + because write_longint changes it */ + w = stats.total_written; + write_longint(f,stats.total_read); + write_longint(f,w); + write_longint(f,stats.total_size); + } return; } - - if (!am_sender) { + + /* this is the client */ + + if (!am_sender && send_stats) { int64 r; stats.total_written = read_longint(f); + /* store total_read in a temporary, read_longint changes it */ r = read_longint(f); stats.total_size = read_longint(f); stats.total_read = r; } if (do_stats) { + if (!am_sender && !send_stats) { + /* missing the bytes written by the generator */ + rprintf(FINFO, "\nCannot show stats as receiver because protocol version is less than 20\n"); + rprintf(FINFO, "Use --stats -v to show stats\n"); + return; + } rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files); rprintf(FINFO,"Number of files transferred: %d\n", stats.num_transferred_files); @@ -81,13 +93,15 @@ static void report(int f) (double)stats.total_read); } - 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))); - 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)); + if (verbose || do_stats) { + 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))); + 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)); + } fflush(stdout); fflush(stderr); @@ -174,20 +188,23 @@ static char *get_local_name(struct file_list *flist,char *name) if (verbose > 2) rprintf(FINFO,"get_local_name count=%d %s\n", - flist->count, name); + flist->count, NS(name)); + + if (!name) + return NULL; if (do_stat(name,&st) == 0) { if (S_ISDIR(st.st_mode)) { if (!push_dir(name, 0)) { rprintf(FERROR,"push_dir %s : %s (1)\n", name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return NULL; } if (flist->count > 1) { rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n"); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return name; } @@ -195,12 +212,9 @@ static char *get_local_name(struct file_list *flist,char *name) if (flist->count == 1) return name; - if (!name) - return NULL; - if (do_mkdir(name,0777 & ~orig_umask) != 0) { rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILEIO); } else { if (verbose > 0) rprintf(FINFO,"created directory %s\n",name); @@ -209,7 +223,7 @@ static char *get_local_name(struct file_list *flist,char *name) if (!push_dir(name, 0)) { rprintf(FERROR,"push_dir %s : %s (2)\n", name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return NULL; @@ -231,7 +245,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) if (!relative_paths && !push_dir(dir, 0)) { rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } argc--; argv++; @@ -278,7 +292,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) if (pipe(recv_pipe) < 0) { rprintf(FERROR,"pipe failed in do_recv\n"); - exit_cleanup(1); + exit_cleanup(RERR_SOCKETIO); } io_flush(); @@ -333,7 +347,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) if (!am_daemon && !push_dir(dir, 0)) { rprintf(FERROR,"push_dir %s : %s (4)\n", dir,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } } @@ -343,7 +357,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) flist = recv_file_list(f_in); if (!flist || flist->count == 0) { rprintf(FERROR,"server_recv: nothing to do\n"); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } if (argc > 0) { @@ -387,6 +401,7 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) int status = 0, status2 = 0; char *local_name = NULL; extern int am_sender; + extern int list_only; setup_protocol(f_out,f_in); @@ -415,6 +430,8 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) report(-1); exit_cleanup(status); } + + if (argc == 0) list_only = 1; send_exclude_list(f_out); @@ -464,6 +481,26 @@ static int start_client(int argc, char *argv[]) extern int local_server; extern int am_sender; extern char *shell_cmd; + extern int rsync_port; + + if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { + char *host, *path; + + host = argv[0] + strlen(URL_PREFIX); + p = strchr(host,'/'); + if (p) { + *p = 0; + path = p+1; + } else { + path=""; + } + p = strchr(host,':'); + if (p) { + rsync_port = atoi(p+1); + *p = 0; + } + return start_socket_client(host, path, argc-1, argv+1); + } p = find_colon(argv[0]); @@ -473,9 +510,9 @@ static int start_client(int argc, char *argv[]) return start_socket_client(argv[0], p+2, argc-1, argv+1); } - if (argc < 2) { + if (argc < 1) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } am_sender = 0; @@ -497,7 +534,7 @@ static int start_client(int argc, char *argv[]) if (argc < 2) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } if (local_server) { @@ -528,9 +565,9 @@ static int start_client(int argc, char *argv[]) shell_path?shell_path:""); } - if (!am_sender && argc != 1) { + if (!am_sender && argc > 1) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); @@ -545,7 +582,7 @@ static int start_client(int argc, char *argv[]) static RETSIGTYPE sigusr1_handler(int val) { - exit_cleanup(1); + exit_cleanup(RERR_SIGNAL); } int main(int argc,char *argv[]) @@ -565,15 +602,15 @@ int main(int argc,char *argv[]) if (argc < 2) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } /* we set a 0 umask so that correct file permissions can be carried across */ orig_umask = (int)umask(0); - if (!parse_arguments(argc, argv)) { - exit_cleanup(1); + if (!parse_arguments(argc, argv, 1)) { + exit_cleanup(RERR_SYNTAX); } argc -= optind; @@ -586,13 +623,19 @@ int main(int argc,char *argv[]) signal(SIGHUP,SIGNAL_CAST sig_int); signal(SIGTERM,SIGNAL_CAST sig_int); + /* 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 + that implement getcwd that way "pwd" can't be found after chroot. */ + push_dir(NULL,0); + if (am_daemon) { return daemon_main(); } if (argc < 1) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } if (dry_run) @@ -601,7 +644,7 @@ int main(int argc,char *argv[]) #ifndef SUPPORT_LINKS if (!am_server && preserve_links) { rprintf(FERROR,"ERROR: symbolic links not supported\n"); - exit_cleanup(1); + exit_cleanup(RERR_UNSUPPORTED); } #endif