--- libaitcfg/src/parse.c	2008/08/28 13:17:41	1.1
+++ libaitcfg/src/parse.c	2014/01/29 23:48:34	1.13
@@ -1,185 +1,495 @@
+/*************************************************************************
+* (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: parse.c,v 1.13 2014/01/29 23:48:34 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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 - 2014
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
-#include "aitcfg.h"
-#include "tools.h"
 
 
-// cfgDbg() Debug/Log operation
-static inline int cfgDbg(FILE *f, char *fmt, ...)
+static inline void
+_invertQueue(cfg_root_t * __restrict cfg)
 {
-	int ret = 0;
-	va_list lst;
+	struct tagCfg *item, *next, *prev = NULL;
 
-	va_start(lst, fmt);
-	ret = vfprintf(f, fmt, lst);
-	va_end(lst);
-
-	return ret;
+	SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) {
+		item->cfg_next.sle_next = prev;
+		prev = item;
+	}
+	cfg->slh_first = prev;
 }
 
-// -----------------------------------------
 
 /*
- * 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)
+ * 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)
 {
-	u_char szLine[MAX_STR + 1];
-	u_char szSection[MAX_STR + 1], *psAttr, *psVal;
-	int pos;
-	struct tagPair *av;
+	char line[BUFSIZ];
+	struct tagCfg *av = NULL;
+	int flg = 0;
+	char *psAttr, *psVal, szSection[STRSIZ] = { 0 };
 
-	memset(szSection, 0, MAX_STR + 1);
+	if (!f || !cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter(s)");
+		return -1;
+	}
+
 	while (!feof(f)) {
-		memset(szLine, 0, MAX_STR + 1);
-		fgets((char*) szLine, MAX_STR, f);
-		trim(szLine);
-#ifdef __DEBUG
-		cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine);
+		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;
+			str_Trim(line);
+		}
 
-		// End of config
-		if (*szLine == '.')
-			break;
-		// Comment
-		if (*szLine == '#' || *szLine == ';' || !*szLine)
+		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 && AIT_ADDR(&av->cfg_val))
+				str_Unquot((char*) AIT_GET_STR(&av->cfg_val));
 			continue;
+		}
 
-#ifdef __DEBUG
-		cfgDbg(stdout, "DEBUG:: Clean |%s|\n", szLine);
-#endif
+		/* *NEW PAIR* alloc new pair element */
+		av = e_malloc(sizeof(struct tagCfg));
+		if (!av) {
+			cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+			return -1;
+		} else {
+			memset(av, 0, sizeof(struct tagCfg));
+			CFG_RC_LOCK(cfg);
+			SLIST_INSERT_HEAD(cfg, av, cfg_next);
+			CFG_RC_UNLOCK(cfg);
+		}
 
-		// Section
-		if (*szLine == '[') {
-			pos = strlen((char*) szLine) - 1;
-			if (szLine[pos] != ']') {
-				cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine);
-			} else {
-				szLine[pos] = 0; 
-				strncpy((char*) szSection, (char*) szLine + 1, MAX_STR);
-#ifdef __DEBUG
-				cfgDbg(stdout, "DEBUG:: Section %s\n", szSection);
-#endif
-			}
-			continue;
+		/* check for continues line */
+		psAttr = line + (*line ? strlen(line) : 1) - 1;
+		if (*psAttr == '\\') {
+			*psAttr = 0;
+			flg = 1;
 		}
 
-		// Devide pairs
-		pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0;
-		if (!pos) {
-			cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine);
+		/* check for comment or empty line */
+		if (!*line || *line == '#' || *line == ';') {
+			AIT_SET_STR(&av->cfg_val, line);
 			continue;
-		} else {
-			av = malloc(sizeof(struct tagPair));
-			if (!av) {
-				LOGERR;
-				return -1;
-			} else {
-				// 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
-					strcpy((char*) av->psSection, (char*) szSection);
+		}
+		/* section */
+		if (*line == '[') {
+			psAttr = line + strlen(line) - 1;
+			if (*psAttr == ']') {
+				*psAttr = 0; 
+				flg = 0;
+				strlcpy(szSection, line + 1, sizeof szSection);
+				AIT_SET_STR(&av->cfg_sec, line);
 			} else
-				av->psSection = NULL;
+				EDEBUG(7, "Ignore section '%s' ... not found ']'", line);
+			continue;
+		}
+		/* parse pair */
+		if (!(psAttr = strchr(line, '='))) {
+			AIT_SET_STR(&av->cfg_val, line);
+			EDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
+			continue;
+		} else {
+			*psAttr = 0;
+			psVal = psAttr + 1;
+			psAttr = line;
+		}
 
-			psAttr = szLine;
-			psVal = (szLine + pos + 1);
-			szLine[pos] = 0;
-			rtrim(psAttr);
-			ltrim(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
-				strcpy((char*) av->psAttribute, (char*) psAttr);
-			// 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
-				strcpy((char*) av->psValue, (char*) psVal);
+		/* 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*), 
+					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
+
+		str_RTrim(psAttr);
+		str_LTrim(psVal);
+		if (!flg)
+			str_Unquot(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*), 
+				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
+
+		CFG_RC_LOCK(cfg);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
 	}
 
 	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)
+ * 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)
 {
-	struct tagPair *av;
+	struct tagCfg *av;
 	time_t tim;
-	char szTime[MAX_STR + 1];
-	u_char szSection[MAX_STR + 1];
+	char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { [0 ... STRSIZ - 1] = 0 };
 
-	bzero(szSection, MAX_STR + 1);
-
-	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;
+	if (!f || !cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
 	}
 
-	for (av = cfg->slh_first; av; av = av->sle_next) {
-		if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) {
-			bzero(szSection, MAX_STR + 1);
-			strcpy((char*) szSection, (char*) av->psSection);
-			if (!cfgDbg(f, "\n[%s]\n", av->psSection)) {
+	CFG_RC_LOCK(cfg);
+	_invertQueue(cfg);
+	SLIST_FOREACH(av, cfg, cfg_next) {
+		/* empty lines or comment */
+		if (AIT_ISEMPTY(&av->cfg_attr)) {
+			if (AIT_ISEMPTY(&av->cfg_val))
+				continue;
+			strlcpy(line, AIT_GET_STR(&av->cfg_val), sizeof line);
+			goto skip_sec;
+		}
+
+		/* 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, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
 				LOGERR;
+				_invertQueue(cfg);
+				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
-		}
-		if (!av->psSection && *szSection) {
-			bzero(szSection, MAX_STR + 1);
-			if (!cfgDbg(f, "\n[]\n")) {
+		} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) {
+			memset(szSection, 0, sizeof szSection);
+			if (!cfg_Write(f, "[]\n")) {
 				LOGERR;
+				_invertQueue(cfg);
+				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
 		}
 
-		if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) {
+		/* 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);
+skip_sec:
+		/* write */
+		if (!cfg_Write(f, "%s\n", line)) {
 			LOGERR;
+			_invertQueue(cfg);
+			CFG_RC_UNLOCK(cfg);
 			return -1;
 		}
 	}
+	_invertQueue(cfg);
+	CFG_RC_UNLOCK(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;
+	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;
+}
+
+/*
+ * 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 tagCfg *item;
+
+	if (!cfg || !add_cfg)
 		return -1;
+
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
+
+	/* 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);
+
+	/* concat red-black trees */
+	SLIST_FOREACH(item, add_cfg, cfg_next)
+		RB_INSERT(tagRC, cfg, item);
+
+	CFG_RC_UNLOCK(cfg);
+
+	add_cfg->slh_first = NULL;
+	add_cfg->rbh_root = NULL;
+	CFG_RC_UNLOCK(add_cfg);
+	pthread_mutex_destroy(&add_cfg->rc_mtx);
+	return 0;
+}
+
+/*
+ * 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 tagCfg *item, *merge, *add_next, *next;
+	int flg;
+
+	if (!cfg || !add_cfg)
+		return -1;
+
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
+
+	/* 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;
+				break;
+			}
+			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;
+				break;
+			}
+		}
+
+		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);
+
+	add_cfg->slh_first = NULL;
+	add_cfg->rbh_root = NULL;
+	CFG_RC_UNLOCK(add_cfg);
+	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 *p, *psSec, *psAttr, *psVal;
+
+	if (!cfg)
+		return -1;
+	if (!delim)
+		delim = ATR_LINES_DELIM;
+
+	while (!feof(f)) {
+		psSec = psAttr = psVal = NULL;
+		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;
+			str_Trim(line);
+			if (!*line)
+				continue;
+		}
+
+		if (!av_MakeExt(line, delim, &p, &psVal))
+			continue;
+		else {
+			str_RTrim(p);
+			str_LTrim(psVal);
+		}
+		if (!av_MakeExt(p, SEC_LINES_DELIM, &psSec, &psAttr))
+			psAttr = p;
+
+		/* *NEW PAIR* alloc new pair element */
+		av = e_malloc(sizeof(struct tagCfg));
+		if (!av) {
+			LOGERR;
+			return -1;
+		} else
+			memset(av, 0, sizeof(struct tagCfg));
+
+		if (psSec) {
+			AIT_SET_STR(&av->cfg_sec, psSec);
+			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
+					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
+		}
+		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*), 
+				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 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);
+			e_free(d);
+		}
+
+		SLIST_INSERT_HEAD(cfg, av, cfg_next);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
+	}
+
+	return 0;
+}
+
+/*
+ * 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)
+{
+	ait_val_t *v = NULL;
+	struct tagCfg *av;
+
+	if (!cfg)
+		return NULL;
+	if (!delim)
+		delim = ATR_LINES_DELIM;
+	if (!eol)
+		eol = EOL_LINES_DELIM;
+	if (!(v = ait_allocVar())) {
+		cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		return NULL;
+	} else
+		AIT_INIT_VAL2(v, string);
+
+	SLIST_FOREACH(av, cfg, cfg_next) {
+		if (AIT_ISEMPTY(&av->cfg_attr))
+			continue;
+		if (section) {
+			if (!AIT_ISEMPTY(&av->cfg_sec) && *section)
+				continue;
+			if (strcmp(section, AIT_GET_STR(&av->cfg_sec)))
+				continue;
+		}
+
+		if (!AIT_ISEMPTY(&av->cfg_sec)) {
+			AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_sec));
+			AIT_SET_STRCAT(v, SEC_LINES_DELIM);
+		}
+		AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_attr));
+		AIT_SET_STRCAT(v, delim);
+		if (!AIT_ISEMPTY(&av->cfg_val))
+			AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val));
+		AIT_SET_STRCAT(v, eol);
+	}
+
+	if (f)
+		fputs(AIT_GET_STR(v), f);
+	return v;
 }