Better pid handling.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 87711c2..7459e1e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -321,7 +321,7 @@ static char *get_local_name(struct file_list *flist,char *name)
 
        if (do_stat(name,&st) == 0) {
                if (S_ISDIR(st.st_mode)) {
-                       if (!push_dir(name, 0)) {
+                       if (!push_dir(name)) {
                                rprintf(FERROR, "push_dir %s failed: %s (1)\n",
                                        full_fname(name), strerror(errno));
                                exit_cleanup(RERR_FILESELECT);
@@ -347,7 +347,7 @@ static char *get_local_name(struct file_list *flist,char *name)
                        rprintf(FINFO,"created directory %s\n",name);
        }
 
-       if (!push_dir(name, 0)) {
+       if (!push_dir(name)) {
                rprintf(FERROR, "push_dir %s failed: %s (2)\n",
                        full_fname(name), strerror(errno));
                exit_cleanup(RERR_FILESELECT);
@@ -363,10 +363,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        struct file_list *flist;
        char *dir = argv[0];
 
-       if (verbose > 2)
-               rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
+       if (verbose > 2) {
+               rprintf(FINFO, "server_sender starting pid=%ld\n",
+                       (long)getpid());
+       }
 
-       if (!relative_paths && !push_dir(dir, 0)) {
+       if (!relative_paths && !push_dir(dir)) {
                rprintf(FERROR, "push_dir %s failed: %s (3)\n",
                        full_fname(dir), strerror(errno));
                exit_cleanup(RERR_FILESELECT);
@@ -462,7 +464,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out, flist, local_name);
 
-       get_redo_num(); /* Read final -1, and any prior messages. */
+       get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        io_flush(FULL_FLUSH);
        if (protocol_version >= 24) {
                /* send a final goodbye message */
@@ -484,8 +486,10 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        char *local_name=NULL;
        char *dir = NULL;
 
-       if (verbose > 2)
-               rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+       if (verbose > 2) {
+               rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+                       argc, (long)getpid());
+       }
 
        if (am_daemon && lp_read_only(module_id) && !am_sender) {
                rprintf(FERROR,"ERROR: module is read only\n");
@@ -498,7 +502,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
                dir = argv[0];
                argc--;
                argv++;
-               if (!am_daemon && !push_dir(dir, 0)) {
+               if (!am_daemon && !push_dir(dir)) {
                        rprintf(FERROR, "push_dir %s failed: %s (4)\n",
                                full_fname(dir), strerror(errno));
                        exit_cleanup(RERR_FILESELECT);
@@ -819,7 +823,7 @@ static int start_client(int argc, char *argv[])
        }
 
        if (shell_machine) {
-               p = strchr(shell_machine,'@');
+               p = strrchr(shell_machine,'@');
                if (p) {
                        *p = 0;
                        shell_user = shell_machine;
@@ -1005,7 +1009,7 @@ int main(int argc,char *argv[])
         * (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);
+       push_dir(NULL);
 
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);