fdcompare.c: Move interface to own file.

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 2eff96d740bfe8735ac46d7d7d8a08a8b16b54dd..95aed5dbfc3d7dc6c4af0f6efe196a05df7c9319 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -5,17 +5,30 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/readconfig.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/signals.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/signals.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/done.h"
+#include "h/utils.h"
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"

 #include "mhfree.h"
 #include "mhshowsbr.h"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 


@@ -74,40 +87,25 @@ DEFINE_SWITCH_ARRAY(MHN, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-

 int debugsw = 0;
 int verbosw = 0;
 
 /*
  * variables for mhbuild (mhn -build)
  */
 int debugsw = 0;
 int verbosw = 0;
 
 /*
  * variables for mhbuild (mhn -build)
  */

-static int buildsw  = 0;
+static bool buildsw;

 static int rfc934sw = 0;
 
 /*
  * what action to take?
  */
 static int rfc934sw = 0;
 
 /*
  * what action to take?
  */

-static int cachesw = 0;
-static int listsw  = 0;
-static int showsw  = 0;
-static int storesw = 0;
+static bool cachesw;
+static bool listsw;
+static bool showsw;
+static bool storesw;

 
 #define        quitser pipeser
 
 
 #define        quitser pipeser
 

-/* mhparse.c */
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-

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


@@ -117,7 +115,9 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int sizesw = 1, headsw = 1, autosw = 0;
+    bool sizesw = true;
+    bool headsw = true;
+    bool autosw = false;

     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;


@@ -129,9 +129,9 @@ main (int argc, char **argv)
     FILE *fp;
     mhstoreinfo_t info;
 
     FILE *fp;
     mhstoreinfo_t info;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
 

-    done=freects_done;
+    set_done(freects_done);

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -146,7 +146,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -158,17 +158,17 @@ main (int argc, char **argv)
                done (0);
 
            case AUTOSW:
                done (0);
 
            case AUTOSW:

-               autosw++;
+               autosw = true;

                continue;
            case NAUTOSW:
                continue;
            case NAUTOSW:

-               autosw = 0;
+               autosw = false;

                continue;
 
            case CACHESW:
                continue;
 
            case CACHESW:

-               cachesw++;
+               cachesw = true;

                continue;
            case NCACHESW:
                continue;
            case NCACHESW:

-               cachesw = 0;
+               cachesw = false;

                continue;
 
            case RCACHESW:
                continue;
 
            case RCACHESW:


@@ -178,13 +178,13 @@ main (int argc, char **argv)
                icachesw = &wcachesw;
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                icachesw = &wcachesw;
 do_cache:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                switch (*icachesw = smatch (cp, cache_policy)) {
                case AMBIGSW:
                    ambigsw (cp, cache_policy);
                    done (1);
                case UNKWNSW:
                switch (*icachesw = smatch (cp, cache_policy)) {
                case AMBIGSW:
                    ambigsw (cp, cache_policy);
                    done (1);
                case UNKWNSW:

-                   adios (NULL, "%s unknown", cp);
+                   die("%s unknown", cp);

                default:
                    break;
                }
                default:
                    break;
                }


@@ -198,69 +198,69 @@ do_cache:
                continue;
 
            case HEADSW:
                continue;
 
            case HEADSW:

-               headsw = 1;
+               headsw = true;

                continue;
            case NHEADSW:
                continue;
            case NHEADSW:

-               headsw = 0;
+               headsw = false;

                continue;
 
            case LISTSW:
                continue;
 
            case LISTSW:

-               listsw = 1;
+               listsw = true;

                continue;
            case NLISTSW:
                continue;
            case NLISTSW:

-               listsw = 0;
+               listsw = false;

                continue;
 
            case SHOWSW:
                continue;
 
            case SHOWSW:

-               showsw = 1;
+               showsw = true;

                continue;
            case NSHOWSW:
                continue;
            case NSHOWSW:

-               showsw = 0;
+               showsw = false;

                continue;
 
            case SIZESW:
                continue;
 
            case SIZESW:

-               sizesw = 1;
+               sizesw = true;

                continue;
            case NSIZESW:
                continue;
            case NSIZESW:

-               sizesw = 0;
+               sizesw = false;

                continue;
 
            case STORESW:
                continue;
 
            case STORESW:

-               storesw = 1;
+               storesw = true;

                continue;
            case NSTORESW:
                continue;
            case NSTORESW:

-               storesw = 0;
+               storesw = false;

                continue;
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')
                continue;
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                if (npart >= NPARTS)
                if (npart >= NPARTS)

-                   adios (NULL, "too many parts (starting with %s), %d max",
+                   die("too many parts (starting with %s), %d max",

                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')
                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                if (ntype >= NTYPES)
                if (ntype >= NTYPES)

-                   adios (NULL, "too many types (starting with %s), %d max",
+                   die("too many types (starting with %s), %d max",

                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
-                mh_xfree(formsw);
-               formsw = getcpy (etcpath (cp));
+                   die("missing argument to %s", argp[-2]);
+                free(formsw);
+               formsw = mh_xstrdup(etcpath(cp));

                continue;
 
            /*
                continue;
 
            /*


@@ -268,7 +268,7 @@ do_cache:
             */
            case PROGSW:
                if (!(progsw = *argp++) || *progsw == '-')
             */
            case PROGSW:
                if (!(progsw = *argp++) || *progsw == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                continue;
            case NPROGSW:
                nomore++;
                continue;
            case NPROGSW:
                nomore++;


@@ -277,17 +277,17 @@ do_cache:
            case LENSW:
            case WIDTHSW:
                if (!(cp = *argp++) || *cp == '-')
            case LENSW:
            case WIDTHSW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                continue;
 
            /*
             * Switches for mhbuild
             */
            case BUILDSW:
                continue;
 
            /*
             * Switches for mhbuild
             */
            case BUILDSW:

-               buildsw = 1;
+               buildsw = true;

                continue;
            case NBUILDSW:
                continue;
            case NBUILDSW:

-               buildsw = 0;
+               buildsw = false;

                continue;
            case RFC934SW:
                rfc934sw = 1;
                continue;
            case RFC934SW:
                rfc934sw = 1;


@@ -309,9 +309,8 @@ do_cache:
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -325,7 +324,7 @@ do_cache:
      */
     if ((cp = getenv ("MHN"))) {
        if ((fp = fopen (cp, "r"))) {
      */
     if ((cp = getenv ("MHN"))) {
        if ((fp = fopen (cp, "r"))) {

-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);

            fclose (fp);
        } else {
            admonish ("", "unable to read $MHN profile (%s)", cp);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHN profile (%s)", cp);


@@ -336,7 +335,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {

-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);

        fclose (fp);
     }
 
        fclose (fp);
     }
 


@@ -347,7 +346,7 @@ do_cache:
     /* Check for private cache location */
     if (!(cache_private = context_find (nmhprivcache)))
        cache_private = ".cache";
     /* Check for private cache location */
     if (!(cache_private = context_find (nmhprivcache)))
        cache_private = ".cache";

-    cache_private = getcpy (m_maildir (cache_private));
+    cache_private = mh_xstrdup(m_maildir(cache_private));

 
     /*
      * Cache the current directory before we do any chdirs()'s.
 
     /*
      * Cache the current directory before we do any chdirs()'s.


@@ -365,11 +364,11 @@ do_cache:
        int vecp;
 
        if (showsw || storesw || cachesw)
        int vecp;
 
        if (showsw || storesw || cachesw)

-           adios (NULL, "cannot use -build with -show, -store, -cache");
+           die("cannot use -build with -show, -store, -cache");

        if (msgs.size < 1)
        if (msgs.size < 1)

-           adios (NULL, "need to specify a %s composition file", invo_name);
+           die("need to specify a %s composition file", invo_name);

        if (msgs.size > 1)
        if (msgs.size > 1)

-           adios (NULL, "only one %s composition file at a time", invo_name);
+           die("only one %s composition file at a time", invo_name);

 
        vecp = 0;
        vec[vecp++] = "mhbuild";
 
        vecp = 0;
        vec[vecp++] = "mhbuild";


@@ -384,7 +383,7 @@ do_cache:
 
        execvp ("mhbuild", vec);
        fprintf (stderr, "unable to exec ");
 
        execvp ("mhbuild", vec);
        fprintf (stderr, "unable to exec ");

-       _exit (-1);
+       _exit(1);

     }
 
     /*
     }
 
     /*


@@ -411,11 +410,11 @@ do_cache:
 
        execvp ("mhbuild", vec);
        fprintf (stderr, "unable to exec ");
 
        execvp ("mhbuild", vec);
        fprintf (stderr, "unable to exec ");

-       _exit (-1);
+       _exit(1);

     }
 
     if (file && msgs.size)
     }
 
     if (file && msgs.size)

-       adios (NULL, "cannot specify msg and file at same time!");
+       die("cannot specify msg and file at same time!");

 
     /*
      * check if message is coming from file
 
     /*
      * check if message is coming from file


@@ -441,11 +440,11 @@ do_cache:
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))

-           adios (NULL, "unable to read folder %s", folder);
+           die("unable to read folder %s", folder);

 
        /* check for empty folder */
        if (mp->nummsg == 0)
 
        /* check for empty folder */
        if (mp->nummsg == 0)

-           adios (NULL, "no messages in %s", folder);
+           die("no messages in %s", folder);

 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)
 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -475,13 +474,13 @@ do_cache:
      * at a time.
      */
     if (showsw + listsw + storesw + cachesw > 1)
      * at a time.
      */
     if (showsw + listsw + storesw + cachesw > 1)

-       adios (NULL, "can only use one of -show, -list, -store, -cache at same time");
+       die("can only use one of -show, -list, -store, -cache at same time");

 
     /* If no action is specified, assume -show */
     if (!listsw && !showsw && !storesw && !cachesw)
 
     /* If no action is specified, assume -show */
     if (!listsw && !showsw && !storesw && !cachesw)

-       showsw = 1;
+       showsw = true;

 
 

-    userrs = 1;
+    userrs = true;

     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);
 
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);