--- libaitcfg/inc/aitcfg.h	2012/04/04 13:11:49	1.7
+++ libaitcfg/inc/aitcfg.h	2014/03/03 09:40:28	1.13.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.h,v 1.7 2012/04/04 13:11:49 misho Exp $
+* $Id: aitcfg.h,v 1.13.2.1 2014/03/03 09:40:28 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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,9 +47,8 @@ SUCH DAMAGE.
 #define __AITCFG_H
 
 
-#include <aitio.h>
-#include <atree.h>
 #include <pthread.h>
+#include <elwix.h>
 
 
 struct tagCfg {
@@ -57,13 +56,14 @@ struct tagCfg {
 	ait_val_t		cfg_attr;
 	ait_val_t		cfg_val;
 
-	SLIST_ENTRY(tagCfg)	cfg_next;
+	TAILQ_ENTRY(tagCfg)	cfg_next;
 	RB_ENTRY(tagCfg)	cfg_node;
 };
 typedef struct tagRC {
 	pthread_mutex_t		rc_mtx;
 
-	struct tagCfg		*slh_first;
+	struct tagCfg		*tqh_first;
+	struct tagCfg		**tqh_last;
 	struct tagCfg		*rbh_root;
 } cfg_root_t;
 #define CFG_RC_LOCK(x)		pthread_mutex_lock(&(x)->rc_mtx)
@@ -71,9 +71,9 @@ typedef struct tagRC {
 
 
 // cfg_GetErrno() Get error code of last operation
-inline int cfg_GetErrno();
+int cfg_GetErrno();
 // cfg_GetError() Get error text of last operation
-inline const char *cfg_GetError();
+const char *cfg_GetError();
 
 
 /*
@@ -85,11 +85,17 @@ inline const char *cfg_GetError();
 /*
  * cfgInitConfig() - Init config root
  *
- * @cfg = Config root
- * return: -1 error or 0 ok
+ * return: NULL error or !=NULL allocated config root
  */
-int cfgInitConfig(cfg_root_t * __restrict cfg);
+cfg_root_t *cfgInitConfig();
 /*
+ * cfgEndConfig() - Free resources & config root
+ *
+ * @pcfg = Config root
+ * return: none
+ */
+void cfgEndConfig(cfg_root_t **pcfg);
+/*
  * cfgLoadConfig() - Load config from file
  *
  * @cfgName = Config filename
@@ -98,13 +104,20 @@ int cfgInitConfig(cfg_root_t * __restrict cfg);
  */
 int cfgLoadConfig(const char *cfgName, cfg_root_t * __restrict cfg);
 /*
- * cfgUnloadConfig() - Unload config from memory and free resources
+ * cfgUnloadConfig() - Unload config from memory and destroy resources
  *
  * @cfg = Config root
  * return: none
  */
 void cfgUnloadConfig(cfg_root_t * __restrict cfg);
 /*
+ * cfgClearConfig() - Clear config and free resources
+ *
+ * @cfg = Config root
+ * return: none
+ */
+void cfgClearConfig(cfg_root_t * __restrict cfg);
+/*
  * cfgCreateConfig() - Create config file from memory
  *
  * @csConfigName = New config filename
@@ -116,6 +129,29 @@ int cfgCreateConfig(const char *csConfigName, cfg_root
 		int whitespace);
 
 /*
+ * cfgReadLines() - Read custom lines and add new item at config root
+ *
+ * @f = File resource
+ * @delim = Custom delimiter, if =NULL default is '='
+ * @end = Custom user end of file, if =NULL default is EOF
+ * @cfg = Config root
+ * return: -1 error or 0 ok
+ */
+int cfgReadLines(FILE *f, const char *delim, const char *end, 
+		cfg_root_t * __restrict cfg);
+/*
+ * cfgWriteLines() - Write custom lines and export data to variable
+ *
+ * @f = File resource
+ * @delim = Custom delimiter, if =NULL default is '='
+ * @eol = End of line string, if =NULL default is "\n"
+ * @section = Export only section, if =NULL default is all
+ * @cfg = Config root
+ * return: =NULL error or !=NULL exported data, must be free after use with ait_freeVar()
+ */
+ait_val_t *cfgWriteLines(FILE *f, const char *delim, const char *eol, 
+		const char *section, cfg_root_t * __restrict cfg);
+/*
  * cfgReadConfig() - Read file and add new item at config root
  *
  * @f = File resource
@@ -157,7 +193,7 @@ int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_ro
  * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 not found item, -1 error or >0 position in list
  */
-inline int cfg_findAttribute(cfg_root_t * __restrict cfg, 
+int cfg_findAttribute(cfg_root_t * __restrict cfg, 
 		const char *csSec, const char *csAttr);
 /*
  * cfg_getAttribute() - Get item from config and return value from it
@@ -167,7 +203,7 @@ inline int cfg_findAttribute(cfg_root_t * __restrict c
  * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
  * return: NULL item not found or null parameters, !=NULL value const string
  */
-inline const char *cfg_getAttribute(cfg_root_t * __restrict cfg, 
+const char *cfg_getAttribute(cfg_root_t * __restrict cfg, 
 		const char *csSec, const char *csAttr);
 /*
  * cfg_setAttribute() - Set item in config or adding new item if not exists