moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-05 00:55:04 -05:00
Code Issues Releases Wiki Activity

gen: support 'redirect'

Browse Source 
... and warn for too long --help lines
This commit is contained in:
Daniel Stenberg 2016-11-16 10:42:02 +01:00
parent 1ef1f10cab
commit 81e61cda39
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/cmdline-opts/MANPAGE.md
View File

@ -26,6 +26,7 @@ Each file has a set of meta-data and a body of text.
Mutexed: (space separated list of options this overrides)
Requires: (space separated list of features this option requires)
See-also: (space separated list of related options)
Redirect: (option name to use instead)
Help: (short text for the --help output for this option)
--- (end of meta-data)

43
docs/cmdline-opts/gen.pl
View File

@ -10,6 +10,7 @@ my %optshort;
my %optlong;
my %helplong;
my %arglong;
my %redirlong;
# get the long name version, return the man page string
sub manpageify {
@ -51,6 +52,7 @@ sub single {
my $arg;
my $mutexed;
my $requires;
my $redirect;
my $seealso;
my $magic; # cmdline special option
while(<F>) {
@ -84,6 +86,9 @@ sub single {
elsif(/^Requires: (.*)/i) {
$requires=$1;
}
elsif(/^Redirect: (.*)/i) {
$redirect=$1;
}
elsif(/^---/) {
last;
}
@ -109,21 +114,26 @@ sub single {
}
print ".IP \"$opt\"\n";
my $o;
if($protocols) {
$o++;
print "($protocols) ";
if($redirect) {
my $l = manpageify($redirect);
print "Use $l instead!\n";
}
if(!$arg && !$mutexed && !$magic) {
$o++;
print "[Boolean] ";
else {
my $o;
if($protocols) {
$o++;
print "($protocols) ";
}
if(!$arg && !$mutexed && !$magic) {
$o++;
print "[Boolean] ";
}
if($magic) {
$o++;
print "[cmdline control] ";
}
print "\n" if($o);
}
if($magic) {
$o++;
print "[cmdline control] ";
}
print "\n" if($o);
printdesc(@desc);
undef @desc;
@ -231,7 +241,12 @@ sub listhelp {
$opt .= " $arg";
}
printf " %-19s %s\n", $opt, $helplong{$f};
my $line = sprintf " %-19s %s\n", $opt, $helplong{$f};
if(length($line) > 79) {
print STDERR "WARN: the --$long line is too long\n";
}
print $line;
}
}