#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 "sbr/m_mktemp.h"
#include "mhfree.h"
#ifdef HAVE_ICONV
# include <iconv.h>
#endif /* HAVE_ICONV */
+#include "sbr/base64.h"
extern int debugsw;
* 3) Suppress the warning about extraneous trailing ';' in header parameter
* lists.
*/
-int skip_mp_cte_check;
-int suppress_bogus_mp_content_warning;
-int bogus_mp_content;
-int suppress_extraneous_trailing_semicolon_warning;
+bool skip_mp_cte_check;
+bool suppress_bogus_mp_content_warning;
+bool bogus_mp_content;
+bool suppress_extraneous_trailing_semicolon_warning;
/*
* By default, suppress warning about multiple MIME-Version header fields.
*/
-int suppress_multiple_mime_version_warning = 1;
+bool suppress_multiple_mime_version_warning = true;
/* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS],
- *preferred_subtypes[NPREFS];
+mime_type_subtype mime_preference[NPREFS];
int npreferred;
};
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-
/*
* static prototypes
*/
/*
* NOTE WELL: si_key MUST NOT have value of NOTOK
*
- * si_key is 1 if access method is anonymous.
+ * si_val is 1 if access method is anonymous.
*/
struct str2init str2methods[] = {
{ "afs", 1, InitFile },
size_t n;
struct stat statbuf;
- bogus_mp_content = 0;
+ bogus_mp_content = false;
/*
* Check if file is actually standard input
/* allocate the content structure */
NEW0(ct);
ct->c_fp = in;
- ct->c_file = add (file, NULL);
+ ct->c_file = mh_xstrdup(FENDNULL(file));
ct->c_begin = ftell (ct->c_fp) + 1;
/*
char c, *cp, *dp;
char *vrsn;
- vrsn = add (hp->value, NULL);
+ vrsn = mh_xstrdup(FENDNULL(hp->value));
/* Now, cleanup this field */
cp = vrsn;
}
/* get copy of this field */
- ct->c_celine = cp = add (hp->value, NULL);
+ ct->c_celine = cp = mh_xstrdup(FENDNULL(hp->value));
while (isspace ((unsigned char) *cp))
cp++;
goto next_header;
}
- ep = cp = add (hp->value, NULL); /* get a copy */
+ ep = cp = mh_xstrdup(FENDNULL(hp->value)); /* get a copy */
while (isspace ((unsigned char) *cp))
cp++;
ci = &ct->c_ctinfo;
/* store copy of Content-Type line */
- cp = ct->c_ctline = add (cp, NULL);
+ cp = ct->c_ctline = mh_xstrdup(FENDNULL(cp));
while (isspace ((unsigned char) *cp)) /* trim leading spaces */
cp++;
* 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);
* time.
*/
- dispoheader = cp = add(cp, NULL);
+ dispoheader = cp = mh_xstrdup(FENDNULL(cp));
while (isspace ((unsigned char) *cp)) /* trim leading spaces */
cp++;
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). "
if (! suppress_bogus_mp_content_warning) {
inform("bogus multipart content in message %s", ct->c_file);
}
- bogus_mp_content = 1;
+ bogus_mp_content = true;
if (!inout && part) {
p = part->mp_part;
}
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);
}
/* scan for parameters "id", "number", and "total" */
for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
if (!strcasecmp (pm->pm_name, "id")) {
- p->pm_partid = add (pm->pm_value, NULL);
+ p->pm_partid = mh_xstrdup(FENDNULL(pm->pm_value));
continue;
}
if (!strcasecmp (pm->pm_name, "number")) {
*cp = '\0';
if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
- ct->c_digested ? digest : NULL) == OK) {
+ ct->c_digested ? digest : NULL) != OK)
+ goto clean_up;
+
+ {
size_t i;
unsigned char *decoded_p = decoded;
for (i = 0; i < decoded_len; ++i) {
}
}
}
- } else {
- goto clean_up;
}
fseek (ct->c_fp, 0L, SEEK_SET);
sizeof digest))
content_error (NULL, ct,
"content integrity suspect (digest mismatch) -- continuing");
- else
- if (debugsw)
- fprintf (stderr, "content integrity confirmed\n");
+ else if (debugsw)
+ fprintf (stderr, "content integrity confirmed\n");
}
fseek (ce->ce_fp, 0L, SEEK_SET);
len = 0;
fprintf (ce->ce_fp, "%s: %s/%s", TYPE_FIELD, ci->ci_type, ci->ci_subtype);
- len += strlen (TYPE_FIELD) + 2 + strlen (ci->ci_type)
+ len += LEN(TYPE_FIELD) + 2 + strlen (ci->ci_type)
+ 1 + strlen (ci->ci_subtype);
buffer = output_params(len, ci->ci_first_pm, &len, 0);
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);
admonish (cachefile, "unable to fopen for reading");
}
- *fd = fileno (ce->ce_fp);
+ *fd = ce->ce_fp ? fileno (ce->ce_fp) : -1;
return OK;
ready_already:
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
(void) m_unlink (cachefile);
- }
- else
- if (ferror (fp)) {
- admonish (cachefile, "error writing");
- (void) m_unlink (cachefile);
- }
+ } else if (ferror (fp)) {
+ admonish (cachefile, "error writing");
+ (void) m_unlink (cachefile);
+ }
fclose (fp);
}
umask (mask);
}
{
- 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");
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
(void) m_unlink (cachefile);
- }
- else
- if (ferror (fp)) {
- admonish (cachefile, "error writing");
- (void) m_unlink (cachefile);
- }
+ } else if (ferror (fp)) {
+ admonish (cachefile, "error writing");
+ (void) m_unlink (cachefile);
+ }
fclose (fp);
}
umask (mask);
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");
/* 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);
fseeko(ce->ce_fp, 0, SEEK_SET);
*file = ce->ce_file;
- return fd;
+ return fileno(ce->ce_fp);
}
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 {
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;
}
projects / nmh / blobdiff