From d9362f04f15b187354119c4cc835f77103985379 Mon Sep 17 00:00:00 2001 From: pcanterino <> Date: Fri, 22 Apr 2005 17:42:53 +0000 Subject: [PATCH 1/1] Merged changes of revision 1.76 of modules/Command.pm and revision 1.33 of modules/Tool.pm to this branch --- modules/Command.pm | 4 ++-- modules/Tool.pm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/Command.pm b/modules/Command.pm index ab4f8b8..b9467a5 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2005-03-18 +# Last modified: 2005-04-22 # use strict; @@ -103,7 +103,7 @@ sub exec_show($$) return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical); my $direntries = dir_read($physical); - return error($config->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries); + return error($config->{'errors'}->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries); my $files = $direntries->{'files'}; my $dirs = $direntries->{'dirs'}; diff --git a/modules/Tool.pm b/modules/Tool.pm index 23770a1..afffeb3 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -6,7 +6,7 @@ package Tool; # Some shared sub routines # # Author: Patrick Canterino -# Last modified: 2005-02-13 +# Last modified: 2005-04-22 # use strict; @@ -61,6 +61,7 @@ sub check_path($$) # We extract the last part of the path and create the absolute path my $first = upper_path($path); + $first = File::Spec->canonpath($first); $first = abs_path($first); my $last = file_name($path); -- 2.34.1