diff options
author | Oliver Tappe | 2007-07-18 21:35:44 +0200 |
---|---|---|
committer | Oliver Tappe | 2007-07-18 21:35:44 +0200 |
commit | 3b2019f3a16965a412eb9197f02567f9ff061a3d (patch) | |
tree | 2bc5b87feebe1f155f0be2fd8f1c332976ad084c /bin/slxldd | |
parent | * fixed yet another uninitialized value (diff) | |
download | core-3b2019f3a16965a412eb9197f02567f9ff061a3d.tar.gz core-3b2019f3a16965a412eb9197f02567f9ff061a3d.tar.xz core-3b2019f3a16965a412eb9197f02567f9ff061a3d.zip |
* tried to avoid a specific (but spurious) uninitialized value warning
that has been reported by Dirk
* some cleanup with respect to regex matching
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1255 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'bin/slxldd')
-rwxr-xr-x | bin/slxldd | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -110,13 +110,15 @@ sub fetchLoaderConfigFile or die(_tr("unable to open file '%s' (%s)", $ldConfFile, $!)); while (<$ldconfFH>) { chomp; - if (/^\s*include\s+(.+?)\s*$/i) { - while (my $incFile = <$rootPath$1>) { - fetchLoaderConfigFile($incFile); + if (m{^\s*include\s+(.+?)\s*$}i) { + while (my $incFile = glob("$rootPath$1")) { + if ($incFile) { + fetchLoaderConfigFile($incFile); + } } next; } - if (/\S+/i) { + if (m{\S+}i) { s[=.+][]; # remove any lib-type specifications (e.g. '=libc5') push @libFolders, "$rootPath$_"; @@ -266,7 +268,7 @@ sub addLibsForBinary } # find out if rpath is set for binary: my $rpath; - if ($res =~ m/Library\s*rpath:\s*\[([^\]]+)/im) { + if ($res =~ m{Library\s*rpath:\s*\[([^\]]+)}im) { $rpath = $1; if ($verbose) { print STDERR _tr("\trpath='%s'\n", $rpath); |