Restored the version of check_path() found in revision 1.34 of Tool.pm

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index d9a20f7ea72bccea4401552fe4872def65c0e823..16d5d72acd2b3aeefc1b45d5e9e998598cdfb209 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-06-10
+# Last modified: 2005-07-23

 #
 
 use strict;
 #
 
 use strict;


@@ -68,8 +68,9 @@ sub check_path($$)
  $first    = abs_path($first);
 
  my $last  = file_name($path);
  $first    = abs_path($first);
 
  my $last  = file_name($path);

+ $last     = '' if($last eq '.');

 
 

- if(-d $first.'/'.$last && not -l $first.'/'.$last)
+ if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!))

  {
   $first = abs_path($first.'/'.$last);
   $last  = '';
  {
   $first = abs_path($first.'/'.$last);
   $last  = '';