--- libaitcfg/src/aitcfg.c	2011/05/01 17:24:28	1.4
+++ libaitcfg/src/aitcfg.c	2012/04/02 14:39:02	1.4.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.c,v 1.4 2011/05/01 17:24:28 misho Exp $
+* $Id: aitcfg.c,v 1.4.4.1 2012/04/02 14:39:02 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
@@ -49,83 +49,128 @@ SUCH DAMAGE.
 
 #pragma GCC visibility push(hidden)
 
-int cfgErrno;
-char cfgError[MAX_STR + 1];
+int cfg_Errno;
+char cfg_Error[STRSIZ];
 
+inline int
+cfg_tree_cmp(struct tagCfg *a, struct tagCfg *b)
+{
+	int ret;
+
+	assert(a && b);
+
+	ret = ((AIT_KEY(&a->cfg_sec) << 16) | AIT_KEY(&a->cfg_attr)) - 
+		((AIT_KEY(&b->cfg_sec) << 16) | AIT_KEY(&b->cfg_attr));
+
+	if (ret < 0)
+		return -1;
+	else if (ret > 0)
+		return 1;
+
+	return ret;
+}
+
+RB_GENERATE(tagRC, tagCfg, cfg_node, cfg_tree_cmp);
+
 #pragma GCC visibility pop
 
 
-/*
- * InitConfig() Head initializing function for config
- * @cfg = New head element for init
- * return: 0 ok; -1 error:: new head element is null
-*/
-inline int InitConfig(sl_config * __restrict cfg)
+// cfg_GetErrno() Get error code of last operation
+inline int
+cfg_GetErrno()
 {
-	if (!cfg)
-		return -1;
+	return cfg_Errno;
+}
 
-	cfg->slh_first = NULL;
-	return 0;
+// cfg_GetError() Get error text of last operation
+inline const char *
+cfg_GetError()
+{
+	return cfg_Error;
 }
 
+// cfg_SetErr() Set error to variables for internal use!!!
+inline void
+cfg_SetErr(int eno, char *estr, ...)
+{
+	va_list lst;
+
+	cfg_Errno = eno;
+	memset(cfg_Error, 0, sizeof cfg_Error);
+	va_start(lst, estr);
+	vsnprintf(cfg_Error, sizeof cfg_Error, estr, lst);
+	va_end(lst);
+}
+
+
 /*
- * LoadConfig() Load config from file
- * @csConfigName = Filename of config
- * @cfg = Head list element
- * return: 0 ok; -1 error:: can`t load config
-*/
-int LoadConfig(const char *csConfigName, sl_config * __restrict cfg)
+ * cfgLoadConfig() - Load config from file
+ *
+ * @cfgName = Config filename
+ * @cfg = Config root
+ * return: -1 error or 0 ok
+ */
+int
+cfgLoadConfig(const char *cfgName, cfg_root_t * __restrict cfg)
 {
 	FILE *f;
 	int ret;
 
-	if (!csConfigName || !cfg)
+	if (!cfgName || !cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
-
-	InitConfig(cfg);
-	if (access(csConfigName, R_OK)) {
-		LOGERR;
-		return -1;
+	} else {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_init(&cfg->rc_mtx, NULL);
+#endif
+		SLIST_INIT(cfg);
+		RB_INIT(cfg);
 	}
 
-	f = fopen(csConfigName, "rt");
+	f = fopen(cfgName, "r");
 	if (!f) {
 		LOGERR;
 		return -1;
 	}
-	
-	ret ^= ret;
-	ret = ReadConfig(f, cfg);
 
+	ret = cfgReadConfig(f, cfg);
+
 	fclose(f);
 	return ret;
 }
 
 /*
- * UnloadConfig() Unload config from memory and free resources
- * @cfg = Head list element
-*/
-void UnloadConfig(sl_config * __restrict cfg)
+ * cfgUnloadConfig() - Unload config from memory and free resources
+ *
+ * @cfg = Config root
+ * return: none
+ */
+void
+cfgUnloadConfig(cfg_root_t * __restrict cfg)
 {
-	struct tagPair *av;
+	struct tagCfg *av;
 
-	if (!cfg->slh_first)
+	if (!cfg)
 		return;
 
-	while ((av = cfg->slh_first)) {
-		cfg->slh_first = cfg->slh_first->sle_next;
+	CFG_RC_LOCK(cfg);
+	while ((av = SLIST_FIRST(cfg))) {
+		SLIST_REMOVE_HEAD(cfg, cfg_next);
 
-		if (av->psValue)
-			free(av->psValue);
-		if (av->psAttribute)
-			free(av->psAttribute);
-		if (av->psSection)
-			free(av->psSection);
+		AIT_FREE_VAL(&av->cfg_val);
+		AIT_FREE_VAL(&av->cfg_attr);
+		AIT_FREE_VAL(&av->cfg_sec);
 		free(av);
 	}
+	cfg->rbh_root = NULL;
+	CFG_RC_UNLOCK(cfg);
+
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_destroy(&cfg->rc_mtx);
+#endif
 }
 
+#if 0
 /*
  * CreateConfig() Create config file from memory
  * @csConfigName = New config filename
@@ -179,21 +224,4 @@ int cfg_CreateConfig(const char *csConfigName, sl_conf
 	fclose(f);
 	return ret;
 }
-
-// -----------------------------------------------------------
-
-//
-// Error maintenance functions ...
-//
-
-// cfg_GetErrno() Get error code of last operation
-inline int cfg_GetErrno()
-{
-	return cfgErrno;
-}
-
-// cfg_GetError() Get error text of last operation
-inline const char *cfg_GetError()
-{
-	return cfgError;
-}
+#endif