--- libaitcfg/src/parse.c	2017/06/28 15:13:03	1.16
+++ libaitcfg/src/parse.c	2019/11/21 14:30:02	1.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.16 2017/06/28 15:13:03 misho Exp $
+* $Id: parse.c,v 1.18 2019/11/21 14:30:02 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 - 2017
+Copyright 2004 - 2018
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -56,10 +56,11 @@ SUCH DAMAGE.
 int
 cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 {
-	char line[BUFSIZ];
+	char line[BUFSIZ], origin[BUFSIZ];
 	struct tagCfg *av = NULL;
 	int flg = 0;
 	char *psAttr, *psVal, szSection[STRSIZ] = { 0 };
+	FILE *ff;
 
 	if (!f || !cfg) {
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
@@ -79,6 +80,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			continue;
 		} else {
 			*psAttr = 0;
+			strlcpy(origin, line, sizeof origin);
 			str_Trim(line);
 		}
 
@@ -96,6 +98,19 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			AIT_SET_STRCAT(&av->cfg_val, line);
 			if (!flg && AIT_ADDR(&av->cfg_val))
 				str_Unquot((char*) AIT_GET_STR(&av->cfg_val));
+
+			/* read include file */
+			if (!flg && AIT_ADDR(&av->cfg_val) && 
+					*AIT_GET_STR(&av->cfg_attr) == '%' && 
+					!strcmp(AIT_GET_STR(&av->cfg_attr), "%include")) {
+				ff = fopen(AIT_GET_STR(&av->cfg_val), "r");
+				if (ff) {
+					cfgReadConfig(ff, cfg);
+					fclose(ff);
+				} else
+					EDEBUG(7, "Error:: Can't open %s file", 
+							AIT_GET_STR(&av->cfg_val));
+			}
 			continue;
 		}
 
@@ -111,6 +126,12 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			CFG_RC_UNLOCK(cfg);
 		}
 
+		/* check for comment or empty line */
+		if (!*line || *line == '#' || *line == ';') {
+			AIT_SET_STR(&av->cfg_val, line);
+			continue;
+		}
+
 		/* check for continues line */
 		psAttr = line + (*line ? strlen(line) : 1) - 1;
 		if (*psAttr == '\\') {
@@ -118,11 +139,6 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			flg = 1;
 		}
 
-		/* check for comment or empty line */
-		if (!*line || *line == '#' || *line == ';') {
-			AIT_SET_STR(&av->cfg_val, line);
-			continue;
-		}
 		/* section */
 		if (*line == '[') {
 			psAttr = line + strlen(line) - 1;
@@ -137,7 +153,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 		}
 		/* parse pair */
 		if (!(psAttr = strchr(line, '='))) {
-			AIT_SET_STR(&av->cfg_val, line);
+			AIT_SET_STR(&av->cfg_val, origin);
 			EDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
 			continue;
 		} else {
@@ -165,6 +181,18 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 		CFG_RC_LOCK(cfg);
 		RB_INSERT(tagRC, cfg, av);
 		CFG_RC_UNLOCK(cfg);
+
+		/* read include file */
+		if (!flg && *AIT_GET_STR(&av->cfg_attr) == '%' && 
+				!strcmp(AIT_GET_STR(&av->cfg_attr), "%include")) {
+			ff = fopen(AIT_GET_STR(&av->cfg_val), "r");
+			if (ff) {
+				cfgReadConfig(ff, cfg);
+				fclose(ff);
+			} else
+				EDEBUG(7, "Error:: Can't open %s file", 
+						AIT_GET_STR(&av->cfg_val));
+		}
 	}
 
 	return 0;