From 2615041bf7c763b356982299b54732eb2c3b1b3f Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 22 Jul 2007 09:49:22 +0000
Subject: * dropped our own implementation of glob() - that was a fix at the
 wrong place.   We now explicitly ecode the string before we are printing it.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1271 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/slxos-export |  7 ++++---
 installer/slxos-setup  |  3 ++-
 lib/OpenSLX/Basics.pm  | 11 +----------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/installer/slxos-export b/installer/slxos-export
index 2533aa1f..be63068d 100755
--- a/installer/slxos-export
+++ b/installer/slxos-export
@@ -18,6 +18,7 @@ slxos-export
     OpenSLX-script to generate an export from a vendor-OS.
 ];
 
+use Encode;
 use Getopt::Long qw(:config pass_through);
 use Pod::Usage;
 
@@ -64,10 +65,10 @@ if ($action =~ m[^list-ex]i) {
 	foreach my $type (sort keys %supportedExportFileSystems) {
 		# list all image files, followed by the block devices using it:
 		my @files = map {
-			my $image = $_;
+			my $image = decode('utf8', $_);
 			$image =~ s[^.+/][];
 			$image;
-		} sort <$openslxConfig{'public-path'}/export/$type/*>;
+		} sort glob("$openslxConfig{'public-path'}/export/$type/*");
 		my %imageFiles;
 		foreach my $file (@files) {
 			if ($file =~ m[^(.+)@(.+)$]) {
@@ -103,7 +104,7 @@ if ($action =~ m[^list-ex]i) {
 	print join(
 		'',
 		map {
-			my $vendorOS = $_;
+			my $vendorOS = decode('utf8', $_);
 			$vendorOS =~ s[^.+/][];
 			"\t$vendorOS\n";
 		  }
diff --git a/installer/slxos-setup b/installer/slxos-setup
index 1d323738..b7461deb 100755
--- a/installer/slxos-setup
+++ b/installer/slxos-setup
@@ -19,6 +19,7 @@ slxos-setup
     a stage1 system for OpenSLX.
 ];
 
+use Encode;
 use Getopt::Long qw(:config pass_through);
 use Pod::Usage;
 
@@ -159,7 +160,7 @@ if ($action =~ m[^import]i) {
 	print join(
 		'', 
 		map {
-			my $vendorOS = $_;
+			my $vendorOS = decode('utf8', $_);
 			$vendorOS =~ s[^.+/][];
 			"\t$vendorOS\n";
 		}
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index d26cf195..6c4fa87e 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -31,12 +31,11 @@ $VERSION = 1.01;
 	&checkFlags
 	&instantiateClass
 	&addCleanupFunction &removeCleanupFunction
-	&glob
 );
 
 our (%openslxConfig, %cmdlineConfig, %openslxPath);
 
-use subs qw(die warn glob);
+use subs qw(die warn);
 
 use open ':utf8';
 
@@ -469,14 +468,6 @@ sub _doThrowOrWarn
 	return;
 }
 
-# ------------------------------------------------------------------------------
-sub glob
-{
-	return map {
-		decode('utf8', $_);
-	} (File::Glob::bsd_glob(@_));
-}
-
 # ------------------------------------------------------------------------------
 sub checkFlags
 {
-- 
cgit v1.2.3-55-g7522