--- libaitcfg/src/queue.c 2021/11/26 01:15:03 1.19 +++ libaitcfg/src/queue.c 2026/10/05 16:38:26 1.21.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.19 2021/11/26 01:15:03 misho Exp $ +* $Id: queue.c,v 1.21.4.1 2026/10/05 16:38:26 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 - 2021 +Copyright 2004 - 2026 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ SUCH DAMAGE. static inline struct tagCfg * -_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) +_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, int *find) { struct tagCfg fav, *c, *n; @@ -55,6 +55,8 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch return NULL; else memset(&fav, 0, sizeof fav); + if (find) + *find = 0; if (csSec && *csSec) AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, @@ -74,34 +76,31 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch !strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) break; } + if (find) + *find = -1; 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)) + 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) && !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) { + if (find) + *find = 1; 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))) + !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) { + if (find) + *find = 2; return c; /* FOUND! */ + } } return NULL; /* not found */ } @@ -119,7 +118,7 @@ void cfg_dumpCfg(cfg_root_t * __restrict cfg) { struct tagCfg *r, *c, *ctmp, *q, *qtmp; - int syn; + int syn = 0; r = RB_ROOT(cfg); printf("ROOT:: KEY=%.8x [%s] %s=%s\n", ((AIT_KEY(&r->cfg_sec) << 15) | AIT_KEY(&r->cfg_attr)), @@ -190,6 +189,39 @@ cfg_getSection(cfg_root_t * __restrict cfg, const char } /* + * cfg_delSection() - Delete entire section + * + * @cfg = Config root + * @csSec = Config section //[{csSec}] + * return: -1 error, 0 nothing deleted or >0 deleted attributes + */ +int +cfg_delSection(cfg_root_t * __restrict cfg, const char *csSec) +{ + int ret = 0; + array_t *arr = NULL; + struct tagCfg *av; + register int i; + + if (!cfg) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); + return -1; + } + if (csSec && !*csSec) + csSec = NULL; + + arr = cfg_getSection(cfg, csSec); + if (!arr) + return ret; + for (i = 0; i < array_Size(arr); i++) + if ((av = array(arr, i, struct tagCfg*)) && AIT_ADDR(&av->cfg_attr)) + if (cfg_unsetAttribute(cfg, csSec, AIT_GET_STR(&av->cfg_attr)) > 0) + ret++; + array_Destroy(&arr); + return ret; +} + +/* * cfg_findAttribute() - Find attribute position in config file * * @cfg = Config root @@ -233,24 +265,48 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagCfg *av; + struct tagCfg *av, *n; + int find; if (!cfg) return -1; - av = _selectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr, &find); if (!av) return 0; - CFG_RC_LOCK(cfg); - RB_REMOVE(tagRC, cfg, av); - TAILQ_REMOVE(cfg, av, cfg_next); - CFG_RC_UNLOCK(cfg); + if (find == 1) { + CFG_RC_LOCK(cfg); + RB_REMOVE(tagRC, cfg, av); + TAILQ_REMOVE(cfg, av, cfg_next); + CFG_RC_UNLOCK(cfg); + } else { + CFG_RC_LOCK(cfg); + TAILQ_REMOVE(cfg, av, cfg_next); + CFG_RC_UNLOCK(cfg); + } AIT_FREE_VAL(&av->cfg_val); AIT_FREE_VAL(&av->cfg_attr); AIT_FREE_VAL(&av->cfg_sec); e_free(av); + + if (find == 1) { + /* if we have duplicated key then update tree */ + TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) { + 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))) { + CFG_RC_LOCK(cfg); + RB_INSERT(tagRC, cfg, av); + CFG_RC_UNLOCK(cfg); + break; + } + } + } + return 1; } @@ -267,14 +323,15 @@ int cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, const char *csVal) { struct tagCfg *av, *section; + int find; if (!cfg || !csAttr) return -1; - av = _selectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr, &find); if (!av) { /* adding new element */ - section = _selectAttribute(cfg, csSec, NULL); + section = _selectAttribute(cfg, csSec, NULL, &find); av = e_malloc(sizeof(struct tagCfg)); if (!av) { @@ -331,11 +388,12 @@ const char * cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av; + int find; if (!cfg) return NULL; - av = _selectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr, &find); if (!av) return NULL; @@ -426,6 +484,7 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c { struct tagCfg *av; int ret = 0; + int find; if (!cfg || !val) { cfg_SetErr(EINVAL, "Invalid argument(s)"); @@ -433,7 +492,7 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c } AIT_INIT_VAL(val); - av = _selectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr, &find); if (!av) { /* not found item */ if (csDefValue) {