diff options
author | Richard Levitte <levitte@openssl.org> | 2016-02-02 19:47:05 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-02 20:07:44 +0100 |
commit | 85152ca4a1e9827d48dc9cbe266da3f90f3d158a (patch) | |
tree | ff74a1852d10813482f25b50271a7ecdda691f6c /Configure | |
parent | 01a35a5da7b91718c70c0c6cccfd7531c7010d5d (diff) |
Use a simpler method to build a glob than splitpath and catpath
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>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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($_); } |