* complete copyright information.
*/
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/context_find.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
#include <fcntl.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.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/utils.h"
#include "mhmisc.h"
-#include <h/mhcachesbr.h>
-#include "../sbr/m_mktemp.h"
+#include "h/mhcachesbr.h"
+#include "sbr/m_mktemp.h"
#include "mhfree.h"
#ifdef HAVE_ICONV
# include <iconv.h>
#endif /* HAVE_ICONV */
+#include "sbr/base64.h"
extern int debugsw;
bool suppress_multiple_mime_version_warning = true;
/* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS];
-char *preferred_subtypes[NPREFS];
+mime_type_subtype mime_preference[NPREFS];
int npreferred;
case LENERR:
case FMTERR:
- adios (NULL, "message format error in component #%d", compnum);
+ die("message format error in component #%d", compnum);
default:
- adios (NULL, "getfld() returned %d", state);
+ die("getfld() returned %d", state);
}
/* break out of the loop */
* Get any <Content-Id> given in buffer
*/
if (magic && *cp == '<') {
- mh_xfree(ct->c_id);
+ free(ct->c_id);
ct->c_id = NULL;
if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
inform("invalid ID in message %s", ct->c_file);
static int
InitMultiPart (CT ct)
{
- int inout;
+ bool inout;
long last, pos;
char *cp, *dp;
PM pm;
bp = cte + strlen (cte) - 1;
while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
- for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
+ for (bp = cte; isblank((unsigned char)*bp); ++bp) continue;
inform("\"%s/%s\" type in message %s must be encoded in\n"
"7bit, 8bit, or binary, per RFC 2045 (6.4). "
last = ct->c_end;
next = &m->mp_parts;
part = NULL;
- inout = 1;
+ inout = true;
while ((gotlen = getline(&bufp, &buflen, fp)) != -1) {
if (pos > last)
part->mp_part = p;
pos = p->c_begin;
fseek (fp, pos, SEEK_SET);
- inout = 0;
+ inout = false;
} else {
if (strcmp (bufp + 2, m->mp_start) == 0) {
- inout = 1;
+ inout = true;
end_part:
p = part->mp_part;
p->c_end = ftell(fp) - (gotlen + 1);
}
static void
-move_preferred_part (CT ct, char *type, char *subtype)
+move_preferred_part(CT ct, mime_type_subtype *pref)
{
struct multipart *m = (struct multipart *) ct->c_ctparams;
struct part *part, *prev, *head, *nhead, *ntail;
part = head->mp_next;
while (part != NULL) {
ci = &part->mp_part->c_ctinfo;
- if (!strcasecmp(ci->ci_type, type) &&
- (!subtype || !strcasecmp(ci->ci_subtype, subtype))) {
+ if (!strcasecmp(ci->ci_type, pref->type) &&
+ (!pref->subtype ||
+ !strcasecmp(ci->ci_subtype, pref->subtype))) {
prev->mp_next = part->mp_next;
part->mp_next = NULL;
ntail->mp_next = part;
}
ntail->mp_next = head->mp_next;
m->mp_parts = nhead->mp_next;
-
}
/*
prefer_parts(CT ct)
{
int i;
- for (i = npreferred-1; i >= 0; i--)
- move_preferred_part(ct, preferred_types[i], preferred_subtypes[i]);
+ for (i = 0; i < npreferred; i++)
+ move_preferred_part(ct, mime_preference + i);
}
example, a text/plain part before a text/html part in a
multipart/alternative part, for example, where it belongs. */
void
-reverse_alternative_parts (CT ct) {
+reverse_alternative_parts (CT ct)
+{
if (ct->c_type == CT_MULTIPART) {
struct multipart *m = (struct multipart *) ct->c_ctparams;
struct part *part;
adios ("failed", "fread");
case OK:
- adios (NULL, "unexpected EOF from fread");
+ die("unexpected EOF from fread");
default:
bp += cc, size -= cc;
}
if (ct->c_encoding == CE_EXTERNAL)
- return (ct->c_end - ct->c_begin);
+ return ct->c_end - ct->c_begin;
file = NULL;
if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
- return (ct->c_end - ct->c_begin);
+ return ct->c_end - ct->c_begin;
if (fstat (fd, &st) != NOTOK)
size = (long) st.st_size;
openBase64 (CT ct, char **file)
{
ssize_t cc, len;
- int fd, own_ct_fp = 0;
+ int fd;
+ bool own_ct_fp = false;
char *cp, *buffer = NULL;
/* sbeck -- handle suffixes */
CI ci;
if (ce->ce_unlink) {
/* Create temporary file with filename extension. */
if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
} else {
} else if (*file == NULL) {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
}
if ((len = ct->c_end - ct->c_begin) < 0)
- adios (NULL, "internal error(1)");
+ die("internal error(1)");
buffer = mh_xmalloc (len + 1);
content_error (ct->c_file, ct, "unable to open for reading");
return NOTOK;
}
- own_ct_fp = 1;
+ own_ct_fp = true;
}
lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
static int
openQuoted (CT ct, char **file)
{
- int cc, digested, len, quoted, own_ct_fp = 0;
+ int cc, digested, len, quoted;
+ bool own_ct_fp = false;
char *cp, *ep;
char *bufp = NULL;
size_t buflen;
if (ce->ce_unlink) {
/* Create temporary file with filename extension. */
if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
} else {
} else if (*file == NULL) {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
}
if ((len = ct->c_end - ct->c_begin) < 0)
- adios (NULL, "internal error(2)");
+ die("internal error(2)");
if (! ct->c_fp) {
if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
content_error (ct->c_file, ct, "unable to open for reading");
return NOTOK;
}
- own_ct_fp = 1;
+ own_ct_fp = true;
}
if ((digested = ct->c_digested))
MD5Init (&mdContext);
quoted = 0;
-#ifdef lint
- mask = 0;
-#endif
fseek (ct->c_fp, ct->c_begin, SEEK_SET);
while (len > 0) {
unsigned char digest[16];
MD5Final (digest, &mdContext);
- if (memcmp((char *) digest, (char *) ct->c_digest,
+ if (memcmp(digest, ct->c_digest,
sizeof digest))
content_error (NULL, ct,
"content integrity suspect (digest mismatch) -- continuing");
int
open7Bit (CT ct, char **file)
{
- int cc, fd, len, own_ct_fp = 0;
+ int cc, fd, len;
+ bool own_ct_fp = false;
char buffer[BUFSIZ];
/* sbeck -- handle suffixes */
char *cp;
if (ce->ce_unlink) {
/* Create temporary file with filename extension. */
if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
} else {
} else if (*file == NULL) {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
}
if ((len = ct->c_end - ct->c_begin) < 0)
- adios (NULL, "internal error(3)");
+ die("internal error(3)");
if (! ct->c_fp) {
if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
content_error (ct->c_file, ct, "unable to open for reading");
return NOTOK;
}
- own_ct_fp = 1;
+ own_ct_fp = true;
}
lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
goto ready_already;
}
- if (find_cache (ct, rcachesw, (int *) 0, cb->c_id,
+ if (find_cache(ct, rcachesw, NULL, cb->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if ((ce->ce_fp = fopen (cachefile, "r"))) {
ce->ce_file = mh_xstrdup(cachefile);
static int
openFTP (CT ct, char **file)
{
- int cachetype, caching, fd;
+ int cachetype;
+ bool caching;
+ int fd;
int len, buflen;
char *bp, *ftp, *user, *pass;
char buffer[BUFSIZ], cachefile[BUFSIZ];
}
ce->ce_unlink = (*file == NULL);
- caching = 0;
+ caching = false;
cachefile[0] = '\0';
if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
&& find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if (*file == NULL) {
ce->ce_unlink = 0;
- caching = 1;
+ caching = true;
}
}
else {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
}
{
- int child_id, i, vecp;
+ int child_id, vecp;
char *vec[9];
vecp = 0;
fflush (stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ child_id = fork();
switch (child_id) {
case NOTOK:
adios ("fork", "unable to");
execvp (ftp, vec);
fprintf (stderr, "unable to exec ");
perror (ftp);
- _exit (-1);
+ _exit(1);
/* NOTREACHED */
default:
static int
openMail (CT ct, char **file)
{
- int child_id, fd, i, vecp;
+ int child_id, fd, vecp;
int len, buflen;
char *bp, buffer[BUFSIZ], *vec[7];
struct exbody *e = ct->c_ctexbody;
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ child_id = fork();
switch (child_id) {
case NOTOK:
advise ("fork", "unable to");
execvp (mailproc, vec);
fprintf (stderr, "unable to exec ");
perror (mailproc);
- _exit (-1);
+ _exit(1);
/* NOTREACHED */
default:
if (*file == NULL) {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
/* showproc is for mhshow and mhstore, though mhlist -debug
* prints it, too. */
- mh_xfree(ct->c_showproc);
+ free(ct->c_showproc);
ct->c_showproc = mh_xstrdup("true");
fseek (ce->ce_fp, 0L, SEEK_SET);
CE ce = &ct->c_cefile;
char *urlprog, *program;
char buffer[BUFSIZ], cachefile[BUFSIZ];
- int fd, caching, cachetype;
+ int fd;
+ bool caching;
+ int cachetype;
struct msgs_array args = { 0, 0, NULL};
pid_t child_id;
}
ce->ce_unlink = (*file == NULL);
- caching = 0;
+ caching = false;
cachefile[0] = '\0';
if (find_cache(NULL, wcachesw, &cachetype, e->eb_content->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if (*file == NULL) {
ce->ce_unlink = 0;
- caching = 1;
+ caching = true;
}
}
else {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
- adios(NULL, "unable to create temporary file in %s",
+ die("unable to create temporary file in %s",
get_temp_dir());
}
ce->ce_file = mh_xstrdup(tempfile);
execvp(program, args.msgs);
fprintf(stderr, "Unable to exec ");
perror(program);
- _exit(-1);
+ _exit(1);
/* NOTREACHED */
default:
{
struct multipart *m = (struct multipart *) ct->c_ctparams;
char *boundary;
- int found_boundary = 0;
+ bool found_boundary = false;
int max = BUFSIZ;
char *bufp = NULL;
size_t buflen;
if (before) {
if (! strcmp (bufp, boundary)) {
- found_boundary = 1;
+ found_boundary = true;
}
} else {
if (! found_boundary && ! strcmp (bufp, boundary)) {
- found_boundary = 1;
+ found_boundary = true;
continue;
}
}
char *
-ct_type_str (int type) {
+ct_type_str (int type)
+{
switch (type) {
case CT_APPLICATION:
return "application";
char *
-ct_subtype_str (int type, int subtype) {
+ct_subtype_str (int type, int subtype)
+{
switch (type) {
case CT_APPLICATION:
switch (subtype) {
int
-ct_str_type (const char *type) {
+ct_str_type (const char *type)
+{
struct str2init *s2i;
for (s2i = str2cts; s2i->si_key; ++s2i) {
int
-ct_str_subtype (int type, const char *subtype) {
+ct_str_subtype (int type, const char *subtype)
+{
struct k2v *kv;
switch (type) {
/* Find the content type and InitFunc for the CT. */
const struct str2init *
-get_ct_init (int type) {
+get_ct_init (int type)
+{
const struct str2init *sp;
for (sp = str2cts; sp->si_key; ++sp) {
}
const char *
-ce_str (int encoding) {
+ce_str (int encoding)
+{
switch (encoding) {
case CE_BASE64:
return "base64";
/* Find the content type and InitFunc for the content encoding method. */
const struct str2init *
-get_ce_method (const char *method) {
+get_ce_method (const char *method)
+{
struct str2init *sp;
for (sp = str2ces; sp->si_key; ++sp) {
while (*cp == ';') {
char *dp, *vp, *up, *nameptr, *valptr, *charset = NULL, *lang = NULL;
- int encoded = 0, partial = 0, len = 0, index = 0;
+ bool encoded = false;
+ bool partial = false;
+ int len = 0, index = 0;
cp++;
while (isspace ((unsigned char) *cp))
for (vp = cp; vp < up; vp++) {
if (*vp == '*' && vp < up - 1) {
- partial = 1;
+ partial = true;
continue;
}
if (*vp == '*' && vp == up - 1) {
- encoded = 1;
+ encoded = true;
} else if (partial) {
if (isdigit((unsigned char) *vp))
index = *vp - '0' + index * 10;
inform("missing language tag in message %s's %s: field\n"
" (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
+ free(charset);
return NOTOK;
}
inform("invalid encoded sequence in message %s's %s: field\n"
" (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
- mh_xfree(lang);
+ free(charset);
+ free(lang);
return NOTOK;
}
vp += 2;
inform("invalid quoted-string in message %s's %s: field\n"
" (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
- mh_xfree(lang);
+ free(charset);
+ free(lang);
return NOTOK;
case '"':
break;
*/
if (index == 0 && encoded) {
- mh_xfree(pp->charset);
+ free(pp->charset);
pp->charset = charset;
- mh_xfree(pp->lang);
+ free(pp->lang);
pp->lang = lang;
}
} else {
*/
char *
-content_charset (CT ct) {
+content_charset (CT ct)
+{
char *ret_charset = NULL;
ret_charset = get_param(ct->c_ctinfo.ci_first_pm, "charset", '?', 0);
if (strlen(params->pm_name) > CPERLIN) {
inform("Parameter name \"%s\" is too long", params->pm_name);
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
numchars, valoff);
if (i == 0) {
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
strlen(params->pm_value + valoff), valoff);
if (i == 0) {
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
if (! pm->pm_charset) {
pm->pm_charset = mh_xstrdup(write_charset_8bit());
if (strcasecmp(pm->pm_charset, "US-ASCII") == 0)
- adios(NULL, "8-bit characters in parameter \"%s\", but "
+ die("8-bit characters in parameter \"%s\", but "
"local character set is US-ASCII", pm->pm_name);
}
if (! pm->pm_lang)
* necessary
*/
-char *get_param_value(PM pm, char replace)
+char *
+get_param_value(PM pm, char replace)
{
static char buffer[4096]; /* I hope no parameters are larger */
size_t bufsize = sizeof(buffer);
projects / nmh / blobdiff