X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=72771a7fcf5627f06d138004dc40fc7e80a82ba7;hp=4939b027bca35d9a04dce12d34c06e6123fc1e8e;hb=d36e56e695fe1c482c7920644bfbb6386ac9edb0;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 4939b02..72771a7 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -1,10 +1,10 @@
 /*
- * mhmail.c -- simple mail program
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** mhmail.c -- simple mail program
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/signals.h>
@@ -34,13 +34,13 @@ static struct swit switches[] = {
 static char tmpfil[BUFSIZ];
 
 /*
- * static prototypes
- */
-static RETSIGTYPE intrser (int);
+** static prototypes
+*/
+static RETSIGTYPE intrser(int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	pid_t child_id;
 	int status, i, iscc = 0, nvec;
@@ -54,112 +54,117 @@ main (int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* foil search of user profile/context */
-	if (context_foil (NULL) == -1)
-		done (1);
+	if (context_foil(NULL) == -1)
+		done(1);
 
-	/* If no arguments, just incorporate new mail */
+	/* Without arguments, exit. */
 	if (argc == 1) {
-		execlp (incproc, r1bindex (incproc, '/'), NULL);
-		adios (incproc, "unable to exec");
+		adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
 	}
 
-	arguments = getarguments (invo_name, argc, argv, 0);
+	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
-				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
-				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [addrs ... [switches]]",
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s addrs... [switches]",
 						invo_name);
-					print_help (buf, switches, 0);
-					done (1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done (1);
-
-				case FROMSW:
-					if (!(from = *argp++) || *from == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case BODYSW:
-					if (!(body = *argp++) || *body == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case CCSW:
-					iscc++;
-					continue;
-
-				case SUBJSW:
-					if (!(subject = *argp++) || *subject == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case RESNDSW:
-					resent++;
-					continue;
-
-				case QUEUESW:
-					queued++;
-					continue;
+				print_help(buf, switches, 0);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case FROMSW:
+				if (!(from = *argp++) || *from == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case BODYSW:
+				if (!(body = *argp++) || *body == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case CCSW:
+				iscc++;
+				continue;
+
+			case SUBJSW:
+				if (!(subject = *argp++) || *subject == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case RESNDSW:
+				resent++;
+				continue;
+
+			case QUEUESW:
+				queued++;
+				continue;
 			}
 		}
 		if (iscc)
-			cclist = cclist ? add (cp, add (", ", cclist)) : getcpy (cp);
+			cclist = cclist ? add(cp, add(", ", cclist)) :
+					getcpy(cp);
 		else
-			tolist = tolist ? add (cp, add (", ", tolist)) : getcpy (cp);
+			tolist = tolist ? add(cp, add(", ", tolist)) :
+					getcpy(cp);
 	}
 
 	if (tolist == NULL)
-		adios (NULL, "usage: %s addrs ... [switches]", invo_name);
+		adios(NULL, "usage: %s addrs ... [switches]", invo_name);
 
-	tfile = m_mktemp2(NULL, invo_name, NULL, &out);
-	if (tfile == NULL) adios("mhmail", "unable to create temporary file");
+	tfile = m_mktemp2("/tmp/", invo_name, NULL, &out);
+	if (tfile == NULL)
+		adios("mhmail", "unable to create temporary file");
 	chmod(tfile, 0600);
-	strncpy (tmpfil, tfile, sizeof(tmpfil));
+	strncpy(tmpfil, tfile, sizeof(tmpfil));
 
-	SIGNAL2 (SIGINT, intrser);
+	SIGNAL2(SIGINT, intrser);
 
-	fprintf (out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
+	fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
 	if (cclist)
-		fprintf (out, "%scc: %s\n", resent ? "Resent-" : "", cclist);
+		fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist);
 	if (subject)
-		fprintf (out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
+		fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
 	if (from)
-		fprintf (out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
+		fprintf(out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
 	if (!resent)
-		fputs ("\n", out);
+		fputs("\n", out);
 
 	if (body) {
-		fprintf (out, "%s", body);
-		if (*body && *(body + strlen (body) - 1) != '\n')
-			fputs ("\n", out);
+		fprintf(out, "%s", body);
+		if (*body && *(body + strlen(body) - 1) != '\n')
+			fputs("\n", out);
 	} else {
-		for (somebody = 0;
-				(i = fread (buf, sizeof(*buf), sizeof(buf), stdin)) > 0;
-				somebody++)
-			if (fwrite (buf, sizeof(*buf), i, out) != i)
-				adios (tmpfil, "error writing");
+		for (somebody = 0; (i = fread(buf, sizeof(*buf), sizeof(buf),
+				stdin)) > 0; somebody++)
+			if (fwrite(buf, sizeof(*buf), i, out) != i)
+				adios(tmpfil, "error writing");
 		if (!somebody) {
-			unlink (tmpfil);
-			done (1);
+			unlink(tmpfil);
+			done(1);
 		}
 	}
-	fclose (out);
+	fclose(out);
 
 	nvec = 0;
-	vec[nvec++] = r1bindex (postproc, '/');
+	vec[nvec++] = mhbasename(postproc);
 	vec[nvec++] = tmpfil;
 	if (resent)
 		vec[nvec++] = "-dist";
@@ -167,29 +172,27 @@ main (int argc, char **argv)
 		vec[nvec++] = "-queued";
 	vec[nvec] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep (5);
-
-	if (child_id == NOTOK) {
+	if ((child_id = fork()) == NOTOK) {
 		/* report failure and then send it */
-		adios (NULL, "unable to fork");
+		adios(NULL, "unable to fork");
 	} else if (child_id) {
 		/* parent process */
 		if ((status = pidXwait(child_id, postproc))) {
-			fprintf (stderr, "Letter saved in dead.letter\n");
-			execl ("/bin/mv", "mv", tmpfil, "dead.letter", NULL);
-			execl ("/usr/bin/mv", "mv", tmpfil, "dead.letter", NULL);
-			perror ("mv");
-			_exit (-1);
+			fprintf(stderr, "Letter saved in dead.letter\n");
+			execl("/bin/mv", "mv", tmpfil, "dead.letter", NULL);
+			execl("/usr/bin/mv", "mv", tmpfil, "dead.letter",
+					NULL);
+			perror("mv");
+			_exit(-1);
 		}
-		unlink (tmpfil);
-		done (status ? 1 : 0);
+		unlink(tmpfil);
+		done(status ? 1 : 0);
 	} else {
 		/* child process */
-		execvp (postproc, vec);
-		fprintf (stderr, "unable to exec ");
-		perror (postproc);
-		_exit (-1);
+		execvp(postproc, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(postproc);
+		_exit(-1);
 	}
 
 	return 0;  /* dead code to satisfy the compiler */
@@ -197,14 +200,14 @@ main (int argc, char **argv)
 
 
 static RETSIGTYPE
-intrser (int i)
+intrser(int i)
 {
 #ifndef RELIABLE_SIGNALS
 	if (i)
-		SIGNAL (i, SIG_IGN);
+		SIGNAL(i, SIG_IGN);
 #endif
 
-	unlink (tmpfil);
-	done (i != 0 ? 1 : 0);
+	unlink(tmpfil);
+	done(i != 0 ? 1 : 0);
 }