X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frepl.c;h=42bcfdc5d72869c661a90889d7221b51ac4a9c10;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=b0956fcbd4b6667e6f616f4e7510ed4acffed132;hpb=ee4f43cf2ef0084ec698e4e87159a94c01940622;p=mmh

diff --git a/uip/repl.c b/uip/repl.c
index b0956fc..42bcfdc 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -18,45 +18,41 @@ static struct swit switches[] = {
 #define GROUPSW  0
 	{ "group", 0 },
 #define NGROUPSW  1
-	{ "nogroup", 0 },
+	{ "nogroup", 2 },
 #define ANNOSW  2
 	{ "annotate", 0 },
 #define NANNOSW  3
-	{ "noannotate", 0 },
+	{ "noannotate", 2 },
 #define CCSW  4
 	{ "cc all|to|cc|me", 0 },
 #define NCCSW  5
-	{ "nocc type", 0 },
+	{ "nocc type", 2 },
 #define EDITRSW  6
 	{ "editor editor", 0 },
-#define NEDITSW  7
-	{ "noedit", 0 },
-#define FILTSW  8
+#define FILTSW  7
 	{ "filter filterfile", 0 },
-#define NFILTSW  9
-	{ "nofilter", 0 },
-#define FORMSW  10
+#define NFILTSW  8
+	{ "nofilter", 2 },
+#define FORMSW  9
 	{ "form formfile", 0 },
-#define MIMESW  11
+#define MIMESW  10
 	{ "mime", 0 },
-#define NMIMESW  12
-	{ "nomime", 0 },
-#define QURYSW  13
+#define NMIMESW  11
+	{ "nomime", 2 },
+#define QURYSW  12
 	{ "query", 0 },
-#define NQURYSW  14
-	{ "noquery", 0 },
-#define WHATSW  15
+#define NQURYSW  13
+	{ "noquery", 2 },
+#define WHATSW  14
 	{ "whatnowproc program", 0 },
-#define VERSIONSW  16
-	{ "version", 0 },
-#define HELPSW  17
+#define VERSIONSW  15
+	{ "Version", 0 },
+#define HELPSW  16
 	{ "help", 0 },
-#define FILESW  18
+#define FILESW  17
 	{ "file file", 4 },  /* interface from msh */
-#ifdef MHE
-# define BILDSW  19
+#define BILDSW  18
 	{ "build", 5 },  /* interface from mhe */
-#endif
 	{ NULL, 0 }
 };
 
@@ -137,23 +133,17 @@ int
 main(int argc, char **argv)
 {
 	int anot = 0;
-	int nedit = 0;
 	char *cp, *cwd, *maildir, *file = NULL;
 	char *folder = NULL, *msg = NULL;
 	char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
 	char **argp, **arguments;
 	struct msgs *mp = NULL;
 	FILE *in;
-
-#ifdef MHE
 	int buildsw = 0;
-#endif /* MHE */
 
 	filter = getcpy(etcpath(mhlreply));
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -167,17 +157,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: [+folder] [msg] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(0);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case GROUPSW:
 				groupreply++;
@@ -210,10 +200,6 @@ main(int argc, char **argv)
 				if (!(ed = *argp++) || *ed == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nedit = 0;
-				continue;
-			case NEDITSW:
-				nedit++;
 				continue;
 
 			case WHATSW:
@@ -222,11 +208,10 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-#ifdef MHE
+
 			case BILDSW:
-				buildsw++;  /* fall... */
+				buildsw++;
 				continue;
-#endif /* MHE */
 
 			case FILESW:
 				if (file)
@@ -293,12 +278,14 @@ main(int argc, char **argv)
 	if (file && (msg || folder))
 		adios(NULL, "can't mix files and folders/msgs");
 
-#ifdef MHE
-	strncpy(drft, buildsw ? toabsdir("reply")
-		: m_draft(seq_beyond), sizeof(drft));
-#else
-	strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+	strncpy(drft, buildsw ? toabsdir("reply") : m_draft(seq_beyond),
+			sizeof(drft));
+	/*
+	** FIXME: (concerning MHE support (buildsw) only)
+	** There's no check if the draft already exists. mmh has removed
+	** this case by having the draft folder. I won't add code only to
+	** handle this legacy issue for MHE. -- meillo@marmaro.de 2012-05
+	*/
 
 	if (file) {
 		/*
@@ -328,7 +315,8 @@ main(int argc, char **argv)
 
 		/* parse the message range/sequence/name and set SELECTED */
 		if (!m_convert(mp, msg))
-			done(1);
+			/* sysexits.h EX_USAGE */
+			exit(1);
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (mp->numsel > 1)
@@ -357,10 +345,9 @@ main(int argc, char **argv)
 	fclose(in);
 
 	if (buildsw)
-		done(0);
-	what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
-			cwd);
-	done(1);
+		exit(0);
+	what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
+	/* sysexits.h EX_SOFTWARE */
 	return 1;
 }
 
@@ -370,7 +357,7 @@ docc(char *cp, int ccflag)
 	switch (smatch(cp, ccswitches)) {
 	case AMBIGSW:
 		ambigsw(cp, ccswitches);
-		done(1);
+		exit(1);
 	case UNKWNSW:
 		adios(NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
 
@@ -587,11 +574,11 @@ finished:
 		/* add an attachment header */
 		char buffer[BUFSIZ];
 
-		snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
-				"-comp '%s' -text '+%s %s'",
-				drft,
-				attach_hdr, mp->foldpath, m_name(mp->lowsel));
-		if (system(buffer) != 0) {
+		snprintf(buffer, sizeof buffer, "+%s %s",
+				mp->foldpath, m_name(mp->lowsel));
+		if (execprogl("anno", "anno", "-append", "-nodate",
+				drft, "-comp", attach_hdr, "-text", buffer,
+				(char *)NULL) != 0) {
 			advise(NULL, "unable to add attachment header");
 		}
 	}
@@ -785,7 +772,8 @@ replfilter(FILE *in, FILE *out, char *filter)
 
 	default:
 		if (pidXwait(pid, "mhl"))
-			done(1);
+			/* sysexits.h EX_SOFTWARE */
+			exit(1);
 		fseek(out, 0L, SEEK_END);
 		break;
 	}