--- libaitcfg/src/queue.c	2011/05/01 17:24:28	1.6
+++ libaitcfg/src/queue.c	2012/04/04 13:11:49	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.6 2011/05/01 17:24:28 misho Exp $
+* $Id: queue.c,v 1.7 2012/04/04 13:11:49 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
@@ -44,296 +44,230 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH
 SUCH DAMAGE.
 */
 #include "global.h"
-#include "aitcfg.h"
 
 
-/*
- * SelectAttribute() Select item //{tagPair} from config list with attribute parameter(s)
- * @cfg = Head list element
- * @csSec = Config section //[{csSec}], if NULL search in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL search in *any* attribute
- * return: NULL not found attribute; //{tagPair} selected first seen attribute item from list
-*/
-static inline struct tagPair *SelectAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr)
+static inline struct tagCfg *
+_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagPair *av;
+	struct tagCfg fav;
 
 	if (!cfg)
 		return NULL;
+	else
+		memset(&fav, 0, sizeof fav);
 
-	for (av = cfg->slh_first; av; av = av->sle_next) {
-		if ((!csSec || !*csSec) && !av->psSection) {
-			if (!csAttr)
-				return av;
-			if (!strcmp((char*) av->psAttribute, (char*) csAttr))
-				return av;
-		}
-		if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec)) {
-			if (!csAttr)
-				return av;
-			if (!strcmp((char*) av->psAttribute, (char*) csAttr))
-				return av;
-		}
-	}
+	if (csSec && *csSec)
+		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
+				io_align(strlen(csSec), 1) / 2);
+	if (csAttr)
+		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
+				io_align(strlen(csAttr), 1) / 2);
 
-	return NULL;
+	if (!csAttr)
+		return RB_NFIND(tagRC, cfg, &fav);
+	else
+		return RB_FIND(tagRC, cfg, &fav);
 }
 
-/*
- * DestroyAttribute() Free //{tagPair} item elements memory and destroy resource
- * @pair = Free this element
-*/
-static inline void DestroyAttribute(struct tagPair *pair)
-{
-	if (!pair)
-		return;
+/* --------------------------------------------------------------- */
 
-	if (pair->psValue)
-		free(pair->psValue);
-	if (pair->psAttribute)
-		free(pair->psAttribute);
-	if (pair->psSection)
-		free(pair->psSection);
-
-	free(pair);
-}
-
-// ----------------------------------------------
-
 /*
- * cfg_FindAttribute() Find attribute position in config list
- * @cfg = Head list element
+ * cfg_findAttribute() - Find attribute position in config file
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}]
  * @csAttr = Config attribute //{csAttr} = ...
- * return: 0 not found item; -1 error: null parameters; >0 position in list
-*/
-inline int cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr)
+ * return: 0 not found item, -1 error or >0 position in list
+ */
+inline int
+cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagPair *av;
+	struct tagCfg *av, fav;
 	register int cx = 0;
 
-	if (!cfg || !csAttr)
+	if (!cfg || !csAttr) {
+		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
+	} else
+		memset(&fav, 0, sizeof fav);
 
-	for (av = cfg->slh_first; av; av = av->sle_next) {
+	if (csSec && *csSec)
+		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
+				io_align(strlen(csSec), 1) / 2);
+	if (csAttr)
+		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
+				io_align(strlen(csAttr), 1) / 2);
+
+	SLIST_FOREACH(av, cfg, cfg_next) {
 		++cx;
-		if ((!csSec || !*csSec) && !av->psSection)
-			if (!strcmp((char*) av->psAttribute, (char*) csAttr))
-				return cx;
-		if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec))
-			if (!strcmp((char*) av->psAttribute, (char*) csAttr))
-				return cx;
+		if (!cfg_tree_cmp(&fav, av))
+			return cx;
 	}
 
 	return 0;
 }
 
 /*
- * cfg_UnsetAttribute() Unset item from config list and free resources
- * @cfg = Head list element
+ * cfg_unsetAttribute() - Unset item from config and free resources
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
- * return: 0 item not found, -1 error: null parameters; >0 position in list
-*/
-int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr)
+ * @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 tagPair *av, *curr;
-	register int cx = 0;
+	struct tagCfg *av;
 
 	if (!cfg || !csAttr)
 		return -1;
 
-	av = SelectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr);
 	if (!av)
 		return 0;
 
-	// remove element
-	//	remove element when is first!
-	if (cfg->slh_first == av) {
-		cfg->slh_first = cfg->slh_first->sle_next;
+	CFG_RC_LOCK(cfg);
+	RB_REMOVE(tagRC, cfg, av);
+	SLIST_REMOVE(cfg, av, tagCfg, cfg_next);
+	CFG_RC_UNLOCK(cfg);
 
-		DestroyAttribute(av);
-		return 1;
-	}
-	//	remove element in other cases...
-	curr = cfg->slh_first;
-	while (curr->sle_next != av) {
-		++cx;
-		curr = curr->sle_next;
-	}
-	curr->sle_next = curr->sle_next->sle_next;
-
-	DestroyAttribute(av);
-	return cx;
+	AIT_FREE_VAL(&av->cfg_val);
+	AIT_FREE_VAL(&av->cfg_attr);
+	AIT_FREE_VAL(&av->cfg_sec);
+	free(av);
+	return 1;
 }
 
 /*
- * cfg_SetAttribute() Set item in config list or add new item if not exists
- * @cfg = Head list element
+ * cfg_setAttribute() - Set item in config or adding new item if not exists
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL set in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL set as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * @csVal = Config value //... = {csVal} to setup
- * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item
-*/
-int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal)
+ * return: 0 nothing changed, -1 error, 1 found and updated item or 2 added new item
+ */
+int
+cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, const char *csVal)
 {
-	struct tagPair *av, *section;
-	int len;
+	struct tagCfg *av, *section;
 
 	if (!cfg || !csAttr)
 		return -1;
 
-	av = SelectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr);
 	if (!av) {
-		section = SelectAttribute(cfg, csSec, NULL);
+		/* adding new element */
+		section = _selectAttribute(cfg, csSec, NULL);
 
-		av = malloc(sizeof(struct tagPair));
+		av = malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
 		} else {
-			memset(av, 0, sizeof(struct tagPair));
+			memset(av, 0, sizeof(struct tagCfg));
 
-			if (!section) {
-				// add new element
-				av->sle_next = cfg->slh_first;
-				cfg->slh_first = av;
-			} else {
-				// add new element in existing section
-				av->sle_next = section->sle_next;
-				section->sle_next = av;
-			}
+			CFG_RC_LOCK(cfg);
+			if (!section)
+				SLIST_INSERT_HEAD(cfg, av, cfg_next);
+			else
+				SLIST_INSERT_AFTER(section, av, cfg_next);
+			CFG_RC_UNLOCK(cfg);
 		}
-		// added section name to element
-		if (csSec && *csSec) {
-			len = strlen((char*) csSec) + 1;
-			av->psSection = malloc(len);
-			if (!av->psSection) {
-				LOGERR;
-				free(av);
-				return -1;
-			} else {
-				strlcpy((char*) av->psSection, (char*) csSec, len);
-			}
-		} else
-			av->psSection = NULL;
 
-		// added attribute to element
-		len = strlen((char*) csAttr) + 1;
-		av->psAttribute = malloc(len);
-		if (!av->psAttribute) {
-			LOGERR;
-			free(av->psSection);
-			free(av);
-			return -1;
-		} else {
-			strlcpy((char*) av->psAttribute, (char*) csAttr, len);
+		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);
 		}
-		// added value to element
-		if (csVal && *csVal) {
-			len = strlen((char*) csVal) + 1;
-			av->psValue = malloc(len);
-			if (!av->psValue) {
-				LOGERR;
-				free(av->psAttribute);
-				free(av->psSection);
-				free(av);
-				return -1;
-			} else {
-				strlcpy((char*) av->psValue, (char*) csVal, len);
-			}
-		} else {
-			av->psValue = malloc(1);
-			*av->psValue = 0;
-		}
+		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);
 
-		// Added new element
+		CFG_RC_LOCK(cfg);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
 		return 2;
 	}
 
-	if (strcmp((char*) csVal, (char*) av->psValue)) {
-		len = strlen((char*) csVal) + 1;
-		av->psValue = realloc(av->psValue, len);
-		strlcpy((char*) av->psValue, (char*) csVal, len);
-
-		// Update element
+	if (csVal && 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);
 		return 1;
 	}
 
-	// Nothing happens ... finded & values is equal!
+	/* Nothing happens ... found & values is equal! */
 	return 0;
 }
 
 /*
- * cfg_GetAttribute() Get item from config list and return his value
- * @cfg = Head list element
+ * cfg_getAttribute() - Get item from config and return value from it
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
  * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
- * return: NULL item not found or null parameters; !=NULL value const string
-*/
-inline const u_char *cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr)
+ * return: NULL item not found or null parameters, !=NULL value const string
+ */
+inline const char *
+cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagPair *av;
+	struct tagCfg *av;
 
 	if (!cfg || !csAttr)
 		return NULL;
 
-	av = SelectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr);
 	if (!av)
 		return NULL;
 
-	return av->psValue;
+	return AIT_GET_STR(&av->cfg_val);
 }
 
 /*
- * cfg_FirstItem() Get first item from config list and return his value
- * @cfg = Head list element
- * return: NULL if no items in list; !=NULL first pair item
-*/
-inline struct tagPair *cfg_FirstItem(sl_config * __restrict cfg)
-{
-	return cfg->slh_first;
-}
-
-// --------------------------------------------------------------
-
-/*
- * cfg_LoadAttribute() Extended get attribute, if not found item return *default value*
- * @cfg = Head list element
+ * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value*
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
- * @psVal = Return buffer for item Value //... = {psVal}
- * @ValLen = Length of buffer //{psVal} for return
- * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list
- * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal}
-*/
-int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, 
-		u_char * __restrict psVal, int ValLen, const char *csDefValue)
+ * @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}
+ */
+int
+cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, 
+		ait_val_t * __restrict val, const char *csDefValue)
 {
-	struct tagPair *av;
+	struct tagCfg *av;
 	int ret = 0;
 
-	if (!cfg || !csAttr || !ValLen || !psVal)
+	if (!cfg || !csAttr || !val) {
+		cfg_SetErr(EINVAL, "Invalid argument(s)");
 		return -1;
+	}
 
-	av = SelectAttribute(cfg, csSec, csAttr);
+	av = _selectAttribute(cfg, csSec, csAttr);
 	if (!av) {
+		/* not found item */
 		if (csDefValue) {
-			strlcpy((char*) psVal, csDefValue, ValLen);
-			ret = strlen((char*) psVal);
+			AIT_SET_STR(val, csDefValue);
+			ret = AIT_LEN(val);
 		}
-
 		return ret;
 	}
 
-	if (!av->psValue || !*av->psValue) {
+	if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) {
+		/* empty value */
 		if (csDefValue) {
-			strlcpy((char*) psVal, csDefValue, ValLen);
-			ret = strlen((char*) psVal);
+			AIT_SET_STR(val, csDefValue);
+			ret = AIT_LEN(val);
 		}
 	} else {
-		strlcpy((char*) psVal, (char*) av->psValue, ValLen);
-		ret = strlen((char*) psVal);
+		/* copy value */
+		AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val));
+		ret = AIT_LEN(val);
 	}
 
 	return ret;