*/
struct k2v SubMessage[] = {
{ "rfc822", MESSAGE_RFC822 },
- { "partial", MESSAGE_PARTIAL },
{ "external-body", MESSAGE_EXTERNAL },
{ NULL, MESSAGE_UNKNOWN } /* this one must be last! */
};
fprintf (stderr, "%s: %s\n", TYPE_FIELD, cp);
if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
- &ci->ci_comment) == NOTOK)
+ &ci->ci_comment) == NOTOK)
return NOTOK;
for (dp = cp; istoken (*dp); dp++)
cp++;
if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
- &ci->ci_comment) == NOTOK)
+ &ci->ci_comment) == NOTOK)
return NOTOK;
if (*cp != '/') {
cp++;
if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
- &ci->ci_comment) == NOTOK)
+ &ci->ci_comment) == NOTOK)
return NOTOK;
for (dp = cp; istoken (*dp); dp++)
cp++;
if (*cp == '(' && get_comment (ct->c_file, TYPE_FIELD, &cp,
- &ci->ci_comment) == NOTOK)
+ &ci->ci_comment) == NOTOK)
return NOTOK;
if ((status = parse_header_attrs (ct->c_file, TYPE_FIELD, &cp,
- &ci->ci_first_pm, &ci->ci_last_pm,
+ &ci->ci_first_pm, &ci->ci_last_pm,
&ci->ci_comment)) != OK) {
return status == NOTOK ? NOTOK : OK;
}
*/
if (magic && *cp == '*') {
- /*
+ /*
* See if it's a CTE we match on
*/
struct k2v *kv;
fprintf (stderr, "%s: %s\n", DISPO_FIELD, cp);
if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) ==
- NOTOK) {
+ NOTOK) {
free(dispoheader);
return NOTOK;
}
return NOTOK;
if ((status = parse_header_attrs (ct->c_file, DISPO_FIELD, &cp,
- &ct->c_dispo_first, &ct->c_dispo_last,
+ &ct->c_dispo_first, &ct->c_dispo_last,
NULL)) != OK) {
if (status == NOTOK) {
free(dispoheader);
}
if (buildflag)
- free(dispoheader);
+ free(dispoheader);
else
ct->c_dispo = dispoheader;
pos += gotlen;
if (bufp[0] != '-' || bufp[1] != '-')
continue;
+
+ /*
+ * A bit of a lame hack; if this line ends in \r\n then replace
+ * the \r\n with just a \n so that the boundary markers will match
+ * up properly in case this uses "MS-DOS" line endings.
+ */
+
+ if (gotlen > 2 && bufp[gotlen - 1] == '\n' &&
+ bufp[gotlen - 2] == '\r') {
+ /*
+ * Note we don't change getpos here, because it is used to
+ * calculate multipart offsets.
+ */
+ bufp[gotlen - 2] = '\n';
+ bufp[gotlen - 1] = '\0';
+ }
+
if (inout) {
if (strcmp (bufp + 2, m->mp_start))
continue;
case MESSAGE_RFC822:
break;
- case MESSAGE_PARTIAL:
- {
- PM pm;
- struct partial *p;
-
- NEW0(p);
- ct->c_ctparams = (void *) p;
-
- /* 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 = mh_xstrdup(FENDNULL(pm->pm_value));
- continue;
- }
- if (!strcasecmp (pm->pm_name, "number")) {
- if (sscanf (pm->pm_value, "%d", &p->pm_partno) != 1
- || p->pm_partno < 1) {
-invalid_param:
- inform("invalid %s parameter for \"%s/%s\" type in message %s's %s field",
- pm->pm_name, ci->ci_type, ci->ci_subtype,
- ct->c_file, TYPE_FIELD);
- return NOTOK;
- }
- continue;
- }
- if (!strcasecmp (pm->pm_name, "total")) {
- if (sscanf (pm->pm_value, "%d", &p->pm_maxno) != 1
- || p->pm_maxno < 1)
- goto invalid_param;
- continue;
- }
- }
-
- if (!p->pm_partid
- || !p->pm_partno
- || (p->pm_maxno && p->pm_partno > p->pm_maxno)) {
- inform("invalid parameters for \"%s/%s\" type in message %s's %s field",
- ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
- return NOTOK;
- }
- }
- break;
-
case MESSAGE_EXTERNAL:
{
int exresult;
e->eb_url = u = mh_xmalloc(strlen(pm->pm_value) + 1);
for (; *p != '\0'; p++) {
- if (! isspace((unsigned char) *p))
+ if (! isspace((unsigned char) *p))
*u++ = *p;
}
if (e->eb_flags) {
user = "anonymous";
- snprintf (buffer, sizeof(buffer), "%s@%s", getusername (),
+ snprintf (buffer, sizeof(buffer), "%s@%s", getusername (1),
LocalName (1));
pass = buffer;
} else {
vec[vecp++] = e->eb_name;
vec[vecp++] = ce->ce_file,
vec[vecp++] = e->eb_mode && !strcasecmp (e->eb_mode, "ascii")
- ? "ascii" : "binary";
+ ? "ascii" : "binary";
vec[vecp] = NULL;
fflush (stdout);
pid_t child_id;
if ((urlprog = context_find(nmhaccessurl)) && *urlprog == '\0')
- urlprog = NULL;
+ urlprog = NULL;
if (! urlprog) {
- content_error(NULL, ct, "No entry for nmh-access-url in profile");
- return NOTOK;
+ content_error(NULL, ct, "No entry for nmh-access-url in profile");
+ return NOTOK;
}
switch (openExternal(e->eb_parent, ce, file, &fd)) {
- case NOTOK:
+ case NOTOK:
return NOTOK;
case OK:
}
if (!e->eb_url) {
- content_error(NULL, ct, "missing url parameter");
+ content_error(NULL, ct, "missing url parameter");
return NOTOK;
}
}
if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
- content_error(ce->ce_file, ct, "unable to fopen for read/writing");
+ content_error(ce->ce_file, ct, "unable to fopen for read/writing");
return NOTOK;
}
switch (child_id = fork()) {
case NOTOK:
- adios ("fork", "unable to");
+ adios ("fork", "unable to");
/* NOTREACHED */
case OK:
- argsplit_msgarg(&args, urlprog, &program);
+ argsplit_msgarg(&args, urlprog, &program);
app_msgarg(&args, e->eb_url);
app_msgarg(&args, NULL);
dup2(fileno(ce->ce_fp), 1);
/* NOTREACHED */
default:
- if (pidXwait(child_id, NULL)) {
+ if (pidXwait(child_id, NULL)) {
ce->ce_unlink = 1;
return NOTOK;
}
switch (subtype) {
case MESSAGE_RFC822:
return "rfc822";
- case MESSAGE_PARTIAL:
- return "partial";
case MESSAGE_EXTERNAL:
return "external";
default:
continue;
}
if (*vp == '*' && vp == up - 1) {
- encoded = true;
+ encoded = true;
} else if (partial) {
if (isdigit((unsigned char) *vp))
index = *vp - '0' + index * 10;
* parameter).
*/
if (index == 0) {
- vp = dp;
+ vp = dp;
while (*vp != '\'' && !isspace((unsigned char) *vp) &&
*vp != '\0')
vp++;
valptr = mh_xmalloc(len + 1);
if (*dp == '"') {
- int i;
+ int i;
for (cp = dp + 1, vp = valptr, i = 0; i < len; i++) {
if (*cp == '\\') {
cp++;
}
cp++;
} else {
- strncpy(valptr, cp = dp, len);
+ strncpy(valptr, cp = dp, len);
cp += len;
}
if (index == 0 && encoded) {
free(pp->charset);
- pp->charset = charset;
+ pp->charset = charset;
free(pp->lang);
pp->lang = lang;
}
*/
for (pp = phead; pp != NULL; ) {
- char *p, *q;
+ char *p, *q;
size_t tlen = 0;
int pindex = 0;
for (sp = pp->sechead; sp != NULL; sp = sp->next) {
if (index > 0) {
q += snprintf(q, sizeof(line) - (q - line), "%s*%d",
- params->pm_name, index);
+ params->pm_name, index);
} else {
strncpy(q, params->pm_name, sizeof(line) - (q - line));
q += strlen(q);
if (encode)
i = encode_param(params, q, sizeof(line) - (q - line),
- strlen(params->pm_value + valoff), valoff, index);
+ strlen(params->pm_value + valoff), valoff, index);
else
i = normal_param(params, q, sizeof(line) - (q - line),
- strlen(params->pm_value + valoff), valoff);
+ strlen(params->pm_value + valoff), valoff);
if (i == 0) {
free(paramout);
len += 3;
maxfit -= 3;
} else {
- len++;
+ len++;
maxfit--;
}
/*
fitlimit++;
}
} else {
- /*
+ /*
* Calculate the string length, but add room for quoting \
* and " if necessary. Also account for quotes at beginning
* and end.
switch (*p) {
case '"':
case '\\':
- len++;
+ len++;
maxfit--;
/* FALLTHRU */
default:
(*last)->pm_next = pm;
*last = pm;
} else {
- *first = pm;
+ *first = pm;
*last = pm;
}
while (first != NULL) {
if (strcasecmp(name, first->pm_name) == 0) {
if (fetchonly)
- return first->pm_value;
+ return first->pm_value;
return getcpy(get_param_value(first, replace));
}
first = first->pm_next;
*/
if (!pm->pm_charset || check_charset(pm->pm_charset,
- strlen(pm->pm_charset))) {
+ strlen(pm->pm_charset))) {
return pm->pm_value;
}
projects / nmh / blobdiff