From ed02f0abcaddb4128fca028054ab9ad64240c70a Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 22 Mar 2014 16:50:47 +0000
Subject: [PATCH] tool_parsecfg: Reworked error handling from commit fc59a9e1
---
src/tool_parsecfg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 53e2660a6f..7a161c3bb8 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -250,7 +250,8 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
res = PARAM_NO_MEM;
}
}
- else if(res != PARAM_OK) {
+
+ if(res != PARAM_OK && res != PARAM_NEXT_OPERATION) {
/* the help request isn't really an error */
if(!strcmp(filename, "-")) {
filename = (char *)"<stdin>";
--
GitLab