Added probe to configure.ac to output flex version (for fed18arm7 build).

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 49c784b9f19761bb5a589ce4c865db8bfb6e18d1..c0b7e7816c7a4e2eb58d569bed82c7cba0b63169 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -91,10 +91,6 @@ extern int nolist;
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
 
-/* mhstoresbr.c */
-extern int autosw;
-extern char *cwd;      /* cache current working directory */
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -132,11 +128,11 @@ void flush_errors (void);
 /* mhshowsbr.c */
 void show_all_messages (CT *);
 
-/* mhlistsbr.c */
-void list_all_messages (CT *, int, int, int, int);
-
 /* mhstoresbr.c */
-void store_all_messages (CT *);
+typedef struct mhstoreinfo *mhstoreinfo_t;
+mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
+void mhstoreinfo_free(mhstoreinfo_t);
+void store_all_messages (mhstoreinfo_t);
 
 /* mhcachesbr.c */
 void cache_all_messages (CT *);
@@ -154,25 +150,21 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1;
+    int sizesw = 1, headsw = 1, autosw = 0;
     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
+    char *cwd;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
+    mhstoreinfo_t info;
 
-    done=freects_done;
+    if (nmh_init(argv[0], 1)) { return 1; }
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    done=freects_done;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -408,7 +400,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
-    cwd = getcpy (pwd());
+    cwd = add(pwd(), NULL);
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
@@ -562,13 +554,16 @@ do_cache:
      * List the message content
      */
     if (listsw)
-       list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+       list_all_messages (cts, headsw, sizesw, verbosw, debugsw, 0);
 
     /*
      * Store the message content
      */
-    if (storesw)
-       store_all_messages (cts);
+    if (storesw) {
+       info = mhstoreinfo_create (cts, cwd, "always", autosw, verbosw);;
+       store_all_messages (info);
+       mhstoreinfo_free (info);
+    }
 
     /*
      * Cache the message content
@@ -586,7 +581,7 @@ do_cache:
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 
-    free ((char *) cts);
+    free (cts);
     cts = NULL;
 
     /* If reading from a folder, do some updating */