moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Steve Holme 2014-02-23 17:19:45 +00:00
parent 3228deff40
commit 1a9b58fcb2
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/curl.1
View File

@ -124,6 +124,11 @@ same command line option.)
.IP "-#, --progress-bar" .IP "-#, --progress-bar"
Make curl display progress as a simple progress bar instead of the standard, Make curl display progress as a simple progress bar instead of the standard,
more informational, meter. 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" .IP "-0, --http1.0"
(HTTP) Tells curl to use HTTP version 1.0 instead of using its internally (HTTP) Tells curl to use HTTP version 1.0 instead of using its internally
preferred: HTTP 1.1. preferred: HTTP 1.1.

3
src/tool_getparam.c
View File

@ -267,6 +267,7 @@ static const struct LongShort aliases[]= {
{"y", "speed-time", TRUE}, {"y", "speed-time", TRUE},
{"z", "time-cond", TRUE}, {"z", "time-cond", TRUE},
{"#", "progress-bar", FALSE}, {"#", "progress-bar", FALSE},
{":", "next", FALSE},
{"~", "xattr", FALSE}, {"~", "xattr", FALSE},
}; };
@ -986,6 +987,8 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
else else
config->progressmode = CURL_PROGRESS_STATS; config->progressmode = CURL_PROGRESS_STATS;
break; break;
case ':': /* --next */
return PARAM_NEXT_OPERATION;
case '~': /* --xattr */ case '~': /* --xattr */
config->xattr = toggle; config->xattr = toggle;
break; break;

1
src/tool_getparam.h
View File

@ -38,6 +38,7 @@ typedef enum {
PARAM_NEGATIVE_NUMERIC, PARAM_NEGATIVE_NUMERIC,
PARAM_LIBCURL_DOESNT_SUPPORT, PARAM_LIBCURL_DOESNT_SUPPORT,
PARAM_NO_MEM, PARAM_NO_MEM,
PARAM_NEXT_OPERATION,
PARAM_LAST PARAM_LAST
} ParameterError; } ParameterError;

2
src/tool_help.c
View File

@ -138,6 +138,8 @@ static const char *const helptext[] = {
" -n, --netrc Must read .netrc for user name and password", " -n, --netrc Must read .netrc for user name and password",
" --netrc-optional Use either .netrc or URL; overrides -n", " --netrc-optional Use either .netrc or URL; overrides -n",
" --netrc-file FILE Set up the netrc filename to use", " --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)", " --no-alpn Disable the ALPN TLS extension (H)",
" -N, --no-buffer Disable buffering of the output stream", " -N, --no-buffer Disable buffering of the output stream",
" --no-keepalive Disable keepalive use on the connection", " --no-keepalive Disable keepalive use on the connection",