--- libaitcfg/src/parse.c	2012/04/03 09:21:06	1.6.4.2
+++ libaitcfg/src/parse.c	2012/08/06 15:08:26	1.10.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6.4.2 2012/04/03 09:21:06 misho Exp $
+* $Id: parse.c,v 1.10.2.1 2012/08/06 15:08:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -80,7 +80,8 @@ _invertQueue(cfg_root_t * __restrict cfg)
  * @cfg = Config root
  * return: -1 error or 0 ok
  */
-int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
+int
+cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 {
 	char line[BUFSIZ];
 	struct tagCfg *av = NULL;
@@ -115,13 +116,13 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
 				flg = 0;
 			/* concat line to value */
 			AIT_SET_STRCAT(&av->cfg_val, line);
-			if (!flg)
+			if (!flg && AIT_ADDR(&av->cfg_val))
 				io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val));
 			continue;
 		}
 
 		/* *NEW PAIR* alloc new pair element */
-		av = malloc(sizeof(struct tagCfg));
+		av = io_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -133,7 +134,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
 		}
 
 		/* check for continues line */
-		psAttr = line + strlen(line) - 1;
+		psAttr = line + (*line ? strlen(line) : 1) - 1;
 		if (*psAttr == '\\') {
 			*psAttr = 0;
 			flg = 1;
@@ -204,19 +205,13 @@ 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) {
-		if (!AIT_ISEMPTY(&av->cfg_sec) && 
+		/* add +1 line for section [] */
+		if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && 
 				strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) {
 			strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection);
 			if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
@@ -234,8 +229,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_STRZ(&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_STRZ(&av->cfg_val), sizeof line);
+
+		/* write */
+		if (!cfg_Write(f, "%s\n", line)) {
 			LOGERR;
 			CFG_RC_UNLOCK(cfg);
 			return -1;
@@ -244,110 +251,173 @@ 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
 /*
- * WriteConfig() Write to file from items in config list
- * @f = file resource
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t write to file
-*/
-int WriteConfig(FILE *f, 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)
 {
-	return cfgWrite(f, cfg, 1);
-}
+	struct tagCfg *item;
 
-/*
- * cfg_WriteConfig() Write to file from items in config list without whitespaces!
- * @f = file resource
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t write to file
-*/
-int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg)
-{
-	return cfgWrite(f, cfg, 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)
-{
-	struct tagPair *item;
-	int ret = 0;
-
 	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;
 }
 
 /*
- * 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)
+ * 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)
 {
-	struct tagPair *item, *merge, *add_next, *next = NULL;
+	struct tagCfg *item, *merge, *add_next, *next;
 	int flg;
 
 	if (!cfg || !add_cfg)
 		return -1;
 
-	item = add_cfg->slh_first;
-	while (item) {
-		add_next = item->sle_next;
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
 
-		for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; 
-				merge = merge->sle_next, next = merge->sle_next) {
-			if (!merge->psSection && !item->psSection) {
+	/* merge lists */
+	SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) {
+		flg = 0;
+		SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) {
+			if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) {
 				flg = 1;
-				merge->sle_next = item;
-				item->sle_next = next;
 				break;
 			}
-			if (merge->psSection && item->psSection && 
-					!strcmp((char*) merge->psSection, (char*) item->psSection)) {
+			if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && 
+					AIT_ADDR(&merge->cfg_sec) && AIT_ADDR(&item->cfg_sec) &&
+					!strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) {
 				flg = 1;
-				merge->sle_next = item;
-				item->sle_next = next;
 				break;
 			}
 		}
 
-		if (!flg) {
-			if (!merge->sle_next) {
-				merge->sle_next = item;
-				item->sle_next = NULL;
-			} else
-				return -1;
-		}
-
-		item = add_next;
+		if (!flg)
+			SLIST_INSERT_HEAD(cfg, item, cfg_next);
+		else
+			SLIST_INSERT_AFTER(merge, item, 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;
+}
 
+/*
+ * 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)
+{
+	char line[BUFSIZ];
+	struct tagCfg *d, *av = NULL;
+	char *psAttr, *psVal = NULL;
+
+	while (!feof(f)) {
+		memset(line, 0, sizeof line);
+		fgets(line, sizeof line - 1, f);
+		/* check for user end-of-file */
+		if (strspn(line, end))
+			break;
+
+		if (!(psAttr = strpbrk(line, "\r\n"))) {
+			/* skip line, too long */
+			continue;
+		} else {
+			*psAttr = 0;
+			io_TrimStr(line);
+			if (!*line)
+				continue;
+		}
+
+		if (!io_MakeAV2(line, delim, &psAttr, &psVal))
+			continue;
+		else {
+			io_LTrimStr(psVal);
+			io_RTrimStr(psAttr);
+		}
+
+		/* *NEW PAIR* alloc new pair element */
+		av = io_malloc(sizeof(struct tagCfg));
+		if (!av) {
+			LOGERR;
+			return -1;
+		} else
+			memset(av, 0, sizeof(struct tagCfg));
+
+		if (psVal)
+			AIT_SET_STR(&av->cfg_val, psVal);
+		AIT_SET_STR(&av->cfg_attr, psAttr);
+		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
+				io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2);
+
+		CFG_RC_LOCK(cfg);
+		/* find & delete duplicates */
+		if ((d = RB_FIND(tagRC, cfg, av))) {
+			RB_REMOVE(tagRC, cfg, d);
+			SLIST_REMOVE(cfg, d, tagCfg, cfg_next);
+
+			AIT_FREE_VAL(&d->cfg_val);
+			AIT_FREE_VAL(&d->cfg_attr);
+			AIT_FREE_VAL(&d->cfg_sec);
+			io_free(d);
+		}
+
+		SLIST_INSERT_HEAD(cfg, av, cfg_next);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
+	}
+
 	return 0;
 }
-#endif
+