X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=efc2b540ca07fa0af216343a046fcd702f00acfe;hp=a36b2c74234bfef0f2c54e1580219d55dd664474;hb=f51956be123db66b00138f80464d06f030dbb88d;hpb=81744a46ac9f845d6c2b9908074d269275178d2e

diff --git a/uip/repl.c b/uip/repl.c
index a36b2c7..efc2b54 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -33,33 +33,31 @@ static struct swit switches[] = {
 	{ "noedit", 0 },
 #define FILTSW  8
 	{ "filter filterfile", 0 },
-#define FORMSW  9
+#define NFILTSW  9
+	{ "nofilter", 0 },
+#define FORMSW  10
 	{ "form formfile", 0 },
-#define FRMTSW  10
-	{ "format", 5 },
-#define NFRMTSW  11
-	{ "noformat", 7 },
-#define MIMESW  12
+#define MIMESW  11
 	{ "mime", 0 },
-#define NMIMESW  13
+#define NMIMESW  12
 	{ "nomime", 0 },
-#define QURYSW  14
+#define QURYSW  13
 	{ "query", 0 },
-#define NQURYSW  15
+#define NQURYSW  14
 	{ "noquery", 0 },
-#define WHATSW  16
+#define WHATSW  15
 	{ "whatnowproc program", 0 },
-#define NWHATSW  17
+#define NWHATSW  16
 	{ "nowhatnowproc", 0 },
-#define VERSIONSW  18
+#define VERSIONSW  17
 	{ "version", 0 },
-#define HELPSW  19
+#define HELPSW  18
 	{ "help", 0 },
-#define FILESW  20
+#define FILESW  19
 	{ "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  21
+#define BILDSW  20
 	{ "build", 5 },  /* interface from mhe */
 #endif
 
@@ -151,6 +149,8 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	FILE *in;
 
+	filter = getcpy(etcpath(mhlreply));
+
 #ifdef MHE
 	int buildsw = 0;
 #endif /* MHE */
@@ -243,30 +243,24 @@ main(int argc, char **argv)
 							argp[-2]);
 				file = getcpy(expanddir(cp));
 				continue;
-			case FILTSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				filter = getcpy(etcpath(cp));
-				mime = 0;
-				continue;
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
-			case FRMTSW:
-				filter = getcpy(etcpath(mhlreply));
-				mime = 0;
+			case FILTSW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				filter = getcpy(etcpath(cp));
 				continue;
-			case NFRMTSW:
+			case NFILTSW:
 				filter = NULL;
 				continue;
 
 			case MIMESW:
 				mime++;
-				filter = NULL;
 				continue;
 			case NMIMESW:
 				mime = 0;
@@ -430,7 +424,7 @@ replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
 	umask(mask);
 
 	/* get new format string */
-	cp = new_fs(form, NULL, NULL);
+	cp = new_fs(form, NULL);
 	format_len = strlen(cp);
 
 	/* compile format string */
@@ -596,8 +590,8 @@ finished:
 		adios(drft, "error writing");
 	fclose(out);
 
-	/* if we want mime, then add an attachment header */
-	if (!filter && mime && mp) {
+	if (mime && mp) {
+		/* add an attachment header */
 		char buffer[BUFSIZ];
 
 		snprintf(buffer, sizeof buffer, "+%s %s",