7 files changed, 304 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 31e9e5f..dac3cb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,12 @@
 SUBDIRS = grecs src
+dist: ChangeLog
+.PHONY: ChangeLog
+ChangeLog:
+        $(AM_V_GEN)if test -d .git; then                                     \
+          git log --pretty='format:%ct  %an  <%ae>%n%n%s%n%n%b%n' |          \
+            awk -f $(top_srcdir)/@GRECS_SUBDIR@/build-aux/git2chg.awk        \
+              > ChangeLog.tmp;                                               \
+          cmp ChangeLog ChangeLog.tmp > /dev/null 2>&1 ||                    \
+            mv ChangeLog.tmp ChangeLog;                                      \
+          rm -f ChangeLog.tmp;                                               \
+        fi
diff --git a/configure.ac b/configure.ac
index 5d36092..a568649 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,47 +6,47 @@
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # Genrc is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with genrc.  If not, see <http://www.gnu.org/licenses/>. 
 
 AC_PREREQ([2.69])
-AC_INIT([genrc], [1.0], [gray@gnu.org])
+AC_INIT([genrc], [1.0.90], [gray@gnu.org])
 AC_CONFIG_SRCDIR([src/genrc.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11 foreign silent-rules])
 AC_CONFIG_MACRO_DIR(grecs/am)
 
 # Enable silent rules by default
 AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_RANLIB
 
 # Checks for libraries.
 AC_CHECK_LIB(pcre, main)
 
 # Checks for header files.
 AC_CHECK_HEADERS([getopt.h pcre.h])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([getdtablesize])
 
-GRECS_SETUP(grecs, [all-parsers])
+GRECS_SETUP(grecs, [all-parsers git2chg])
 
 AM_CONDITIONAL([COND_PCRE],
   [test "$ac_cv_header_pcre_h" = yes && test "$ac_cv_lib_pcre_main" = yes])
 
 if test -f /proc/$$/cmdline; then
   DEFAULT_PID_SOURCE='"PROC"'
 else
   DEFAULT_PID_SOURCE='"PS"'
 fi
 AC_DEFINE_UNQUOTED(DEFAULT_PID_SOURCE,$DEFAULT_PID_SOURCE,
  [Default PID source])
   
diff --git a/src/com_start.c b/src/com_start.c
index 5744e39..3a9dffc 100644
--- a/src/com_start.c
+++ b/src/com_start.c
@@ -34,27 +34,31 @@ report_exec_error(int rc, char const *program)
 typedef void (*SIGHANDLER)(int);
 
 void
 sigchld(int sig)
 {
 }
 
 int
 timedwaitpid(pid_t pid, int *status)
 {
         struct timeval now, stoptime, ttw;
         int rc = -1;
-        SIGHANDLER oldsig;
+        struct sigaction act, oldact;
+
+        act.sa_handler = sigchld;
+        act.sa_flags = 0;
+        sigemptyset(&act.sa_mask);
+        sigaction(SIGCHLD, &act, &oldact);
 
-        oldsig = signal(SIGCHLD, sigchld);
         gettimeofday(&stoptime, NULL);
         stoptime.tv_sec += genrc_timeout;
         while (1) {
                 pid_t p;
                 
                 p = waitpid(pid, status, WNOHANG);
                 if (p == pid) {
                         rc = 0;
                         break;
                 }
                 if (p < 0 && errno != EINTR) {
                         system_error(errno, "waitpid");
@@ -64,25 +68,25 @@ timedwaitpid(pid_t pid, int *status)
                 gettimeofday(&now, NULL);
                 if (timercmp(&now, &stoptime, >=))
                         break;
                 timersub(&stoptime, &now, &ttw);
                 if (select(0, NULL, NULL, NULL, &ttw) < 0) {
                         if (errno != EINTR) {
                                 system_error(errno, "select");
                                 break;
                         }
                 }
 
         }
-        signal(SIGCHLD, oldsig);
+        sigaction(SIGCHLD, &oldact, NULL);
         if (rc) {
                 kill(pid, SIGKILL);
         }
         return rc;
 }
 
 int
 com_start(void)
 {
         pid_t pid;
         int status;
         PIDLIST pids;
diff --git a/src/genrc.8 b/src/genrc.8
index 00522ee..959a00e 100644
--- a/src/genrc.8
+++ b/src/genrc.8
@@ -4,47 +4,49 @@
 .\" Genrc is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" the Free Software Foundation; either version 3, or (at your option)
 .\" any later version.
 .\"
 .\" Genrc is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with genrc.  If not, see <http://www.gnu.org/licenses/>. 
-.TH GENRC 8 "May 17, 2018" "GENRC" "Genrc User Manual"
+.TH GENRC 8 "May 20, 2018" "GENRC" "Genrc User Manual"
 .SH NAME
 genrc \- generic system initialization script helper
 .SH SYNOPSIS
 .nh
 .na
 \fBgenrc\fR\
  [\fB\-hv\fR]\
  [\fB\-F\fR \fIPIDFILE\fR]\
  [\fB\-P\fR \fISOURCE\fR]\
  [\fB\-c\fR \fICOMMAND\fR]\
  [\fB\-g\fR \fIGROUP\fR[,\fIGROUP\fR...]]\
  [\fB\-p\fR \fIPROGRAM\fR]\
  [\fB\-t\fR \fISECONDS\fR]\
  [\fB\-u\fR \fIUSER\fR]\
  [\fB\-\-command=\fICOMMAND\fR]\
  [\fB\-\-create\-pidfile=\fIPIDFILE\fR]\
  [\fB\-\-group=\fIGROUP\fR[,\fIGROUP\fR...]]\
  [\fB\-\-help\fR]\
  [\fB\-\-no\-reload\fR]\
  [\fB\-\-pid\-from=\fISOURCE\fR]\
  [\fB\-\-pidfile=\fIPIDFILE\fR]\
  [\fB\-\-program=\fIPROGRAM\fR]\
+ [\fB\-\-restart\-on\-exit=\fR[\fB!\fR]\fISTATUS\fR[\fB,\fISTATUS\fR...]]\
+ [\fB\-\-restart\-on\-signal=\fR[\fB!\fR]\fISIG\fR[\fB,\fISIG\fR...]]\
  [\fB\-\-sentinel\fR]\
  [\fB\-\-signal\-reload=\fISIG\fR]\
  [\fB\-\-signal\-stop=\fISIG\fR]\
  [\fB\-\-timeout=\fISECONDS\fR]\
  [\fB\-\-user=\fIUSER\fR]\
  [\fB\-\-usage\fR]\