--- libaitcfg/src/parse.c	2011/05/01 17:24:28	1.6
+++ libaitcfg/src/parse.c	2012/04/04 13:11:49	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6 2011/05/01 17:24:28 misho Exp $
+* $Id: parse.c,v 1.7 2012/04/04 13:11:49 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
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,8 @@ SUCH DAMAGE.
 #include "aitcfg.h"
 
 
-// cfgDbg() Debug/Log operation
-static inline int cfgDbg(FILE *f, char *fmt, ...)
+static inline int
+cfg_Write(FILE *f, char *fmt, ...)
 {
 	int ret = 0;
 	va_list lst;
@@ -60,290 +60,287 @@ static inline int cfgDbg(FILE *f, char *fmt, ...)
 	return ret;
 }
 
-/*
- * InvertQueue() InvertQueue order //{cfg} list of elements for revert
- * @cfg = Head list element for revert 
-*/
-static inline void InvertQueue(sl_config * __restrict cfg)
+static inline void
+_invertQueue(cfg_root_t * __restrict cfg)
 {
-	struct tagPair *item, *next, *prev = NULL;
+	struct tagCfg *item, *next, *prev = NULL;
 
-	for (item = cfg->slh_first; item; item = next) {
-		next = item->sle_next;
-		item->sle_next = prev;
+	SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) {
+		item->cfg_next.sle_next = prev;
 		prev = item;
 	}
 	cfg->slh_first = prev;
 }
 
-// cfgWrite() Write to file from config list
-static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace)
+
+/*
+ * cfgReadConfig() - Read file and add new item at config root
+ *
+ * @f = File resource
+ * @cfg = Config root
+ * return: -1 error or 0 ok
+ */
+int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 {
-	struct tagPair *av;
-	time_t tim;
-	char szTime[MAX_STR + 1];
-	u_char szSection[MAX_STR + 1];
+	char line[BUFSIZ];
+	struct tagCfg *av = NULL;
+	int flg = 0;
+	char *psAttr, *psVal, szSection[STRSIZ] = { 0 };
 
-	bzero(szSection, MAX_STR + 1);
+	while (!feof(f)) {
+		memset(line, 0, sizeof line);
+		fgets(line, sizeof line - 1, f);
+#ifdef SUPPORT_USER_EOF
+		/* check for user end-of-file */
+		if (line[0] == '.' && line[1] == '\n')
+			break;
+#endif
+		if (!(psAttr = strpbrk(line, "\r\n"))) {
+			/* skip line, too long */
+			continue;
+		} else {
+			*psAttr = 0;
+			io_TrimStr(line);
+		}
 
-	bzero(szTime, MAX_STR + 1);
-	time(&tim);
-	strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) {
-		LOGERR;
-		return -1;
-	}
+		if (flg) {
+			/* continues line */
+			if (!av)
+				continue;
+			else
+				psAttr = line + strlen(line) - 1;
+			if (*psAttr == '\\')
+				*psAttr = 0;
+			else
+				flg = 0;
+			/* concat line to value */
+			AIT_SET_STRCAT(&av->cfg_val, line);
+			if (!flg)
+				io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val));
+			continue;
+		}
 
-	InvertQueue(cfg);
-	for (av = cfg->slh_first; av; av = av->sle_next) {
-		if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) {
-			strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1);
-			if (!cfgDbg(f, "\n[%s]\n", av->psSection)) {
-				LOGERR;
-				return -1;
-			}
+		/* *NEW PAIR* alloc new pair element */
+		av = malloc(sizeof(struct tagCfg));
+		if (!av) {
+			LOGERR;
+			return -1;
+		} else {
+			memset(av, 0, sizeof(struct tagCfg));
+			CFG_RC_LOCK(cfg);
+			SLIST_INSERT_HEAD(cfg, av, cfg_next);
+			CFG_RC_UNLOCK(cfg);
 		}
-		if (!av->psSection && *szSection) {
-			bzero(szSection, MAX_STR + 1);
-			if (!cfgDbg(f, "\n[]\n")) {
-				LOGERR;
-				return -1;
-			}
+
+		/* check for continues line */
+		psAttr = line + strlen(line) - 1;
+		if (*psAttr == '\\') {
+			*psAttr = 0;
+			flg = 1;
 		}
 
-		if (whitespace) {
-			if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) {
-				LOGERR;
-				return -1;
-			}
+		/* check for comment or empty line */
+		if (!*line || *line == '#' || *line == ';') {
+			AIT_SET_STR(&av->cfg_val, line);
+			continue;
+		}
+		/* section */
+		if (*line == '[') {
+			AIT_SET_STR(&av->cfg_val, line);
+			psAttr = line + strlen(line) - 1;
+			if (*psAttr == ']') {
+				*psAttr = 0; 
+				flg = 0;
+				strlcpy(szSection, line + 1, sizeof szSection);
+			} else
+				ioDEBUG(7, "Ignore section '%s' ... not found ']'", line);
+			continue;
+		}
+		/* parse pair */
+		if (!(psAttr = strchr(line, '='))) {
+			AIT_SET_STR(&av->cfg_val, line);
+			ioDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
+			continue;
 		} else {
-			if (!cfgDbg(f, "%s=%s\n", av->psAttribute, av->psValue)) {
-				LOGERR;
-				return -1;
-			}
+			*psAttr = 0;
+			psVal = psAttr + 1;
+			psAttr = line;
 		}
-	}
-	InvertQueue(cfg);
 
-	bzero(szTime, MAX_STR + 1);
-	time(&tim);
-	strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfgDbg(f, "\n#\n## Done. :: %s\n", szTime)) {
-		LOGERR;
-		return -1;
+		/* if exists, added section name to element */
+		if (*szSection) {
+			AIT_SET_STR(&av->cfg_sec, szSection);
+			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
+					io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2);
+		}
+
+		io_RTrimStr(psAttr);
+		io_LTrimStr(psVal);
+		if (!flg)
+			io_UnquotStr(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);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
 	}
 
 	return 0;
 }
 
-// ---------------------------------------------------
-
 /*
- * ReadConfig() Read from file and add new item to config list
- * @f = file resource
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t allocate memory
-*/
-int ReadConfig(FILE *f, sl_config * __restrict cfg)
+ * cfgWriteConfig() - Write config from memory
+ *
+ * @f = File handle
+ * @cfg = Config root
+ * @whitespace = Additional whitespace characters to file
+ * return: -1 error or 0 ok
+ */
+int
+cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace)
 {
-	u_char szLine[MAX_STR + 1];
-	u_char szSection[MAX_STR + 1], *psAttr, *psVal;
-	int pos;
-	struct tagPair *av;
+	struct tagCfg *av;
+	time_t tim;
+	char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 };
 
-	memset(szSection, 0, MAX_STR + 1);
-	while (!feof(f)) {
-		memset(szLine, 0, MAX_STR + 1);
-		fgets((char*) szLine, MAX_STR, f);
-		io_TrimStr(szLine);
-#ifdef __DEBUG
-		cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine);
-#endif
-
-		// End of config
-		if (*szLine == '.')
-			break;
-		// Comment
-		if (*szLine == '#' || *szLine == ';' || !*szLine)
-			continue;
-
-#ifdef __DEBUG
-		cfgDbg(stdout, "DEBUG:: Clean |%s|\n", szLine);
-#endif
-
-		// Section
-		if (*szLine == '[') {
-			pos = strlen((char*) szLine) - 1;
-			if (szLine[pos] != ']') {
-#ifdef __DEBUG
-				cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine);
-#endif
-			} else {
-				szLine[pos] = 0; 
-				strncpy((char*) szSection, (char*) szLine + 1, MAX_STR);
-#ifdef __DEBUG
-				cfgDbg(stdout, "DEBUG:: Section %s\n", szSection);
-#endif
+	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);
+			if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
+				LOGERR;
+				CFG_RC_UNLOCK(cfg);
+				return -1;
 			}
-			continue;
 		}
-
-		// Devide pairs
-		pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0;
-		if (!pos) {
-#ifdef __DEBUG
-			cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine);
-#endif
-			continue;
-		} else {
-			av = malloc(sizeof(struct tagPair));
-			if (!av) {
+		if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) {
+			memset(szSection, 0, sizeof szSection);
+			if (!cfg_Write(f, "\n[]\n")) {
 				LOGERR;
+				CFG_RC_UNLOCK(cfg);
 				return -1;
-			} else {
-				memset(av, 0, sizeof(struct tagPair));
-				// added new element
-				av->sle_next = cfg->slh_first;
-				cfg->slh_first = av;
 			}
-			// added section name to element
-			if (*szSection) {
-				av->psSection = malloc(strlen((char*) szSection) + 1);
-				if (!av->psSection) {
-					LOGERR;
-					free(av);
-					return -1;
-				} else
-					strlcpy((char*) av->psSection, (char*) szSection, strlen((char*) szSection) + 1);
-			} else
-				av->psSection = NULL;
+		}
 
-			psAttr = szLine;
-			psVal = (szLine + pos + 1);
-			szLine[pos] = 0;
-			io_RTrimStr(psAttr);
-			io_LTrimStr(psVal);
-			io_UnquotStr(psVal);
-#ifdef __DEBUG
-			cfgDbg(stdout, "DEBUG:: Attr(%p) ->%s size=%d Value(%p) ->%s size=%d\n", 
-					psAttr, psAttr, strlen((char*) psAttr), psVal, psVal, strlen((char*) psVal));
-#endif
-			// added attribute to element
-			av->psAttribute = malloc(strlen((char*) psAttr) + 1);
-			if (!av->psAttribute) {
-				LOGERR;
-				free(av->psSection);
-				free(av);
-				return -1;
-			} else
-				strlcpy((char*) av->psAttribute, (char*) psAttr, strlen((char*) psAttr) + 1);
-			// added value to element
-			av->psValue = malloc(strlen((char*) psVal) + 1);
-			if (!av->psValue) {
-				LOGERR;
-				free(av->psAttribute);
-				free(av->psSection);
-				free(av);
-				return -1;
-			} else
-				strlcpy((char*) av->psValue, (char*) psVal, strlen((char*) psVal) + 1);
+		/* 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;
+		}
 	}
+	_invertQueue(cfg);
+	CFG_RC_UNLOCK(cfg);
 
+	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;
 }
 
 /*
- * 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 = NULL;
 	int flg;
 
 	if (!cfg || !add_cfg)
 		return -1;
 
-	item = add_cfg->slh_first;
-	while (item) {
-		add_next = item->sle_next;
-
-		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) {
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
+	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)) {
+				SLIST_INSERT_AFTER(merge, item, cfg_next);
+				RB_INSERT(tagRC, cfg, item);
 				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) && 
+					!strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) {
+				SLIST_INSERT_AFTER(merge, item, cfg_next);
+				RB_INSERT(tagRC, cfg, item);
 				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;
+			SLIST_INSERT_AFTER(merge, item, cfg_next);
+			RB_INSERT(tagRC, cfg, item);
 		}
-
-		item = add_next;
 	}
+	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;
 }