--- libaitcfg/inc/aitcfg.h 2019/12/05 14:33:35 1.17 +++ libaitcfg/inc/aitcfg.h 2025/01/31 00:03:15 1.20 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.17 2019/12/05 14:33:35 misho Exp $ +* $Id: aitcfg.h,v 1.20 2025/01/31 00:03:15 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 - 2024 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; @@ -73,6 +74,9 @@ typedef struct tagRC { #define CFG_ATTRIBUTE(x) (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_attr, const char*)) #define CFG_VALUE(x) (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_val, const char*)) +#ifdef __cplusplus +extern "C" { +#endif // cfg_GetErrno() Get error code of last operation int cfg_GetErrno(); @@ -173,6 +177,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 @@ -209,7 +222,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, @@ -219,7 +232,7 @@ 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, @@ -229,7 +242,7 @@ const char *cfg_getAttribute(cfg_root_t * __restrict 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: value */ long cfg_getAttributeLong(cfg_root_t * __restrict cfg, @@ -239,7 +252,7 @@ long cfg_getAttributeLong(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: value */ long long @@ -250,7 +263,7 @@ cfg_getAttributeLLong(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: value */ double cfg_getAttributeDouble(cfg_root_t * __restrict cfg, @@ -260,7 +273,7 @@ double cfg_getAttributeDouble(cfg_root_t * __restrict * * @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 cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, @@ -281,7 +294,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, @@ -292,7 +305,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} @@ -300,5 +313,8 @@ int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, ait_val_t * __restrict val, const char *csDefValue); +#ifdef __cplusplus +} +#endif #endif