X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=46b16fd21d58decf6ad9d2f8c38835362be31587;hp=b3a9acb538f6ddbda27de29ab1cb842643c0252a;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9

diff --git a/uip/mhmail.c b/uip/mhmail.c
index b3a9acb..46b16fd 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -51,15 +51,13 @@ main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
 
-	/* foil search of user profile/context */
-	if (context_foil(NULL) == -1)
-		done(1);
-
 	/* Without arguments, exit. */
 	if (argc == 1) {
 		adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
 	}
 
+	context_read();
+
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -68,7 +66,8 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				/* sysexits.h EX_USAGE */
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
@@ -77,10 +76,10 @@ main(int argc, char **argv)
 						"%s addrs... [switches]",
 						invo_name);
 				print_help(buf, switches, 0);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case FROMSW:
 				if (!(from = *argp++) || *from == '-')
@@ -184,7 +183,8 @@ main(int argc, char **argv)
 			if (in == -1 || out == -1) {
 				fprintf(stderr, "Letter left at %s.\n",
 						tmpfil);
-				done(status ? 1 : 0);
+				/* sysexits.h exit-status from spost */
+				exit(status ? 1 : 0);
 			}
 			cpydata(in, out, tmpfil, "dead.letter");
 			close(in);
@@ -192,7 +192,8 @@ main(int argc, char **argv)
 			fprintf(stderr, "Letter saved in dead.letter\n");
 		}
 		unlink(tmpfil);
-		done(status ? 1 : 0);
+		/* sysexits.h exit status from spost */
+		exit(status ? 1 : 0);
 	}
 
 	return 0;  /* dead code to satisfy the compiler */
@@ -203,6 +204,6 @@ static void
 intrser(int i)
 {
 	unlink(tmpfil);
-	done(i != 0 ? 1 : 0);
+	exit(i != 0 ? 1 : 0);
 }