-
-/*
- * mhbuild.c -- expand/translate MIME composition files
+/* mhbuild.c -- expand/translate MIME composition files
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
*/
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/m_backup.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 <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
-#include <h/utils.h>
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/mhcachesbr.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "mhfree.h"
+#include "mhoutsbr.h"
#define MHBUILD_SWITCHES \
X("auto", 0, AUTOSW) \
X("norfc934mode", 0, NRFC934SW) \
X("verbose", 0, VERBSW) \
X("noverbose", 0, NVERBSW) \
+ X("disposition", 0, DISPOSW) \
+ X("nodisposition", 0, NDISPOSW) \
X("rcache policy", 0, RCACHESW) \
X("wcache policy", 0, WCACHESW) \
X("contentid", 0, CONTENTIDSW) \
X("nocontentid", 0, NCONTENTIDSW) \
X("headerencoding encoding-algorithm", 0, HEADERENCSW) \
X("autoheaderencoding", 0, AUTOHEADERENCSW) \
+ X("maxunencoded", 0, MAXUNENCSW) \
X("version", 0, VERSIONSW) \
X("help", 0, HELPSW) \
X("debug", -5, DEBUGSW) \
+ X("dist", 0, DISTSW) \
#define X(sw, minchars, id) id,
DEFINE_SWITCH_ENUM(MHBUILD);
DEFINE_SWITCH_ARRAY(MHBUILD, switches);
#undef X
+/* utf-8 is for Email Address Internationalization, using SMTPUTF8. */
#define MIMEENCODING_SWITCHES \
X("base64", 0, BASE64SW) \
X("quoted-printable", 0, QUOTEDPRINTSW) \
+ X("utf-8", 0, UTF8SW) \
#define X(sw, minchars, id) id,
DEFINE_SWITCH_ENUM(MIMEENCODING);
DEFINE_SWITCH_ARRAY(MIMEENCODING, encodingswitches);
#undef X
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
int debugsw = 0;
-int verbosw = 0;
-int listsw = 0;
-int rfc934sw = 0;
-int contentidsw = 1;
+bool listsw;
+bool rfc934sw;
+bool contentidsw = true;
/*
* Temporary files
*/
static char infile[BUFSIZ];
-static int unlink_infile = 0;
-
static char outfile[BUFSIZ];
-static int unlink_outfile = 0;
-
-static void unlink_done (int) NORETURN;
-
-/* mhbuildsbr.c */
-int output_message (CT, char *);
-int output_message_fp (CT, FILE *, char*);
-
-/* mhlistsbr.c */
-int list_all_messages (CT *, int, int, int, int);
int
main (int argc, char **argv)
{
- int sizesw = 1, headsw = 1, directives = 1, autobuild = 0;
+ bool sizesw = true;
+ bool headsw = true;
+ bool directives = true;
+ bool autobuild = false;
+ bool dist = false;
+ bool verbosw = false;
+ bool dispo = false;
+ size_t maxunencoded = MAXTEXTPERLN;
int *icachesw;
char *cp, buf[BUFSIZ];
char buffer[BUFSIZ], *compfile = NULL;
FILE *fp = NULL;
FILE *fp_out = NULL;
int header_encoding = CE_UNKNOWN;
+ size_t n;
- done=unlink_done;
-
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], true, false)) { return 1; }
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
while ((cp = *argp++)) {
if (cp[0] == '-' && cp[1] == '\0') {
if (compfile)
- adios (NULL, "cannot specify both standard input and a file");
- else
- compfile = cp;
- listsw = 0; /* turn off -list if using standard in/out */
- verbosw = 0; /* turn off -verbose listings */
+ die("cannot specify both standard input and a file");
+ compfile = cp;
+ listsw = false; /* turn off -list if using standard in/out */
+ verbosw = false; /* turn off -verbose listings */
break;
}
if (*cp == '-') {
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);
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:
icachesw = &wcachesw;
do_cache: ;
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- switch (*icachesw = smatch (cp, caches)) {
+ die("missing argument to %s", argp[-2]);
+ switch (*icachesw = smatch (cp, cache_policy)) {
case AMBIGSW:
- ambigsw (cp, caches);
+ ambigsw (cp, cache_policy);
done (1);
case UNKWNSW:
- adios (NULL, "%s unknown", cp);
+ die("%s unknown", cp);
default:
break;
}
continue;
case HEADSW:
- headsw++;
+ headsw = true;
continue;
case NHEADSW:
- headsw = 0;
+ headsw = false;
continue;
case DIRECTIVES:
- directives = 1;
+ directives = true;
continue;
case NDIRECTIVES:
- directives = 0;
+ directives = false;
continue;
case LISTSW:
- listsw++;
+ listsw = true;
continue;
case NLISTSW:
- listsw = 0;
+ listsw = false;
continue;
case RFC934SW:
- rfc934sw++;
+ rfc934sw = true;
continue;
case NRFC934SW:
- rfc934sw = 0;
+ rfc934sw = false;
continue;
case SIZESW:
- sizesw++;
+ sizesw = true;
continue;
case NSIZESW:
- sizesw = 0;
+ sizesw = false;
continue;
case CONTENTIDSW:
- contentidsw = 1;
+ contentidsw = true;
continue;
case NCONTENTIDSW:
- contentidsw = 0;
+ contentidsw = false;
continue;
case HEADERENCSW: {
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;
case QUOTEDPRINTSW:
header_encoding = CE_QUOTED;
break;
+ case UTF8SW:
+ header_encoding = CE_8BIT;
+ break;
default:
- adios (NULL, "Internal error: algorithm %s", cp);
+ die("Internal error: algorithm %s", cp);
}
continue;
}
header_encoding = CE_UNKNOWN;
continue;
+ case MAXUNENCSW:
+ if (!(cp = *argp++) || *cp == '-')
+ die("missing argument to %s", argp[-2]);
+ if ((maxunencoded = atoi(cp)) < 1)
+ die("Invalid argument for %s: %s", argp[-2], cp);
+ if (maxunencoded > 998)
+ die("limit of -maxunencoded is 998");
+ continue;
+
case VERBSW:
- verbosw++;
+ verbosw = true;
continue;
case NVERBSW:
- verbosw = 0;
+ verbosw = false;
+ continue;
+ case DISPOSW:
+ dispo = true;
+ continue;
+ case NDISPOSW:
+ dispo = false;
continue;
case DEBUGSW:
debugsw = 1;
continue;
+ case DISTSW:
+ dist = true;
+ continue;
}
}
if (compfile)
- adios (NULL, "only one composition file allowed");
- else
- compfile = cp;
+ die("only one composition file allowed");
+ compfile = cp;
}
/*
*/
if ((cp = getenv ("MHBUILD"))) {
if ((fp = fopen (cp, "r"))) {
- readconfig ((struct node **) 0, fp, cp, 0);
+ readconfig(NULL, fp, cp, 0);
fclose (fp);
} else {
admonish ("", "unable to read $MHBUILD profile (%s)", cp);
* 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);
}
/* 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) {
+ die("unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ strncpy (infile, cp, sizeof(infile));
+
/* copy standard input to temporary file */
- strncpy (infile, m_mktemp2(NULL, invo_name, NULL, &fp), sizeof(infile));
- while (fgets (buffer, BUFSIZ, stdin))
- fputs (buffer, fp);
+ while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
+ if (fwrite(buffer, 1, n, fp) != n) {
+ die("error copying to temporary file");
+ }
+ }
fclose (fp);
- unlink_infile = 1;
/* build the content structures for MIME message */
- ct = build_mime (infile, autobuild, directives, header_encoding);
+ ct = build_mime (infile, autobuild, dist, directives, header_encoding,
+ maxunencoded, verbosw);
/*
* If ct == NULL, that means that -auto was set and a MIME version
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) {
+ die("error copying %s to stdout", 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;
-
done (0);
}
*/
/* build the content structures for MIME message */
- ct = build_mime (compfile, autobuild, directives, header_encoding);
+ ct = build_mime (compfile, autobuild, dist, directives, header_encoding,
+ maxunencoded, verbosw);
/*
* If ct == NULL, that means -auto was set and we found a MIME version
cts[1] = NULL;
/* output MIME message to this temporary file */
- strncpy(outfile, m_mktemp2(compfile, invo_name, NULL, &fp_out),
- sizeof(outfile));
- unlink_outfile = 1;
+ if ((cp = m_mktemp2(compfile, invo_name, NULL, &fp_out)) == NULL) {
+ die("unable to create temporary file");
+ }
+ strncpy(outfile, cp, sizeof(outfile));
/* output the message */
output_message_fp (ct, fp_out, outfile);
* List the message info
*/
if (listsw)
- list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+ list_all_messages (cts, headsw, sizesw, verbosw, debugsw, dispo);
/* Rename composition draft */
snprintf (buffer, sizeof(buffer), "%s.orig", m_backup (compfile));
rename (buffer, compfile);
done (1);
}
- unlink_outfile = 0;
+ /* Remove from atexit(3) list of files to unlink. */
+ if (!(m_unlink(outfile) == -1 && errno == ENOENT)) {
+ adios(outfile, "file exists after rename:");
+ }
free_content (ct);
done (0);
return 1;
}
-
-
-static void
-unlink_done (int status)
-{
- /*
- * Check if we need to remove stray
- * temporary files.
- */
- if (unlink_infile)
- unlink (infile);
- if (unlink_outfile)
- unlink (outfile);
-
- exit (status);
-}
projects / nmh / blobdiff