--- libaitcfg/src/parse.c	2012/07/22 21:54:47	1.8
+++ libaitcfg/src/parse.c	2012/08/01 00:39:11	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.8 2012/07/22 21:54:47 misho Exp $
+* $Id: parse.c,v 1.9 2012/08/01 00:39:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -80,7 +80,8 @@ _invertQueue(cfg_root_t * __restrict cfg)
  * @cfg = Config root
  * return: -1 error or 0 ok
  */
-int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
+int
+cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 {
 	char line[BUFSIZ];
 	struct tagCfg *av = NULL;
@@ -344,3 +345,78 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
 	pthread_mutex_destroy(&add_cfg->rc_mtx);
 	return 0;
 }
+
+/*
+ * cfgReadLines() - Read custom lines and add new item at config root
+ *
+ * @f = File resource
+ * @delim = Custom delimiter, if =NULL default is '='
+ * @end = Custom user end of file, if =NULL default is EOF
+ * @cfg = Config root
+ * return: -1 error or 0 ok
+ */
+int
+cfgReadLines(FILE *f, const char *delim, const char *end, cfg_root_t * __restrict cfg)
+{
+	char line[BUFSIZ];
+	struct tagCfg *d, *av = NULL;
+	char *psAttr, *psVal = NULL;
+
+	while (!feof(f)) {
+		memset(line, 0, sizeof line);
+		fgets(line, sizeof line - 1, f);
+		/* check for user end-of-file */
+		if (strspn(line, end))
+			break;
+
+		if (!(psAttr = strpbrk(line, "\r\n"))) {
+			/* skip line, too long */
+			continue;
+		} else {
+			*psAttr = 0;
+			io_TrimStr(line);
+			if (!*line)
+				continue;
+		}
+
+		if (!io_MakeAV2(line, delim, &psAttr, &psVal))
+			continue;
+		else {
+			io_LTrimStr(psVal);
+			io_RTrimStr(psAttr);
+		}
+
+		/* *NEW PAIR* alloc new pair element */
+		av = io_malloc(sizeof(struct tagCfg));
+		if (!av) {
+			LOGERR;
+			return -1;
+		} else
+			memset(av, 0, sizeof(struct tagCfg));
+
+		if (psVal)
+			AIT_SET_STR(&av->cfg_val, psVal);
+		AIT_SET_STR(&av->cfg_attr, psAttr);
+		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
+				io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2);
+
+		CFG_RC_LOCK(cfg);
+		/* find & delete duplicates */
+		if ((d = RB_FIND(tagRC, cfg, av))) {
+			RB_REMOVE(tagRC, cfg, d);
+			SLIST_REMOVE(cfg, d, tagCfg, cfg_next);
+
+			AIT_FREE_VAL(&d->cfg_val);
+			AIT_FREE_VAL(&d->cfg_attr);
+			AIT_FREE_VAL(&d->cfg_sec);
+			io_free(d);
+		}
+
+		SLIST_INSERT_HEAD(cfg, av, cfg_next);
+		RB_INSERT(tagRC, cfg, av);
+		CFG_RC_UNLOCK(cfg);
+	}
+
+	return 0;
+}
+