whatnow: Call send(1) as `send', not as `whatnow'.
[mmh] / uip / mhl.c
index 8c2094e..5280ade 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -40,7 +40,7 @@
 
 #define QUOTE  '\\'
 
-static struct swit mhlswitches[] = {
+static struct swit switches[] = {
 #define FORMSW  0
        { "form formfile", 0 },
 #define WIDTHSW  1
@@ -55,7 +55,7 @@ static struct swit mhlswitches[] = {
        { "forward", -7 },
 #define FORW2SW  6
        { "forwall", -7 },
-#define NBODYSW  8
+#define NBODYSW  7
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -226,10 +226,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 +240,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);