X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=9f2e54b7b8af2219fec5ff3ed43ec660527b488c;hb=1ec4ef34243a756d1f51718e7e15b094f4b36618;hp=608ddf29f514468615a2fdf35350b891a98b08da;hpb=5f08476e3bc5c134ce57d924b01d1c1fcacd53db;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index 608ddf2..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, ...);
@@ -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;
@@ -1200,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);
 }
 
@@ -1322,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)) {