--- libaitcfg/src/queue.c	2012/04/04 13:11:49	1.7
+++ libaitcfg/src/queue.c	2014/03/19 18:38:43	1.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.7 2012/04/04 13:11:49 misho Exp $
+* $Id: queue.c,v 1.15 2014/03/19 18:38:43 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, 2012
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ SUCH DAMAGE.
 static inline struct tagCfg *
 _selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagCfg fav;
+	struct tagCfg fav, *c;
 
 	if (!cfg)
 		return NULL;
@@ -58,34 +58,100 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 1) / 2);
+				E_ALIGN(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 1) / 2);
+				E_ALIGN(strlen(csAttr), 2) / 2);
 
 	if (!csAttr)
 		return RB_NFIND(tagRC, cfg, &fav);
-	else
-		return RB_FIND(tagRC, cfg, &fav);
+	else {
+		c = RB_FIND(tagRC, cfg, &fav);
+		if (!c)
+			return NULL;	/* not found */
+		do {
+			if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
+				return c;	/* FOUND! */
+		} while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav));
+		return NULL;	/* not found */
+	}
 }
 
 /* --------------------------------------------------------------- */
 
 /*
+ * cfg_getSection() - Get entire section attributes into array
+ *
+ * @cfg = Config root
+ * @csSec = Config section //[{csSec}]
+ * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use!
+ */
+array_t *
+cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec)
+{
+	array_t *arr = NULL;
+	struct tagCfg *av, fav;
+
+	if (!cfg) {
+		cfg_SetErr(EINVAL, "Invalid argument(s)");
+		return NULL;
+	} else
+		memset(&fav, 0, sizeof fav);
+	if (csSec && !*csSec)
+		csSec = NULL;
+
+	if (csSec && *csSec)
+		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
+				E_ALIGN(strlen(csSec), 2) / 2);
+
+	av = RB_NFIND(tagRC, cfg, &fav);
+	if (!av)
+		return NULL;
+	if (csSec) {
+		if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec))
+			return NULL;
+	} else {
+		if (!AIT_ISEMPTY(&av->cfg_sec))
+			return NULL;
+	}
+
+	arr = array_Init(1);
+	if (!arr) {
+		cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		return NULL;
+	} else
+		array_Push(arr, av, 0);
+
+	while ((av = RB_NEXT(tagRC, cfg, av)) && av) {
+		if (csSec) {
+			if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec))
+				break;
+		} else {
+			if (!AIT_ISEMPTY(&av->cfg_sec))
+				break;
+		}
+
+		array_Push(arr, av, 0);
+	}
+
+	return arr;
+}
+
+/*
  * cfg_findAttribute() - Find attribute position in config file
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}]
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: 0 not found item, -1 error or >0 position in list
  */
-inline int
+int
 cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
 	struct tagCfg *av, fav;
 	register int cx = 0;
 
-	if (!cfg || !csAttr) {
+	if (!cfg) {
 		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
 	} else
@@ -93,12 +159,12 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 1) / 2);
+				E_ALIGN(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 1) / 2);
+				E_ALIGN(strlen(csAttr), 2) / 2);
 
-	SLIST_FOREACH(av, cfg, cfg_next) {
+	TAILQ_FOREACH(av, cfg, cfg_next) {
 		++cx;
 		if (!cfg_tree_cmp(&fav, av))
 			return cx;
@@ -112,7 +178,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: 0 item not found, -1 error or 1 removed item
  */
 int
@@ -120,7 +186,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const 
 {
 	struct tagCfg *av;
 
-	if (!cfg || !csAttr)
+	if (!cfg)
 		return -1;
 
 	av = _selectAttribute(cfg, csSec, csAttr);
@@ -129,13 +195,13 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const 
 
 	CFG_RC_LOCK(cfg);
 	RB_REMOVE(tagRC, cfg, av);
-	SLIST_REMOVE(cfg, av, tagCfg, cfg_next);
+	TAILQ_REMOVE(cfg, av, cfg_next);
 	CFG_RC_UNLOCK(cfg);
 
 	AIT_FREE_VAL(&av->cfg_val);
 	AIT_FREE_VAL(&av->cfg_attr);
 	AIT_FREE_VAL(&av->cfg_sec);
-	free(av);
+	e_free(av);
 	return 1;
 }
 
@@ -161,7 +227,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		/* adding new element */
 		section = _selectAttribute(cfg, csSec, NULL);
 
-		av = malloc(sizeof(struct tagCfg));
+		av = e_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -170,21 +236,21 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 
 			CFG_RC_LOCK(cfg);
 			if (!section)
-				SLIST_INSERT_HEAD(cfg, av, cfg_next);
+				TAILQ_INSERT_TAIL(cfg, av, cfg_next);
 			else
-				SLIST_INSERT_AFTER(section, av, cfg_next);
+				TAILQ_INSERT_BEFORE(section, av, cfg_next);
 			CFG_RC_UNLOCK(cfg);
 		}
 
 		if (csSec && *csSec) {
 			AIT_SET_STR(&av->cfg_sec, csSec);
 			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
-					io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2);
+					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
 		AIT_SET_STR(&av->cfg_val, csVal ? csVal : "");
 		AIT_SET_STR(&av->cfg_attr, csAttr);
 		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
-				io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2);
+				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
 
 		CFG_RC_LOCK(cfg);
 		RB_INSERT(tagRC, cfg, av);
@@ -192,7 +258,8 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		return 2;
 	}
 
-	if (csVal && strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) {
+	if (csVal && AIT_ADDR(&av->cfg_val) && 
+			strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) {
 		/* Update element */
 		AIT_FREE_VAL(&av->cfg_val);
 		AIT_SET_STR(&av->cfg_val, csVal);
@@ -208,15 +275,15 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: NULL item not found or null parameters, !=NULL value const string
  */
-inline const char *
+const char *
 cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
 	struct tagCfg *av;
 
-	if (!cfg || !csAttr)
+	if (!cfg)
 		return NULL;
 
 	av = _selectAttribute(cfg, csSec, csAttr);
@@ -231,7 +298,7 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * @val = Return buffer for item Value //... = {val}
  * @csDefValue = *Default Value* for return in //{val}, if not found item in config
  * return: 0 item not found, -1 error or >0 number of copied bytes in //{val}
@@ -243,27 +310,31 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 	struct tagCfg *av;
 	int ret = 0;
 
-	if (!cfg || !csAttr || !val) {
+	if (!cfg || !val) {
 		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
 	}
 
+	AIT_INIT_VAL(val);
 	av = _selectAttribute(cfg, csSec, csAttr);
 	if (!av) {
 		/* not found item */
 		if (csDefValue) {
 			AIT_SET_STR(val, csDefValue);
 			ret = AIT_LEN(val);
-		}
+		} else
+			AIT_INIT_VAL(val);
 		return ret;
 	}
 
-	if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) {
+	if (AIT_ISEMPTY(&av->cfg_val) || !AIT_ADDR(&av->cfg_val) || 
+			!*AIT_GET_LIKE(&av->cfg_val, char*)) {
 		/* empty value */
 		if (csDefValue) {
 			AIT_SET_STR(val, csDefValue);
 			ret = AIT_LEN(val);
-		}
+		} else
+			AIT_INIT_VAL(val);
 	} else {
 		/* copy value */
 		AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val));