mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
- fixed FlattenHash bug
- better handling of .. in filenames
This commit is contained in:
parent
feb1239576
commit
4a9953f55b
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user