X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=8e8b3605cb1134d8fbbbd939c81fc9f01fb693e6;hp=2ee95f437cc95f4e50e7fd472586ca3646cfd343;hb=79cbafe7268202d5b9c231b2d25472c152caa709;hpb=70bc44ec2fd9f4033a6190868979991338ba6664 diff --git a/uip/mhparse.c b/uip/mhparse.c index 2ee95f4..8e8b360 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -8,14 +8,16 @@ #include #include -#include -#include -#include #include +#include #include #include #include #include +#include +#include +#include +#include extern int debugsw; @@ -23,10 +25,6 @@ extern int endian; /* mhmisc.c */ extern pid_t xpid; /* mhshowsbr.c */ -/* cache policies */ -extern int rcachesw; /* mhcachesbr.c */ -extern int wcachesw; /* mhcachesbr.c */ - /* ** Directory to place temp files. This must ** be set before these routines are called. @@ -80,9 +78,6 @@ struct k2v SubApplication[] = { }; -/* mhcachesbr.c */ -int find_cache(CT, int, int *, char *, char *, int); - /* mhmisc.c */ int part_ok(CT, int); int type_ok(CT, int); @@ -112,13 +107,6 @@ static int openBase64(CT, char **); static int InitQuoted(CT); static int openQuoted(CT, char **); static int Init7Bit(CT); -static int openExternal(CT, CT, CE, char **, int *); -static int InitFile(CT); -static int openFile(CT, char **); -static int InitFTP(CT); -static int openFTP(CT, char **); -static int InitMail(CT); -static int openMail(CT, char **); struct str2init str2cts[] = { { "application", CT_APPLICATION, InitApplication }, @@ -142,20 +130,6 @@ struct str2init str2ces[] = { { NULL, CE_UNKNOWN, NULL }, }; -/* -** NOTE WELL: si_key MUST NOT have value of NOTOK -** -** si_key is 1 if access method is anonymous. -*/ -struct str2init str2methods[] = { - { "afs", 1, InitFile }, - { "anon-ftp", 1, InitFTP }, - { "ftp", 0, InitFTP }, - { "local-file", 0, InitFile }, - { "mail-server", 0, InitMail }, - { NULL, 0, NULL } -}; - int pidcheck(int status) @@ -165,7 +139,7 @@ pidcheck(int status) fflush(stdout); fflush(stderr); - done(1); + exit(EX_SOFTWARE); return 1; } @@ -192,7 +166,7 @@ parse_mime(char *file) advise("mhparse", "unable to create temporary file"); return NULL; } - file = getcpy(tfile); + file = mh_xstrdup(tfile); chmod(file, 0600); while (fgets(buffer, sizeof(buffer), stdin)) @@ -257,71 +231,56 @@ parse_mime(char *file) static CT get_content(FILE *in, char *file, int toplevel) { - int compnum, state; - char buf[BUFSIZ], name[NAMESZ]; - char *np, *vp; + enum state state; + struct field f = {{0}}; + int compnum; CT ct; HF hp; /* allocate the content structure */ - if (!(ct = (CT) calloc(1, sizeof(*ct)))) - adios(NULL, "out of memory"); + ct = mh_xcalloc(1, sizeof(*ct)); ct->c_fp = in; - ct->c_file = getcpy(file); + ct->c_file = mh_xstrdup(file); ct->c_begin = ftell(ct->c_fp) + 1; /* ** Parse the header fields for this ** content into a linked list. */ - for (compnum = 1, state = FLD;;) { - switch (state = m_getfld(state, name, buf, sizeof(buf), in)) { - case FLD: - case FLDPLUS: - case FLDEOF: + for (compnum = 1, state = FLD2;;) { + switch (state = m_getfld2(state, &f, in)) { + case LENERR2: + state = FLD2; + /* FALL */ + case FLD2: compnum++; - /* get copies of the buffers */ - np = getcpy(name); - vp = getcpy(buf); + /* add the header data to the list */ + add_header(ct, mh_xstrdup(f.name), mh_xstrdup(f.value)); - /* if necessary, get rest of field */ - while (state == FLDPLUS) { - state = m_getfld(state, name, buf, - sizeof(buf), in); - vp = add(buf, vp); /* add to previous value */ - } - - /* Now add the header data to the list */ - add_header(ct, np, vp); - - /* continue, if this isn't the last header field */ - if (state != FLDEOF) { - ct->c_begin = ftell(in) + 1; - continue; - } - /* else fall... */ + ct->c_begin = ftell(in) + 1; + continue; - case BODY: - case BODYEOF: - ct->c_begin = ftell(in) - strlen(buf); + case BODY2: + ct->c_begin = ftell(in) - strlen(f.value); break; - case FILEEOF: + case FILEEOF2: ct->c_begin = ftell(in); break; - case LENERR: - case FMTERR: - adios(NULL, "message format error in component #%d", - compnum); + case FMTERR2: + advise(NULL, "message format error in component #%d", compnum); + state = FLD2; + continue; + + case IOERR2: + adios(EX_IOERR, "m_getfld2", "io error"); default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } - - /* break out of the loop */ break; } @@ -344,7 +303,7 @@ get_content(FILE *in, char *file, int toplevel) advise(NULL, "message %s has multiple %s: fields", ct->c_file, VRSN_FIELD); goto next_header; } - ct->c_vrsn = getcpy(hp->value); + ct->c_vrsn = mh_xstrdup(hp->value); /* Now, cleanup this field */ cp = ct->c_vrsn; @@ -416,7 +375,7 @@ get_content(FILE *in, char *file, int toplevel) } /* get copy of this field */ - ct->c_celine = cp = getcpy(hp->value); + ct->c_celine = cp = mh_xstrdup(hp->value); while (isspace(*cp)) cp++; @@ -508,7 +467,7 @@ add_header(CT ct, char *name, char *value) HF hp; /* allocate header field structure */ - hp = mh_xmalloc(sizeof(*hp)); + hp = mh_xcalloc(1, sizeof(*hp)); /* link data into header structure */ hp->name = name; @@ -563,24 +522,24 @@ incl_name_value(unsigned char *buf, char *name, char *value) { ** Insert at first semicolon, if any. ** If none, append to end. */ - prefix = getcpy(buf); + prefix = mh_xstrdup(buf); if ((cp = strchr(prefix, ';'))) { suffix = concat(cp, NULL); *cp = '\0'; newbuf = concat(prefix, insertion, suffix, "\n", NULL); - free(suffix); + mh_free0(&suffix); } else { /* Append to end. */ newbuf = concat(buf, insertion, "\n", NULL); } - free(prefix); - free(insertion); - free(buf); + mh_free0(&prefix); + mh_free0(&insertion); + mh_free0(&buf); } - free(name_plus_equal); + mh_free0(&name_plus_equal); } return newbuf; @@ -591,14 +550,20 @@ incl_name_value(unsigned char *buf, char *name, char *value) { ** one, return the entire value. Note that, for example, a name_suffix ** of name will match filename="foo", and return foo. */ -static char * +char * extract_name_value(char *name_suffix, char *value) { - char *extracted_name_value = value; - char *name_suffix_plus_quote = concat(name_suffix, "=\"", NULL); - char *name_suffix_equals = strstr(value, name_suffix_plus_quote); + char *extracted_name_value; + char *name_suffix_plus_quote; + char *name_suffix_equals; char *cp; - free(name_suffix_plus_quote); + if (!value) { + return value; + } + extracted_name_value = value; + name_suffix_plus_quote = concat(name_suffix, "=\"", NULL); + name_suffix_equals = strstr(value, name_suffix_plus_quote); + mh_free0(&name_suffix_plus_quote); if (name_suffix_equals) { char *name_suffix_begin; @@ -610,7 +575,7 @@ extract_name_value(char *name_suffix, char *value) { for (; *cp != '"'; ++cp) ; - extracted_name_value = mh_xmalloc(cp - name_suffix_begin + 1); + extracted_name_value = mh_xcalloc(cp - name_suffix_begin + 1, sizeof(char)); memcpy(extracted_name_value, name_suffix_begin, cp - name_suffix_begin); extracted_name_value[cp - name_suffix_begin] = '\0'; @@ -636,7 +601,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic) i = strlen(invo_name) + 2; /* store copy of Content-Type line */ - cp = ct->c_ctline = getcpy(cp); + cp = ct->c_ctline = mh_xstrdup(cp); while (isspace(*cp)) /* trim leading spaces */ cp++; @@ -660,7 +625,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic) for (dp = cp; istoken(*dp); dp++) continue; c = *dp, *dp = '\0'; - ci->ci_type = getcpy(cp); /* store content type */ + ci->ci_type = mh_xstrdup(cp); /* store content type */ *dp = c, cp = dp; if (!*ci->ci_type) { @@ -682,7 +647,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic) if (*cp != '/') { if (!magic) - ci->ci_subtype = getcpy(""); + ci->ci_subtype = mh_xstrdup(""); goto magic_skip; } @@ -696,7 +661,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic) for (dp = cp; istoken(*dp); dp++) continue; c = *dp, *dp = '\0'; - ci->ci_subtype = getcpy(cp); /* store the content subtype */ + ci->ci_subtype = mh_xstrdup(cp); /* store the content subtype */ *dp = c, cp = dp; if (!*ci->ci_subtype) { @@ -753,7 +718,7 @@ magic_skip: return NOTOK; } - vp = (*ap = getcpy(cp)) + (up - cp); + vp = (*ap = mh_xstrdup(cp)) + (up - cp); *vp = '\0'; for (dp++; isspace(*dp);) dp++; @@ -792,7 +757,9 @@ bad_quote: } if (!*vp) { advise(NULL, "invalid parameter in message %s's %s: field\n%*.*s(parameter %s)", ct->c_file, TYPE_FIELD, i, i, "", *ap); - return NOTOK; + *ci->ci_values[ap - ci->ci_attrs] = '\0'; + *ci->ci_attrs[ap - ci->ci_attrs] = '\0'; + continue; } ap++; @@ -808,8 +775,7 @@ bad_quote: */ if (magic && *cp == '<') { if (ct->c_id) { - free(ct->c_id); - ct->c_id = NULL; + mh_free0(&(ct->c_id)); } if (!(dp = strchr(ct->c_id = ++cp, '>'))) { advise(NULL, "invalid ID in message %s", ct->c_file); @@ -889,7 +855,7 @@ bad_quote: */ if (*cp) { if (magic) { - ci->ci_magic = getcpy(cp); + ci->ci_magic = mh_xstrdup(cp); /* ** If there is a Content-Disposition header and @@ -956,9 +922,9 @@ invalid: if (istype) { if ((dp = ci->ci_comment)) { ci->ci_comment = concat(dp, " ", buffer, NULL); - free(dp); + mh_free0(&dp); } else { - ci->ci_comment = getcpy(buffer); + ci->ci_comment = mh_xstrdup(buffer); } } @@ -991,9 +957,7 @@ InitGeneric(CT ct) static int InitText(CT ct) { - char buffer[BUFSIZ]; - char *chset = NULL; - char **ap, **ep, *cp; + char **ap, **ep; struct k2v *kv; struct text *t; CI ci = &ct->c_ctinfo; @@ -1009,8 +973,7 @@ InitText(CT ct) ct->c_subtype = kv->kv_value; /* allocate text character set structure */ - if ((t = (struct text *) calloc(1, sizeof(*t))) == NULL) - adios(NULL, "out of memory"); + t = mh_xcalloc(1, sizeof(*t)); ct->c_ctparams = (void *) t; /* scan for charset parameter */ @@ -1020,10 +983,11 @@ InitText(CT ct) /* check if content specified a character set */ if (*ap) { + /* store its name */ + ct->c_charset = mh_xstrdup(norm_charmap(*ep)); /* match character set or set to CHARSET_UNKNOWN */ for (kv = Charset; kv->kv_key; kv++) { if (!mh_strcasecmp(*ep, kv->kv_key)) { - chset = *ep; break; } } @@ -1032,20 +996,6 @@ InitText(CT ct) t->tx_charset = CHARSET_UNSPECIFIED; } - /* - ** If we can not handle character set natively, - ** then check profile for string to modify the - ** terminal or display method. - ** - ** termproc is for mhshow, though mhlist -debug prints it, too. - */ - if (chset != NULL && !check_charset(chset, strlen(chset))) { - snprintf(buffer, sizeof(buffer), "%s-charset-%s", - invo_name, chset); - if ((cp = context_find(buffer))) - ct->c_termproc = getcpy(cp); - } - return OK; } @@ -1075,8 +1025,8 @@ InitMultiPart(CT ct) */ if (ct->c_encoding != CE_7BIT && ct->c_encoding != CE_8BIT && ct->c_encoding != CE_BINARY) { - admonish(NULL, "\"%s/%s\" type in message %s must be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file); - return NOTOK; + admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file); + ct->c_encoding = CE_7BIT; } /* match subtype */ @@ -1104,8 +1054,7 @@ InitMultiPart(CT ct) } /* allocate primary structure for multipart info */ - if ((m = (struct multipart *) calloc(1, sizeof(*m))) == NULL) - adios(NULL, "out of memory"); + m = mh_xcalloc(1, sizeof(*m)); ct->c_ctparams = (void *) m; /* check if boundary parameter contains only whitespace characters */ @@ -1148,9 +1097,7 @@ InitMultiPart(CT ct) if (strcmp(buffer + 2, m->mp_start)!=0) continue; next_part: - if ((part = (struct part *) calloc(1, sizeof(*part))) - == NULL) - adios(NULL, "out of memory"); + part = mh_xcalloc(1, sizeof(*part)); *next = part; next = &part->mp_next; @@ -1193,7 +1140,7 @@ end_part: continue; *next = NULL; free_content(p); - free((char *) part); + mh_free0(&part); } } @@ -1224,7 +1171,7 @@ last_part: p = part->mp_part; sprintf(pp, "%d", partnum); - p->c_partno = getcpy(partnam); + p->c_partno = mh_xstrdup(partnam); /* initialize the content of the subparts */ if (p->c_ctinitfnx && (*p->c_ctinitfnx) (p) == NOTOK) { @@ -1264,8 +1211,7 @@ reverse_parts(CT ct) i++; /* allocate array of pointers to the parts */ - if (!(base = (struct part **) calloc((size_t) (i + 1), sizeof(*base)))) - adios(NULL, "out of memory"); + base = mh_xcalloc(i + 1, sizeof(*base)); bmp = base; /* point at all the parts */ @@ -1283,7 +1229,7 @@ reverse_parts(CT ct) *next = NULL; /* free array of pointers */ - free((char *) base); + mh_free0(&base); } @@ -1297,9 +1243,9 @@ InitMessage(CT ct) struct k2v *kv; CI ci = &ct->c_ctinfo; - if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) { - admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit", ci->ci_type, ci->ci_subtype, ct->c_file); - return NOTOK; + if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT) && (ct->c_encoding != CE_BINARY)) { + admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file); + ct->c_encoding = CE_7BIT; } /* check for missing subtype */ @@ -1321,8 +1267,7 @@ InitMessage(CT ct) char **ap, **ep; struct partial *p; - if ((p = (struct partial *) calloc(1, sizeof(*p))) == NULL) - adios(NULL, "out of memory"); + p = mh_xcalloc(1, sizeof(*p)); ct->c_ctparams = (void *) p; /* @@ -1331,7 +1276,7 @@ InitMessage(CT ct) */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { if (!mh_strcasecmp(*ap, "id")) { - p->pm_partid = getcpy(*ep); + p->pm_partid = mh_xstrdup(*ep); continue; } if (!mh_strcasecmp(*ap, "number")) { @@ -1360,15 +1305,9 @@ invalid_param: case MESSAGE_EXTERNAL: { - int exresult; - struct exbody *e; CT p; FILE *fp; - if ((e = (struct exbody *) calloc(1, sizeof(*e))) == NULL) - adios(NULL, "out of memory"); - ct->c_ctparams = (void *) e; - if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) { advise(ct->c_file, "unable to open for reading"); return NOTOK; @@ -1381,46 +1320,12 @@ invalid_param: return NOTOK; } - e->eb_parent = ct; - e->eb_content = p; - p->c_ctexbody = e; - if ((exresult = params_external(ct, 0)) != NOTOK && - p->c_ceopenfnx == openMail) { - int cc, size; - char *bp; - - if ((size = ct->c_end - p->c_begin) <= 0) { - if (!e->eb_subject) - content_error(NULL, ct, "empty body for access-type=mail-server"); - goto no_body; - } - - e->eb_body = bp = mh_xmalloc((unsigned) size); - fseek(p->c_fp, p->c_begin, SEEK_SET); - while (size > 0) - switch (cc = fread(bp, sizeof(*bp), size, p->c_fp)) { - case NOTOK: - adios("failed", "fread"); - case OK: - adios(NULL, "unexpected EOF from fread"); - default: - bp += cc, size -= cc; - break; - } - *bp = 0; - } -no_body: p->c_fp = NULL; p->c_end = p->c_begin; fclose(ct->c_fp); ct->c_fp = NULL; - if (exresult == NOTOK) - return NOTOK; - if (e->eb_flags == NOTOK) - return OK; - switch (p->c_type) { case CT_MULTIPART: break; @@ -1428,9 +1333,8 @@ no_body: case CT_MESSAGE: if (p->c_subtype != MESSAGE_RFC822) break; - /* else fall... */ + /* else fall... */ default: - e->eb_partno = ct->c_partno; if (p->c_ctinitfnx) (*p->c_ctinitfnx) (p); break; @@ -1446,83 +1350,6 @@ no_body: } -int -params_external(CT ct, int composing) -{ - char **ap, **ep; - struct exbody *e = (struct exbody *) ct->c_ctparams; - CI ci = &ct->c_ctinfo; - - for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!mh_strcasecmp(*ap, "access-type")) { - struct str2init *s2i; - CT p = e->eb_content; - - for (s2i = str2methods; s2i->si_key; s2i++) - if (!mh_strcasecmp(*ep, s2i->si_key)) - break; - if (!s2i->si_key) { - e->eb_access = *ep; - e->eb_flags = NOTOK; - p->c_encoding = CE_EXTERNAL; - continue; - } - e->eb_access = s2i->si_key; - e->eb_flags = s2i->si_val; - p->c_encoding = CE_EXTERNAL; - - /* Call the Init function for this external type */ - if ((*s2i->si_init)(p) == NOTOK) - return NOTOK; - continue; - } - if (!mh_strcasecmp(*ap, "name")) { - e->eb_name = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "permission")) { - e->eb_permission = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "site")) { - e->eb_site = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "directory")) { - e->eb_dir = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "mode")) { - e->eb_mode = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "size")) { - sscanf(*ep, "%lu", &e->eb_size); - continue; - } - if (!mh_strcasecmp(*ap, "server")) { - e->eb_server = *ep; - continue; - } - if (!mh_strcasecmp(*ap, "subject")) { - e->eb_subject = *ep; - continue; - } - if (composing && !mh_strcasecmp(*ap, "body")) { - e->eb_body = getcpy(*ep); - continue; - } - } - - if (!e->eb_access) { - advise(NULL, "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; - } - - return OK; -} - - /* ** APPLICATION */ @@ -1552,8 +1379,7 @@ init_encoding(CT ct, OpenCEFunc openfnx) { CE ce; - if ((ce = (CE) calloc(1, sizeof(*ce))) == NULL) - adios(NULL, "out of memory"); + ce = mh_xcalloc(1, sizeof(*ce)); ct->c_cefile = ce; ct->c_ceopenfnx = openfnx; @@ -1683,10 +1509,10 @@ openBase64(CT ct, char **file) } if (*file == NULL) { - ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL)); + ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL)); ce->ce_unlink = 1; } else { - ce->ce_file = getcpy(*file); + ce->ce_file = mh_xstrdup(*file); ce->ce_unlink = 0; } @@ -1697,7 +1523,7 @@ openBase64(CT ct, char **file) cp = context_find(buffer); if (cp == NULL || *cp == '\0') { snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name, - ci->ci_type); + ci->ci_type); cp = context_find(buffer); } if (cp != NULL && *cp != '\0') { @@ -1706,13 +1532,13 @@ openBase64(CT ct, char **file) ** Temporary file already exists, so we rename to ** version with extension. */ - char *file_org = strdup(ce->ce_file); + char *file_org = mh_xstrdup(ce->ce_file); ce->ce_file = add(cp, ce->ce_file); if (rename(file_org, ce->ce_file)) { - adios(ce->ce_file, "unable to rename %s to ", + adios(EX_IOERR, ce->ce_file, "unable to rename %s to ", file_org); } - free(file_org); + mh_free0(&file_org); } else { ce->ce_file = add(cp, ce->ce_file); @@ -1726,7 +1552,7 @@ openBase64(CT ct, char **file) } if ((len = ct->c_end - ct->c_begin) < 0) - adios(NULL, "internal error(1)"); + adios(EX_SOFTWARE, NULL, "internal error(1)"); if (!ct->c_fp) { if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) { @@ -1894,10 +1720,10 @@ openQuoted(CT ct, char **file) } if (*file == NULL) { - ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL)); + ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL)); ce->ce_unlink = 1; } else { - ce->ce_file = getcpy(*file); + ce->ce_file = mh_xstrdup(*file); ce->ce_unlink = 0; } @@ -1913,15 +1739,17 @@ openQuoted(CT ct, char **file) } if (cp != NULL && *cp != '\0') { if (ce->ce_unlink) { - // Temporary file already exists, so we rename to - // version with extension. - char *file_org = strdup(ce->ce_file); + /* + ** Temporary file already exists, so we rename to + ** version with extension. + */ + char *file_org = mh_xstrdup(ce->ce_file); ce->ce_file = add(cp, ce->ce_file); if (rename(file_org, ce->ce_file)) { - adios(ce->ce_file, "unable to rename %s to ", + adios(EX_IOERR, ce->ce_file, "unable to rename %s to ", file_org); } - free(file_org); + mh_free0(&file_org); } else { ce->ce_file = add(cp, ce->ce_file); @@ -1935,7 +1763,7 @@ openQuoted(CT ct, char **file) } if ((len = ct->c_end - ct->c_begin) < 0) - adios(NULL, "internal error(2)"); + adios(EX_SOFTWARE, NULL, "internal error(2)"); if (!ct->c_fp) { if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) { @@ -2109,10 +1937,10 @@ open7Bit(CT ct, char **file) } if (*file == NULL) { - ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL)); + ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL)); ce->ce_unlink = 1; } else { - ce->ce_file = getcpy(*file); + ce->ce_file = mh_xstrdup(*file); ce->ce_unlink = 0; } @@ -2123,7 +1951,7 @@ open7Bit(CT ct, char **file) cp = context_find(buffer); if (cp == NULL || *cp == '\0') { snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name, - ci->ci_type); + ci->ci_type); cp = context_find(buffer); } if (cp != NULL && *cp != '\0') { @@ -2132,13 +1960,13 @@ open7Bit(CT ct, char **file) ** Temporary file already exists, so we rename to ** version with extension. */ - char *file_org = strdup(ce->ce_file); + char *file_org = mh_xstrdup(ce->ce_file); ce->ce_file = add(cp, ce->ce_file); if (rename(file_org, ce->ce_file)) { - adios(ce->ce_file, "unable to rename %s to ", + adios(EX_IOERR, ce->ce_file, "unable to rename %s to ", file_org); } - free(file_org); + mh_free0(&file_org); } else { ce->ce_file = add(cp, ce->ce_file); @@ -2201,7 +2029,7 @@ open7Bit(CT ct, char **file) } if ((len = ct->c_end - ct->c_begin) < 0) - adios(NULL, "internal error(3)"); + adios(EX_SOFTWARE, NULL, "internal error(3)"); if (!ct->c_fp) { if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) { @@ -2261,452 +2089,3 @@ clean_up: } return NOTOK; } - - -/* -** External -*/ - -static int -openExternal(CT ct, CT cb, CE ce, char **file, int *fd) -{ - char cachefile[BUFSIZ]; - - if (ce->ce_fp) { - fseek(ce->ce_fp, 0L, SEEK_SET); - goto ready_already; - } - - if (ce->ce_file) { - if ((ce->ce_fp = fopen(ce->ce_file, "r")) == NULL) { - content_error(ce->ce_file, ct, - "unable to fopen for reading"); - return NOTOK; - } - goto ready_already; - } - - if (find_cache(ct, rcachesw, (int *) 0, cb->c_id, - cachefile, sizeof(cachefile)) != NOTOK) { - if ((ce->ce_fp = fopen(cachefile, "r"))) { - ce->ce_file = getcpy(cachefile); - ce->ce_unlink = 0; - goto ready_already; - } else { - admonish(cachefile, "unable to fopen for reading"); - } - } - - return OK; - -ready_already: - *file = ce->ce_file; - *fd = fileno(ce->ce_fp); - return DONE; -} - -/* -** File -*/ - -static int -InitFile(CT ct) -{ - return init_encoding(ct, openFile); -} - - -static int -openFile(CT ct, char **file) -{ - int fd, cachetype; - char cachefile[BUFSIZ]; - struct exbody *e = ct->c_ctexbody; - CE ce = ct->c_cefile; - - switch (openExternal(e->eb_parent, e->eb_content, ce, file, &fd)) { - case NOTOK: - return NOTOK; - case OK: - break; - case DONE: - return fd; - } - - if (!e->eb_name) { - content_error(NULL, ct, "missing name parameter"); - return NOTOK; - } - - ce->ce_file = getcpy(e->eb_name); - ce->ce_unlink = 0; - - if ((ce->ce_fp = fopen(ce->ce_file, "r")) == NULL) { - content_error(ce->ce_file, ct, "unable to fopen for reading"); - return NOTOK; - } - - if ((!e->eb_permission || - mh_strcasecmp(e->eb_permission, "read-write")) && - find_cache(NULL, wcachesw, &cachetype, - e->eb_content->c_id, cachefile, sizeof(cachefile)) - != NOTOK) { - int mask; - FILE *fp; - - mask = umask(cachetype ? ~m_gmprot() : 0222); - if ((fp = fopen(cachefile, "w"))) { - int cc; - char buffer[BUFSIZ]; - FILE *gp = ce->ce_fp; - - fseek(gp, 0L, SEEK_SET); - - while ((cc = fread(buffer, sizeof(*buffer), - sizeof(buffer), gp)) > 0) - fwrite(buffer, sizeof(*buffer), cc, fp); - fflush(fp); - - if (ferror(gp)) { - admonish(ce->ce_file, "error reading"); - unlink(cachefile); - } else if (ferror(fp)) { - admonish(cachefile, "error writing"); - unlink(cachefile); - } - fclose(fp); - } - umask(mask); - } - - fseek(ce->ce_fp, 0L, SEEK_SET); - *file = ce->ce_file; - return fileno(ce->ce_fp); -} - -/* -** FTP -*/ - -static int -InitFTP(CT ct) -{ - return init_encoding(ct, openFTP); -} - - -static int -openFTP(CT ct, char **file) -{ - int cachetype, caching, fd; - int len, buflen; - char *bp, *ftp, *user, *pass; - char buffer[BUFSIZ], cachefile[BUFSIZ]; - struct exbody *e; - CE ce; - static char *username = NULL; - static char *password = NULL; - int child_id, vecp; - char *vec[9]; - - e = ct->c_ctexbody; - ce = ct->c_cefile; - - if ((ftp = context_find(nmhaccessftp)) && !*ftp) - ftp = NULL; - - if (!ftp) - return NOTOK; - - switch (openExternal(e->eb_parent, e->eb_content, ce, file, &fd)) { - case NOTOK: - return NOTOK; - case OK: - break; - case DONE: - return fd; - } - - if (!e->eb_name || !e->eb_site) { - content_error(NULL, ct, "missing %s parameter", - e->eb_name ? "site": "name"); - return NOTOK; - } - - if (xpid) { - if (xpid < 0) - xpid = -xpid; - pidcheck(pidwait(xpid, NOTOK)); - xpid = 0; - } - - /* Get the buffer ready to go */ - bp = buffer; - buflen = sizeof(buffer); - - /* - ** Construct the query message for user - */ - snprintf(bp, buflen, "Retrieve %s", e->eb_name); - len = strlen(bp); - bp += len; - buflen -= len; - - if (e->eb_partno) { - snprintf(bp, buflen, " (content %s)", e->eb_partno); - len = strlen(bp); - bp += len; - buflen -= len; - } - - snprintf(bp, buflen, "\n using %sFTP from site %s", - e->eb_flags ? "anonymous " : "", e->eb_site); - len = strlen(bp); - bp += len; - buflen -= len; - - if (e->eb_size > 0) { - snprintf(bp, buflen, " (%lu octets)", e->eb_size); - len = strlen(bp); - bp += len; - buflen -= len; - } - snprintf(bp, buflen, "? "); - - /* - ** Now, check the answer - */ - if (!getanswer(buffer)) - return NOTOK; - - if (e->eb_flags) { - user = "anonymous"; - snprintf(buffer, sizeof(buffer), "%s@%s", getusername(), - LocalName()); - pass = buffer; - } else { - ruserpass(e->eb_site, &username, &password); - user = username; - pass = password; - } - - ce->ce_unlink = (*file == NULL); - caching = 0; - cachefile[0] = '\0'; - if ((!e->eb_permission || - mh_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; - } - } - - if (*file) - ce->ce_file = getcpy(*file); - else if (caching) - ce->ce_file = getcpy(cachefile); - else - ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL)); - - if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) { - content_error (ce->ce_file, ct, - "unable to fopen for reading/writing"); - return NOTOK; - } - - vecp = 0; - vec[vecp++] = mhbasename(ftp); - vec[vecp++] = e->eb_site; - vec[vecp++] = user; - vec[vecp++] = pass; - vec[vecp++] = e->eb_dir; - vec[vecp++] = e->eb_name; - vec[vecp++] = ce->ce_file, - vec[vecp++] = e->eb_mode && - !mh_strcasecmp(e->eb_mode, "ascii") ? - "ascii" : "binary"; - vec[vecp] = NULL; - - fflush(stdout); - - switch (child_id = fork()) { - case NOTOK: - adios("fork", "unable to"); - /* NOTREACHED */ - - case OK: - close(fileno(ce->ce_fp)); - execvp(ftp, vec); - fprintf(stderr, "unable to exec "); - perror(ftp); - _exit(-1); - /* NOTREACHED */ - - default: - if (pidXwait(child_id, NULL)) { - username = password = NULL; - ce->ce_unlink = 1; - return NOTOK; - } - break; - } - - if (cachefile[0]) { - if (caching) - chmod(cachefile, cachetype ? m_gmprot() : 0444); - else { - int mask; - FILE *fp; - - mask = umask(cachetype ? ~m_gmprot() : 0222); - if ((fp = fopen(cachefile, "w"))) { - int cc; - FILE *gp = ce->ce_fp; - - fseek(gp, 0L, SEEK_SET); - - while ((cc= fread(buffer, sizeof(*buffer), - sizeof(buffer), gp)) > 0) - fwrite(buffer, sizeof(*buffer), cc, fp); - fflush(fp); - - if (ferror(gp)) { - admonish(ce->ce_file, "error reading"); - unlink(cachefile); - } else if (ferror(fp)) { - admonish(cachefile, "error writing"); - unlink(cachefile); - } - fclose(fp); - } - umask(mask); - } - } - - fseek(ce->ce_fp, 0L, SEEK_SET); - *file = ce->ce_file; - return fileno(ce->ce_fp); -} - - -/* -** Mail -*/ - -static int -InitMail(CT ct) -{ - return init_encoding(ct, openMail); -} - - -static int -openMail(CT ct, char **file) -{ - int child_id, fd, vecp; - int len, buflen; - char *bp, buffer[BUFSIZ], *vec[7]; - struct exbody *e = ct->c_ctexbody; - CE ce = ct->c_cefile; - - switch (openExternal(e->eb_parent, e->eb_content, ce, file, &fd)) { - case NOTOK: - return NOTOK; - case OK: - break; - case DONE: - return fd; - } - - if (!e->eb_server) { - content_error(NULL, ct, "missing server parameter"); - return NOTOK; - } - - if (xpid) { - if (xpid < 0) - xpid = -xpid; - pidcheck(pidwait(xpid, NOTOK)); - xpid = 0; - } - - /* Get buffer ready to go */ - bp = buffer; - buflen = sizeof(buffer); - - /* Now, construct query message */ - snprintf(bp, buflen, "Retrieve content"); - len = strlen(bp); - bp += len; - buflen -= len; - - if (e->eb_partno) { - snprintf(bp, buflen, " %s", e->eb_partno); - len = strlen(bp); - bp += len; - buflen -= len; - } - - snprintf(bp, buflen, " by asking %s\n\n%s\n? ", e->eb_server, - e->eb_subject ? e->eb_subject : e->eb_body); - - /* Now, check answer */ - if (!getanswer(buffer)) - return NOTOK; - - vecp = 0; - vec[vecp++] = "mhmail"; - vec[vecp++] = e->eb_server; - vec[vecp++] = "-subject"; - vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request"; - vec[vecp++] = "-body"; - vec[vecp++] = e->eb_body; - vec[vecp] = NULL; - - switch (child_id = fork()) { - case NOTOK: - advise("fork", "unable to"); - return NOTOK; - - case OK: - execvp(*vec, vec); - fprintf(stderr, "unable to exec "); - perror(*vec); - _exit(-1); - /* NOTREACHED */ - - default: - if (pidXwait(child_id, NULL) == OK) - advise(NULL, "request sent"); - break; - } - - if (*file == NULL) { - ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL)); - ce->ce_unlink = 1; - } else { - ce->ce_file = getcpy(*file); - ce->ce_unlink = 0; - } - - if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) { - content_error(ce->ce_file, ct, - "unable to fopen for reading/writing"); - return NOTOK; - } - - /* - ** showproc is for mhshow and mhstore, though mhlist -debug - ** prints it, too. - */ - if (ct->c_showproc) - free(ct->c_showproc); - ct->c_showproc = getcpy("true"); - - fseek(ce->ce_fp, 0L, SEEK_SET); - *file = ce->ce_file; - return fileno(ce->ce_fp); -}