--- libaitcfg/src/queue.c	2019/12/05 14:32:36	1.17.2.1
+++ libaitcfg/src/queue.c	2026/10/07 22:07:30	1.22.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.17.2.1 2019/12/05 14:32:36 misho Exp $
+* $Id: queue.c,v 1.22.2.1 2026/10/07 22:07:30 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 - 2019
+Copyright 2004 - 2026
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,14 +47,16 @@ SUCH DAMAGE.
 
 
 static inline struct tagCfg *
-_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
+_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, int *find)
 {
-	struct tagCfg fav, *c;
+	struct tagCfg fav, *c, *n;
 
 	if (!cfg)
 		return NULL;
 	else
 		memset(&fav, 0, sizeof fav);
+	if (find)
+		*find = 0;
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
@@ -63,16 +65,46 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
 				E_ALIGN(strlen(csAttr), 2) / 2);
 
-	if (!csAttr)
-		return RB_NFIND(tagRC, cfg, &fav);
-	else {
+	if (!csAttr) {
+		c = RB_NFIND(tagRC, cfg, &fav);
+		if (!c)
+			return NULL;	/* not found */
+		if (csSec && !AIT_ISEMPTY(&c->cfg_sec) && 
+				strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))
+			TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) {
+				if (!AIT_ISEMPTY(&c->cfg_sec) && 
+						!strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))
+					break;
+			}
+		if (find)
+			*find = -1;
+		return c;
+	} else {
 		c = RB_FIND(tagRC, cfg, &fav);
 		if (!c)
 			return NULL;	/* not found */
-		do {
-			if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
+		if ((!csSec && AIT_ISEMPTY(&c->cfg_sec)) || (csSec && !*csSec && AIT_ISEMPTY(&c->cfg_sec)) ||
+				(csSec && !AIT_ISEMPTY(&c->cfg_sec) && !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))) {
+			if (!AIT_ISEMPTY(&c->cfg_attr) && !strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) {
+				if (find)
+					*find = 1;
 				return c;	/* FOUND! */
-		} while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav));
+			}
+		}
+		/* if cannot find right attribute */
+		TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) {
+			if ((!csSec && AIT_ISEMPTY(&c->cfg_sec)) ||
+					(csSec && !*csSec && AIT_ISEMPTY(&c->cfg_sec)) ||
+					(csSec && !AIT_ISEMPTY(&c->cfg_sec) &&
+					 !strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))) {
+				if (!AIT_ISEMPTY(&c->cfg_attr) && csAttr && 
+						!strcmp(csAttr, AIT_GET_STR(&c->cfg_attr))) {
+					if (find)
+						*find = 2;
+					return c;	/* FOUND! */
+				}
+			}
+		}
 		return NULL;	/* not found */
 	}
 }
@@ -89,7 +121,7 @@ void
 cfg_dumpCfg(cfg_root_t * __restrict cfg)
 {
 	struct tagCfg *r, *c, *ctmp, *q, *qtmp;
-	int syn;
+	int syn = 0;
 
 	r = RB_ROOT(cfg);
 	printf("ROOT:: KEY=%.8x [%s] %s=%s\n", ((AIT_KEY(&r->cfg_sec) << 15) | AIT_KEY(&r->cfg_attr)), 
@@ -160,36 +192,66 @@ cfg_getSection(cfg_root_t * __restrict cfg, const char
 }
 
 /*
+ * cfg_delSection() - Delete entire section
+ *
+ * @cfg = Config root
+ * @csSec = Config section //[{csSec}]
+ * return: -1 error, 0 nothing deleted or >0 deleted attributes
+ */
+int
+cfg_delSection(cfg_root_t * __restrict cfg, const char *csSec)
+{
+	int ret = 0;
+	array_t *arr = NULL;
+	struct tagCfg *av;
+	register int i;
+
+	if (!cfg) {
+		cfg_SetErr(EINVAL, "Invalid argument(s)");
+		return -1;
+	}
+	if (csSec && !*csSec)
+		csSec = NULL;
+
+	arr = cfg_getSection(cfg, csSec);
+	if (!arr)
+		return ret;
+	for (i = 0; i < array_Size(arr); i++)
+		if ((av = array(arr, i, struct tagCfg*)) && AIT_ADDR(&av->cfg_attr))
+			if (cfg_unsetAttribute(cfg, csSec, AIT_GET_STR(&av->cfg_attr)) > 0)
+				ret++;
+	array_Destroy(&arr);
+	return ret;
+}
+
+/*
  * cfg_findAttribute() - Find attribute position in config file
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}]
- * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 not found item, -1 error or >0 position in list
  */
 int
 cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagCfg *av, fav;
+	struct tagCfg *av, *n;
 	register int cx = 0;
 
 	if (!cfg) {
 		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
-	} else
-		memset(&fav, 0, sizeof fav);
+	}
 
-	if (csSec && *csSec)
-		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				E_ALIGN(strlen(csSec), 2) / 2);
-	if (csAttr)
-		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				E_ALIGN(strlen(csAttr), 2) / 2);
-
-	TAILQ_FOREACH(av, cfg, cfg_next) {
+	TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) {
 		++cx;
-		if (!cfg_tree_cmp(&fav, av))
-			return cx;
+
+		if ((!csSec && AIT_ISEMPTY(&av->cfg_sec)) || 
+				(csSec && !AIT_ISEMPTY(&av->cfg_sec) && 
+				 !strcmp(csSec, AIT_GET_STR(&av->cfg_sec))))
+			if (!AIT_ISEMPTY(&av->cfg_attr) && csAttr && 
+					!strcmp(csAttr, AIT_GET_STR(&av->cfg_attr)))
+				return cx;
 	}
 
 	return 0;
@@ -200,30 +262,54 @@ 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} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 item not found, -1 error or 1 removed item
  */
 int
 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagCfg *av;
+	struct tagCfg *av, *n;
+	int find;
 
 	if (!cfg)
 		return -1;
 
-	av = _selectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr, &find);
 	if (!av)
 		return 0;
 
-	CFG_RC_LOCK(cfg);
-	RB_REMOVE(tagRC, cfg, av);
-	TAILQ_REMOVE(cfg, av, cfg_next);
-	CFG_RC_UNLOCK(cfg);
+	if (find == 1) {
+		CFG_RC_LOCK(cfg);
+		RB_REMOVE(tagRC, cfg, av);
+		TAILQ_REMOVE(cfg, av, cfg_next);
+		CFG_RC_UNLOCK(cfg);
+	} else {
+		CFG_RC_LOCK(cfg);
+		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);
 	e_free(av);
+
+	if (find == 1) {
+		/* if we have duplicated key then update tree */
+		TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) {
+			if ((!csSec && AIT_ISEMPTY(&av->cfg_sec)) || 
+					(csSec && !AIT_ISEMPTY(&av->cfg_sec) && 
+					 !strcmp(csSec, AIT_GET_STR(&av->cfg_sec))))
+				if (!AIT_ISEMPTY(&av->cfg_attr) && csAttr && 
+						!strcmp(csAttr, AIT_GET_STR(&av->cfg_attr))) {
+					CFG_RC_LOCK(cfg);
+					RB_INSERT(tagRC, cfg, av);
+					CFG_RC_UNLOCK(cfg);
+					break;
+				}
+		}
+	}
+
 	return 1;
 }
 
@@ -240,14 +326,15 @@ int
 cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, const char *csVal)
 {
 	struct tagCfg *av, *section;
+	int find;
 
 	if (!cfg || !csAttr)
 		return -1;
 
-	av = _selectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr, &find);
 	if (!av) {
 		/* adding new element */
-		section = _selectAttribute(cfg, csSec, NULL);
+		section = _selectAttribute(cfg, csSec, NULL, &find);
 
 		av = e_malloc(sizeof(struct tagCfg));
 		if (!av) {
@@ -297,18 +384,19 @@ 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 as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: NULL item not found or null parameters, !=NULL value const string
  */
 const char *
 cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
 	struct tagCfg *av;
+	int find;
 
 	if (!cfg)
 		return NULL;
 
-	av = _selectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr, &find);
 	if (!av)
 		return NULL;
 
@@ -320,7 +408,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} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: value
  */
 long
@@ -337,7 +425,7 @@ cfg_getAttributeLong(cfg_root_t * __restrict cfg, cons
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: value
  */
 long long
@@ -354,7 +442,7 @@ cfg_getAttributeLLong(cfg_root_t * __restrict cfg, con
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: value
  */
 double
@@ -371,7 +459,7 @@ cfg_getAttributeDouble(cfg_root_t * __restrict cfg, co
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * return: value
  */
 long double
@@ -388,7 +476,7 @@ cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, c
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * @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}
@@ -399,6 +487,7 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 {
 	struct tagCfg *av;
 	int ret = 0;
+	int find;
 
 	if (!cfg || !val) {
 		cfg_SetErr(EINVAL, "Invalid argument(s)");
@@ -406,7 +495,7 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 	}
 
 	AIT_INIT_VAL(val);
-	av = _selectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr, &find);
 	if (!av) {
 		/* not found item */
 		if (csDefValue) {