--- libaitcfg/inc/aitcfg.h	2012/04/03 09:21:06	1.6.4.5
+++ libaitcfg/inc/aitcfg.h	2012/09/19 15:22:32	1.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.h,v 1.6.4.5 2012/04/03 09:21:06 misho Exp $
+* $Id: aitcfg.h,v 1.10 2012/09/19 15:22:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,6 +49,7 @@ SUCH DAMAGE.
 
 #include <aitio.h>
 #include <atree.h>
+#include <pthread.h>
 
 
 struct tagCfg {
@@ -60,19 +61,13 @@ struct tagCfg {
 	RB_ENTRY(tagCfg)	cfg_node;
 };
 typedef struct tagRC {
-#ifdef HAVE_LIBPTHREAD
 	pthread_mutex_t		rc_mtx;
-#endif
+
 	struct tagCfg		*slh_first;
 	struct tagCfg		*rbh_root;
 } cfg_root_t;
-#ifdef HAVE_LIBPTHREAD
 #define CFG_RC_LOCK(x)		pthread_mutex_lock(&(x)->rc_mtx)
 #define CFG_RC_UNLOCK(x)	pthread_mutex_unlock(&(x)->rc_mtx)
-#else
-#define CFG_RC_LOCK(x)
-#define CFG_RC_UNLOCK(x)
-#endif
 
 
 // cfg_GetErrno() Get error code of last operation
@@ -103,14 +98,54 @@ 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
+ * @cfg = Config root
+ * @whitespace = Additional whitespace characters to file
+ * return: -1 error or 0 ok
+ */
+int cfgCreateConfig(const char *csConfigName, cfg_root_t * __restrict cfg, 
+		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 io_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
@@ -127,40 +162,22 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
  * return: -1 error or 0 ok
  */
 int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace);
-
-#if 0
 /*
- * cfg_CreateConfig() Create config file from memory without whitespaces!
- * @csConfigName = New config filename
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t save new config
-*/
-int cfg_CreateConfig(const char *csConfigName, sl_config * __restrict cfg);
+ * cfgConcatConfig() - Concat two configs into one
+ *
+ * @cfg = Config root
+ * @add_cfg = Concated config will be destroy after merge
+ * return: -1 error or 0 ok
+ */
+int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);
 /*
- * CreateConfig() Create config file from memory
- * @csConfigName = New config filename
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t save new config
-*/
-int CreateConfig(const char *csConfigName, sl_config * __restrict cfg);
-
-
-/*
- * ConcatConfig() Concat two list in one
- * @cfg = Head list element of main list
- * @add_cfg = Head list element of added list
- * return: 0 ok; -1 error:: can`t concat lists
-*/
-int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
-
-/*
- * MergeConfig() Marge two list in one cfg and destroy add_cfg
- * @cfg = Head list element of main list
- * @add_cfg = Head list element of merged list (destroy after all!)
- * return: 0 ok; -1 error:: can`t merge lists
-*/
-int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
-#endif
+ * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg
+ *
+ * @cfg = Config root of main list
+ * @add_cfg = Merged config will be destroy after merge
+ * return: -1 error or 0 ok
+ */
+int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);
 
 /*
  * cfg_findAttribute() - Find attribute position in config file