There's no need for killpg(). We can use kill() instead.

(Also removed a now unused define.)

diff --git a/configure.ac b/configure.ac
index 20bcbd1223ce51293464790c33e124261cc24364..cb5a79a3404c9f630ed9ba94ec4e5d364562f91b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -367,7 +367,7 @@ dnl CHECK FUNCTIONS
 dnl ---------------
 AC_CHECK_LIB(mkstemp,mkstemp)
 AC_CHECK_FUNCS(waitpid sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse lstat uname tzset killpg mkstemp \
+               sighold sigrelse lstat uname tzset mkstemp \
                getutent nl_langinfo mbtowc wcwidth)
 
 dnl sigsetjmp may be a macro

diff --git a/h/nmh.h b/h/nmh.h
index 26eb0a2b0c031264b7a7dcbdc287872235fae74a..896786f54cbf0d8ed82e04340e8b3bc07837259c 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -84,17 +84,6 @@
 # endif
 #endif
 
-/*
-** we should get this value from sysconf(_SC_NGROUPS_MAX)
-*/
-#ifndef NGROUPS_MAX
-# ifdef NGROUPS
-#  define NGROUPS_MAX NGROUPS
-# else
-#  define NGROUPS_MAX 16
-# endif
-#endif
-
 /*
 ** we should be getting this value from sysconf(_SC_OPEN_MAX)
 */
@@ -109,12 +98,6 @@
 
 #include <signal.h>
 
-#ifdef HAVE_KILLPG
-# define KILLPG(pgrp,sig) killpg(pgrp,sig);
-#else
-# define KILLPG(pgrp,sig) kill((-pgrp),sig);
-#endif
-
 /*
 ** If your stat macros are broken,
 ** we will just undefine them.

diff --git a/uip/slocal.c b/uip/slocal.c
index 608ddf29f514468615a2fdf35350b891a98b08da..986583999aa763c247e09c5851eec44c98b602ad 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1164,7 +1164,7 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
                        ** Ruthlessly kill the child and anything
                        ** else in its process group.
                        */
-                       KILLPG(child_id, SIGKILL);
+                       kill(-child_id, SIGKILL);
                        if (verbose)
                                verbose_printf(", timed-out; terminated\n");
                        return -1;