--- libaitcfg/src/queue.c 2019/12/05 14:33:35 1.18 +++ libaitcfg/src/queue.c 2021/11/26 01:15:03 1.19 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.18 2019/12/05 14:33:35 misho Exp $ +* $Id: queue.c,v 1.19 2021/11/26 01:15:03 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2019 +Copyright 2004 - 2021 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ SUCH DAMAGE. static inline struct tagCfg * _selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagCfg fav, *c; + struct tagCfg fav, *c, *n; if (!cfg) return NULL; @@ -63,16 +63,46 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, E_ALIGN(strlen(csAttr), 2) / 2); - if (!csAttr) - return RB_NFIND(tagRC, cfg, &fav); - else { + if (!csAttr) { + c = RB_NFIND(tagRC, cfg, &fav); + if (!c) + return NULL; /* not found */ + if (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if (!AIT_ISEMPTY(&c->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) + break; + } + return c; + } else { c = RB_FIND(tagRC, cfg, &fav); if (!c) return NULL; /* not found */ + /* if cannot find right section */ + if (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) { + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if (!AIT_ISEMPTY(&c->cfg_sec) && csAttr && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)) && + !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) + return c; /* FOUND! */ + } + return NULL; /* not found */ + } do { if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr)) return c; /* FOUND! */ } while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav)); + /* if cannot find right attribute */ + TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) { + if ((!csSec && AIT_ISEMPTY(&c->cfg_sec)) || + (csSec && !AIT_ISEMPTY(&c->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))) + if (!AIT_ISEMPTY(&c->cfg_attr) && csAttr && + !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) + return c; /* FOUND! */ + } return NULL; /* not found */ } } @@ -164,32 +194,29 @@ cfg_getSection(cfg_root_t * __restrict cfg, const char * * @cfg = Config root * @csSec = Config section //[{csSec}] - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: 0 not found item, -1 error or >0 position in list */ int cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagCfg *av, fav; + struct tagCfg *av, *n; register int cx = 0; if (!cfg) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; - } else - memset(&fav, 0, sizeof fav); + } - if (csSec && *csSec) - AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - E_ALIGN(strlen(csSec), 2) / 2); - if (csAttr) - AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - E_ALIGN(strlen(csAttr), 2) / 2); - - TAILQ_FOREACH(av, cfg, cfg_next) { + TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) { ++cx; - if (!cfg_tree_cmp(&fav, av)) - return cx; + + if ((!csSec && AIT_ISEMPTY(&av->cfg_sec)) || + (csSec && !AIT_ISEMPTY(&av->cfg_sec) && + !strcmp(csSec, AIT_GET_STR(&av->cfg_sec)))) + if (!AIT_ISEMPTY(&av->cfg_attr) && csAttr && + !strcmp(csAttr, AIT_GET_STR(&av->cfg_attr))) + return cx; } return 0; @@ -200,7 +227,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: 0 item not found, -1 error or 1 removed item */ int @@ -297,7 +324,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: NULL item not found or null parameters, !=NULL value const string */ const char * @@ -320,7 +347,7 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: value */ long @@ -337,7 +364,7 @@ cfg_getAttributeLong(cfg_root_t * __restrict cfg, cons * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: value */ long long @@ -354,7 +381,7 @@ cfg_getAttributeLLong(cfg_root_t * __restrict cfg, con * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: value */ double @@ -371,7 +398,7 @@ cfg_getAttributeDouble(cfg_root_t * __restrict cfg, co * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * return: value */ long double @@ -388,7 +415,7 @@ cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, c * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @csAttr = Config attribute //{csAttr} = ... * @val = Return buffer for item Value //... = {val} * @csDefValue = *Default Value* for return in //{val}, if not found item in config * return: 0 item not found, -1 error or >0 number of copied bytes in //{val}