--- libaitcfg/src/queue.c 2012/04/02 15:39:55 1.6.4.3 +++ libaitcfg/src/queue.c 2014/03/19 18:38:43 1.15 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.6.4.3 2012/04/02 15:39:55 misho Exp $ +* $Id: queue.c,v 1.15 2014/03/19 18:38:43 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004 - 2014 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; + struct tagCfg fav, *c; if (!cfg) return NULL; @@ -58,52 +58,100 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch if (csSec && *csSec) AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - io_align(strlen(csSec), 1) / 2); + E_ALIGN(strlen(csSec), 2) / 2); if (csAttr) AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - io_align(strlen(csAttr), 1) / 2); + E_ALIGN(strlen(csAttr), 2) / 2); - /* - struct tagCfg *av; - - RB_FOREACH(av, tagRC, cfg) { - 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)); - } - - 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); + else { + c = RB_FIND(tagRC, cfg, &fav); + if (!c) + 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)); + return NULL; /* not found */ + } } -static inline void -_destroyAttribute(struct tagCfg *av) +/* --------------------------------------------------------------- */ + +/* + * cfg_getSection() - Get entire section attributes into array + * + * @cfg = Config root + * @csSec = Config section //[{csSec}] + * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use! + */ +array_t * +cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec) { + array_t *arr = NULL; + struct tagCfg *av, fav; + + if (!cfg) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); + return NULL; + } else + memset(&fav, 0, sizeof fav); + if (csSec && !*csSec) + csSec = NULL; + + if (csSec && *csSec) + AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, + E_ALIGN(strlen(csSec), 2) / 2); + + av = RB_NFIND(tagRC, cfg, &fav); if (!av) - return; + return NULL; + if (csSec) { + if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) + return NULL; + } else { + if (!AIT_ISEMPTY(&av->cfg_sec)) + return NULL; + } -} + arr = array_Init(1); + if (!arr) { + cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + return NULL; + } else + array_Push(arr, av, 0); -// ---------------------------------------------- + while ((av = RB_NEXT(tagRC, cfg, av)) && av) { + if (csSec) { + if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) + break; + } else { + if (!AIT_ISEMPTY(&av->cfg_sec)) + break; + } + array_Push(arr, av, 0); + } + + return arr; +} + /* * cfg_findAttribute() - Find attribute position in config file * * @cfg = Config root * @csSec = Config section //[{csSec}] - * @csAttr = Config attribute //{csAttr} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: 0 not found item, -1 error or >0 position in list */ -inline int +int cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av, fav; register int cx = 0; - if (!cfg || !csAttr) { + if (!cfg) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; } else @@ -111,12 +159,12 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c if (csSec && *csSec) AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, - io_align(strlen(csSec), 1) / 2); + E_ALIGN(strlen(csSec), 2) / 2); if (csAttr) AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, - io_align(strlen(csAttr), 1) / 2); + E_ALIGN(strlen(csAttr), 2) / 2); - SLIST_FOREACH(av, cfg, cfg_next) { + TAILQ_FOREACH(av, cfg, cfg_next) { ++cx; if (!cfg_tree_cmp(&fav, av)) return cx; @@ -130,7 +178,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} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: 0 item not found, -1 error or 1 removed item */ int @@ -138,7 +186,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -147,13 +195,13 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const CFG_RC_LOCK(cfg); RB_REMOVE(tagRC, cfg, av); - SLIST_REMOVE(cfg, av, tagCfg, cfg_next); + 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); - free(av); + e_free(av); return 1; } @@ -171,7 +219,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch { struct tagCfg *av, *section; - if (!cfg || !csAttr || !csVal) + if (!cfg || !csAttr) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -179,7 +227,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch /* adding new element */ section = _selectAttribute(cfg, csSec, NULL); - av = malloc(sizeof(struct tagCfg)); + av = e_malloc(sizeof(struct tagCfg)); if (!av) { LOGERR; return -1; @@ -188,21 +236,21 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch CFG_RC_LOCK(cfg); if (!section) - SLIST_INSERT_HEAD(cfg, av, cfg_next); + TAILQ_INSERT_TAIL(cfg, av, cfg_next); else - SLIST_INSERT_AFTER(section, av, cfg_next); + TAILQ_INSERT_BEFORE(section, av, cfg_next); CFG_RC_UNLOCK(cfg); } if (csSec && *csSec) { AIT_SET_STR(&av->cfg_sec, csSec); AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), - io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); + E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); } - AIT_SET_STR(&av->cfg_val, csVal); + AIT_SET_STR(&av->cfg_val, csVal ? csVal : ""); AIT_SET_STR(&av->cfg_attr, csAttr); AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), - io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); + E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); CFG_RC_LOCK(cfg); RB_INSERT(tagRC, cfg, av); @@ -210,7 +258,8 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch return 2; } - if (strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { + if (csVal && AIT_ADDR(&av->cfg_val) && + strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { /* Update element */ AIT_FREE_VAL(&av->cfg_val); AIT_SET_STR(&av->cfg_val, csVal); @@ -226,15 +275,15 @@ 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 unset as *any* attribute + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: NULL item not found or null parameters, !=NULL value const string */ -inline const char * +const char * cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return NULL; av = _selectAttribute(cfg, csSec, csAttr); @@ -243,48 +292,54 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch return AIT_GET_STR(&av->cfg_val); } -#if 0 -// -------------------------------------------------------------- /* - * cfg_LoadAttribute() Extended get attribute, if not found item return *default value* - * @cfg = Head list element + * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value* + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * @psVal = Return buffer for item Value //... = {psVal} - * @ValLen = Length of buffer //{psVal} for return - * @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, - u_char * __restrict psVal, int ValLen, const char *csDefValue) + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute + * @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} + */ +int +cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, + ait_val_t * __restrict val, const char *csDefValue) { - struct tagPair *av; + struct tagCfg *av; int ret = 0; - if (!cfg || !csAttr || !ValLen || !psVal) + if (!cfg || !val) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; + } - av = SelectAttribute(cfg, csSec, csAttr); + AIT_INIT_VAL(val); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) { + /* not found item */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); - } - + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); + } else + AIT_INIT_VAL(val); return ret; } - if (!av->psValue || !*av->psValue) { + if (AIT_ISEMPTY(&av->cfg_val) || !AIT_ADDR(&av->cfg_val) || + !*AIT_GET_LIKE(&av->cfg_val, char*)) { + /* empty value */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); - } + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); + } else + AIT_INIT_VAL(val); } else { - strlcpy((char*) psVal, (char*) av->psValue, ValLen); - ret = strlen((char*) psVal); + /* copy value */ + AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val)); + ret = AIT_LEN(val); } return ret; } -#endif