X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/ce10babcb8d07587e9bf95496e22e9b4e801f207..40f2eee5acdbe92aca68f47ffc6ee15aa3035f7e:/modules/Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 3ef4a10..1cd2456 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-07-23
+# Last modified: 2008-04-25
 #
 
 use strict;
@@ -68,8 +68,9 @@ sub check_path($$)
  $first    = abs_path($first);
 
  my $last  = file_name($path);
+ $last     = '' if($last eq '.');
 
- if(-d $first.'/'.$last && (not -l $first.'/'.$last) && -r $first.'/'.$last && -x $first.'/'.$last)
+ if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!))
  {
   $first = abs_path($first.'/'.$last);
   $last  = '';
@@ -80,6 +81,7 @@ sub check_path($$)
  # Check if the path is above the root directory
 
  return if(index($path,$root) != 0);
+ return if(substr($path,length($root)) && not File::Spec->file_name_is_absolute(substr($path,length($root))));
 
  # Create short path name
 
@@ -181,6 +183,8 @@ sub dos_wildcard_match($$)
 {
  my ($pattern,$string) = @_;
 
+ return 1 if($pattern eq '*');
+
  # The following part is stolen from File::DosGlob
 
  # escape regex metachars but not glob chars