From: Yedaya Katsman Date: Tue, 2 Jul 2024 14:52:26 +0000 (+0300) Subject: help: add flags to output and ssh categories X-Git-Tag: curl-8_9_0~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62bfcb0c4409e8886cd1af5fb969143848c28303;p=thirdparty%2Fcurl.git help: add flags to output and ssh categories - 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 --- diff --git a/docs/cmdline-opts/create-dirs.md b/docs/cmdline-opts/create-dirs.md index fcbeb3343b..f114494652 100644 --- a/docs/cmdline-opts/create-dirs.md +++ b/docs/cmdline-opts/create-dirs.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , 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: diff --git a/docs/cmdline-opts/hostpubmd5.md b/docs/cmdline-opts/hostpubmd5.md index 7dc873254f..5d480a5bcd 100644 --- a/docs/cmdline-opts/hostpubmd5.md +++ b/docs/cmdline-opts/hostpubmd5.md @@ -6,7 +6,7 @@ Arg: 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 diff --git a/docs/cmdline-opts/hostpubsha256.md b/docs/cmdline-opts/hostpubsha256.md index 8ec080551d..35aa8ff7da 100644 --- a/docs/cmdline-opts/hostpubsha256.md +++ b/docs/cmdline-opts/hostpubsha256.md @@ -6,7 +6,7 @@ Arg: 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 diff --git a/docs/cmdline-opts/insecure.md b/docs/cmdline-opts/insecure.md index b1c056b448..6b7009f251 100644 --- a/docs/cmdline-opts/insecure.md +++ b/docs/cmdline-opts/insecure.md @@ -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: diff --git a/docs/cmdline-opts/output-dir.md b/docs/cmdline-opts/output-dir.md index 04d780f298..8d779df0c7 100644 --- a/docs/cmdline-opts/output-dir.md +++ b/docs/cmdline-opts/output-dir.md @@ -5,7 +5,7 @@ Long: output-dir Arg: Help: Directory to save files in Added: 7.73.0 -Category: curl +Category: curl output Multi: single See-also: - remote-name diff --git a/docs/cmdline-opts/output.md b/docs/cmdline-opts/output.md index 548e02f15c..3ab7e7e5a8 100644 --- a/docs/cmdline-opts/output.md +++ b/docs/cmdline-opts/output.md @@ -5,7 +5,7 @@ Long: output Arg: Short: o Help: Write to file instead of stdout -Category: important curl +Category: important curl output Added: 4.0 Multi: per-URL See-also: diff --git a/docs/cmdline-opts/pubkey.md b/docs/cmdline-opts/pubkey.md index 94e50e4e94..373d113c3f 100644 --- a/docs/cmdline-opts/pubkey.md +++ b/docs/cmdline-opts/pubkey.md @@ -5,7 +5,7 @@ Long: pubkey Arg: 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: diff --git a/docs/cmdline-opts/remove-on-error.md b/docs/cmdline-opts/remove-on-error.md index b0064ae318..54e8be874a 100644 --- a/docs/cmdline-opts/remove-on-error.md +++ b/docs/cmdline-opts/remove-on-error.md @@ -3,7 +3,7 @@ c: Copyright (C) Daniel Stenberg, , 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: diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c index 93941811c2..fd25927a62 100644 --- a/src/tool_listhelp.c +++ b/src/tool_listhelp.c @@ -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 ", "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 ", "Acceptable MD5 hash of host public key", - CURLHELP_SFTP | CURLHELP_SCP}, + CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH}, {" --hostpubsha256 ", "Acceptable SHA256 hash of host public key", - CURLHELP_SFTP | CURLHELP_SCP}, + CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH}, {" --hsts ", "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 ", "Use network interface", CURLHELP_CONNECTION}, @@ -440,10 +440,10 @@ const struct helptxt helptext[] = { CURLHELP_AUTH}, {"-o, --output ", "Write to file instead of stdout", - CURLHELP_IMPORTANT | CURLHELP_CURL}, + CURLHELP_IMPORTANT | CURLHELP_CURL | CURLHELP_OUTPUT}, {" --output-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 ", "SSH Public key filename", - CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_AUTH}, + CURLHELP_SFTP | CURLHELP_SCP | CURLHELP_SSH | CURLHELP_AUTH}, {"-Q, --quote ", "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 ", "Specify request method to use", CURLHELP_CONNECTION},