Build: change remaining $unified_info{install} checks to use attributes

[openssl.git] / tools / c_rehash.in

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index a23a8f3f22516f5510974d6fc8da642d30140950..ad72b51cfebde0dc506b93cb8055b8d5b629cfb6 100644 (file)
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -1,9 +1,9 @@
-#!{- $config{perl} -}
+#!{- $config{HASHBANGPERL} -}
 
 # {- join("\n# ", @autowarntext) -}
-# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -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;
 }
@@ -109,7 +109,7 @@ sub hash_dir {
        print "Doing $_[0]\n";
        chdir $_[0];
        opendir(DIR, ".");
-       my @flist = readdir(DIR);
+       my @flist = sort readdir(DIR);
        closedir DIR;
        if ( $removelinks ) {
                # Delete any existing symbolic links