mirror of
https://github.com/curl/curl.git
synced 2026-08-24 17:33:33 +03:00
cmdline-opts: category cleanup
Option cleanups: --get is not upload --form* are post - added several options into ldap, smtp, imap and pop3 - shortened the category descriptions in the list category curl fixes: --create-dirs removed from 'curl' --ftp-create-dirs removed from 'curl' --netrc moved to 'auth' from 'curl' --netrc-file moved to 'auth' from 'curl' --netrc-optional moved to 'auth' from 'curl' --no-buffer moved to 'output' from 'curl' --no-clobber removed from 'curl' --output removed from 'curl' --output-dir removed from 'curl' --remove-on-error removed from 'curl' Add a "global" category: - Made all "global" options set this category Add a "deprecated" category: - Moved the deprecated options to it (maybe they should not be in any category long term) Add a 'timeout' category - Put a number of appropriate options in it Add an 'ldap' category - Put the LDAP related option in there Remove categories "ECH" and "ipfs" - They should not be categories. Had only one single option each. Remove category "misc" - It should not be a category as it is impossible to know when to browse it. --use-ascii moved to ftp and output --xattr moved to output --service-name moved to auth Managen fixes: - errors if an option is given a category name that is not already setup for in code - verifies that options set `scope: global` also is put in category `global´ Closes #14101
This commit is contained in:
Daniel Stenberg
parent
18c61aa036
commit
2abfc759b9
64 changed files with 239 additions and 204 deletions
|
|
@ -83,10 +83,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CURL},
|
||||
{" --connect-timeout <seconds>",
|
||||
"Maximum time allowed to connect",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_TIMEOUT},
|
||||
{" --connect-to <HOST1:PORT1:HOST2:PORT2>",
|
||||
"Connect to host",
|
||||
CURLHELP_CONNECTION},
|
||||
"Connect to host2 instead of host1",
|
||||
CURLHELP_CONNECTION | CURLHELP_DNS},
|
||||
{"-C, --continue-at <offset>",
|
||||
"Resumed transfer offset",
|
||||
CURLHELP_CONNECTION},
|
||||
|
|
@ -98,7 +98,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP},
|
||||
{" --create-dirs",
|
||||
"Create necessary local directory hierarchy",
|
||||
CURLHELP_CURL | CURLHELP_OUTPUT},
|
||||
CURLHELP_OUTPUT},
|
||||
{" --create-file-mode <mode>",
|
||||
"File mode for created files",
|
||||
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_FILE | CURLHELP_UPLOAD},
|
||||
|
|
@ -170,10 +170,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP | CURLHELP_FTP},
|
||||
{" --ech <config>",
|
||||
"Configure ECH",
|
||||
CURLHELP_TLS | CURLHELP_ECH},
|
||||
CURLHELP_TLS},
|
||||
{" --egd-file <file>",
|
||||
"EGD socket path for random data",
|
||||
CURLHELP_TLS},
|
||||
CURLHELP_DEPRECATED},
|
||||
{" --engine <name>",
|
||||
"Crypto engine to use",
|
||||
CURLHELP_TLS},
|
||||
|
|
@ -185,13 +185,13 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP},
|
||||
{" --expect100-timeout <seconds>",
|
||||
"How long to wait for 100-continue",
|
||||
CURLHELP_HTTP},
|
||||
CURLHELP_HTTP | CURLHELP_TIMEOUT},
|
||||
{"-f, --fail",
|
||||
"Fail fast with no output on HTTP errors",
|
||||
CURLHELP_IMPORTANT | CURLHELP_HTTP},
|
||||
{" --fail-early",
|
||||
"Fail on first transfer error",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{" --fail-with-body",
|
||||
"Fail on HTTP errors but save the body",
|
||||
CURLHELP_HTTP | CURLHELP_OUTPUT},
|
||||
|
|
@ -200,13 +200,15 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_TLS},
|
||||
{"-F, --form <name=content>",
|
||||
"Specify multipart MIME data",
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD},
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST | CURLHELP_IMAP |
|
||||
CURLHELP_SMTP},
|
||||
{" --form-escape",
|
||||
"Escape form fields using backslash",
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD},
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST},
|
||||
{" --form-string <name=string>",
|
||||
"Specify multipart MIME data",
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD},
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD | CURLHELP_POST | CURLHELP_SMTP |
|
||||
CURLHELP_IMAP},
|
||||
{" --ftp-account <data>",
|
||||
"Account data string",
|
||||
CURLHELP_FTP | CURLHELP_AUTH},
|
||||
|
|
@ -215,7 +217,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_FTP},
|
||||
{" --ftp-create-dirs",
|
||||
"Create the remote dirs if not present",
|
||||
CURLHELP_FTP | CURLHELP_SFTP | CURLHELP_CURL},
|
||||
CURLHELP_FTP | CURLHELP_SFTP},
|
||||
{" --ftp-method <method>",
|
||||
"Control CWD usage",
|
||||
CURLHELP_FTP},
|
||||
|
|
@ -242,13 +244,13 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_FTP | CURLHELP_TLS},
|
||||
{"-G, --get",
|
||||
"Put the post data in the URL and use GET",
|
||||
CURLHELP_HTTP | CURLHELP_UPLOAD},
|
||||
CURLHELP_HTTP},
|
||||
{"-g, --globoff",
|
||||
"Disable URL globbing with {} and []",
|
||||
CURLHELP_CURL},
|
||||
{" --happy-eyeballs-timeout-ms <ms>",
|
||||
"Time for IPv6 before IPv4",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_TIMEOUT},
|
||||
{" --haproxy-clientip <ip>",
|
||||
"Set address in HAProxy PROXY",
|
||||
CURLHELP_HTTP | CURLHELP_PROXY},
|
||||
|
|
@ -311,7 +313,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CONNECTION},
|
||||
{" --ipfs-gateway <URL>",
|
||||
"Gateway for IPFS",
|
||||
CURLHELP_IPFS},
|
||||
CURLHELP_CURL},
|
||||
{"-4, --ipv4",
|
||||
"Resolve names to IPv4 addresses",
|
||||
CURLHELP_CONNECTION | CURLHELP_DNS},
|
||||
|
|
@ -329,7 +331,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CONNECTION},
|
||||
{" --keepalive-time <seconds>",
|
||||
"Interval time for keepalive probes",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_TIMEOUT},
|
||||
{" --key <key>",
|
||||
"Private key filename",
|
||||
CURLHELP_TLS | CURLHELP_SSH},
|
||||
|
|
@ -341,7 +343,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_FTP},
|
||||
{" --libcurl <file>",
|
||||
"Generate libcurl code for this command line",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{" --limit-rate <speed>",
|
||||
"Limit transfer speed to RATE",
|
||||
CURLHELP_CONNECTION},
|
||||
|
|
@ -359,7 +361,8 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP | CURLHELP_AUTH},
|
||||
{" --login-options <options>",
|
||||
"Server login options",
|
||||
CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | CURLHELP_AUTH},
|
||||
CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP | CURLHELP_AUTH |
|
||||
CURLHELP_LDAP},
|
||||
{" --mail-auth <address>",
|
||||
"Originator address of the original email",
|
||||
CURLHELP_SMTP},
|
||||
|
|
@ -383,10 +386,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP},
|
||||
{"-m, --max-time <seconds>",
|
||||
"Maximum time allowed for transfer",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_TIMEOUT},
|
||||
{" --metalink",
|
||||
"Process given URLs as metalink XML file",
|
||||
CURLHELP_MISC},
|
||||
CURLHELP_DEPRECATED},
|
||||
{" --mptcp",
|
||||
"Enable Multipath TCP",
|
||||
CURLHELP_CONNECTION},
|
||||
|
|
@ -395,13 +398,13 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_AUTH | CURLHELP_HTTP},
|
||||
{"-n, --netrc",
|
||||
"Must read .netrc for username and password",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_AUTH},
|
||||
{" --netrc-file <filename>",
|
||||
"Specify FILE for netrc",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_AUTH},
|
||||
{" --netrc-optional",
|
||||
"Use either .netrc or URL",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_AUTH},
|
||||
{"-:, --next",
|
||||
"Make next URL use separate options",
|
||||
CURLHELP_CURL},
|
||||
|
|
@ -410,10 +413,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_TLS | CURLHELP_HTTP},
|
||||
{"-N, --no-buffer",
|
||||
"Disable buffering of the output stream",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_OUTPUT},
|
||||
{" --no-clobber",
|
||||
"Do not overwrite files that already exist",
|
||||
CURLHELP_CURL | CURLHELP_OUTPUT},
|
||||
CURLHELP_OUTPUT},
|
||||
{" --no-keepalive",
|
||||
"Disable TCP keepalive on the connection",
|
||||
CURLHELP_CONNECTION},
|
||||
|
|
@ -434,25 +437,26 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_AUTH | CURLHELP_HTTP},
|
||||
{" --ntlm-wb",
|
||||
"HTTP NTLM authentication with winbind",
|
||||
CURLHELP_AUTH | CURLHELP_HTTP},
|
||||
CURLHELP_DEPRECATED},
|
||||
{" --oauth2-bearer <token>",
|
||||
"OAuth 2 Bearer Token",
|
||||
CURLHELP_AUTH},
|
||||
CURLHELP_AUTH | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP |
|
||||
CURLHELP_LDAP},
|
||||
{"-o, --output <file>",
|
||||
"Write to file instead of stdout",
|
||||
CURLHELP_IMPORTANT | CURLHELP_CURL | CURLHELP_OUTPUT},
|
||||
CURLHELP_IMPORTANT | CURLHELP_OUTPUT},
|
||||
{" --output-dir <dir>",
|
||||
"Directory to save files in",
|
||||
CURLHELP_CURL | CURLHELP_OUTPUT},
|
||||
CURLHELP_OUTPUT},
|
||||
{"-Z, --parallel",
|
||||
"Perform transfers in parallel",
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL},
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{" --parallel-immediate",
|
||||
"Do not wait for multiplexing",
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL},
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{" --parallel-max <num>",
|
||||
"Maximum concurrency for parallel transfers",
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL},
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{" --pass <phrase>",
|
||||
"Passphrase for the private key",
|
||||
CURLHELP_SSH | CURLHELP_TLS | CURLHELP_AUTH},
|
||||
|
|
@ -476,7 +480,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_PROXY},
|
||||
{"-#, --progress-bar",
|
||||
"Display transfer progress as a bar",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --proto <protocols>",
|
||||
"Enable/disable PROTOCOLS",
|
||||
CURLHELP_CONNECTION | CURLHELP_CURL},
|
||||
|
|
@ -587,13 +591,13 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_FTP | CURLHELP_SFTP},
|
||||
{" --random-file <file>",
|
||||
"File for reading random data from",
|
||||
CURLHELP_MISC},
|
||||
CURLHELP_DEPRECATED},
|
||||
{"-r, --range <range>",
|
||||
"Retrieve only the bytes within RANGE",
|
||||
CURLHELP_HTTP | CURLHELP_FTP | CURLHELP_SFTP | CURLHELP_FILE},
|
||||
{" --rate <max request rate>",
|
||||
"Request rate for serial transfers",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_GLOBAL},
|
||||
{" --raw",
|
||||
"Do HTTP raw; no transfer decoding",
|
||||
CURLHELP_HTTP},
|
||||
|
|
@ -614,10 +618,11 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_OUTPUT},
|
||||
{" --remove-on-error",
|
||||
"Remove output file on errors",
|
||||
CURLHELP_CURL | CURLHELP_OUTPUT},
|
||||
CURLHELP_OUTPUT},
|
||||
{"-X, --request <method>",
|
||||
"Specify request method to use",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_POP3 | CURLHELP_FTP | CURLHELP_IMAP |
|
||||
CURLHELP_SMTP},
|
||||
{" --request-target <path>",
|
||||
"Specify the target for this request",
|
||||
CURLHELP_HTTP},
|
||||
|
|
@ -635,10 +640,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CURL},
|
||||
{" --retry-delay <seconds>",
|
||||
"Wait time between retries",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_CURL | CURLHELP_TIMEOUT},
|
||||
{" --retry-max-time <seconds>",
|
||||
"Retry only within this period",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_CURL | CURLHELP_TIMEOUT},
|
||||
{" --sasl-authzid <identity>",
|
||||
"Identity for SASL PLAIN authentication",
|
||||
CURLHELP_AUTH},
|
||||
|
|
@ -647,10 +652,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_AUTH},
|
||||
{" --service-name <name>",
|
||||
"SPNEGO service name",
|
||||
CURLHELP_MISC},
|
||||
CURLHELP_AUTH},
|
||||
{"-S, --show-error",
|
||||
"Show error even when -s is used",
|
||||
CURLHELP_CURL},
|
||||
CURLHELP_CURL | CURLHELP_GLOBAL},
|
||||
{"-s, --silent",
|
||||
"Silent mode",
|
||||
CURLHELP_IMPORTANT | CURLHELP_VERBOSE},
|
||||
|
|
@ -683,10 +688,11 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CONNECTION},
|
||||
{"-y, --speed-time <seconds>",
|
||||
"Trigger 'speed-limit' abort after this time",
|
||||
CURLHELP_CONNECTION},
|
||||
CURLHELP_CONNECTION | CURLHELP_TIMEOUT},
|
||||
{" --ssl",
|
||||
"Try enabling TLS",
|
||||
CURLHELP_TLS},
|
||||
CURLHELP_TLS | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP |
|
||||
CURLHELP_LDAP},
|
||||
{" --ssl-allow-beast",
|
||||
"Allow security flaw to improve interop",
|
||||
CURLHELP_TLS},
|
||||
|
|
@ -698,7 +704,8 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_TLS},
|
||||
{" --ssl-reqd",
|
||||
"Require SSL/TLS",
|
||||
CURLHELP_TLS},
|
||||
CURLHELP_TLS | CURLHELP_IMAP | CURLHELP_POP3 | CURLHELP_SMTP |
|
||||
CURLHELP_LDAP},
|
||||
{" --ssl-revoke-best-effort",
|
||||
"Ignore missing cert CRL dist points",
|
||||
CURLHELP_TLS},
|
||||
|
|
@ -710,10 +717,10 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_TLS},
|
||||
{" --stderr <file>",
|
||||
"Where to redirect stderr",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --styled-output",
|
||||
"Enable styled output for HTTP headers",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --suppress-connect-headers",
|
||||
"Suppress proxy CONNECT response headers",
|
||||
CURLHELP_PROXY},
|
||||
|
|
@ -770,19 +777,19 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP},
|
||||
{" --trace <file>",
|
||||
"Write a debug trace to FILE",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --trace-ascii <file>",
|
||||
"Like --trace, but without hex output",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --trace-config <string>",
|
||||
"Details to log in trace/verbose output",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --trace-ids",
|
||||
"Transfer + connection ids in verbose output",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --trace-time",
|
||||
"Add time stamps to trace/verbose output",
|
||||
CURLHELP_VERBOSE},
|
||||
CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{" --unix-socket <path>",
|
||||
"Connect through this Unix domain socket",
|
||||
CURLHELP_CONNECTION},
|
||||
|
|
@ -797,7 +804,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_HTTP | CURLHELP_POST | CURLHELP_UPLOAD},
|
||||
{"-B, --use-ascii",
|
||||
"Use ASCII/text transfer",
|
||||
CURLHELP_MISC},
|
||||
CURLHELP_FTP | CURLHELP_OUTPUT | CURLHELP_LDAP},
|
||||
{"-u, --user <user:password>",
|
||||
"Server user and password",
|
||||
CURLHELP_IMPORTANT | CURLHELP_AUTH},
|
||||
|
|
@ -809,7 +816,7 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_CURL},
|
||||
{"-v, --verbose",
|
||||
"Make the operation more talkative",
|
||||
CURLHELP_IMPORTANT | CURLHELP_VERBOSE},
|
||||
CURLHELP_IMPORTANT | CURLHELP_VERBOSE | CURLHELP_GLOBAL},
|
||||
{"-V, --version",
|
||||
"Show version number and quit",
|
||||
CURLHELP_IMPORTANT | CURLHELP_CURL},
|
||||
|
|
@ -821,6 +828,6 @@ const struct helptxt helptext[] = {
|
|||
CURLHELP_VERBOSE},
|
||||
{" --xattr",
|
||||
"Store metadata in extended file attributes",
|
||||
CURLHELP_MISC},
|
||||
{ NULL, NULL, CURLHELP_HIDDEN }
|
||||
CURLHELP_OUTPUT},
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue