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

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index ee51219..f737d69 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -41,11 +41,11 @@ static struct swit switches[] = {
 #define AUDSW  0
        { "audit audit-file", 0 },
 #define NAUDSW  1
-       { "noaudit", 0 },
+       { "noaudit", 2 },
 #define CHGSW  2
        { "changecur", 0 },
 #define NCHGSW  3
-       { "nochangecur", 0 },
+       { "nochangecur", 2 },
 #define FILESW  4
        { "file name", 0 },
 #define FORMSW  5
@@ -53,17 +53,18 @@ static struct swit switches[] = {
 #define SILSW  6
        { "silent", 0 },
 #define NSILSW  7
-       { "nosilent", 0 },
+       { "nosilent", 2 },
 #define TRNCSW  8
        { "truncate", 0 },
 #define NTRNCSW  9
-       { "notruncate", 0 },
+       { "notruncate", 2 },
 #define WIDTHSW  10
        { "width columns", 0 },
 #define VERSIONSW  11
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  12
        { "help", 0 },
+       { NULL, 0 },
 };
 
 /*
@@ -142,10 +143,6 @@ main(int argc, char **argv)
        /* copy of mail directory because the static gets overwritten */
        char *maildir_copy = NULL;
 
-#ifdef MHE
-       FILE *mhe = NULL;
-#endif
-
        done=inc_done;
 
 /*
@@ -155,9 +152,7 @@ main(int argc, char **argv)
        SAVEGROUPPRIVS();
        TRYDROPGROUPPRIVS();
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -340,20 +335,6 @@ main(int argc, char **argv)
                         dtimenow(), from);
        }
 
-#ifdef MHE
-       if (context_find("mhe")) {
-               int i;
-               cp = concat(maildir, "/++", NULL);
-               i = stat(cp, &st);
-               if ((mhe = fopen(cp, "a")) == NULL)
-                       admonish(cp, "unable to append to");
-               else
-                       if (i == NOTOK)
-                               chmod(cp, m_gmprot());
-               free(cp);
-       }
-#endif /* MHE */
-
        /* Get new format string */
        fmtstr = new_fs(form, FORMAT);
 
@@ -414,10 +395,6 @@ main(int argc, char **argv)
 
                        if (aud)
                                fputs(scanl, aud);
-#ifdef MHE
-                       if (mhe)
-                               fputs(scanl, mhe);
-#endif /* MHE */
                        if (noisy)
                                fflush(stdout);
                        msgnum++;
@@ -437,6 +414,7 @@ main(int argc, char **argv)
                */
                break;
        }
+       free(maildir_copy);
 
        if (incerr < 0) {  /* error */
                if (locked) {
@@ -455,11 +433,6 @@ main(int argc, char **argv)
        if (aud)
                fclose(aud);
 
-#ifdef MHE
-       if (mhe)
-               fclose(mhe);
-#endif /* MHE */
-
        if (noisy)
                fflush(stdout);