Convert whatnow over to using the new Attach header.

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index ef4598581702e8c0773a33b66fca14b2871319cd..681c4fe8684f1239286c4c753a28314989c68121 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -19,6 +19,8 @@
 #include <h/utils.h>
 
 #define MHBUILD_SWITCHES \
+    X("auto", 0, AUTOSW) \
+    X("noauto", 0, NAUTOSW) \
     X("check", 0, CHECKSW) \
     X("nocheck", 0, NCHECKSW) \
     X("directives", 0, DIRECTIVES) \
@@ -42,6 +44,7 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \
+    X("dist", -4, DISTSW) \
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHBUILD);
@@ -101,7 +104,7 @@ int list_all_messages (CT *, int, int, int, int);
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1, directives = 1;
+    int sizesw = 1, headsw = 1, directives = 1, autobuild = 0, dist = 0;
     int *icachesw;
     char *cp, buf[BUFSIZ];
     char buffer[BUFSIZ], *compfile = NULL;
@@ -150,6 +153,20 @@ main (int argc, char **argv)
                print_version(invo_name);
                done (0);
 
+           case AUTOSW:
+               /* -auto implies -nodirectives */
+               autobuild = 1;
+               directives = 0;
+               continue;
+           case NAUTOSW:
+               /*
+                * We're turning directives back on since this is likely here
+                * to override a profile entry
+                */
+               autobuild = 0;
+               directives = 1;
+               continue;
+
            case RCACHESW:
                icachesw = &rcachesw;
                goto do_cache;
@@ -254,6 +271,9 @@ main (int argc, char **argv)
            case DEBUGSW:
                debugsw = 1;
                continue;
+           case DISTSW:
+               dist = 1;
+               continue;
            }
        }
        if (compfile)
@@ -320,32 +340,28 @@ main (int argc, char **argv)
        unlink_infile = 1;
 
        /* build the content structures for MIME message */
-       ct = build_mime (infile, directives, header_encoding);
-       cts[0] = ct;
-       cts[1] = NULL;
-
-       /* output MIME message to this temporary file */
-       strncpy (outfile, m_mktemp(invo_name, NULL, &fp_out), sizeof(outfile));
-       unlink_outfile = 1;
-
-       /* output the message */
-       output_message_fp (ct, fp_out, outfile);
-        fclose(fp_out);
-
-       /* output the temp file to standard output */
-       if ((fp = fopen (outfile, "r")) == NULL)
-           adios (outfile, "unable to open");
-       while (fgets (buffer, BUFSIZ, fp))
-           fputs (buffer, stdout);
-       fclose (fp);
+       ct = build_mime (infile, autobuild, dist, directives, header_encoding);
+
+       /*
+        * If ct == NULL, that means that -auto was set and a MIME version
+        * header was already seen.  Just use the input file as the output
+        */
+
+       if (!ct) {
+           if (! (fp = fopen(infile, "r"))) {
+               adios(NULL, "Unable to open %s for reading", infile);
+           }
+           while (fgets(buffer, BUFSIZ, fp))
+               fputs(buffer, stdout);
+       } else {
+           /* output the message */
+           output_message_fp (ct, stdout, NULL);
+           free_content (ct);
+       }
 
        unlink (infile);
        unlink_infile = 0;
 
-       unlink (outfile);
-       unlink_outfile = 0;
-
-       free_content (ct);
        done (0);
     }
 
@@ -354,7 +370,16 @@ main (int argc, char **argv)
      */
 
     /* build the content structures for MIME message */
-    ct = build_mime (compfile, directives, header_encoding);
+    ct = build_mime (compfile, autobuild, dist, directives, header_encoding);
+
+    /*
+     * If ct == NULL, that means -auto was set and we found a MIME version
+     * header.  Simply exit and do nothing.
+     */
+
+    if (! ct)
+       done(0);
+
     cts[0] = ct;
     cts[1] = NULL;