From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 22 Mar 2014 16:50:47 +0000 (+0000)
Subject: tool_parsecfg: Reworked error handling from commit fc59a9e1
X-Git-Tag: curl-7_36_0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed02f0abcaddb4128fca028054ab9ad64240c70a;p=thirdparty%2Fcurl.git

tool_parsecfg: Reworked error handling from commit fc59a9e1
---

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>";