--- libaitcfg/src/parse.c	2012/04/04 12:44:48	1.6.4.7
+++ libaitcfg/src/parse.c	2012/05/23 14:52:50	1.7.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6.4.7 2012/04/04 12:44:48 misho Exp $
+* $Id: parse.c,v 1.7.2.2 2012/05/23 14:52:50 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -121,7 +121,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
 		}
 
 		/* *NEW PAIR* alloc new pair element */
-		av = malloc(sizeof(struct tagCfg));
+		av = io_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -133,7 +133,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
 		}
 
 		/* check for continues line */
-		psAttr = line + strlen(line) - 1;
+		psAttr = line + (*line ? strlen(line) : 1) - 1;
 		if (*psAttr == '\\') {
 			*psAttr = 0;
 			flg = 1;
@@ -204,16 +204,8 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 {
 	struct tagCfg *av;
 	time_t tim;
-	char szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 };
-	char line[BUFSIZ];
+	char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 };
 
-	time(&tim);
-	strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfg_Write(f, "## Write Config :: %s\n#\n", szTime)) {
-		LOGERR;
-		return -1;
-	}
-
 	CFG_RC_LOCK(cfg);
 	_invertQueue(cfg);
 	SLIST_FOREACH(av, cfg, cfg_next) {
@@ -258,12 +250,11 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 	_invertQueue(cfg);
 	CFG_RC_UNLOCK(cfg);
 
-	memset(szTime, 0, sizeof szTime);
-	time(&tim);
-	strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
-	if (!cfg_Write(f, "\n#\n## Done. :: %s\n", szTime)) {
-		LOGERR;
-		return -1;
+	if (whitespace) {
+		time(&tim);
+		memset(line, 0, sizeof line);
+		strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim));
+		cfg_Write(f, "\n## Config was saved at :: %s ##\n", line);
 	}
 
 	return 0;