Commit 1a9b58fc authored by Steve Holme's avatar Steve Holme
Browse files

tool_getparam: Added initial support for --next/-: 

Added initial support for --next/-: which will be used to replace the
rather confusing : command line operation what was used for the URL
specific options prototype.
parent 3228deff

docs/curl.1

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ same command line option.) 
.IP "-#, --progress-bar"

Make curl display progress as a simple progress bar instead of the standard,

more informational, meter.

.IP "-:, --next"

Tells curl to use a separate operation for the following URL and associated

options. This allows you to send several URL requests, each with their own

specific options, for example, such as different user names or custom requests

for each. (Added in 7.36.0)

.IP "-0, --http1.0"

(HTTP) Tells curl to use HTTP version 1.0 instead of using its internally

preferred: HTTP 1.1.

src/tool_getparam.c

+3 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ static const struct LongShort aliases[]= { 
  {"y",  "speed-time",               TRUE},

  {"z",  "time-cond",                TRUE},

  {"#",  "progress-bar",             FALSE},

  {":",  "next",                     FALSE},

  {"~",  "xattr",                    FALSE},

};
@@ -986,6 +987,8 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
      else

        config->progressmode = CURL_PROGRESS_STATS;

      break;

    case ':': /* --next */

      return PARAM_NEXT_OPERATION;

    case '~': /* --xattr */

      config->xattr = toggle;

      break;

src/tool_getparam.h

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

  PARAM_LIBCURL_DOESNT_SUPPORT,

  PARAM_NO_MEM,

  PARAM_NEXT_OPERATION,

  PARAM_LAST

} ParameterError;

src/tool_help.c

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static const char *const helptext[] = { 
  " -n, --netrc         Must read .netrc for user name and password",

  "     --netrc-optional Use either .netrc or URL; overrides -n",

  "     --netrc-file FILE  Set up the netrc filename to use",

  " -:  --next          "

  "Allows the following URL to use a separate set of options",

  "     --no-alpn       Disable the ALPN TLS extension (H)",

  " -N, --no-buffer     Disable buffering of the output stream",

  "     --no-keepalive  Disable keepalive use on the connection",