mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use a simpler method to build a glob than splitpath and catpath

Browse Source 
It turns out that the combination splitpath() could return an empty
string for the directory part.  This doesn't play well with catdir().

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-02 19:47:05 +01:00
parent 01a35a5da7
commit 85152ca4a1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Configure
View File

@ -10,7 +10,7 @@
require 5.000;
use strict;
use File::Basename;
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs catpath splitpath/;
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
use File::Path qw/make_path/;
use Cwd qw/:DEFAULT realpath/;
@ -175,8 +175,7 @@ die "erroneous version information in opensslv.h: ",
# Collect target configurations
my ($vol, $dir, $dummy) = splitpath($0);
my $pattern = catpath($vol, catdir($dir, "Configurations"), "*.conf");
my $pattern = catfile(dirname($0), "Configurations", "*.conf");
foreach (sort glob($pattern) ) {
&read_config($_);
}