X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=cf9a9b0f160c2abeb67181e22a06fde4b132b6d0;hp=9d468025e5e7e0fc87091524d1fcb7239c4b0a8a;hb=62b0c6727235a0bc560179dbf6b13d252716c02c;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9

diff --git a/uip/slocal.c b/uip/slocal.c
index 9d46802..cf9a9b0 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -90,7 +90,8 @@ static struct passwd *pw;  /* passwd file entry */
 static char ddate[BUFSIZ];  /* record the delivery date */
 struct tws *now;
 
-static jmp_buf myctx;
+volatile sig_atomic_t eflag = 0; /* flag to indecate interrupt */
+static pid_t child_id;
 
 /* flags for pair->p_flags */
 #define P_NIL  0x00
@@ -162,7 +163,7 @@ static int copy_message(int, char *, int);
 static void verbose_printf(char *fmt, ...);
 static void adorn(char *, char *, ...);
 static void debug_printf(char *fmt, ...);
-static char *trim(char *);
+static char *trimstr(char *);
 
 
 int
@@ -177,10 +178,6 @@ main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(*argv);
 
-	/* foil search of user profile/context */
-	if (context_foil(NULL) == -1) {
-		done(1);
-	}
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -190,17 +187,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [switches] [address info sender]", invo_name);
 				print_help(buf, switches, 0);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case ADDRSW:
 				if (!(addr = *argp++)) {
@@ -386,23 +383,22 @@ main(int argc, char **argv)
 	}
 
 	if (debug) {
-		debug_printf("addr=\"%s\"\n", trim(addr));
-		debug_printf("user=\"%s\"\n", trim(user));
-		debug_printf("info=\"%s\"\n", trim(info));
-		debug_printf("sender=\"%s\"\n", trim(sender));
+		debug_printf("addr=\"%s\"\n", trimstr(addr));
+		debug_printf("user=\"%s\"\n", trimstr(user));
+		debug_printf("info=\"%s\"\n", trimstr(info));
+		debug_printf("sender=\"%s\"\n", trimstr(sender));
 		debug_printf("envelope=\"%s\"\n",
-				envelope ? trim(envelope) : "");
-		debug_printf("mbox=\"%s\"\n", trim(mbox));
-		debug_printf("home=\"%s\"\n", trim(home));
-		debug_printf("ddate=\"%s\"\n", trim(ddate));
+				envelope ? trimstr(envelope) : "");
+		debug_printf("mbox=\"%s\"\n", trimstr(mbox));
+		debug_printf("home=\"%s\"\n", trimstr(home));
+		debug_printf("ddate=\"%s\"\n", trimstr(ddate));
 		debug_printf("now=%02d:%02d\n\n", now->tw_hour, now->tw_min);
 	}
 
 	/* deliver the message */
 	status = localmail(fd, mdlvr);
 
-	done(status != -1 ? RCV_MOK : RCV_MBX);
-	return 1;
+	return (status != -1 ? RCV_MOK : RCV_MBX);
 }
 
 
@@ -487,7 +483,7 @@ usr_delivery(int fd, char *delivery, int su)
 		if (debug) {
 			for (i = 0; vec[i]; i++) {
 				debug_printf("vec[%d]: \"%s\"\n",
-						i, trim(vec[i]));
+						i, trimstr(vec[i]));
 			}
 		}
 
@@ -828,14 +824,14 @@ parse(int fd)
 		p->p_flags &= ~P_CHK;
 		if (debug) {
 			debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
-					p - vars, p->p_name, trim(p->p_value));
+					p - vars, p->p_name, trimstr(p->p_value));
 		}
 	}
 	if (debug) {
 		for (p = hdrs; p->p_name; p++) {
 			debug_printf("hdrs[%d]: name=\"%s\" value=\"%s\"\n",
 					p - hdrs, p->p_name,
-					p->p_value ? trim(p->p_value) : "");
+					p->p_value ? trimstr(p->p_value) : "");
 		}
 	}
 	return 0;
@@ -913,7 +909,7 @@ glob(int fd)
 	if (debug) {
 		for (p = vars; p->p_name; p++) {
 			debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
-					p - vars, p->p_name, trim(p->p_value));
+					p - vars, p->p_name, trimstr(p->p_value));
 		}
 	}
 }
@@ -1039,16 +1035,6 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 
 	default:
 		/* parent process */
-		if (setjmp(myctx)) {
-			/*
-			** Ruthlessly kill the child and anything
-			** else in its process group.
-			*/
-			kill(-child_id, SIGKILL);
-			if (verbose)
-				verbose_printf(", timed-out; terminated\n");
-			return -1;
-		}
 		SIGNAL(SIGALRM, alrmser);
 		bytes = fstat(fd, &st) != -1 ? (int) st.st_size : 100;
 
@@ -1066,6 +1052,13 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 		status = pidwait(child_id, 0);
 		alarm(0);
 
+		if (eflag) {
+			if (verbose) {
+				verbose_printf(", timed-out; terminated\n");
+			}
+			return -1;
+		}
+
 		if (verbose) {
 			if (!status) {
 				verbose_printf(", success.\n");
@@ -1083,7 +1076,8 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 static void
 alrmser(int i)
 {
-	longjmp(myctx, DONE);
+	eflag = 1;
+	kill(-child_id, SIGKILL);
 }
 
 
@@ -1241,7 +1235,7 @@ fputs_error:
 ** Trim strings for pretty printing of debugging output
 */
 static char *
-trim(char *cp)
+trimstr(char *cp)
 {
 	char buffer[BUFSIZ*4];
 	unsigned char *bp, *sp;