X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=f10c76dec93f161c5dd8a101218388dd2113496a;hb=aac9670c207aaefb17521c2ce4db39cb8893f660;hp=e6880fe04420ebe42cb571063e4726f58dc721db;hpb=119362982fae61ae7aaa899eaf2544e4f4a84283;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index e6880fe..f10c76d 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -439,11 +439,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 +1202,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;
@@ -1335,9 +1331,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 +1341,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))