Garbage collect autoconf support for checking for the header file for initgroups

[mmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index e6880fe..13d0511 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -34,16 +34,6 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#ifdef INITGROUPS_HEADER
-#include INITGROUPS_HEADER
-#else
-/* On AIX 4.1, initgroups() is defined and even documented (giving the parameter
-   types as char* and int), but doesn't have a prototype in any of the system
-   header files.  AIX 4.3, SunOS 4.1.3, and ULTRIX 4.2A have the same
-   problem. */
-extern int  initgroups(char*, int);
-#endif
-
 /* This define is needed for Berkeley db v2 and above to
  * make the header file expose the 'historical' ndbm APIs.
  * We define it unconditionally because this is simple and
@@ -190,7 +180,7 @@ static int timely (char *, char *);
 static int usr_file (int, char *, int);
 static int usr_pipe (int, char *, char *, char **, int);
 static int usr_folder (int, char *);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
 static void get_sender (char *, char **);
 static int copy_message (int, char *, int);
 static void verbose_printf (char *fmt, ...);
@@ -439,11 +429,7 @@ localmail (int fd, char *mdlvr)
        verbose_printf ("(delivering to standard mail spool)\n");
 
     /* last resort - deliver to standard mail spool */
-#ifdef SLOCAL_MBOX
     return usr_file (fd, mbox, MBOX_FORMAT);
-#else
-    return usr_file (fd, mbox, MMDF_FORMAT);
-#endif
 }
 
 
@@ -1206,7 +1192,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);
+               killpg(child_id, SIGKILL);
                if (verbose)
                    verbose_printf (", timed-out; terminated\n");
                return -1;
@@ -1215,13 +1201,9 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
 }
 
 
-static RETSIGTYPE
+static void
 alrmser (int i)
 {
-#ifndef RELIABLE_SIGNALS
-    SIGNAL (SIGALRM, alrmser);
-#endif
-
     longjmp (myctx, DONE);
 }
 
@@ -1335,9 +1317,6 @@ you_lose:
        if (first) {
            first = 0;
            if (!strncmp (buffer, "From ", i)) {
-#ifdef RPATHS
-               char *fp, *cp, *hp, *ep;
-#endif
                /* get copy of envelope information ("From " line) */
                envelope = getcpy (buffer);
 
@@ -1348,33 +1327,6 @@ you_lose:
                    goto fputs_error;
 #endif
 
-#ifdef RPATHS
-               /*
-                * Now create a "Return-Path:" line
-                * from the "From " line.
-                */
-               hp = cp = strchr(fp = envelope + i, ' ');
-               while ((hp = strchr(++hp, 'r')))
-                   if (uprf (hp, "remote from")) {
-                       hp = strrchr(hp, ' ');
-                       break;
-                   }
-               if (hp) {
-                   /* return path for UUCP style addressing */
-                   ep = strchr(++hp, '\n');
-                   snprintf (buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n",
-                       (int)(ep - hp), hp, (int)(cp - fp), fp);
-               } else {
-                   /* return path for standard domain addressing */
-                   snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n",
-                       (int)(cp - fp), fp);
-               }
-
-               /* Add Return-Path header to message */
-               fputs (buffer, ffp);
-               if (ferror (ffp))
-                   goto fputs_error;
-#endif
                /* Put the delivery date in message */
                fputs (ddate, ffp);
                if (ferror (ffp))