Commit 8c80840d authored by Steve Holme's avatar Steve Holme
Browse files

tool_getparam: Moved tool_help() call into operate()

parent 24e22e10

src/tool_getparam.c

+0 −2
Original line number Diff line number Diff line
@@ -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! */

src/tool_operate.c

+5 −2
Original line number Diff line number Diff line
@@ -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 */