uip: Change global int userrs to bool.

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index b6f26eb9a2e9f08e5f0adb306bd2a2c5bd56ca5c..233d7a6a227a58b70b2d7568aef78ec8af4bba61 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -89,8 +89,12 @@ static char outfile[BUFSIZ];
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1, directives = 1, autobuild = 0, dist = 0;
-    int verbosw = 0, dispo = 0;
+    int sizesw = 1, headsw = 1;
+    bool directives = true;
+    bool autobuild = false;
+    bool dist = false;
+    int verbosw = 0;
+    bool dispo = false;
     size_t maxunencoded = MAXTEXTPERLN;
     int *icachesw;
     char *cp, buf[BUFSIZ];
@@ -102,7 +106,7 @@ main (int argc, char **argv)
     int header_encoding = CE_UNKNOWN;
     size_t n;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -110,7 +114,7 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
        if (cp[0] == '-' && cp[1] == '\0') {
            if (compfile)
-               adios (NULL, "cannot specify both standard input and a file");
+               die("cannot specify both standard input and a file");
             compfile = cp;
            listsw = 0;         /* turn off -list if using standard in/out */
            verbosw = 0;        /* turn off -verbose listings */
@@ -122,7 +126,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 
-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
@@ -134,16 +138,16 @@ main (int argc, char **argv)
 
            case AUTOSW:
                /* -auto implies -nodirectives */
-               autobuild = 1;
-               directives = 0;
+               autobuild = true;
+               directives = false;
                continue;
            case NAUTOSW:
                /*
                 * We're turning directives back on since this is likely here
                 * to override a profile entry
                 */
-               autobuild = 0;
-               directives = 1;
+               autobuild = false;
+               directives = true;
                continue;
 
            case RCACHESW:
@@ -153,13 +157,13 @@ main (int argc, char **argv)
                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:
-                   adios (NULL, "%s unknown", cp);
+                   die("%s unknown", cp);
                default:
                    break;
                }
@@ -180,10 +184,10 @@ main (int argc, char **argv)
                continue;
 
            case DIRECTIVES:
-               directives = 1;
+               directives = true;
                continue;
            case NDIRECTIVES:
-               directives = 0;
+               directives = false;
                continue;
 
            case LISTSW:
@@ -218,13 +222,13 @@ main (int argc, char **argv)
                int encoding;
 
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                switch (encoding = smatch (cp, encodingswitches)) {
                case AMBIGSW:
                    ambigsw (cp, encodingswitches);
                    done (1);
                case UNKWNSW:
-                   adios (NULL, "%s unknown encoding algorithm", cp);
+                   die("%s unknown encoding algorithm", cp);
                case BASE64SW:
                    header_encoding = CE_BASE64;
                    break;
@@ -235,7 +239,7 @@ main (int argc, char **argv)
                    header_encoding = CE_8BIT;
                    break;
                default:
-                   adios (NULL, "Internal error: algorithm %s", cp);
+                   die("Internal error: algorithm %s", cp);
                }
                continue;
            }
@@ -246,11 +250,11 @@ main (int argc, char **argv)
 
            case MAXUNENCSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                if ((maxunencoded = atoi(cp)) < 1)
-                   adios (NULL, "Invalid argument for %s: %s", argp[-2], cp);
+                   die("Invalid argument for %s: %s", argp[-2], cp);
                if (maxunencoded > 998)
-                   adios (NULL, "limit of -maxunencoded is 998");
+                   die("limit of -maxunencoded is 998");
                continue;
 
            case VERBSW: 
@@ -260,21 +264,21 @@ main (int argc, char **argv)
                verbosw = 0;
                continue;
            case DISPOSW:
-               dispo = 1;
+               dispo = true;
                continue;
            case NDISPOSW:
-               dispo = 0;
+               dispo = false;
                continue;
            case DEBUGSW:
                debugsw = 1;
                continue;
            case DISTSW:
-               dist = 1;
+               dist = true;
                continue;
            }
        }
        if (compfile)
-           adios (NULL, "only one composition file allowed");
+           die("only one composition file allowed");
         compfile = cp;
     }
 
@@ -305,21 +309,21 @@ main (int argc, char **argv)
     /* 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));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     /* Check if we have a file to process */
     if (!compfile)
-       adios (NULL, "need to specify a %s composition file", invo_name);
+       die("need to specify a %s composition file", invo_name);
 
     /*
      * Process the composition file from standard input.
      */
     if (compfile[0] == '-' && compfile[1] == '\0') {
        if ((cp = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
+           die("unable to create temporary file in %s",
                  get_temp_dir());
        }
        strncpy (infile, cp, sizeof(infile));
@@ -327,7 +331,7 @@ main (int argc, char **argv)
        /* copy standard input to temporary file */
        while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
            if (fwrite(buffer, 1, n, fp) != n) {
-               adios (NULL, "error copying to temporary file");
+               die("error copying to temporary file");
            }
        }
        fclose (fp);
@@ -343,11 +347,11 @@ main (int argc, char **argv)
 
        if (!ct) {
            if (! (fp = fopen(infile, "r"))) {
-               adios(NULL, "Unable to open %s for reading", infile);
+               die("Unable to open %s for reading", infile);
            }
            while ((n = fread(buffer, 1, sizeof(buffer), fp)) > 0) {
                if (fwrite(buffer, 1, n, stdout) != n) {
-                   adios(NULL, "error copying %s to stdout", infile);
+                   die("error copying %s to stdout", infile);
                }
            }
        } else {
@@ -380,7 +384,7 @@ main (int argc, char **argv)
 
     /* output MIME message to this temporary file */
     if ((cp = m_mktemp2(compfile, invo_name, NULL, &fp_out)) == NULL) {
-       adios(NULL, "unable to create temporary file");
+       die("unable to create temporary file");
     }
     strncpy(outfile, cp, sizeof(outfile));