X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=9f2e54b7b8af2219fec5ff3ed43ec660527b488c;hp=f03d48717a1fa22b33afc2bf0cb1a91b5ba7c103;hb=ac0b9fcce4167e2959ebc5b8d6efb8511acec66d;hpb=612e67b21d1c9a6cc5db0e2903ddaeb5f2fbe2a0

diff --git a/uip/slocal.c b/uip/slocal.c
index f03d487..9f2e54b 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -175,7 +175,7 @@ static int timely(char *, char *);
 static int usr_file(int, char *);
 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, ...);
@@ -1106,7 +1106,7 @@ static int
 usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 {
 	pid_t child_id;
-	int bytes, seconds, status;
+	int bytes, seconds, status, n;
 	struct stat st;
 	char *path;
 
@@ -1133,7 +1133,9 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 		if (fd != 3) {
 			dup2(fd, 3);
 		}
-		closefds(4);
+		for (n=4; n<OPEN_MAX; n++) {
+			close(n);
+		}
 
 #ifdef TIOCNOTTY
 		if ((fd = open("/dev/tty", O_RDWR)) != -1) {
@@ -1162,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;
@@ -1198,13 +1200,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);
 }
 
@@ -1320,27 +1318,12 @@ you_lose:
 		if (first) {
 			first = 0;
 			if (strncmp(buffer, "From ", i)==0) {
-				char *fp, *cp;
 				/*
 				** get copy of envelope information
 				** ("From " line)
 				*/
 				envelope = getcpy(buffer);
 
-				/*
-				** Now create a "Return-Path:" line
-				** from the "From " line.
-				*/
-				cp = strchr(fp = envelope + i, ' ');
-				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;
-				}
 				/* Put the delivery date in message */
 				fputs(ddate, ffp);
 				if (ferror(ffp)) {