Handle the case in the test suite where wcwidth() can return different

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index edb288f135689d4d9b8994dab94ad7868d0cc5ac..3ec47fae6dfbb0857f67759d2d80be73da0fb649 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -46,55 +46,39 @@
 # define SASLminc(a)  0
 #endif
 
-static struct swit switches[] = {
-#define        AUDSW                      0
-    { "audit audit-file", 0 },
-#define        NAUDSW                     1
-    { "noaudit", 0 },
-#define        CHGSW                      2
-    { "changecur", 0 },
-#define        NCHGSW                     3
-    { "nochangecur", 0 },
-#define        FILESW                     4
-    { "file name", 0 },
-#define        FORMSW                     5
-    { "form formatfile", 0 },
-#define        FMTSW                      6
-    { "format string", 5 },
-#define        HOSTSW                     7
-    { "host hostname", 0 },
-#define        USERSW                     8
-    { "user username", 0 },
-#define        PACKSW                     9
-    { "pack file", 0},
-#define        NPACKSW                   10
-    { "nopack", 0 },
-#define PORTSW                   11
-    { "port name/number", 0 },
-#define        SILSW                     12
-    { "silent", 0 },
-#define        NSILSW                    13
-    { "nosilent", 0 },
-#define        TRNCSW                    14
-    { "truncate", 0 },
-#define        NTRNCSW                   15
-    { "notruncate", 0 },
-#define        WIDTHSW                   16
-    { "width columns", 0 },
-#define VERSIONSW                 17
-    { "version", 0 },
-#define        HELPSW                    18
-    { "help", 0 },
-#define SNOOPSW                   19
-    { "snoop", -5 },
-#define SASLSW                    20
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW                21
-    { "saslmech", SASLminc(-8) },
-#define PROXYSW                   22
-    { "proxy command", 0 },
-    { NULL, 0 }
-};
+#define INC_SWITCHES \
+    X("audit audit-file", 0, AUDSW) \
+    X("noaudit", 0, NAUDSW) \
+    X("changecur", 0, CHGSW) \
+    X("nochangecur", 0, NCHGSW) \
+    X("file name", 0, FILESW) \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("host hostname", 0, HOSTSW) \
+    X("user username", 0, USERSW) \
+    X("pack file", 0, PACKSW) \
+    X("nopack", 0, NPACKSW) \
+    X("port name/number", 0, PORTSW) \
+    X("silent", 0, SILSW) \
+    X("nosilent", 0, NSILSW) \
+    X("truncate", 0, TRNCSW) \
+    X("notruncate", 0, NTRNCSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("snoop", -5, SNOOPSW) \
+    X("sasl", SASLminc(-4), SASLSW) \
+    X("nosasl", SASLminc(-6), NOSASLSW) \
+    X("saslmech", SASLminc(-8), SASLMECHSW) \
+    X("proxy command", 0, PROXYSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(INC);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(INC, switches);
+#undef X
 
 /*
  * flags for the mail source
@@ -202,7 +186,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     struct stat st, s1;
     FILE *aud = NULL;
-    char b[MAXPATHLEN + 1];
+    char b[PATH_MAX + 1];
     char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
 
     int nmsgs, nbytes;
@@ -245,9 +229,6 @@ main (int argc, char **argv)
     if (pophost && *pophost)
        host = pophost;
 
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-       snoop++;
-
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
@@ -260,10 +241,10 @@ main (int argc, char **argv)
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                print_help (buf, switches, 1);
-               done (1);
+               done (0);
            case VERSIONSW:
                print_version(invo_name);
-               done (1);
+               done (0);
 
            case AUDSW: 
                if (!(cp = *argp++) || *cp == '-')
@@ -338,7 +319,7 @@ main (int argc, char **argv)
                continue;
 
            case PORTSW:
-               if (!(host = *argp++) || *port == '-')
+               if (!(port = *argp++) || *port == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
 
@@ -362,6 +343,9 @@ main (int argc, char **argv)
            case SASLSW:
                sasl++;
                continue;
+           case NOSASLSW:
+               sasl = 0;
+               continue;
        
            case SASLMECHSW:
                if (!(saslmech = *argp++) || *saslmech == '-')
@@ -732,19 +716,6 @@ go_to_it:
                break;
            }
 
-#if 0
-           /* copy file from spool to tmp file */
-           tmpfilenam = m_scratch ("", invo_name);
-           if ((fd = creat (tmpfilenam, m_gmprot ())) == NOTOK)
-               adios (tmpfilenam, "unable to create");
-           chmod (tmpfilenam, m_gmprot ());
-           if (!(in2 = fdopen (fd, "r+")))
-               adios (tmpfilenam, "unable to access");
-           cpymsg (in, in2);
-
-           /* link message into folder */
-           newmsg = folder_addmsg(mp, tmpfilenam);
-#endif
            /* create scanline for new message */
            switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
                              msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
@@ -973,39 +944,6 @@ go_to_it:
 }
 
 
-#if 0
-
-/*
- * Copy message message from spool into
- * temporary file.  Massage the "From " line
- * while copying.
- */
-
-cpymsg (FILE *in, FILE *out)
-{
-    int state;
-    char *tmpbuf, name[NAMESZ];
-
-    for (;;) {
-       state = m_getfld (state, name, tmpbuf, rlwidth, in);
-       switch (state) {
-       case FLD:
-       case FLDPLUS:
-           break;
-       case BODY:
-           break;
-       case LENERR:
-       case FMTERR:
-           break;
-       case FILEEOF:
-           break;
-       default:
-       }
-    }
-}
-#endif /* if 0 */
-
-
 static void
 inc_done (int status)
 {