diff --git a/apps/rehash.c b/apps/rehash.c index aacb1691981ccc105d1cd4764c38125d14336330..4e10ded7903e50534ae7b7174b8a0faeaba6d47c 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -403,6 +403,7 @@ OPTIONS rehash_options[] = { {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"}, {OPT_HELP_STR, 1, '-', "Valid options are:\n"}, {"help", OPT_HELP, '-', "Display this summary"}, + {"h", OPT_HELP, '-', "Display this summary"}, {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"}, {"old", OPT_OLD, '-', "Use old-style hash to generate links"}, {"n", OPT_N, '-', "Do not remove existing links"}, diff --git a/doc/apps/rehash.pod b/doc/apps/rehash.pod index 62e39cf9e22d09b8dd2762bae4acbfba5350c79b..936fda61807bc2bf7a9628fcb11a92091a2fcbba 100644 --- a/doc/apps/rehash.pod +++ b/doc/apps/rehash.pod @@ -11,6 +11,7 @@ c_rehash, rehash - Create symbolic links to files named by the hash values B B +B<[-h]> B<[-help]> B<[-old]> B<[-n]> @@ -82,7 +83,7 @@ optionally prefixed with some text and an equals sign. =over 4 -=item B<-help> +=item B<-help> B<-h> Display a brief usage message. diff --git a/tools/c_rehash.in b/tools/c_rehash.in index 2fef62784fade48967c2c8a203deb8442ac07ed8..e65822203dba36bb8fbe68ed01404f45df11830f 100644 --- a/tools/c_rehash.in +++ b/tools/c_rehash.in @@ -30,7 +30,7 @@ while ( $ARGV[0] =~ /^-/ ) { if ( $flag eq '-old') { $x509hash = "-subject_hash_old"; $crlhash = "-hash_old"; - } elsif ( $flag eq '-h') { + } elsif ( $flag eq '-h' || $flag eq '-help' ) { help(); } elsif ( $flag eq '-n' ) { $removelinks = 0; @@ -38,15 +38,15 @@ while ( $ARGV[0] =~ /^-/ ) { $verbose++; } else { - print STDERR "Usage error; try -help.\n"; + print STDERR "Usage error; try -h.\n"; exit 1; } } 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 " -h print this help text\n"; + print " -h or -help print this help text\n"; print " -v print files removed and linked\n"; exit 0; }