--- libaitwww/src/mime.c 2012/03/15 01:59:37 1.3 +++ libaitwww/src/mime.c 2012/08/01 00:40:41 1.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: mime.c,v 1.3 2012/03/15 01:59:37 misho Exp $ +* $Id: mime.c,v 1.4 2012/08/01 00:40:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -45,7 +45,6 @@ SUCH DAMAGE. */ #include "global.h" #include "mime.h" -#include "tools.h" static int decode_quoted(char *, int, char *); @@ -69,9 +68,9 @@ bd_begin(const char *str) char *s; int len = strlen(str) + 6; - s = malloc(len + 1); + s = io_malloc(len + 1); if (!s) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); return NULL; } else { snprintf(s, len + 1, "\r\n--%s\r\n", str); @@ -87,9 +86,9 @@ bd_end(const char *str) char *s; int len = strlen(str) + 8; - s = malloc(len + 1); + s = io_malloc(len + 1); if (!s) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); return NULL; } else { snprintf(s, len + 1, "\r\n--%s--\r\n", str); @@ -151,21 +150,21 @@ freeHeader(struct tagMIME * __restrict m) struct tagCGI *c; while ((c = SLIST_FIRST(&m->mime_header))) { - if (c->cgi_name) - free(c->cgi_name); - if (c->cgi_value) - free(c->cgi_value); + io_freeVar(&c->cgi_name); + io_freeVar(&c->cgi_value); + SLIST_REMOVE_HEAD(&m->mime_header, cgi_node); - free(c); + io_free(c); } } -static char * +static ait_val_t * hdrValue(const char *str, size_t len, const char **end) { const char *e, *crlf = NULL; char *tmp, *s = NULL; int off = 0; + ait_val_t *ret = NULL; e = str + len; while (str < e) { @@ -174,10 +173,10 @@ hdrValue(const char *str, size_t len, const char **end return NULL; } - tmp = realloc(s, crlf - str + off + 1); + tmp = io_realloc(s, crlf - str + off + 1); if (!tmp) { LOGERR; - free(s); + io_free(s); return NULL; } else s = tmp; @@ -195,7 +194,12 @@ hdrValue(const char *str, size_t len, const char **end } *end = crlf + strlen(CRLF); - return s; + ret = io_makeVar(string, s); + if (!ret) + www_SetErr(io_GetErrno(), "%s", io_GetError()); + io_free(s); + + return ret; } static inline int @@ -336,9 +340,9 @@ mime_parseMultiPart(const char *str, size_t len, const } /* init MIME */ - mime = malloc(sizeof(mime_t)); + mime = io_malloc(sizeof(mime_t)); if (!mime) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); return NULL; } else { memset(mime, 0, sizeof(mime_t)); @@ -348,14 +352,14 @@ mime_parseMultiPart(const char *str, size_t len, const /* prepare boundary format */ bd[0].iov_base = bd_begin(bdtag); if (!bd[0].iov_base) { - free(mime); + io_free(mime); return NULL; } else bd[0].iov_len = strlen(bd[0].iov_base); bd[1].iov_base = bd_end(bdtag); if (!bd[1].iov_base) { - free(bd[0].iov_base); - free(mime); + io_free(bd[0].iov_base); + io_free(mime); return NULL; } else bd[1].iov_len = strlen(bd[1].iov_base); @@ -363,9 +367,9 @@ mime_parseMultiPart(const char *str, size_t len, const /* check boundary tag */ if (memcmp(str, strstr(bd[0].iov_base, "--"), strlen(strstr(bd[0].iov_base, "--")))) { www_SetErr(EFAULT, "Bad content data, not found boundary tag"); - free(bd[1].iov_base); - free(bd[0].iov_base); - free(mime); + io_free(bd[1].iov_base); + io_free(bd[0].iov_base); + io_free(mime); return NULL; } else { str += strlen(strstr(bd[0].iov_base, "--")); @@ -373,12 +377,12 @@ mime_parseMultiPart(const char *str, size_t len, const } while (len > 0) { - m = malloc(sizeof(struct tagMIME)); + m = io_malloc(sizeof(struct tagMIME)); if (!m) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); mime_close(&mime); - free(bd[1].iov_base); - free(bd[0].iov_base); + io_free(bd[1].iov_base); + io_free(bd[0].iov_base); return NULL; } else { memset(m, 0, sizeof(struct tagMIME)); @@ -391,8 +395,8 @@ mime_parseMultiPart(const char *str, size_t len, const /* parse message between tags */ if (mime_readPart(m, str, next - str)) { mime_close(&mime); - free(bd[1].iov_base); - free(bd[0].iov_base); + io_free(bd[1].iov_base); + io_free(bd[0].iov_base); return NULL; } @@ -420,8 +424,8 @@ mime_parseMultiPart(const char *str, size_t len, const len -= bd[0].iov_len; */ - free(bd[1].iov_base); - free(bd[0].iov_base); + io_free(bd[1].iov_base); + io_free(bd[0].iov_base); if (end) *end = str; @@ -432,11 +436,11 @@ static inline void freeMIME(struct tagMIME * __restrict m) { if (m->mime_body.iov_base) - free(m->mime_body.iov_base); + io_free(m->mime_body.iov_base); if (m->mime_prolog.iov_base) - free(m->mime_prolog.iov_base); + io_free(m->mime_prolog.iov_base); if (m->mime_epilog.iov_base) - free(m->mime_epilog.iov_base); + io_free(m->mime_epilog.iov_base); freeHeader(m); mime_close(&m->mime_attach); @@ -459,10 +463,10 @@ mime_close(mime_t ** __restrict mime) while ((m = SLIST_FIRST(*mime))) { SLIST_REMOVE_HEAD(*mime, mime_node); freeMIME(m); - free(m); + io_free(m); } - free(*mime); + io_free(*mime); *mime = NULL; } @@ -501,23 +505,21 @@ mime_parseHeader(struct tagMIME * __restrict m, const return -1; } - c = malloc(sizeof(struct tagCGI)); + c = io_malloc(sizeof(struct tagCGI)); if (!c) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); freeHeader(m); return -1; } /* get name */ - c->cgi_name = malloc(colon - str + 1); + c->cgi_name = io_allocVar(); if (!c->cgi_name) { - LOGERR; - free(c); + www_SetErr(io_GetErrno(), "%s", io_GetError()); + io_free(c); freeHeader(m); return -1; - } else { - memcpy(c->cgi_name, str, colon - str); - c->cgi_name[colon - str] = 0; - } + } else + AIT_SET_STRLCPY(c->cgi_name, str, colon - str + 1); /* get value */ c->cgi_value = hdrValue(colon + 1, e - colon - 1, &str); if (!c->cgi_value) { @@ -550,14 +552,12 @@ inline const char * mime_getValue(struct tagMIME * __restrict m, const char *name) { struct tagCGI *c; - const char *v = NULL; SLIST_FOREACH(c, &m->mime_header, cgi_node) - if (!strcasecmp(c->cgi_name, name)) { - v = c->cgi_value; - break; - } - return v; + if (!strcasecmp(AIT_GET_STR(c->cgi_name), name)) + return AIT_GET_STR(c->cgi_value); + + return NULL; } /* @@ -574,6 +574,7 @@ mime_readPart(struct tagMIME * __restrict m, const cha const char *eoh, *ct, *eb; cgi_t *attr; struct iovec bd; + ait_val_t *v; if (!m || !str || (ssize_t) len < 0) { www_SetErr(EINVAL, "Mime part, string is NULL or length is less 0"); @@ -586,9 +587,9 @@ mime_readPart(struct tagMIME * __restrict m, const cha ct = mime_getValue(m, "content-type"); if (!ct || www_cmptype(ct, "multipart")) { /* not multi part, assign like body element */ - m->mime_body.iov_base = malloc(len - (eoh - str) + 1); + m->mime_body.iov_base = io_malloc(len - (eoh - str) + 1); if (!m->mime_body.iov_base) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); freeHeader(m); return -1; } @@ -602,16 +603,17 @@ mime_readPart(struct tagMIME * __restrict m, const cha freeHeader(m); return -1; } - bd.iov_base = bd_begin(www_getAttribute(attr, "boundary")); + v = www_getAttribute(attr, "boundary"); + bd.iov_base = bd_begin(AIT_GET_STR(v)); bd.iov_len = strlen(bd.iov_base); eb = findtextpos(eoh, len - (eoh - str), bd.iov_base, bd.iov_len); - free(bd.iov_base); + io_free(bd.iov_base); /* set prolog if exists */ if (eb != eoh) { - m->mime_prolog.iov_base = malloc(eb - eoh + 1); + m->mime_prolog.iov_base = io_malloc(eb - eoh + 1); if (!m->mime_prolog.iov_base) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); www_freeAttributes(&attr); freeHeader(m); return -1; @@ -621,14 +623,15 @@ mime_readPart(struct tagMIME * __restrict m, const cha m->mime_prolog.iov_len = eb - eoh + 1; } + v = www_getAttribute(attr, "boundary"); m->mime_attach = mime_parseMultiPart(eb + 1, len - (eb + 1 - str), - www_getAttribute(attr, "boundary"), &eoh); + AIT_GET_STR(v), &eoh); /* set epilog if exists */ if (eoh - str < len) { - m->mime_epilog.iov_base = malloc(len - (eoh - str) + 1); + m->mime_epilog.iov_base = io_malloc(len - (eoh - str) + 1); if (!m->mime_epilog.iov_base) { - LOGERR; + www_SetErr(io_GetErrno(), "%s", io_GetError()); www_freeAttributes(&attr); freeHeader(m); return -1; @@ -672,7 +675,7 @@ mime_calcRawSize(struct tagMIME * __restrict m) if (!s) return m->mime_body.iov_len; /* strip whitespaces */ - while (isspace(*s)) + while (isspace((int) *s)) s++; t = strchr(s, ';'); len = t ? strlen(s) : t - s; @@ -723,7 +726,7 @@ mime_getRawData(struct tagMIME * __restrict m, char * } /* strip whitespaces */ - while (isspace(*s)) + while (isspace((int) *s)) s++; t = strchr(s, ';'); len = t ? strlen(s) : t - s;