wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add -h and -help for c_rehash script and app

Browse source 
Resolves GH1515 and GH1509.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Rich Salz 2016-09-12 11:29:22 -04:00
parent dd8710dc54
commit 7d959c358a
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/rehash.c
View file

@ -403,6 +403,7 @@ OPTIONS rehash_options[] = {
{OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"}, {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"},
{OPT_HELP_STR, 1, '-', "Valid options are:\n"}, {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
{"help", OPT_HELP, '-', "Display this summary"}, {"help", OPT_HELP, '-', "Display this summary"},
{"h", OPT_HELP, '-', "Display this summary"},
{"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"}, {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
{"old", OPT_OLD, '-', "Use old-style hash to generate links"}, {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
{"n", OPT_N, '-', "Do not remove existing links"}, {"n", OPT_N, '-', "Do not remove existing links"},

3
doc/apps/rehash.pod
View file

@ -11,6 +11,7 @@ c_rehash, rehash - Create symbolic links to files named by the hash values
B<openssl> B<openssl>
B<rehash> B<rehash>
B<[-h]>
B<[-help]> B<[-help]>
B<[-old]> B<[-old]>
B<[-n]> B<[-n]>
@ -82,7 +83,7 @@ optionally prefixed with some text and an equals sign.
=over 4 =over 4
=item B<-help> =item B<-help> B<-h>
Display a brief usage message. Display a brief usage message.

8
tools/c_rehash.in
View file

@ -30,7 +30,7 @@ while ( $ARGV[0] =~ /^-/ ) {
if ( $flag eq '-old') { if ( $flag eq '-old') {
$x509hash = "-subject_hash_old"; $x509hash = "-subject_hash_old";
$crlhash = "-hash_old"; $crlhash = "-hash_old";
} elsif ( $flag eq '-h') { } elsif ( $flag eq '-h' || $flag eq '-help' ) {
help(); help();
} elsif ( $flag eq '-n' ) { } elsif ( $flag eq '-n' ) {
$removelinks = 0; $removelinks = 0;
@ -38,15 +38,15 @@ while ( $ARGV[0] =~ /^-/ ) {
$verbose++; $verbose++;
} }
else { else {
print STDERR "Usage error; try -help.\n"; print STDERR "Usage error; try -h.\n";
exit 1; exit 1;
} }
} }
sub help { sub help {
print "Usage: c_rehash [-old] [-h] [-v] [dirs...]\n"; print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
print " -old use old-style digest\n"; print " -old use old-style digest\n";
print " -h print this help text\n"; print " -h or -help print this help text\n";
print " -v print files removed and linked\n"; print " -v print files removed and linked\n";
exit 0; exit 0;
} }