Matt McCutchen's Web Site / rsync / rsync.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
patch from Alberto Accomazzi <aaccomazzi@cfa.harvard.edu> to add
[rsync/rsync.git] / main.c
diff --git a/main.c b/main.c
index 2d1b35e..bc587cc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -36,10 +36,7 @@ static void report(int f)
        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;
        }
 
@@ -181,13 +178,13 @@ static char *get_local_name(struct file_list *flist,char *name)
                        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;
        }
@@ -200,7 +197,7 @@ static char *get_local_name(struct file_list *flist,char *name)
 
        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 +206,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 +228,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++;
@@ -250,15 +247,15 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                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);
        }
 
-       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();
@@ -278,7 +275,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();
@@ -288,6 +285,7 @@ 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);
+               set_nonblocking(recv_pipe[1]);
 
                recv_files(f_in,flist,local_name,recv_pipe[1]);
                report(f_in);
@@ -301,6 +299,7 @@ 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);
+       set_nonblocking(recv_pipe[0]);
 
        io_start_buffering(f_out);
 
@@ -331,7 +330,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);
                }    
        }
 
@@ -341,7 +340,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) {    
@@ -362,8 +361,12 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
        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);
-       
+
        if (am_sender) {
                recv_exclude_list(f_in);
                if (cvs_exclude)
@@ -381,6 +384,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);
        
@@ -409,6 +413,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);
        
@@ -459,6 +465,20 @@ static int start_client(int argc, char *argv[])
        extern int am_sender;
        extern char *shell_cmd;
 
+       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="";
+               }
+               return start_socket_client(host, path, argc-1, argv+1);
+       }
+
        p = find_colon(argv[0]);
 
        if (p) {
@@ -467,9 +487,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;
@@ -491,7 +511,7 @@ static int start_client(int argc, char *argv[])
 
                if (argc < 2) {
                        usage(FERROR);
-                       exit_cleanup(1);
+                       exit_cleanup(RERR_SYNTAX);
                }
                
                if (local_server) {
@@ -522,9 +542,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);
@@ -538,8 +558,8 @@ static int start_client(int argc, char *argv[])
 }
 
 
-RETSIGTYPE sigusr1_handler(int val) {
-       exit_cleanup(1);
+static RETSIGTYPE sigusr1_handler(int val) {
+       exit_cleanup(RERR_SIGNAL);
 }
 
 int main(int argc,char *argv[])
@@ -559,14 +579,16 @@ 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);
 
-       parse_arguments(argc, argv);
+       if (!parse_arguments(argc, argv)) {
+               exit_cleanup(RERR_SYNTAX);
+       }
 
        argc -= optind;
        argv += optind;
@@ -576,6 +598,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(SIGTERM,SIGNAL_CAST sig_int);
 
        if (am_daemon) {
                return daemon_main();
@@ -583,7 +606,7 @@ int main(int argc,char *argv[])
 
        if (argc < 1) {
                usage(FERROR);
-               exit_cleanup(1);
+               exit_cleanup(RERR_SYNTAX);
        }
 
        if (dry_run)
@@ -592,7 +615,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
 
Matt McCutchen's repository for rsync, the fast and versatile remote file copier