From 98d1d7b7b74c5157f2a0c8bca1f9347924bad8ff Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 22 Jul 2007 09:41:31 +0000
Subject: * fixed glob()-related hang in slxldd.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1270 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 bin/slxldd            | 3 ++-
 lib/OpenSLX/Basics.pm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/slxldd b/bin/slxldd
index b8732a44..3ad849c8 100755
--- a/bin/slxldd
+++ b/bin/slxldd
@@ -111,7 +111,8 @@ sub fetchLoaderConfigFile
 	while (<$ldconfFH>) {
 		chomp;
 		if (m{^\s*include\s+(.+?)\s*$}i) {
-			while (my $incFile = glob("$rootPath$1")) {
+			my @incFiles = glob("$rootPath$1");
+			foreach my $incFile (@incFiles) {
 				if ($incFile) {
 					fetchLoaderConfigFile($incFile);
 				}
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index 3aebb54e..d26cf195 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -474,7 +474,7 @@ sub glob
 {
 	return map {
 		decode('utf8', $_);
-	} File::Glob::bsd_glob(@_);
+	} (File::Glob::bsd_glob(@_));
 }
 
 # ------------------------------------------------------------------------------
-- 
cgit v1.2.3-55-g7522