Now that whole_file and no_whole_file are separate variables, have the

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index a54d67f..f723da4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -280,7 +280,8 @@ static char *get_local_name(struct file_list *flist,char *name)
                return name;
 
        if (do_mkdir(name,0777 & ~orig_umask) != 0) {
-               rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
+               rprintf(FERROR, RSYNC_NAME ": mkdir %s: %s\n",
+                       name, strerror(errno));
                exit_cleanup(RERR_FILEIO);
        } else {
                if (verbose > 0)
@@ -288,8 +289,8 @@ 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));
+               rprintf(FERROR, RSYNC_NAME ": push_dir %s: %s\n",
+                       name, strerror(errno));
                exit_cleanup(RERR_FILESELECT);
        }
 
@@ -643,6 +644,9 @@ static int copy_argv (char *argv[])
  * Start a client for either type of remote connection.  Work out
  * whether the arguments request a remote shell or rsyncd connection,
  * and call the appropriate connection function, then run_client.
+ *
+ * Calls either start_socket_client (for sockets) or do_cmd and
+ * client_run (for ssh).
  */
 static int start_client(int argc, char *argv[])
 {
@@ -712,12 +716,6 @@ static int start_client(int argc, char *argv[])
                p = find_colon(argv[argc-1]);
                if (!p) {
                        local_server = 1;
-                       /*
-                        * disable "rsync algorithm" when both sides local,
-                        * except when creating a batch update
-                        */
-                       if (!write_batch && whole_file == -1)
-                               whole_file = 1;
                } else if (p[1] == ':') {
                        *p = 0;
                        return start_socket_client(argv[argc-1], p+2, argc-1, argv);
@@ -782,17 +780,17 @@ static int start_client(int argc, char *argv[])
 }
 
 
-static RETSIGTYPE sigusr1_handler(int val) {
+static RETSIGTYPE sigusr1_handler(int UNUSED(val)) {
        exit_cleanup(RERR_SIGNAL);
 }
 
-static RETSIGTYPE sigusr2_handler(int val) {
+static RETSIGTYPE sigusr2_handler(int UNUSED(val)) {
        extern int log_got_error;
        if (log_got_error) _exit(RERR_PARTIAL);
        _exit(0);
 }
 
-static RETSIGTYPE sigchld_handler(int val) {
+static RETSIGTYPE sigchld_handler(int UNUSED(val)) {
 #ifdef WNOHANG
        while (waitpid(-1, NULL, WNOHANG) > 0) ;
 #endif