projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e09758
)
tool_parsecfg: Reworked error handling from commit fc59a9e1
author
Steve Holme
<steve_holme@hotmail.com>
Sat, 22 Mar 2014 16:50:47 +0000
(16:50 +0000)
committer
Steve Holme
<steve_holme@hotmail.com>
Sat, 22 Mar 2014 16:50:47 +0000
(16:50 +0000)
src/tool_parsecfg.c
patch
|
blob
|
history
diff --git
a/src/tool_parsecfg.c
b/src/tool_parsecfg.c
index
53e2660
..
7a161c3
100644
(file)
--- 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;
}
}
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>";
/* the help request isn't really an error */
if(!strcmp(filename, "-")) {
filename = (char *)"<stdin>";