another hang-at-end fix. It looks like we are more sensiitive to

these with socketpairs. The receiver now sleeps until it gets a signal
to tell it to exit

also fixed test.sh to use the current version remotely

diff --git a/cleanup.c b/cleanup.c
index b4ac82a..c828d73 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -39,6 +39,7 @@ void _exit_cleanup(int code, const char *file, int line)
        if (code == 0 && io_error) code = RERR_FILEIO;
 
        signal(SIGUSR1, SIG_IGN);
+       signal(SIGUSR2, SIG_IGN);
 
        if (cleanup_got_literal && cleanup_fname && keep_partial) {
                char *fname = cleanup_fname;

diff --git a/io.c b/io.c
index 540ef2a..6cdbe6b 100644 (file)
--- a/io.c
+++ b/io.c
@@ -599,3 +599,4 @@ void io_close_input(int fd)
 {
        buffer_f_in = -1;
 }
+

diff --git a/main.c b/main.c
index ac5c1d2..0c4f2cd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -321,9 +321,12 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                recv_files(f_in,flist,local_name,recv_pipe[1]);
                report(f_in);
 
-               write_int(recv_pipe[1],-1);
+               write_int(recv_pipe[1],1);
+               close(recv_pipe[1]);
                io_flush();
-               _exit(0);
+               /* finally we go to sleep until our parent kills us with
+                  a USR2 signal */
+               while (1) sleep(60);
        }
 
        close(recv_pipe[1]);
@@ -337,13 +340,15 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out,flist,local_name,recv_pipe[0]);
 
-       read_int(recv_pipe[1]);
+       read_int(recv_pipe[0]);
+       close(recv_pipe[0]);
        if (remote_version >= 24) {
                /* send a final goodbye message */
                write_int(f_out, -1);
        }
        io_flush();
 
+       kill(pid, SIGUSR2);
        wait_process(pid, &status);
        return status;
 }
@@ -621,6 +626,10 @@ static RETSIGTYPE sigusr1_handler(int val) {
        exit_cleanup(RERR_SIGNAL);
 }
 
+static RETSIGTYPE sigusr2_handler(int val) {
+       _exit(0);
+}
+
 int main(int argc,char *argv[])
 {       
        extern int am_root;
@@ -630,6 +639,7 @@ int main(int argc,char *argv[])
        extern int am_server;
 
        signal(SIGUSR1, sigusr1_handler);
+       signal(SIGUSR2, sigusr2_handler);
 
        starttime = time(NULL);
        am_root = (getuid() == 0);

diff --git a/test.sh b/test.sh
index 792bb67..e9c953a 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -24,7 +24,9 @@ not for end users. You may experience failures on some platforms that
 do not indicate a problem with rsync.
 
 EOF
-  export PATH=.:$PATH
+
+RSYNC=`pwd`/rsync
+
   runtest() {
     echo -n "Test $1: "
     eval "$2"
@@ -123,33 +125,33 @@ EOF
 
 # Main script starts here
 
-runtest "basic operation" 'checkit "rsync -av ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest "basic operation" 'checkit "$RSYNC -av ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 ln ${FROM}/pslist ${FROM}/dir
-runtest "hard links" 'checkit "rsync -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest "hard links" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 rm ${TO}/${F1}
-runtest "one file" 'checkit "rsync -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest "one file" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 echo "extra line" >> ${TO}/${F1}
-runtest "extra data" 'checkit "rsync -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest "extra data" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 cp ${FROM}/${F1} ${TO}/ThisShouldGo
-runtest " --delete" 'checkit "rsync --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest " --delete" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 LONGDIR=${FROM}/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job
 mkdir -p ${LONGDIR}
 date > ${LONGDIR}/1
 ls -la / > ${LONGDIR}/2
-runtest "long paths" 'checkit "rsync --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
+runtest "long paths" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 if type ssh >/dev/null 2>&1; then
   if [ "`ssh -o'BatchMode yes' localhost echo yes 2>/dev/null`" = "yes" ]; then
   rm -rf ${TO}
-    runtest "ssh: basic test" 'checkit "rsync -avH -e ssh ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
+    runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
 
     mv ${TO}/${F1} ${TO}/ThisShouldGo
-    runtest "ssh: renamed file" 'checkit "rsync --delete -avH -e ssh ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
+    runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
   else
   printmsg "Skipping SSH tests because ssh conection to localhost not authorised"
   fi
@@ -161,7 +163,7 @@ rm -rf ${TO}
 mkdir -p ${FROM}2/dir/subdir
 cp -a ${FROM}/dir/subdir/subsubdir ${FROM}2/dir/subdir
 cp ${FROM}/dir/* ${FROM}2/dir 2>/dev/null
-runtest "excludes" 'checkit "rsync -vv -Hlrt --delete --include /dir/ --include /dir/\* --include /dir/\*/subsubdir  --include /dir/\*/subsubdir/\*\* --exclude \*\* ${FROM}/dir ${TO}" ${FROM}2/ ${TO}'
+runtest "excludes" 'checkit "$RSYNC -vv -Hlrt --delete --include /dir/ --include /dir/\* --include /dir/\*/subsubdir  --include /dir/\*/subsubdir/\*\* --exclude \*\* ${FROM}/dir ${TO}" ${FROM}2/ ${TO}'
 rm -r ${FROM}2
 
 checkforlogs ${LOG}.?