--- libaitio/src/Attic/url.c 2010/03/09 09:26:27 1.2 +++ libaitio/src/Attic/url.c 2011/04/20 22:56:32 1.6 @@ -1,11 +1,48 @@ /************************************************************************* -* (C) 2010 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: url.c,v 1.2 2010/03/09 09:26:27 misho Exp $ +* $Id: url.c,v 1.6 2011/04/20 22:56:32 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" @@ -16,7 +53,8 @@ * return: 0 error format not find tech:// and return URL like path; -1 error:: can`t read; >0 ok, up bits for known elements */ -int ioURLGet(const char *csURL, struct tagIOURL *url) +int +ioURLGet(const char *csURL, struct tagIOURL *url) { char *pos, *at, *cl, *sl; int ret = 0; @@ -115,92 +153,6 @@ int ioURLGet(const char *csURL, struct tagIOURL *url) } /* - * io_MakeArray() Parse and make array of arguments values - * @psArgs = Input arguments line - * @csDelim = Delimiter(s) for separate - * @args = Output array of arguments ... (must be free() after procced function!) - * @nargs = Requested count of arguments - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, char *** __restrict args, int nargs) -{ - char **app; - register int i; - - if (!psArgs || !csDelim || !args || !nargs) - return -1; - if (!(*args = malloc(sizeof(char*) * nargs))) { - LOGERR; - return -1; - } else - memset(*args, 0, sizeof(char*) * nargs); - - for (i = 0, app = *args; app < *args + nargs && (*app = strsep(&psArgs, csDelim)); - **app ? i++ : i, **app ? app++ : app); - return i; -} -/* - * io_SizeArray() Parse and calculate size of array - * @csArgs = Input arguments line - * @csDelim = Delimiter(s) for separate - * return: 0 error format; -1 error:: can`t read; >0 ok, number of items -*/ -inline int io_SizeArray(const char *csArgs, const char *csDelim) -{ - register int res; - char *pos; - - if (!csArgs || !csDelim) - return -1; - - for (res = 1, pos = (char*) csArgs; (pos = strpbrk(pos, csDelim)); res++, pos++); - return res; -} -/* - * io_MakeAV() Parse and make attribute/value pair - * @csArgs = Input argument line - * @csDelim = Delimiter for separate - * @psAttr = Output Attribute - * @attrLen = Size of attribute array - * @psValue = Output Value, if ==NULL this element not present value or not wanted for return - * @valLen = Size of value array - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -inline int io_MakeAV(const char * __restrict csArgs, const char *csDelim, - char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen) -{ - register int ret = 0; - char *pos, *psBuf; - - if (!csArgs || !csDelim || !psAttr || !attrLen) - return -1; - if (psValue && !valLen) - return -1; - else - memset(psValue, 0, valLen); - psBuf = strdup(csArgs); - if (!psBuf) { - LOGERR; - return -1; - } - - pos = strpbrk(psBuf, csDelim); - if (pos) - *pos++ = 0; - ret++; - strlcpy(psAttr, psBuf, attrLen); - - if (pos && *pos) { - ret++; - if (psValue) - strlcpy(psValue, pos, valLen); - } - - free(psBuf); - return ret; -} - -/* * io_Path2File() Parse and make path/filename pair * @csArgs = Input argument line * @psPath = Output Path, if ==NULL path not returned @@ -209,7 +161,8 @@ inline int io_MakeAV(const char * __restrict csArgs, c * @fileLen = Size of file array * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items */ -inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, +inline int +io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, char * __restrict psFile, int fileLen) { char *pos, *psBuf; @@ -251,21 +204,23 @@ inline int io_Path2File(const char * __restrict csArgs * @valLen = Size of psValue array * return: 0 error attribute not find; -1 error:: can`t read; >0 ok, find at position */ -int ioURLGetValue(struct tagIOURL *url, const char *csAttr, char * __restrict psValue, int valLen) +int +ioURLGetValue(struct tagIOURL *url, const char *csAttr, char * __restrict psValue, int valLen) { register int i, ret = 0; - char szBuf[BUFSIZ], **items, szElem[2][BUFSIZ]; + char szBuf[BUFSIZ], szElem[2][BUFSIZ]; int len; + array_t *items; if (!url || !csAttr) return -1; strlcpy(szBuf, url->url_args.value, BUFSIZ); - if (io_MakeArray(szBuf, "&", &items, (len = io_SizeArray(szBuf, "&"))) < 1) + if ((len = io_arrayMake(szBuf, 0, "&", &items)) < 1) return ret; - for (i = 0; i < len && items[i]; i++) { - if (io_MakeAV(items[i], "=", szElem[0], BUFSIZ, szElem[1], BUFSIZ) < 1) + for (i = 0; i < len && items->arr_data[i]; i++) { + if (io_MakeAV(items->arr_data[i], "=", szElem[0], BUFSIZ, szElem[1], BUFSIZ) < 1) continue; if (!strcmp(szElem[0], csAttr)) { @@ -276,7 +231,7 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs } } - free(items); + io_arrayDestroy(&items); return ret; } @@ -287,7 +242,8 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs * @valLen = Size of psValue array * return: -1 error:: can`t read; 0 ok */ -int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen) +int +ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen) { if (!url || !psValue || !valLen) return -1; @@ -299,4 +255,112 @@ int ioURLGetFile(struct tagIOURL *url, char * __restri if (!*psValue) strlcpy(psValue, "/", valLen); return 0; +} + +// ------------------------------------------ + +/* + * ioXMLGet() Parse and get data from input XML request string [ns:]container[|attribute[=value]][?data] + * @csXML = Input XML request line + * @xml = Output parsed XML request + * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits +*/ +int +ioXMLGet(const char *csXML, struct tagReqXML *xml) +{ + char *pos, *p, *end; + int ret = 0; + + if (!csXML || !xml) + return -1; + else + memset(xml, 0, sizeof *xml); + + strlcpy((char*) xml->xml_line, csXML, BUFSIZ); + // if namespace present + if ((pos = strchr((char*) xml->xml_line, ':'))) { + xml->xml_namespace.value = (char*) xml->xml_line; + xml->xml_namespace.vallen = pos - (char*) xml->xml_line; + if (xml->xml_namespace.vallen) + ret |= 1; + *pos++ = 0; + } else + pos = (char*) xml->xml_line; + // if container is path + if (*pos == '/') { + xml->xml_node.path.value = pos; + xml->xml_node.path.vallen = strlen(pos); + if (!xml->xml_node.path.vallen) + ret = 0; + else + ret |= 32; + return ret; + } else { + // container + xml->xml_node.container.value = pos; + xml->xml_node.container.vallen = strlen(pos); + if (!xml->xml_node.container.vallen) + return 0; + else + ret |= 2; + } + end = strchr(pos, '?'); + // if attribute present + if (pos && (p = strchr(pos, '|')) && (!end || end > p)) { + pos = p; + *pos++ = 0; + xml->xml_node.container.vallen = strlen(xml->xml_node.container.value); + if (!xml->xml_node.container.vallen) + return 0; + + xml->xml_attribute.value = pos; + xml->xml_attribute.vallen = strlen(pos); + if (xml->xml_attribute.vallen) + ret |= 4; + } + // if value present + if (pos && (p = strchr(pos, '=')) && (!end || end > p)) { + if (!(ret & 4)) + return 0; + else + pos = p; + *pos++ = 0; + xml->xml_attribute.vallen = strlen(xml->xml_attribute.value); + if (!xml->xml_attribute.vallen) + return 0; + + xml->xml_value.value = pos; + xml->xml_value.vallen = strlen(pos); + if (xml->xml_value.vallen) + ret |= 8; + } + // if data present + if (pos && end) { + if (ret < 2) + return 0; + else + pos = end; + *pos++ = 0; + if (ret & 8) { + xml->xml_value.vallen = strlen(xml->xml_value.value); + if (!xml->xml_value.vallen) + return 0; + } else if (ret & 4) { + xml->xml_attribute.vallen = strlen(xml->xml_attribute.value); + if (!xml->xml_attribute.vallen) + return 0; + } else if (ret & 2) { + xml->xml_node.container.vallen = strlen(xml->xml_node.container.value); + if (!xml->xml_node.container.vallen) + return 0; + } else + return 0; + + xml->xml_data.value = pos; + xml->xml_data.vallen = strlen(pos); + if (xml->xml_data.vallen) + ret |= 16; + } + + return ret; }