From f593fd87df697e132d92330c4e22584a614454e5 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sat, 21 Jul 2007 18:11:04 +0000
Subject: * base work towards utf8-cleanness (it is now possible to handle
 vendor-OSes   whose name contain UTF8-characters * fixed problem with
 locale-specific number format being used during DB-   creation (fixes the
 problem that database access would only work once   for de_DE-locales
 [reported by Detlef Schulz])

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1266 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 lib/OpenSLX/Basics.pm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index 6f61c7a7..dfcb27b1 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -31,11 +31,14 @@ $VERSION = 1.01;
 	&checkFlags
 	&instantiateClass
 	&addCleanupFunction &removeCleanupFunction
+	&glob
 );
 
 our (%openslxConfig, %cmdlineConfig, %openslxPath);
 
-use subs qw(die warn);
+use subs qw(die warn glob);
+
+use open ':utf8';
 
 ################################################################################
 ### Module implementation
@@ -47,6 +50,8 @@ use Carp::Heavy;    # use it here to have it loaded immediately, not at
                     # be at a point in time where the script executes in
                     # a chrooted environment, such that the module can't
                     # be loaded anymore).
+use Encode;
+require File::Glob;
 use FindBin;
 use Getopt::Long;
 use POSIX qw(locale_h);
@@ -149,7 +154,7 @@ sub openslxInit
 {
 	# evaluate cmdline arguments:
 	Getopt::Long::Configure('no_pass_through');
-	GetOptions(%openslxCmdlineArgs) or return 0;
+	GetOptions(%openslxCmdlineArgs);
 
 	# try to read and evaluate config files:
 	my $configPath = $cmdlineConfig{'config-path'}
@@ -220,25 +225,19 @@ sub openslxInit
 # ------------------------------------------------------------------------------
 sub trInit
 {
-
-	# set the specified locale...
-	setlocale(LC_ALL, $openslxConfig{'locale'});
-
-	# ...and activate automatic charset conversion on all I/O streams:
+	# activate automatic charset conversion on all the standard I/O streams,
+	# just to give *some* support to shells in other charsets:
 	binmode(STDIN,  ":encoding($openslxConfig{'locale-charmap'})");
 	binmode(STDOUT, ":encoding($openslxConfig{'locale-charmap'})");
 	binmode(STDERR, ":encoding($openslxConfig{'locale-charmap'})");
-	use open ':locale';
 
 	my $locale = $openslxConfig{'locale'};
 	if (lc($locale) eq 'c') {
-
 		# treat locale 'c' as equivalent for 'posix':
 		$locale = 'posix';
 	}
 
 	if (lc($locale) ne 'posix') {
-
 		# parse locale and canonicalize it (e.g. to 'de_DE') and generate
 		# two filenames from it (language+country and language only):
 		if ($locale !~ m{^\s*([^_]+)(?:_(\w+))?}) {
@@ -474,6 +473,14 @@ sub _doThrowOrWarn
 	return;
 }
 
+# ------------------------------------------------------------------------------
+sub glob
+{
+	return map {
+		decode('utf8', $_);
+	} File::Glob::bsd_glob(@_);
+}
+
 # ------------------------------------------------------------------------------
 sub checkFlags
 {
-- 
cgit v1.2.3-55-g7522