Introduce signal_shutdown().

It allows para_server to close the write end of the signal pipe
before afs is started.

diff --git a/server.c b/server.c
index 9b6b55c9397161ceec4d60c317dbfec90cbc831b..4ea6df0b2abdd550866a1189fc2c72de48106614 100644 (file)
--- a/server.c
+++ b/server.c
@@ -560,7 +560,7 @@ genocide:
        }
        alarm(ALARM_TIMEOUT);
        close_listed_fds();
        }
        alarm(ALARM_TIMEOUT);
        close_listed_fds();

-       close(sockfd); /* child doesn't need the listener */
+       para_signal_shutdown();

        /*
         * put info on who we are serving into argv[0] to make
         * client ip visible in top/ps
        /*
         * put info on who we are serving into argv[0] to make
         * client ip visible in top/ps

diff --git a/signal.c b/signal.c
index 92f76c7b181b6c665f552ef5859c69ac3e6a891e..33449c632f5214e5acd464faeeae079b0701f0d5 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -143,3 +143,8 @@ int para_next_signal(void)
        }
        return r < 0 && (errno != EAGAIN)? 0 : -E_SIGNAL_READ;
 }
        }
        return r < 0 && (errno != EAGAIN)? 0 : -E_SIGNAL_READ;
 }

+
+void para_signal_shutdown(void)
+{
+       close(signal_pipe[1]);
+}

diff --git a/signal.h b/signal.h
index 5df64c33f7e0a6b8a441efef82b04c355fc62a2d..9a7a52791aecd81f451cdee85ec187f5b1903007 100644 (file)
--- a/signal.h
+++ b/signal.h
@@ -23,3 +23,4 @@ int para_install_sighandler(int);
 void para_reap_children(void);
 int para_reap_child(pid_t *pid);
 int para_next_signal(void);
 void para_reap_children(void);
 int para_reap_child(pid_t *pid);
 int para_next_signal(void);

+void para_signal_shutdown(void);