X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=e5fbc0ffaf8bb7f79a38ff3524e86046ee8bb4a6;hp=f8af5caaf68b8d68c4298c5b777ae6a35571105d;hb=8bf8e1e29df17658c3d77629e17f88bf9159e21b;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a

diff --git a/uip/repl.c b/uip/repl.c
index f8af5ca..e5fbc0f 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -18,31 +18,31 @@ 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 FILTSW  7
 	{ "filter filterfile", 0 },
 #define NFILTSW  8
-	{ "nofilter", 0 },
+	{ "nofilter", 2 },
 #define FORMSW  9
 	{ "form formfile", 0 },
 #define MIMESW  10
 	{ "mime", 0 },
 #define NMIMESW  11
-	{ "nomime", 0 },
+	{ "nomime", 2 },
 #define QURYSW  12
 	{ "query", 0 },
 #define NQURYSW  13
-	{ "noquery", 0 },
+	{ "noquery", 2 },
 #define WHATSW  14
 	{ "whatnowproc program", 0 },
 #define VERSIONSW  15
@@ -51,7 +51,7 @@ static struct swit switches[] = {
 	{ "help", 0 },
 #define FILESW  17
 	{ "file file", 4 },  /* interface from msh */
-# define BILDSW  18
+#define BILDSW  18
 	{ "build", 5 },  /* interface from mhe */
 	{ NULL, 0 }
 };
@@ -143,9 +143,7 @@ main(int argc, char **argv)
 
 	filter = getcpy(etcpath(mhlreply));
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -575,11 +573,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");
 		}
 	}