X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/dff53f21c8fccc7585f785fec893a5773e78a1b6..d1804166ad8a4bf5e932ee792c46ea8ecc78a0e6:/modules/Tool.pm?ds=sidebyside

diff --git a/modules/Tool.pm b/modules/Tool.pm
index dc11571..1f72b75 100644
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-01-06
+# Last modified: 2005-01-08
 #
 
 use strict;
@@ -61,18 +61,22 @@ sub check_path($$)
  # We extract the last part of the path and create the absolute path
 
  my $first = upper_path($path);
+ $first    = abs_path($first);
+
  my $last  = file_name($path);
+ $last     = '' if($last eq '.');
 
- $first = abs_path($first);
- $path  = $first.'/'.$last;
+ if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!))
+ {
+  $first = abs_path($first.'/'.$last);
+  $last  = '';
+ }
 
- $first = File::Spec->canonpath($first);
- $path  = File::Spec->canonpath($path);
+ $path = File::Spec->canonpath($first.'/'.$last);
 
  # Check if the path is above the root directory
 
  return if(index($path,$root) != 0);
- return if($first eq $root && ($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.+$!)));
 
  # Create short path name
 
@@ -219,7 +223,7 @@ sub file_name($)
  my $path =  shift;
  $path    =~ tr!\\!/!;
 
- unless($path eq '/')
+ unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!))
  {
   $path =~ s!/+$!!;
   $path =  substr($path,rindex($path,'/')+1);
@@ -279,7 +283,7 @@ sub upper_path($)
  my $path =  shift;
  $path    =~ tr!\\!/!;
 
- unless($path eq '/')
+ unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!))
  {
   $path =~ s!/+$!!;
   $path =  substr($path,0,rindex($path,'/')+1);