X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=fedf78fa9f00a7b9fce00eaf75566dd34f730f98;hp=8b29ee4b3be65de88fbbc291ed4ca8da015bdafe;hb=10e03b3fba3e01052baf92c963c46a2a5529b4e0;hpb=f1b5a26561ad625f8fc87fe19c77097e719b9aed

diff --git a/uip/mhl.c b/uip/mhl.c
index 8b29ee4..fedf78f 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -40,22 +40,20 @@
 
 #define QUOTE  '\\'
 
-static struct swit mhlswitches[] = {
+static struct swit switches[] = {
 #define FORMSW  0
 	{ "form formfile", 0 },
 #define WIDTHSW  1
 	{ "width columns", 0 },
-#define SLEEPSW  2
-	{ "sleep seconds",  0 },
-#define VERSIONSW  3
+#define VERSIONSW  2
 	{ "Version", 0 },
-#define HELPSW  4
+#define HELPSW  3
 	{ "help", 0 },
-#define FORW1SW  5
+#define FORW1SW  4
 	{ "forward", -7 },
-#define FORW2SW  6
+#define FORW2SW  5
 	{ "forwall", -7 },
-#define NBODYSW  7
+#define NBODYSW  6
 	{ "nobody", -6 },
 	{ NULL, 0 }
 };
@@ -157,8 +155,6 @@ static int dobody    = 1;
 static int forwflg   = 0;
 static int forwall   = 0;
 
-static int sleepsw = NOTOK;
-
 static int exitstat = 0;
 static int mhldebug = 0;
 
@@ -226,10 +222,7 @@ main(int argc, char **argv)
 	char buf[BUFSIZ], *files[MAXARGS];
 	char **argp, **arguments;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
-
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -243,16 +236,16 @@ main(int argc, char **argv)
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch(++cp, mhlswitches)) {
+			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
-				ambigsw(cp, mhlswitches);
+				ambigsw(cp, switches);
 				done(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown\n", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
-				print_help(buf, mhlswitches, 1);
+				print_help(buf, switches, 1);
 				done(1);
 			case VERSIONSW:
 				print_version(invo_name);
@@ -264,13 +257,6 @@ main(int argc, char **argv)
 							argp[-2]);
 				continue;
 
-			case SLEEPSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				sleepsw = atoi(cp);  /* ZERO ok! */
-				continue;
-
 			case WIDTHSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",