X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=f08f2ffc5b561e9ca3d0695d04a9ca26a382c287;hb=3a84d814004fd4557bf4f44952648e9e69bd22a8;hp=cf91737d0cce2beb9674fec24391bbb92e64796b;hpb=d1b702b1220d45e441b2b9597a8cf58edb51a653;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index cf91737..f08f2ff 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -34,15 +34,9 @@
 #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
+/* Hopefully, grp.h declares initgroups().  If we run into a platform
+   where it doesn't, we could consider declaring it here as well. */
+#include <grp.h>
 
 /* This define is needed for Berkeley db v2 and above to
  * make the header file expose the 'historical' ndbm APIs.
@@ -50,6 +44,8 @@ extern int  initgroups(char*, int);
  * harmless.
  */
 #define DB_DBM_HSEARCH 1
+#ifdef DB_DBM_HSEARCH
+#endif /* Use DB_DBM_HSEARCH to prevent warning from gcc -Wunused-macros. */
 #ifdef NDBM_HEADER
 #include NDBM_HEADER
 #endif
@@ -190,7 +186,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 +435,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
 }
 
 
@@ -1215,12 +1207,10 @@ 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
+    NMH_UNUSED (i);
 
     longjmp (myctx, DONE);
 }
@@ -1335,9 +1325,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 +1335,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))