--- libaitcfg/src/queue.c	2014/01/30 08:30:47	1.14
+++ 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.14 2014/01/30 08:30:47 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
@@ -72,7 +72,7 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 		do {
 			if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
 				return c;	/* FOUND! */
-		} while (RB_NEXT(tagRC, cfg, c) && !cfg_tree_cmp(c, &fav));
+		} while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav));
 		return NULL;	/* not found */
 	}
 }
@@ -80,11 +80,69 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 /* --------------------------------------------------------------- */
 
 /*
+ * 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
  */
 int
@@ -93,7 +151,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c
 	struct tagCfg *av, fav;
 	register int cx = 0;
 
-	if (!cfg || !csAttr) {
+	if (!cfg) {
 		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
 	} else
@@ -120,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
@@ -128,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);
@@ -217,7 +275,7 @@ 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
  */
 const char *
@@ -225,7 +283,7 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
 {
 	struct tagCfg *av;
 
-	if (!cfg || !csAttr)
+	if (!cfg)
 		return NULL;
 
 	av = _selectAttribute(cfg, csSec, csAttr);
@@ -240,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}
@@ -252,7 +310,7 @@ 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;
 	}