--- libaitwww/src/aitwww.c 2012/03/09 10:03:21 1.1.1.1.2.2 +++ libaitwww/src/aitwww.c 2012/03/09 16:42:31 1.1.1.1.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitwww.c,v 1.1.1.1.2.2 2012/03/09 10:03:21 misho Exp $ +* $Id: aitwww.c,v 1.1.1.1.2.7 2012/03/09 16:42:31 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -135,8 +135,9 @@ www_initCGI(void) if (!str) { LOGERR; return NULL; - } - for (i = 0; i < ctlen && (rlen = + } else + memset(str, 0, ctlen + 1); + for (i = 0; i <= ctlen && (rlen = read(STDIN_FILENO, (void*) str + i, ctlen - i)) > 0; i += rlen); str[ctlen] = 0; @@ -348,6 +349,35 @@ www_delPair(cgi_t * __restrict cgi, const char *name) } /* + * www_listPairs() - Walk over CGI session variables + * + * @cgi = Cgi session + * @func = If !=NULL call function for each element + * @arg = Optional argument pass through callback + * return: -1 error or >-1 number of elements + */ +inline int +www_listPairs(cgi_t * __restrict cgi, list_cb_t func, void *arg) +{ + register int ret = 0; + struct tagCGI *t; + + if (!cgi) { + www_SetErr(EINVAL, "Invalid CGI session argument"); + return -1; + } + + SLIST_FOREACH(t, cgi, cgi_node) { + ret++; + + if (func) + func(t, arg); + } + + return ret; +} + +/* * www_header() - Output initial html header * * @output = file handle @@ -495,10 +525,18 @@ www_parseMultiPart(const char *str, int ctlen, const c } mime = mime_parseMultiPart(str, ctlen, www_getAttribute(attr, "boundary"), NULL); www_freeAttributes(&attr); + if (!mime) { + www_closeCGI(&cgi); + return NULL; + } SLIST_FOREACH(m, mime, mime_node) { s = mime_getValue(m, "content-disposition"); attr = www_parseAttributes(&s); + if (!www_getAttribute(attr, "name")) { + www_freeAttributes(&attr); + continue; + } t = malloc(sizeof(struct tagCGI)); if (!t) {