runit

commit 49cceaa94ae129fb00e4251069dc84cca7cc3cb1
parent ec471843a3f4312d6864d7bc3df78a94d869c04a
Author: Gerrit Pape <pape@smarden.org>
Date:   Fri, 14 Jan 2005 22:24:16 +0000

  * runsv.c: typos; bugfix: run optional control/x when receiving SIGTERM
    (thx Vladimir Smelhaus); minor.
1.2.1.

Diffstat:
M
package/CHANGES
 | 
2
++
M
src/runsv.c
 | 
19
+++++++++++--------

2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/package/CHANGES b/package/CHANGES
@@ -9,6 +9,8 @@ Wed, 12 Jan 2005 22:56:40 +0000
   * man/svwaitdown.8, man/svwaitup.8: adapt.
   * doc/runscripts.html: add contributed run scripts (thx Stefan Karrmann,
     Kevin Berry, Karl Chen).
+  * runsv.c: typos; bugfix: run optional control/x when receiving SIGTERM
+    (thx Vladimir Smelhaus); minor.
 
 runit 1.2.0
 Fri, 17 Dec 2004 21:08:50 +0000
diff --git a/src/runsv.c b/src/runsv.c
@@ -53,6 +53,7 @@ struct svdir {
 };
 struct svdir svd[2];
 
+int sigterm =0;
 int haslog =0;
 int pidchanged =1;
 int logpipe[2];
@@ -78,9 +79,8 @@ void stopservice(struct svdir *);
 
 void s_child() { write(selfpipe[1], "", 1); }
 void s_term() {
-  svd[0].want =W_EXIT;
-  stopservice(&svd[0]);
-  write(selfpipe[1], "", 1);
+  sigterm =1;
+  write(selfpipe[1], "", 1); /* XXX */
 }
 
 void update_status(struct svdir *s) {
@@ -215,25 +215,26 @@ unsigned int custom(struct svdir *s, char c) {
   if (stat(a, &st) == 0) {
     if (st.st_mode & S_IXUSR) {
       if ((pid =fork()) == -1) {
-        warn("unable to fork for ctrl/?");
+        warn("unable to fork for control/?");
         return(0);
       }
       if (! pid) {
         if (haslog && fd_copy(1, logpipe[1]) == -1)
-          warn("unable to setup stdout for ctrl/?");
+          warn("unable to setup stdout for control/?");
         prog[0] =a;
         prog[1] =0;
         execve(a, prog, environ);
+	fatal("unable to run control/?");
       }
       if (wait_pid(&w, pid) == -1) {
-        warn("unable to wait for child ctrl/?");
+        warn("unable to wait for child control/?");
         return(0);
       }
       return(! wait_exitcode(w));
     }
   }
   else
-    if (errno != error_noent) warn("unable to stat ctrl/?");
+    if (errno != error_noent) warn("unable to stat control/?");
   return(0);
 }
 void stopservice(struct svdir *s) {
@@ -531,7 +532,7 @@ int main(int argc, char **argv) {
             close(fd);
             svd[0].state =S_FINISH;
             update_status(&svd[0]);
-            break;
+            continue;
           }
         svd[0].state =S_DOWN;
         taia_uint(&deadline, 1);
@@ -555,6 +556,8 @@ int main(int argc, char **argv) {
     if (haslog)
       if (read(svd[1].fdcontrol, &ch, 1) == 1) ctrl(&svd[1], ch);
 
+    if (sigterm) { ctrl(&svd[0], 'x'); sigterm =0; }
+
     if (svd[0].want == W_EXIT && svd[0].state == S_DOWN) {
       if (svd[1].pid == 0) _exit(0);
       if (svd[1].want != W_EXIT) {