Removed a local variable from m_Eom().

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 7f85ae55e9627f5c629145cb64fb74d3396112b2..6a1acc3851e2ec8494c39be7c70adadc7dfe09e9 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -1,6 +1,4 @@
-
-/*
- * mhn.c -- display, list, cache, or store the contents of MIME messages
+/* mhn.c -- display, list, cache, or store the contents of MIME messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -13,10 +11,14 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>

+#include <h/fmt_scan.h>

 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>

+#include "../sbr/m_maildir.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"

 
 #define MHN_SWITCHES \
     X("auto", 0, AUTOSW) \
 
 #define MHN_SWITCHES \
     X("auto", 0, AUTOSW) \


@@ -29,8 +31,6 @@
     X("noheaders", 0, NHEADSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("noheaders", 0, NHEADSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \

-    X("pause", 0, PAUSESW) \
-    X("nopause", 0, NPAUSESW) \

     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
     X("show", 0, SHOWSW) \
     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
     X("show", 0, SHOWSW) \


@@ -63,8 +63,8 @@
      */                                        \
     X("build", -5, BUILDSW) \
     X("nobuild", -7, NBUILDSW) \
      */                                        \
     X("build", -5, BUILDSW) \
     X("nobuild", -7, NBUILDSW) \

-    X("rfc934mode", -10, RFC934SW) \
-    X("norfc934mode", -12, NRFC934SW) \
+    X("rfc934mode", 0, RFC934SW) \
+    X("norfc934mode", 0, NRFC934SW) \

 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHN);
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHN);


@@ -75,19 +75,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhshowsbr.c */
-extern int pausesw;
-extern char *progsw;
-extern int nolist;
-extern int nomore;     /* flags for moreproc/header display */
-extern char *formsw;
-

 /* mhmisc.c */
 extern int npart;
 extern int ntype;
 /* mhmisc.c */
 extern int npart;
 extern int ntype;


@@ -118,26 +105,10 @@ static int storesw = 0;
 CT parse_mime (char *);
 
 /* mhmisc.c */
 CT parse_mime (char *);
 
 /* mhmisc.c */

-int part_ok (CT, int);
+int part_ok (CT);

 int type_ok (CT, int);
 void flush_errors (void);
 
 int type_ok (CT, int);
 void flush_errors (void);
 

-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
-/* mhstoresbr.c */
-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 *);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -209,9 +180,9 @@ main (int argc, char **argv)
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

-               switch (*icachesw = smatch (cp, caches)) {
+               switch (*icachesw = smatch (cp, cache_policy)) {

                case AMBIGSW:
                case AMBIGSW:

-                   ambigsw (cp, caches);
+                   ambigsw (cp, cache_policy);

                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);
                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);


@@ -241,13 +212,6 @@ do_cache:
                listsw = 0;
                continue;
 
                listsw = 0;
                continue;
 

-           case PAUSESW:
-               pausesw = 1;
-               continue;
-           case NPAUSESW:
-               pausesw = 0;
-               continue;
-

            case SHOWSW:
                showsw = 1;
                continue;
            case SHOWSW:
                showsw = 1;
                continue;


@@ -296,8 +260,7 @@ do_cache:
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

-               if (formsw)
-                   free (formsw);
+                mh_xfree(formsw);

                formsw = getcpy (etcpath (cp));
                continue;
 
                formsw = getcpy (etcpath (cp));
                continue;
 


@@ -390,7 +353,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
     /*
      * Cache the current directory before we do any chdirs()'s.
      */

-    cwd = add(pwd(), NULL);
+    cwd = mh_xstrdup(pwd());

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));


@@ -459,8 +422,7 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
      * check if message is coming from file
      */
     if (file) {

-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(2, sizeof *cts);

        ctp = cts;
 
        if ((ct = parse_mime (file)))
        ctp = cts;
 
        if ((ct = parse_mime (file)))


@@ -492,8 +454,7 @@ do_cache:
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 

-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);

        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {


@@ -555,6 +516,14 @@ do_cache:
        mhstoreinfo_free (info);
     }
 
        mhstoreinfo_free (info);
     }
 

+    /* 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 */
+       seq_save (mp);                    /* synchronize sequences  */
+       context_save ();                  /* save the context file  */
+    }
+

     /*
      * Cache the message content
      */
     /*
      * Cache the message content
      */


@@ -565,7 +534,7 @@ do_cache:
      * Show the message content
      */
     if (showsw)
      * Show the message content
      */
     if (showsw)

-       show_all_messages (cts);
+       show_all_messages (cts, 0, 0, 0);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)


@@ -574,14 +543,6 @@ do_cache:
     free (cts);
     cts = NULL;
 
     free (cts);
     cts = NULL;
 

-    /* 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 */
-       seq_save (mp);                    /* synchronize sequences  */
-       context_save ();                  /* save the context file  */
-    }
-

     done (0);
     return 1;
 }
     done (0);
     return 1;
 }