version 1.6, 2011/05/01 17:24:28
|
version 1.6.4.2, 2012/04/02 15:12:15
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 44 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH
|
Line 44 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH
|
SUCH DAMAGE. |
SUCH DAMAGE. |
*/ |
*/ |
#include "global.h" |
#include "global.h" |
#include "aitcfg.h" |
|
|
|
|
|
/* | static inline struct tagCfg * |
* SelectAttribute() Select item //{tagPair} from config list with attribute parameter(s) | _selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) |
* @cfg = Head list element | |
* @csSec = Config section //[{csSec}], if NULL search in *default* section | |
* @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) | |
{ |
{ |
struct tagPair *av; | struct tagCfg fav; |
|
|
if (!cfg) |
if (!cfg) |
return NULL; |
return NULL; |
|
else |
|
memset(&fav, 0, sizeof fav); |
|
|
for (av = cfg->slh_first; av; av = av->sle_next) { | if (csSec && *csSec) |
if ((!csSec || !*csSec) && !av->psSection) { | AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, |
if (!csAttr) | io_align(strlen(csSec), 1) / 2); |
return av; | if (csAttr) |
if (!strcmp((char*) av->psAttribute, (char*) csAttr)) | AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, |
return av; | io_align(strlen(csAttr), 1) / 2); |
} | |
if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec)) { | /* |
if (!csAttr) | struct tagCfg *av; |
return av; | |
if (!strcmp((char*) av->psAttribute, (char*) csAttr)) | RB_FOREACH(av, tagRC, cfg) { |
return av; | printf("sec=%s(%d) attr=%s(%d) val=%s\n", AIT_GET_LIKE(&av->cfg_sec, char*), AIT_KEY(&av->cfg_sec), |
} | AIT_GET_LIKE(&av->cfg_attr, char*), AIT_KEY(&av->cfg_attr), AIT_GET_STR(&av->cfg_val)); |
} |
} |
|
|
return NULL; | printf("ssss=%d aaaa=%d\n", AIT_KEY(&fav.cfg_sec), AIT_KEY(&fav.cfg_attr)); |
| */ |
| if (!csAttr) |
| return RB_NFIND(tagRC, cfg, &fav); |
| else |
| return RB_FIND(tagRC, cfg, &fav); |
} |
} |
|
|
/* | static inline void |
* DestroyAttribute() Free //{tagPair} item elements memory and destroy resource | _destroyAttribute(struct tagCfg *av) |
* @pair = Free this element | |
*/ | |
static inline void DestroyAttribute(struct tagPair *pair) | |
{ |
{ |
if (!pair) | if (!av) |
return; |
return; |
|
|
if (pair->psValue) | AIT_FREE_VAL(&av->cfg_val); |
free(pair->psValue); | AIT_FREE_VAL(&av->cfg_attr); |
if (pair->psAttribute) | AIT_FREE_VAL(&av->cfg_sec); |
free(pair->psAttribute); | free(av); |
if (pair->psSection) | |
free(pair->psSection); | |
| |
free(pair); | |
} |
} |
|
|
// ---------------------------------------------- |
// ---------------------------------------------- |
|
|
/* |
/* |
* cfg_FindAttribute() Find attribute position in config list | * cfg_findAttribute() - Find attribute position in config file |
* @cfg = Head list element | * |
| * @cfg = Config root |
* @csSec = Config section //[{csSec}] |
* @csSec = Config section //[{csSec}] |
* @csAttr = Config attribute //{csAttr} = ... |
* @csAttr = Config attribute //{csAttr} = ... |
* return: 0 not found item; -1 error: null parameters; >0 position in list | * return: 0 not found item, -1 error or >0 position in list |
*/ | */ |
inline int cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) | inline int |
| cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) |
{ |
{ |
struct tagPair *av; | struct tagCfg *av, fav; |
register int cx = 0; |
register int cx = 0; |
|
|
if (!cfg || !csAttr) | if (!cfg || !csAttr) { |
| cfg_SetErr(EINVAL, "Invalid argument(s)"); |
return -1; |
return -1; |
|
} else |
|
memset(&fav, 0, sizeof fav); |
|
|
for (av = cfg->slh_first; av; av = av->sle_next) { | if (csSec && *csSec) |
| AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, |
| io_align(strlen(csSec), 1) / 2); |
| if (csAttr) |
| AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, |
| io_align(strlen(csAttr), 1) / 2); |
| |
| SLIST_FOREACH(av, cfg, cfg_next) { |
++cx; |
++cx; |
if ((!csSec || !*csSec) && !av->psSection) | if (!cfg_tree_cmp(&fav, av)) |
if (!strcmp((char*) av->psAttribute, (char*) csAttr)) | return cx; |
return cx; | |
if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec)) | |
if (!strcmp((char*) av->psAttribute, (char*) csAttr)) | |
return cx; | |
} |
} |
|
|
return 0; |
return 0; |
} |
} |
| #if 0 |
/* |
/* |
* cfg_UnsetAttribute() Unset item from config list and free resources |
* cfg_UnsetAttribute() Unset item from config list and free resources |
* @cfg = Head list element |
* @cfg = Head list element |
Line 166 int cfg_UnsetAttribute(sl_config * __restrict cfg, con
|
Line 167 int cfg_UnsetAttribute(sl_config * __restrict cfg, con
|
DestroyAttribute(av); |
DestroyAttribute(av); |
return cx; |
return cx; |
} |
} |
|
#endif |
|
|
/* |
/* |
* cfg_SetAttribute() Set item in config list or add new item if not exists | * cfg_setAttribute() - Set item in config or adding new item if not exists |
* @cfg = Head list element | * |
| * @cfg = Config root |
* @csSec = Config section //[{csSec}], if NULL set in *default* section |
* @csSec = Config section //[{csSec}], if NULL set in *default* section |
* @csAttr = Config attribute //{csAttr} = ..., if NULL set as *any* attribute | * @csAttr = Config attribute //{csAttr} = ... |
* @csVal = Config value //... = {csVal} to setup |
* @csVal = Config value //... = {csVal} to setup |
* return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item | * return: 0 nothing changed, -1 error, 1 found and updated item or 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(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, const char *csVal) |
{ |
{ |
struct tagPair *av, *section; | struct tagCfg *av, *section; |
int len; | |
|
|
if (!cfg || !csAttr) | if (!cfg || !csAttr || !csVal) |
return -1; |
return -1; |
|
|
av = SelectAttribute(cfg, csSec, csAttr); | av = _selectAttribute(cfg, csSec, csAttr); |
if (!av) { |
if (!av) { |
section = SelectAttribute(cfg, csSec, NULL); | /* adding new element */ |
| section = _selectAttribute(cfg, csSec, NULL); |
|
|
av = malloc(sizeof(struct tagPair)); | av = malloc(sizeof(struct tagCfg)); |
if (!av) { |
if (!av) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else { |
} else { |
memset(av, 0, sizeof(struct tagPair)); | memset(av, 0, sizeof(struct tagCfg)); |
|
|
if (!section) { | CFG_RC_LOCK(cfg); |
// add new element | if (!section) |
av->sle_next = cfg->slh_first; | SLIST_INSERT_HEAD(cfg, av, cfg_next); |
cfg->slh_first = av; | else |
} else { | SLIST_INSERT_AFTER(section, av, cfg_next); |
// add new element in existing section | CFG_RC_UNLOCK(cfg); |
av->sle_next = section->sle_next; | |
section->sle_next = av; | |
} | |
} |
} |
// added section name to element |
|
if (csSec && *csSec) { |
|
len = strlen((char*) csSec) + 1; |
|
av->psSection = malloc(len); |
|
if (!av->psSection) { |
|
LOGERR; |
|
free(av); |
|
return -1; |
|
} else { |
|
strlcpy((char*) av->psSection, (char*) csSec, len); |
|
} |
|
} else |
|
av->psSection = NULL; |
|
|
|
// added attribute to element | if (csSec && *csSec) { |
len = strlen((char*) csAttr) + 1; | AIT_SET_STR(&av->cfg_sec, csSec); |
av->psAttribute = malloc(len); | AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
if (!av->psAttribute) { | io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); |
LOGERR; | |
free(av->psSection); | |
free(av); | |
return -1; | |
} else { | |
strlcpy((char*) av->psAttribute, (char*) csAttr, len); | |
} |
} |
// added value to element | AIT_SET_STR(&av->cfg_val, csVal); |
if (csVal && *csVal) { | AIT_SET_STR(&av->cfg_attr, csAttr); |
len = strlen((char*) csVal) + 1; | AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
av->psValue = malloc(len); | io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); |
if (!av->psValue) { | |
LOGERR; | |
free(av->psAttribute); | |
free(av->psSection); | |
free(av); | |
return -1; | |
} else { | |
strlcpy((char*) av->psValue, (char*) csVal, len); | |
} | |
} else { | |
av->psValue = malloc(1); | |
*av->psValue = 0; | |
} | |
|
|
// Added new element | CFG_RC_LOCK(cfg); |
| RB_INSERT(tagRC, cfg, av); |
| CFG_RC_UNLOCK(cfg); |
return 2; |
return 2; |
} |
} |
|
|
if (strcmp((char*) csVal, (char*) av->psValue)) { | if (strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { |
len = strlen((char*) csVal) + 1; | /* Update element */ |
av->psValue = realloc(av->psValue, len); | AIT_FREE_VAL(&av->cfg_val); |
strlcpy((char*) av->psValue, (char*) csVal, len); | AIT_SET_STR(&av->cfg_val, csVal); |
| |
// Update element | |
return 1; |
return 1; |
} |
} |
|
|
// Nothing happens ... finded & values is equal! | /* Nothing happens ... found & values is equal! */ |
return 0; |
return 0; |
} |
} |
|
|
/* |
/* |
* cfg_GetAttribute() Get item from config list and return his value | * cfg_getAttribute() - Get item from config and return value from it |
* @cfg = Head list element | * |
| * @cfg = Config root |
* @csSec = Config section //[{csSec}], if NULL unset in *default* section |
* @csSec = Config section //[{csSec}], if NULL unset in *default* section |
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute |
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute |
* return: NULL item not found or null parameters; !=NULL value const string | * 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 char * |
| cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) |
{ |
{ |
struct tagPair *av; | struct tagCfg *av; |
|
|
if (!cfg || !csAttr) |
if (!cfg || !csAttr) |
return NULL; |
return NULL; |
|
|
av = SelectAttribute(cfg, csSec, csAttr); | av = _selectAttribute(cfg, csSec, csAttr); |
if (!av) |
if (!av) |
return NULL; |
return NULL; |
|
|
return av->psValue; | return AIT_GET_STR(&av->cfg_val); |
} |
} |
| #if 0 |
/* | |
* 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; | |
} | |
| |
// -------------------------------------------------------------- |
// -------------------------------------------------------------- |
|
|
/* |
/* |
Line 338 int cfg_LoadAttribute(sl_config * __restrict cfg, cons
|
Line 299 int cfg_LoadAttribute(sl_config * __restrict cfg, cons
|
|
|
return ret; |
return ret; |
} |
} |
|
#endif |