- fixed FlattenHash bug

- better handling of .. in filenames
(This used to be commit 4a9953f55bf48e04515510f9dc5e9015fd37bffd)

diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm
index c0182bb79e87bd625cb0bb9dbb37d7c23dfd0bb0..f0e3c2a2f8454c4fab922ffa79203f5600d89e9d 100644 (file)
--- 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";