Removed configure flag --disable-locale and have it always enabled.

[mmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 896c37b..e94c259 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -45,23 +45,23 @@ static struct swit switches[] = {
 #define BEFRSW  13
        { "before date", 0 },
 #define DATFDSW  14
-       { "datefield field", 5 },
+       { "datefield field", 5 },  /* 5 chars required to differ from -date */
 #define SEQSW  15
        { "sequence name", 0 },
 #define PUBLSW  16
        { "public", 0 },
 #define NPUBLSW  17
-       { "nopublic", 0 },
+       { "nopublic", 2 },
 #define ZEROSW  18
        { "zero", 0 },
 #define NZEROSW  19
-       { "nozero", 0 },
+       { "nozero", 2 },
 #define LISTSW  20
        { "list", 0 },
 #define NLISTSW  21
-       { "nolist", 0 },
+       { "nolist", 2 },
 #define VERSIONSW  22
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  23
        { "help", 0 },
        { NULL, 0 }
@@ -81,7 +81,8 @@ static void putzero_done(int) NORETURN;
 int
 main(int argc, char **argv)
 {
-       int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0;
+       int publicsw = -1, zerosw = 1, vecp = 0;
+       unsigned int seqp = 0;
        int lo, hi, msgnum;
        char *maildir, *folder = NULL, buf[100];
        char *cp, **argp, **arguments;
@@ -92,9 +93,7 @@ main(int argc, char **argv)
 
        done=putzero_done;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -475,23 +474,23 @@ static struct nexus *head;
 /*
 ** prototypes for date routines
 */
-static struct tws *tws_parse();
-static struct tws *tws_special();
+static struct tws *tws_parse(char *, int);
+static struct tws *tws_special(char *);
 
 /*
 ** static prototypes
 */
-static void PRaction();
-static int gcompile();
-static int advance();
-static int cclass();
-static int tcompile();
-
-static struct nexus *parse();
-static struct nexus *nexp1();
-static struct nexus *nexp2();
-static struct nexus *nexp3();
-static struct nexus *newnexus();
+static void PRaction(struct nexus *, int);
+static int gcompile(struct nexus *, char *);
+static int advance(char *, char *);
+static int cclass(unsigned char *, int, int);
+static int tcompile(char *, struct tws *, int);
+
+static struct nexus *parse(void);
+static struct nexus *nexp1(void);
+static struct nexus *nexp2(void);
+static struct nexus *nexp3(void);
+static struct nexus *newnexus(int (*)());
 
 static int ORaction();
 static int ANDaction();
@@ -828,7 +827,7 @@ PRaction(struct nexus *n, int level)
        if (n->n_action == TWSaction) {
                fprintf(stderr, "TEMPORAL(%s) %s: %s\n",
                                n->n_after ? "after" : "before", n->n_datef,
-                               dasctime(&n->n_tws, TW_NULL));
+                               dasctime(&n->n_tws));
                return;
        }
        fprintf(stderr, "UNKNOWN(0x%x)\n",