From 8c80840d0191f21b2e6c568b2346f68bc3fc0cf6 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 23 Feb 2014 10:58:56 +0000
Subject: [PATCH] tool_getparam: Moved tool_help() call into operate()
---
src/tool_getparam.c | 2 --
src/tool_operate.c | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 80a3c864e..45dc5c9f7 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -32,7 +32,6 @@
#include "tool_cb_prg.h"
#include "tool_formparse.h"
#include "tool_getparam.h"
-#include "tool_help.h"
#include "tool_helpers.h"
#include "tool_libinfo.h"
#include "tool_metalink.h"
@@ -1395,7 +1394,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'h': /* h for help */
if(toggle) {
- tool_help();
return PARAM_HELP_REQUESTED;
}
/* we now actually support --no-help too! */
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 8350c1df9..eaff86500 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1829,8 +1829,11 @@ CURLcode operate(struct Configurable *config, int argc, argv_item_t argv[])
if(res) {
result = CURLE_OK;
+ /* Check if we were asked for the help */
+ if(res == PARAM_HELP_REQUESTED)
+ tool_help();
/* Check if we were asked for the manual */
- if(res == PARAM_MANUAL_REQUESTED)
+ else if(res == PARAM_MANUAL_REQUESTED)
hugehelp();
/* Check if we were asked for the version information */
else if(res == PARAM_VERSION_INFO_REQUESTED)
@@ -1838,7 +1841,7 @@ CURLcode operate(struct Configurable *config, int argc, argv_item_t argv[])
/* Check if we were asked to list the SSL engines */
if(res == PARAM_ENGINES_REQUESTED)
tool_list_engines(config->easy);
- else if(res != PARAM_HELP_REQUESTED)
+ else
result = CURLE_FAILED_INIT;
}
/* Perform the main operations */
--
2.40.0