Completely deprecate support for MM_CHARSET.

[nmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 161b6c1c631a3136a41ee28fd34a3eaee2e4a097..7092434895a57f34375cd137495c427dbdbc5440 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -34,6 +32,8 @@
     X("type content", 0, TYPESW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
+    X("changecur", 0, CHGSW) \
+    X("nochangecur", 0, NCHGSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \
@@ -86,7 +86,6 @@ void flush_errors (void);
 void list_all_messages (CT *, int, int, int, int);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -99,7 +98,7 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1;
+    int sizesw = 1, headsw = 1, chgflag = 1;
     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
@@ -110,9 +109,7 @@ main (int argc, char **argv)
 
     done=freects_done;
 
-#ifdef LOCALE
     setlocale(LC_ALL, "");
-#endif
     invo_name = r1bindex (argv[0], '/');
 
     /* read user profile/context */
@@ -206,6 +203,13 @@ do_cache:
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
+           case CHGSW:
+               chgflag++;
+               continue;
+           case NCHGSW:
+               chgflag = 0;
+               continue;
+
            case VERBSW: 
                verbosw = 1;
                continue;
@@ -279,7 +283,7 @@ do_cache:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
-       if (!(mp = folder_read (folder)))
+       if (!(mp = folder_read (folder, 0)))
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */
@@ -344,7 +348,8 @@ do_cache:
     /* If reading from a folder, do some updating */
     if (mp) {
        context_replace (pfolder, folder);/* update current folder  */
-       seq_setcur (mp, mp->hghsel);      /* update current message */
+       if (chgflag)
+           seq_setcur (mp, mp->hghsel);  /* update current message */
        seq_save (mp);                    /* synchronize sequences  */
        context_save ();                  /* save the context file  */
     }