--- libaitcfg/inc/aitcfg.h 2014/03/19 18:38:43 1.15 +++ libaitcfg/inc/aitcfg.h 2023/01/23 21:03:50 1.18.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.15 2014/03/19 18:38:43 misho Exp $ +* $Id: aitcfg.h,v 1.18.6.1 2023/01/23 21:03:50 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 - 2014 +Copyright 2004 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -55,6 +55,7 @@ struct tagCfg { ait_val_t cfg_sec; ait_val_t cfg_attr; ait_val_t cfg_val; + int cfg_quoted; TAILQ_ENTRY(tagCfg) cfg_next; RB_ENTRY(tagCfg) cfg_node; @@ -173,6 +174,15 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg */ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace); /* + * cfgWriteConfigRaw() - Write config from memory by list + * + * @f = File handle + * @cfg = Config root + * @whitespace = Additional whitespace characters to file + * return: -1 error or 0 ok + */ +int cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg, int whitespace); +/* * cfgConcatConfig() - Concat two configs into one * * @cfg = Config root @@ -190,6 +200,13 @@ int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_r int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); /* + * cfg_dumpCfg() - dump config data + * + * @cfg = Config root + * return: none + */ +void cfg_dumpCfg(cfg_root_t * __restrict cfg); +/* * cfg_getSection() - Get entire section attributes into array * * @cfg = Config root @@ -202,7 +219,7 @@ array_t *cfg_getSection(cfg_root_t * __restrict cfg, c * * @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, @@ -212,12 +229,53 @@ int cfg_findAttribute(cfg_root_t * __restrict cfg, * * @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 *cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr); /* + * cfg_getAttributeLong() - Get item as long from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ... + * return: value + */ +long cfg_getAttributeLong(cfg_root_t * __restrict cfg, + const char *csSec, const char *csAttr); +/* + * cfg_getAttributeLLong() - Get item as long long from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ... + * return: value + */ +long long +cfg_getAttributeLLong(cfg_root_t * __restrict cfg, + const char *csSec, const char *csAttr); +/* + * cfg_getAttributeDouble() - Get item as double from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ... + * return: value + */ +double cfg_getAttributeDouble(cfg_root_t * __restrict cfg, + const char *csSec, const char *csAttr); +/* + * cfg_getAttributeLDouble() - Get item as long double from config and return value from it + * + * @cfg = Config root + * @csSec = Config section //[{csSec}], if NULL unset in *default* section + * @csAttr = Config attribute //{csAttr} = ... + * return: value + */ +long double cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, + const char *csSec, const char *csAttr); +/* * cfg_setAttribute() - Set item in config or adding new item if not exists * * @cfg = Config root @@ -233,7 +291,7 @@ int cfg_setAttribute(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: 0 item not found, -1 error or 1 removed item */ int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, @@ -244,7 +302,7 @@ int cfg_unsetAttribute(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} = ... * @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}