luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

help: add flags to output and ssh categories

Browse Source 
- Add --output, --remove-on-error, --output-dir and --created-dirs to
  the output help category

- Add --hostpubmd5, --hostpubsha256, --insecure (-k), and --pubkey to
  the ssh help category

Closes #14076
This commit is contained in:
Yedaya Katsman 2024-07-02 17:52:26 +03:00 committed by Daniel Stenberg
parent 82b32b344e
commit 62bfcb0c44
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/cmdline-opts/create-dirs.md
View File

@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
SPDX-License-Identifier: curl
Long: create-dirs
Help: Create necessary local directory hierarchy
Category: curl
Category: curl output
Added: 7.10.3
Multi: boolean
See-also:

2
docs/cmdline-opts/hostpubmd5.md
View File

@ -6,7 +6,7 @@ Arg: <md5>
Help: Acceptable MD5 hash of host public key
Protocols: SFTP SCP
Added: 7.17.1
Category: sftp scp
Category: sftp scp ssh
Multi: single
See-also:
- hostpubsha256

2
docs/cmdline-opts/hostpubsha256.md
View File

@ -6,7 +6,7 @@ Arg: <sha256>
Help: Acceptable SHA256 hash of host public key
Protocols: SFTP SCP
Added: 7.80.0
Category: sftp scp
Category: sftp scp ssh
Multi: single
See-also:
- hostpubmd5

2
docs/cmdline-opts/insecure.md
View File

@ -5,7 +5,7 @@ Long: insecure
Short: k
Help: Allow insecure server connections
Protocols: TLS SFTP SCP
Category: tls sftp scp
Category: tls sftp scp ssh
Added: 7.10
Multi: boolean
See-also:

2
docs/cmdline-opts/output-dir.md
View File

@ -5,7 +5,7 @@ Long: output-dir
Arg: <dir>
Help: Directory to save files in
Added: 7.73.0
Category: curl
Category: curl output
Multi: single
See-also:
- remote-name

2
docs/cmdline-opts/output.md
View File

@ -5,7 +5,7 @@ Long: output
Arg: <file>
Short: o
Help: Write to file instead of stdout
Category: important curl
Category: important curl output
Added: 4.0
Multi: per-URL
See-also:

2
docs/cmdline-opts/pubkey.md
View File

@ -5,7 +5,7 @@ Long: pubkey
Arg: <key>
Protocols: SFTP SCP
Help: SSH Public key filename
Category: sftp scp auth
Category: sftp scp ssh auth
Added: 7.16.2
Multi: single
See-also:

2
docs/cmdline-opts/remove-on-error.md
View File

@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
SPDX-License-Identifier: curl
Long: remove-on-error
Help: Remove output file on errors
Category: curl
Category: curl output
Added: 7.83.0
Multi: boolean
See-also:

16
src/tool_listhelp.c
View File

@ -98,7 +98,7 @@ const struct helptxt helptext[] = {
CURLHELP_HTTP},
{" --create-dirs",
"Create necessary local directory hierarchy",
CURLHELP_CURL},
CURLHELP_CURL | CURLHELP_OUTPUT},
{" --create-file-mode <mode>",
"File mode for created files",
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_FILE | CURLHELP_UPLOAD},
@ -266,10 +266,10 @@ const struct helptxt helptext[] = {
CURLHELP_IMPORTANT | CURLHELP_CURL},
{" --hostpubmd5 <md5>",
"Acceptable MD5 hash of host public key",
CURLHELP_SFTP | CURLHELP_SCP},
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
{" --hostpubsha256 <sha256>",
"Acceptable SHA256 hash of host public key",
CURLHELP_SFTP | CURLHELP_SCP},
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
{" --hsts <filename>",
"Enable HSTS with this cache file",
CURLHELP_HTTP},
@ -302,7 +302,7 @@ const struct helptxt helptext[] = {
CURLHELP_IMPORTANT | CURLHELP_VERBOSE},
{"-k, --insecure",
"Allow insecure server connections",
CURLHELP_TLS | CURLHELP_SFTP | CURLHELP_SCP},
CURLHELP_TLS | CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH},
{" --interface <name>",
"Use network interface",
CURLHELP_CONNECTION},
@ -440,10 +440,10 @@ const struct helptxt helptext[] = {
CURLHELP_AUTH},
{"-o, --output <file>",
"Write to file instead of stdout",
CURLHELP_IMPORTANT | CURLHELP_CURL},
CURLHELP_IMPORTANT | CURLHELP_CURL | CURLHELP_OUTPUT},
{" --output-dir <dir>",
"Directory to save files in",
CURLHELP_CURL},
CURLHELP_CURL | CURLHELP_OUTPUT},
{"-Z, --parallel",
"Perform transfers in parallel",
CURLHELP_CONNECTION | CURLHELP_CURL},
@ -581,7 +581,7 @@ const struct helptxt helptext[] = {
CURLHELP_PROXY},
{" --pubkey <key>",
"SSH Public key filename",
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_AUTH},
CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH | CURLHELP_AUTH},
{"-Q, --quote <command>",
"Send command(s) to server before transfer",
CURLHELP_FTP | CURLHELP_SFTP},
@ -614,7 +614,7 @@ const struct helptxt helptext[] = {
CURLHELP_OUTPUT},
{" --remove-on-error",
"Remove output file on errors",
CURLHELP_CURL},
CURLHELP_CURL | CURLHELP_OUTPUT},
{"-X, --request <method>",
"Specify request method to use",
CURLHELP_CONNECTION},