--- libaitcfg/src/parse.c	2022/12/05 22:31:12	1.20
+++ libaitcfg/src/parse.c	2023/01/23 21:03:50	1.20.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.20 2022/12/05 22:31:12 misho Exp $
+* $Id: parse.c,v 1.20.2.1 2023/01/23 21:03:50 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 - 2021
+Copyright 2004 - 2023
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -98,7 +98,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			/* concat line to value */
 			AIT_SET_STRCAT(&av->cfg_val, line);
 			if (!flg && AIT_ADDR(&av->cfg_val))
-				str_Unquot((char*) AIT_GET_STR(&av->cfg_val));
+				av->cfg_quoted += str_Unquot((char*) AIT_GET_STR(&av->cfg_val));
 
 			/* read include file */
 			if (!flg && AIT_ADDR(&av->cfg_val) && 
@@ -109,7 +109,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 					cfgReadConfig(ff, cfg);
 					fclose(ff);
 				} else
-					EDEBUG(7, "Error:: Can't open %s file", 
+					EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", 
 							AIT_GET_STR(&av->cfg_val));
 			}
 			continue;
@@ -149,13 +149,13 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 				strlcpy(szSection, line + 1, sizeof szSection);
 				AIT_SET_STR(&av->cfg_sec, line);
 			} else
-				EDEBUG(7, "Ignore section '%s' ... not found ']'", line);
+				EDEBUG(ELWIX_DEBUG_LOG, "Ignore section '%s' ... not found ']'", line);
 			continue;
 		}
 		/* parse pair */
 		if (!(psAttr = strchr(line, '='))) {
 			AIT_SET_STR(&av->cfg_val, origin);
-			EDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
+			EDEBUG(ELWIX_DEBUG_LOG, "Ignore a/v '%s' ... not found '='", line);
 			continue;
 		} else {
 			*psAttr = 0;
@@ -173,7 +173,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 		str_RTrim(psAttr);
 		str_LTrim(psVal);
 		if (!flg)
-			str_Unquot(psVal);
+			av->cfg_quoted += str_Unquot(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*), 
@@ -191,7 +191,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 				cfgReadConfig(ff, cfg);
 				fclose(ff);
 			} else
-				EDEBUG(7, "Error:: Can't open %s file", 
+				EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", 
 						AIT_GET_STR(&av->cfg_val));
 		}
 	}
@@ -232,14 +232,14 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 		if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && 
 				strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) {
 			strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection);
-			if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
+			if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
 				LOGERR;
 				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
 		} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) {
 			memset(szSection, 0, sizeof szSection);
-			if (!cfg_Write(f, "\n[]\n")) {
+			if (!cfg_Write(f, "[]\n")) {
 				LOGERR;
 				CFG_RC_UNLOCK(cfg);
 				return -1;
@@ -255,8 +255,13 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 			else
 				strlcat(line, "=", sizeof line);
 		}
-		if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string)
+		if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) {
+			if (av->cfg_quoted)
+				strlcat(line, "\"", sizeof line);
 			strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line);
+			if (av->cfg_quoted)
+				strlcat(line, "\"", sizeof line);
+		}
 skip_sec:
 		/* write */
 		if (!cfg_Write(f, "%s\n", line)) {
@@ -303,14 +308,14 @@ cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
 		if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && 
 				strcmp(AIT_GET_STRZ(&av->cfg_sec), szSection)) {
 			strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection);
-			if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
+			if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
 				LOGERR;
 				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
 		} else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) {
 			memset(szSection, 0, sizeof szSection);
-			if (!cfg_Write(f, "\n[]\n")) {
+			if (!cfg_Write(f, "[]\n")) {
 				LOGERR;
 				CFG_RC_UNLOCK(cfg);
 				return -1;
@@ -326,8 +331,13 @@ cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg
 			else
 				strlcat(line, "=", sizeof line);
 		}
-		if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string)
+		if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) {
+			if (av->cfg_quoted)
+				strlcat(line, "\"", sizeof line);
 			strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line);
+			if (av->cfg_quoted)
+				strlcat(line, "\"", sizeof line);
+		}
 skip_sec:
 		/* write */
 		if (!cfg_Write(f, "%s\n", line)) {
@@ -486,8 +496,10 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
 					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
-		if (psVal)
+		if (psVal) {
+			av->cfg_quoted = str_Unquot(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*), 
 				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
@@ -556,8 +568,13 @@ cfgWriteLines(FILE *f, const char *delim, const char *
 			AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_attr));
 			AIT_SET_STRCAT(v, delim);
 		}
-		if (!AIT_ISEMPTY(&av->cfg_val))
+		if (!AIT_ISEMPTY(&av->cfg_val)) {
+			if (av->cfg_quoted)
+				AIT_SET_STRCAT(v, "\"");
 			AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val));
+			if (av->cfg_quoted)
+				AIT_SET_STRCAT(v, "\"");
+		}
 		AIT_SET_STRCAT(v, eol);
 	}