From: markus schnalke <meillo@marmaro.de>
Date: Sat, 5 May 2012 06:14:26 +0000 (+0200)
Subject: mhmail: Removed hidden -resent and -queued switches.
X-Git-Tag: mmh-thesis-end~46
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=853cad7faa5eed9a5988825ac24f462887e12494;p=mmh

mhmail: Removed hidden -resent and -queued switches.
Mhmail is intended to provide only a simple mail(1) interface to mmh
for the system. For all fancy stuff, use the mmh tools directly.
The -queued switch is not supported by spost anyway. For resending
messages, use dist not mhmail.
---

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 6506b7d..5c7f002 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -26,10 +26,6 @@ static struct swit switches[] = {
 	{ "Version", 0 },
 #define HELPSW  5
 	{ "help", 0 },
-#define RESNDSW  6
-	{ "resent", -6 },
-#define QUEUESW  7
-	{ "queued", -6 },
 	{ NULL, 0 }
 };
 
@@ -47,7 +43,7 @@ main(int argc, char **argv)
 	pid_t child_id;
 	int status, iscc = 0, nvec;
 	unsigned int i;
-	int queued = 0, resent = 0, somebody;
+	int somebody;
 	char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
 	char *from = NULL, *body = NULL, **argp, **arguments;
 	char *vec[5], buf[BUFSIZ];
@@ -111,14 +107,6 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-
-			case RESNDSW:
-				resent++;
-				continue;
-
-			case QUEUESW:
-				queued++;
-				continue;
 			}
 		}
 		if (iscc)
@@ -140,15 +128,14 @@ main(int argc, char **argv)
 
 	SIGNAL2(SIGINT, intrser);
 
-	fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
+	fprintf(out, "To: %s\n", tolist);
 	if (cclist)
-		fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist);
+		fprintf(out, "Cc: %s\n", cclist);
 	if (subject)
-		fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
+		fprintf(out, "Subject: %s\n", subject);
 	if (from)
-		fprintf(out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
-	if (!resent)
-		fputs("\n", out);
+		fprintf(out, "From: %s\n", from);
+	fputs("\n", out);
 
 	if (body) {
 		fprintf(out, "%s", body);
@@ -169,10 +156,6 @@ main(int argc, char **argv)
 	nvec = 0;
 	vec[nvec++] = "spost";
 	vec[nvec++] = tmpfil;
-	if (resent)
-		vec[nvec++] = "-dist";
-	if (queued)
-		vec[nvec++] = "-queued";
 	vec[nvec] = NULL;
 
 	if ((child_id = fork()) == NOTOK) {