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

Although the form
	attach: +folder 1234
is preferred, one may as well use
	attach: /path/to/message.rfc822
A warning is printed though.

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 5ad0fc1..1b2afa5 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -111,7 +111,7 @@ 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;
 
@@ -220,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),
@@ -255,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),
@@ -788,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))