X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=30e283f44cf180cd4ec62720f76c4ab0b850d5e4;hb=f2a6db98791abab22db95b9a4a01516859d92103;hp=093bad56436efd426e7114a1d0b9f12ca85f48a2;hpb=a8a894a102eb7f31662d49355312d6e64e081664;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index 093bad5..30e283f 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -19,21 +19,21 @@
 
 #define MAX_SM_FIELD 1476  /* < largest hdr field sendmail will accept */
 
-struct swit switches[] = {
+static struct swit switches[] = {
 #define VERBSW  0
 	{ "verbose", 0 },
 #define NVERBSW  1
-	{ "noverbose", 0 },
+	{ "noverbose", 2 },
 #define WATCSW  2
 	{ "watch", 0 },
 #define NWATCSW  3
-	{ "nowatch", 0 },
+	{ "nowatch", 2 },
 #define ALIASW  4
 	{ "alias aliasfile", 0 },
 #define NALIASW  5
-	{ "noalias", 0 },
+	{ "noalias", 2 },
 #define VERSIONSW  6
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  7
 	{ "help", 0 },
 #define DEBUGSW  8
@@ -147,9 +147,7 @@ main(int argc, char **argv)
 	char *sargv[16], buf[BUFSIZ], name[NAMESZ];
 	FILE *in;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* foil search of user profile/context */
@@ -300,16 +298,6 @@ main(int argc, char **argv)
 		fcc(tmpfil, fccs);
 	}
 
-	argp = sargv;
-	*argp++ = "send-mail";
-	*argp++ = "-m";  /* send to me too */
-	*argp++ = "-t";  /* read msg for recipients */
-	*argp++ = "-i";  /* don't stop on "." */
-	if (watch || verbose) {
-		*argp++ = "-v";
-	}
-	*argp = NULL;
-
 	if (bccs) {
 		process_bccs(tmpfil);
 		if (!(msgflags & MVIS)) {
@@ -328,6 +316,15 @@ main(int argc, char **argv)
 	}
 	unlink(tmpfil);
 
+	argp = sargv;
+	*argp++ = "send-mail";
+	*argp++ = "-m";  /* send to me too */
+	*argp++ = "-t";  /* read msg for recipients */
+	*argp++ = "-i";  /* don't stop on "." */
+	if (watch || verbose) {
+		*argp++ = "-v";
+	}
+	*argp = NULL;
 	execv(sendmail, sargv);
 	adios(sendmail, "can't exec");
 	return -1;