mhbuild: Don't fail if one attaches an rfc822 message as a file

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 0fb5315..1b2afa5 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -32,16 +32,12 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
-#define CONTENTIDSW  2
-       { "contentid", 0 },
-#define NCONTENTIDSW  3
-       { "nocontentid", 0 },
-#define VERSIONSW  4
-       { "version", 0 },
-#define HELPSW  5
+       { "noverbose", 2 },
+#define VERSIONSW  2
+       { "Version", 0 },
+#define HELPSW  3
        { "help", 0 },
-#define DEBUGSW  6
+#define DEBUGSW  4
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -87,8 +83,6 @@ static CT build_mime(char *);
 int debugsw = 0;
 int verbosw = 0;
 
-int contentidsw = 1;
-
 /*
 ** Temporary files
 */
@@ -117,15 +111,13 @@ main(int argc, char **argv)
        char *cp, buf[BUFSIZ];
        char buffer[BUFSIZ], *compfile = NULL;
        char **argp, **arguments;
-       CT ct, cts[2];
+       CT ct;
        FILE *fp = NULL;
        FILE *fp_out = NULL;
 
        done = unlink_done;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -159,13 +151,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case CONTENTIDSW:
-                               contentidsw = 1;
-                               continue;
-                       case NCONTENTIDSW:
-                               contentidsw = 0;
-                               continue;
-
                        case VERBSW:
                                verbosw++;
                                continue;
@@ -235,8 +220,6 @@ main(int argc, char **argv)
 
                /* build the content structures for MIME message */
                ct = build_mime(infile);
-               cts[0] = ct;
-               cts[1] = NULL;
 
                /* output MIME message to this temporary file */
                strncpy(outfile, m_mktemp(invo_name, NULL, &fp_out),
@@ -270,8 +253,6 @@ main(int argc, char **argv)
 
        /* build the content structures for MIME message */
        ct = build_mime(compfile);
-       cts[0] = ct;
-       cts[1] = NULL;
 
        /* output MIME message to this temporary file */
        strncpy(outfile, m_mktemp2(compfile, invo_name, NULL, &fp_out),
@@ -283,14 +264,14 @@ main(int argc, char **argv)
        fclose(fp_out);
 
        /* Rename composition draft */
-       snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));
+       snprintf(buffer, sizeof(buffer), "%s.orig", compfile);
        if (rename(compfile, buffer) == NOTOK) {
-               adios(compfile, "unable to rename comp draft %s to", buffer);
+               adios(buffer, "unable to rename draft %s to", compfile);
        }
 
        /* Rename output file to take its place */
        if (rename(outfile, compfile) == NOTOK) {
-               advise(outfile, "unable to rename output %s to", compfile);
+               advise(compfile, "unable to rename output %s to", outfile);
                rename(buffer, compfile);
                done(1);
        }
@@ -803,8 +784,8 @@ call_init:
                                adios(NULL, "sorry, \"#%s/%s\" isn't supported", ci->ci_type, ci->ci_subtype);
                        }
 use_forw:
-                       adios(NULL, "use \"#forw [+folder] [msgs]\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
-                       /* NOTREACHED */
+                       admonish(NULL, "use \"#forw [+folder] [msgs]\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
+                       /* FALL */
 
                default:
                        if ((ct->c_ctinitfnx = s2i->si_init))
@@ -1553,9 +1534,9 @@ build_headers(CT ct)
        add_header(ct, np, vp);
 
        /*
-       ** output the Content-ID, unless disabled by -nocontentid
+       ** output the Content-ID
        */
-       if (contentidsw && ct->c_id) {
+       if (ct->c_id) {
                np = getcpy(ID_FIELD);
                vp = concat(" ", ct->c_id, NULL);
                add_header(ct, np, vp);