version 1.2, 2009/09/09 09:07:31
|
version 1.6, 2011/05/01 17:24:28
|
Line 5
|
Line 5
|
* $Author$ |
* $Author$ |
* $Id$ |
* $Id$ |
* |
* |
*************************************************************************/ | ************************************************************************** |
| 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 <info@elwix.org> |
| |
| Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| by Michael Pounov <misho@elwix.org>. 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 <misho@elwix.org> |
| 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 "global.h" |
#include "aitcfg.h" |
#include "aitcfg.h" |
|
|
Line 141 int cfg_UnsetAttribute(sl_config * __restrict cfg, con
|
Line 178 int cfg_UnsetAttribute(sl_config * __restrict cfg, con
|
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; |
struct tagPair *av, *section; |
|
int len; |
|
|
if (!cfg || !csAttr) |
if (!cfg || !csAttr) |
return -1; |
return -1; |
Line 168 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
Line 206 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
} |
} |
// added section name to element |
// added section name to element |
if (csSec && *csSec) { |
if (csSec && *csSec) { |
av->psSection = malloc(strlen((char*) csSec) + 1); | len = strlen((char*) csSec) + 1; |
| av->psSection = malloc(len); |
if (!av->psSection) { |
if (!av->psSection) { |
LOGERR; |
LOGERR; |
free(av); |
free(av); |
return -1; |
return -1; |
} else { |
} else { |
strlcpy((char*) av->psSection, (char*) csSec, strlen((char*) csSec) + 1); | strlcpy((char*) av->psSection, (char*) csSec, len); |
} |
} |
} else |
} else |
av->psSection = NULL; |
av->psSection = NULL; |
|
|
// added attribute to element |
// added attribute to element |
av->psAttribute = malloc(strlen((char*) csAttr) + 1); | len = strlen((char*) csAttr) + 1; |
| av->psAttribute = malloc(len); |
if (!av->psAttribute) { |
if (!av->psAttribute) { |
LOGERR; |
LOGERR; |
free(av->psSection); |
free(av->psSection); |
free(av); |
free(av); |
return -1; |
return -1; |
} else { |
} else { |
strlcpy((char*) av->psAttribute, (char*) csAttr, strlen((char*) csAttr) + 1); | strlcpy((char*) av->psAttribute, (char*) csAttr, len); |
} |
} |
// added value to element |
// added value to element |
if (csVal && *csVal) { |
if (csVal && *csVal) { |
av->psValue = malloc(strlen((char*) csVal) + 1); | len = strlen((char*) csVal) + 1; |
| av->psValue = malloc(len); |
if (!av->psValue) { |
if (!av->psValue) { |
LOGERR; |
LOGERR; |
free(av->psAttribute); |
free(av->psAttribute); |
Line 199 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
Line 240 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
free(av); |
free(av); |
return -1; |
return -1; |
} else { |
} else { |
strlcpy((char*) av->psValue, (char*) csVal, strlen((char*) csVal) + 1); | strlcpy((char*) av->psValue, (char*) csVal, len); |
} |
} |
} else { |
} else { |
av->psValue = malloc(1); |
av->psValue = malloc(1); |
Line 211 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
Line 252 int cfg_SetAttribute(sl_config * __restrict cfg, const
|
} |
} |
|
|
if (strcmp((char*) csVal, (char*) av->psValue)) { |
if (strcmp((char*) csVal, (char*) av->psValue)) { |
av->psValue = realloc(av->psValue, strlen((char*) csVal) + 1); | len = strlen((char*) csVal) + 1; |
strlcpy((char*) av->psValue, (char*) csVal, strlen((char*) csVal) + 1); | av->psValue = realloc(av->psValue, len); |
| strlcpy((char*) av->psValue, (char*) csVal, len); |
|
|
// Update element |
// Update element |
return 1; |
return 1; |
Line 241 inline const u_char *cfg_GetAttribute(sl_config * __re
|
Line 283 inline const u_char *cfg_GetAttribute(sl_config * __re
|
return NULL; |
return NULL; |
|
|
return av->psValue; |
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; |
} |
} |
|
|
// -------------------------------------------------------------- |
// -------------------------------------------------------------- |