tool_help: Increase space between option and description

- Increase the minimum number of spaces between the option and the
  description from 1 to 2.

Before:
~~~
 -u, --user <user:password> Server user and password
 -A, --user-agent <name> Send User-Agent <name> to server
 -v, --verbose       Make the operation more talkative
 -V, --version       Show version number and quit
 -w, --write-out <format> Use output FORMAT after completion
     --xattr         Store metadata in extended file attributes
~~~

After:
~~~
 -u, --user <user:password>  Server user and password
 -A, --user-agent <name>  Send User-Agent <name> to server
 -v, --verbose       Make the operation more talkative
 -V, --version       Show version number and quit
 -w, --write-out <format>  Use output FORMAT after completion
     --xattr         Store metadata in extended file attributes
~~~

Closes https://github.com/curl/curl/pull/6674

diff --git a/src/tool_help.c b/src/tool_help.c
index f3046b7df8e223e59e5011a4602dea4d3d7b5fa9..0d1e4cd355939546b505229f035c67108fe399d5 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -889,7 +889,7 @@ static void print_category(curlhelp_t category)
   unsigned int i;
   for(i = 0; helptext[i].opt; ++i)
     if(helptext[i].categories & category) {
-      printf(" %-19s %s\n", helptext[i].opt, helptext[i].desc);
+      printf(" %-18s  %s\n", helptext[i].opt, helptext[i].desc);
     }
 }
 

diff --git a/tests/data/test1461 b/tests/data/test1461
index 4b8f6c4101304c9c2cc71abdc81496c04d9a354e..301dc144e4d01844fa0ff31beeef20dcdf6b2708 100644 (file)
--- a/tests/data/test1461
+++ b/tests/data/test1461
@@ -34,14 +34,14 @@ curl important --help
 Usage: curl [options...] <url>
  -d, --data <data>   HTTP POST data
  -f, --fail          Fail silently (no output at all) on HTTP errors
- -h, --help <category> Get help for commands
+ -h, --help <category>  Get help for commands
  -i, --include       Include protocol response headers in the output
- -o, --output <file> Write to file instead of stdout
+ -o, --output <file>  Write to file instead of stdout
  -O, --remote-name   Write output to a file named as the remote file
  -s, --silent        Silent mode
- -T, --upload-file <file> Transfer local FILE to destination
- -u, --user <user:password> Server user and password
- -A, --user-agent <name> Send User-Agent <name> to server
+ -T, --upload-file <file>  Transfer local FILE to destination
+ -u, --user <user:password>  Server user and password
+ -A, --user-agent <name>  Send User-Agent <name> to server
  -v, --verbose       Make the operation more talkative
  -V, --version       Show version number and quit
 

diff --git a/tests/data/test1463 b/tests/data/test1463
index 3901d7b73b69e9c7ba5f2afe8c1da6aeb3ac2661..9326748ed8fc85b8c79992db23edf796a7b9a40c 100644 (file)
--- a/tests/data/test1463
+++ b/tests/data/test1463
@@ -37,9 +37,9 @@ curl file category --help
 <stdout mode="text">
 Usage: curl [options...] <url>
 file: FILE protocol options
-     --create-file-mode <mode> File mode (octal) for created files
+     --create-file-mode <mode>  File mode (octal) for created files
  -I, --head          Show document info only
- -r, --range <range> Retrieve only the bytes within RANGE
+ -r, --range <range>  Retrieve only the bytes within RANGE
 </stdout>
 </verify>
 </testcase>

diff --git a/tests/data/test1464 b/tests/data/test1464
index 5e0b475b239ce4557ce36fadf978308ebd44ab8f..2ddacefa557ab6f364fdb70a39502f591ebcb468 100644 (file)
--- a/tests/data/test1464
+++ b/tests/data/test1464
@@ -37,9 +37,9 @@ curl file category --help with lower/upper mix
 <stdout mode="text">
 Usage: curl [options...] <url>
 file: FILE protocol options
-     --create-file-mode <mode> File mode (octal) for created files
+     --create-file-mode <mode>  File mode (octal) for created files
  -I, --head          Show document info only
- -r, --range <range> Retrieve only the bytes within RANGE
+ -r, --range <range>  Retrieve only the bytes within RANGE
 </stdout>
 </verify>
 </testcase>