From 5bd7a4a83267b237a216b0d91c2b0b6b6616974c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 14 Dec 2000 04:16:57 +0000 Subject: - fixed FlattenHash bug - better handling of .. in filenames (This used to be commit 4a9953f55bf48e04515510f9dc5e9015fd37bffd) --- source4/build/pidl/util.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm index c0182bb79e..f0e3c2a2f8 100644 --- a/source4/build/pidl/util.pm +++ b/source4/build/pidl/util.pm @@ -28,7 +28,7 @@ sub FlattenHash($) my $a = shift; my %b; for my $d (@{$a}) { - for my $k (%{$d}) { + for my $k (keys %{$d}) { $b{$k} = $d->{$k}; } } @@ -102,7 +102,7 @@ sub ChangeExtension($$) { my($fname) = shift; my($ext) = shift; - if ($fname =~ /^(.*?)\.(.*?)$/) { + if ($fname =~ /^(.*)\.(.*?)$/) { return "$1.$ext"; } return "$fname.$ext"; -- cgit