--- libaitcfg/src/queue.c 2008/08/28 13:17:41 1.1 +++ libaitcfg/src/queue.c 2011/05/10 20:52:36 1.6.2.1 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: queue.c,v 1.6.2.1 2011/05/10 20:52:36 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" #include "aitcfg.h" @@ -9,7 +54,8 @@ * @csAttr = Config attribute //{csAttr} = ..., if NULL search in *any* attribute * return: NULL not found attribute; //{tagPair} selected first seen attribute item from list */ -static inline struct tagPair *SelectAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +static inline struct tagPair * +SelectAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) { struct tagPair *av; @@ -38,7 +84,8 @@ static inline struct tagPair *SelectAttribute(sl_confi * DestroyAttribute() Free //{tagPair} item elements memory and destroy resource * @pair = Free this element */ -static inline void DestroyAttribute(struct tagPair *pair) +static inline void +DestroyAttribute(struct tagPair *pair) { if (!pair) return; @@ -62,7 +109,8 @@ static inline void DestroyAttribute(struct tagPair *pa * @csAttr = Config attribute //{csAttr} = ... * return: 0 not found item; -1 error: null parameters; >0 position in list */ -inline int cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +inline int +cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) { struct tagPair *av; register int cx = 0; @@ -90,7 +138,8 @@ inline int cfg_FindAttribute(sl_config * __restrict cf * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute * return: 0 item not found, -1 error: null parameters; >0 position in list */ -int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +int +cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) { struct tagPair *av, *curr; register int cx = 0; @@ -130,9 +179,11 @@ int cfg_UnsetAttribute(sl_config * __restrict cfg, con * @csVal = Config value //... = {csVal} to setup * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item */ -int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal) +int +cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal) { struct tagPair *av, *section; + int len; if (!cfg || !csAttr) return -1; @@ -160,32 +211,33 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const } // added section name to element if (csSec && *csSec) { - av->psSection = malloc(strlen((char*) csSec) + 1); + len = strlen((char*) csSec) + 1; + av->psSection = malloc(len); if (!av->psSection) { LOGERR; free(av); return -1; } else { - memset(av->psSection, 0, strlen((char*) csSec) + 1); - strcpy((char*) av->psSection, (char*) csSec); + strlcpy((char*) av->psSection, (char*) csSec, len); } } else av->psSection = NULL; // added attribute to element - av->psAttribute = malloc(strlen((char*) csAttr) + 1); + len = strlen((char*) csAttr) + 1; + av->psAttribute = malloc(len); if (!av->psAttribute) { LOGERR; free(av->psSection); free(av); return -1; } else { - memset(av->psAttribute, 0, strlen((char*) csAttr) + 1); - strcpy((char*) av->psAttribute, (char*) csAttr); + strlcpy((char*) av->psAttribute, (char*) csAttr, len); } // added value to element if (csVal && *csVal) { - av->psValue = malloc(strlen((char*) csVal) + 1); + len = strlen((char*) csVal) + 1; + av->psValue = malloc(len); if (!av->psValue) { LOGERR; free(av->psAttribute); @@ -193,8 +245,7 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const free(av); return -1; } else { - memset(av->psValue, 0, strlen((char*) csVal) + 1); - strcpy((char*) av->psValue, (char*) csVal); + strlcpy((char*) av->psValue, (char*) csVal, len); } } else { av->psValue = malloc(1); @@ -206,9 +257,9 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const } if (strcmp((char*) csVal, (char*) av->psValue)) { - av->psValue = realloc(av->psValue, strlen((char*) csVal) + 1); - memset(av->psValue, 0, strlen((char*) csVal) + 1); - strcpy((char*) av->psValue, (char*) csVal); + len = strlen((char*) csVal) + 1; + av->psValue = realloc(av->psValue, len); + strlcpy((char*) av->psValue, (char*) csVal, len); // Update element return 1; @@ -225,7 +276,8 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute * return: NULL item not found or null parameters; !=NULL value const string */ -inline const u_char *cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +inline const u_char * +cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) { struct tagPair *av; @@ -239,6 +291,17 @@ inline const u_char *cfg_GetAttribute(sl_config * __re return av->psValue; } +/* + * cfg_FirstItem() Get first item from config list and return his value + * @cfg = Head list element + * return: NULL if no items in list; !=NULL first pair item +*/ +inline struct tagPair * +cfg_FirstItem(sl_config * __restrict cfg) +{ + return cfg->slh_first; +} + // -------------------------------------------------------------- /* @@ -251,7 +314,8 @@ inline const u_char *cfg_GetAttribute(sl_config * __re * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal} */ -int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, +int +cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, u_char * __restrict psVal, int ValLen, const char *csDefValue) { struct tagPair *av; @@ -260,11 +324,10 @@ int cfg_LoadAttribute(sl_config * __restrict cfg, cons if (!cfg || !csAttr || !ValLen || !psVal) return -1; - memset(psVal, 0, ValLen); av = SelectAttribute(cfg, csSec, csAttr); if (!av) { if (csDefValue) { - strncpy((char*) psVal, csDefValue, ValLen - 1); + strlcpy((char*) psVal, csDefValue, ValLen); ret = strlen((char*) psVal); } @@ -273,11 +336,11 @@ int cfg_LoadAttribute(sl_config * __restrict cfg, cons if (!av->psValue || !*av->psValue) { if (csDefValue) { - strncpy((char*) psVal, csDefValue, ValLen - 1); + strlcpy((char*) psVal, csDefValue, ValLen); ret = strlen((char*) psVal); } } else { - strncpy((char*) psVal, (char*) av->psValue, ValLen - 1); + strlcpy((char*) psVal, (char*) av->psValue, ValLen); ret = strlen((char*) psVal); }