Commit 24e22e10 authored by Steve Holme's avatar Steve Holme
Browse files

tool_getparam: Moved hugehelp() call into operate()

parent c10bf9bb

src/tool_getparam.c

+2 −6
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
/* use our own printf() functions */

#include "curlx.h"



#ifdef USE_MANUAL

#  include "tool_hugehelp.h"

#endif



#include "tool_binmode.h"

#include "tool_cfgable.h"

#include "tool_cb_prg.h"
@@ -1465,8 +1461,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
    case 'M': /* M for manual, huge help */

      if(toggle) { /* --no-manual shows no manual... */

#ifdef USE_MANUAL

        hugehelp();

        return PARAM_HELP_REQUESTED;

        return PARAM_MANUAL_REQUESTED;

#else

        warnf(config,

              "built-in manual was disabled at build-time!\n");
@@ -1864,6 +1859,7 @@ ParameterError parse_args(struct Configurable *config, int argc, 
  }



  if(result && result != PARAM_HELP_REQUESTED &&

     result != PARAM_MANUAL_REQUESTED &&

     result != PARAM_VERSION_INFO_REQUESTED &&

     result != PARAM_ENGINES_REQUESTED) {

    const char *reason = param2text(result);

src/tool_getparam.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ typedef enum { 
  PARAM_REQUIRES_PARAMETER,

  PARAM_BAD_USE,

  PARAM_HELP_REQUESTED,

  PARAM_MANUAL_REQUESTED,

  PARAM_VERSION_INFO_REQUESTED,

  PARAM_ENGINES_REQUESTED,

  PARAM_GOT_EXTRA_PARAMETER,

src/tool_hugehelp.h

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -23,6 +23,10 @@ 
 ***************************************************************************/

#include "tool_setup.h"



#ifdef USE_MANUAL

void hugehelp(void);

#else

#define hugehelp() Curl_nop_stmt

#endif



#endif /* HEADER_CURL_TOOL_HUGEHELP_H */

src/tool_operate.c

+5 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
#include "tool_xattr.h"

#include "tool_vms.h"

#include "tool_help.h"

#include "tool_hugehelp.h"



#include "memdebug.h" /* keep this as LAST include */
@@ -1828,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 manual */

      if(res == PARAM_MANUAL_REQUESTED)

        hugehelp();

      /* Check if we were asked for the version information */

      if(res == PARAM_VERSION_INFO_REQUESTED)

      else if(res == PARAM_VERSION_INFO_REQUESTED)

        tool_version_info();

      /* Check if we were asked to list the SSL engines */

      if(res == PARAM_ENGINES_REQUESTED)

src/tool_parsecfg.c

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ int parseconfig(const char *filename, 
          filename = (char *)"<stdin>";

        }

        if(res != PARAM_HELP_REQUESTED &&

           res != PARAM_MANUAL_REQUESTED &&

           res != PARAM_VERSION_INFO_REQUESTED &&

           res != PARAM_ENGINES_REQUESTED) {

          const char *reason = param2text(res);