summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-03-22 16:50:47 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-03-22 16:50:47 +0000
commited02f0abcaddb4128fca028054ab9ad64240c70a (patch)
treeeda52faf429f88deba9acb81031ce0b9d8b699c2 /src
parent5e097583f7d5c633c939da26e7cc009d4b259b45 (diff)
downloadcurl-ed02f0abcaddb4128fca028054ab9ad64240c70a.tar.gz
tool_parsecfg: Reworked error handling from commit fc59a9e1
Diffstat (limited to 'src')
-rw-r--r--src/tool_parsecfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 53e2660a6..7a161c3bb 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>";