diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-12-14 04:16:57 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-12-14 04:16:57 +0000 |
| commit | 5bd7a4a83267b237a216b0d91c2b0b6b6616974c (patch) | |
| tree | 1e7ecdfca8c119ff9db83a95358d7c687608afea | |
| parent | ee9dc3c0ad1a5988bfe00eee31f00e573c3680c2 (diff) | |
| download | samba-5bd7a4a83267b237a216b0d91c2b0b6b6616974c.tar.gz samba-5bd7a4a83267b237a216b0d91c2b0b6b6616974c.tar.bz2 samba-5bd7a4a83267b237a216b0d91c2b0b6b6616974c.zip | |
- fixed FlattenHash bug
- better handling of .. in filenames
(This used to be commit 4a9953f55bf48e04515510f9dc5e9015fd37bffd)
| -rw-r--r-- | source4/build/pidl/util.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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"; |