--- libaitcfg/src/parse.c	2012/04/03 12:54:49	1.6.4.3
+++ libaitcfg/src/parse.c	2012/04/04 13:10:56	1.6.4.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6.4.3 2012/04/03 12:54:49 misho Exp $
+* $Id: parse.c,v 1.6.4.8 2012/04/04 13:10:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -204,18 +204,12 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 {
 	struct tagCfg *av;
 	time_t tim;
-	char szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 };
+	char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 };
 
-	time(&tim);
-	strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfg_Write(f, "## Write Config :: %s\n#\n", szTime)) {
-		LOGERR;
-		return -1;
-	}
-
 	CFG_RC_LOCK(cfg);
 	_invertQueue(cfg);
 	SLIST_FOREACH(av, cfg, cfg_next) {
+		/* add +1 line for section [] */
 		if (!AIT_ISEMPTY(&av->cfg_sec) && 
 				strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) {
 			strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection);
@@ -234,8 +228,20 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 			}
 		}
 
-		if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), 
-					AIT_GET_STR(&av->cfg_attr), AIT_GET_STR(&av->cfg_val))) {
+		/* build line */
+		memset(line, 0, sizeof line);
+		if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) {
+			strlcpy(line, AIT_GET_STR(&av->cfg_attr), sizeof line);
+			if (whitespace)
+				strlcat(line, " = ", sizeof line);
+			else
+				strlcat(line, "=", sizeof line);
+		}
+		if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string)
+			strlcat(line, AIT_GET_STR(&av->cfg_val), sizeof line);
+
+		/* write */
+		if (!cfg_Write(f, "%s\n", line)) {
 			LOGERR;
 			CFG_RC_UNLOCK(cfg);
 			return -1;
@@ -244,40 +250,50 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 	_invertQueue(cfg);
 	CFG_RC_UNLOCK(cfg);
 
-	memset(szTime, 0, sizeof szTime);
-	time(&tim);
-	strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfg_Write(f, "\n#\n## Done. :: %s\n", szTime)) {
-		LOGERR;
-		return -1;
+	if (whitespace) {
+		time(&tim);
+		memset(line, 0, sizeof line);
+		strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
+		cfg_Write(f, "\n## Config was saved at :: %s ##\n", line);
 	}
 
 	return 0;
 }
 
-#if 0
 /*
- * 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)
+ * 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)
 {
-	struct tagPair *item;
-	int ret = 0;
+	struct tagCfg *item;
 
 	if (!cfg || !add_cfg)
 		return -1;
 
-	for (item = cfg->slh_first; item->sle_next; item = item->sle_next);
-	item->sle_next = add_cfg->slh_first;
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
 
-	add_cfg->slh_first = NULL;
+	/* concat lists */
+	for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next));
+	SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg);
 
-	return ret;
+	/* concat red-black trees */
+	SLIST_FOREACH(item, add_cfg, cfg_next)
+		RB_INSERT(tagRC, cfg, item);
+
+	CFG_RC_UNLOCK(cfg);
+	CFG_RC_UNLOCK(add_cfg);
+
+	add_cfg->slh_first = NULL;
+	add_cfg->rbh_root = NULL;
+	pthread_mutex_destroy(&add_cfg->rc_mtx);
+	return 0;
 }
-#endif
 
 /*
  * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg