Changed my email address (patshaping@gmx.net -> patrick@patshaping.de) in all

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 6fbf8e05277ee7e9a54eaf7700530042979ff541..baaff16d8d8aedd6d697ef125cb745649690fbcc 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -5,8 +5,8 @@ package Tool;
 #
 # Some shared sub routines
 #
-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-30
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-11-13
 #
 
 use strict;
@@ -35,7 +35,7 @@ use base qw(Exporter);
 
 # check_path()
 #
-# Check, if a virtual path is above a virtual root directory
+# Check if a virtual path is above a virtual root directory
 # (currently no check if the path exists - check otherwise!)
 #
 # Params: 1. Virtual root directory
@@ -56,27 +56,21 @@ sub check_path($$)
  $path =~ s!^/{1}!!;
  $path = $root."/".$path;
 
- unless(-d $path)
- {
-  # The path points to a file
-  # We have to extract the directory name and create the absolute path
+ # We extract the last part of the path and create the absolute path
 
-  my $dir  = upper_path($path);
-  my $file = file_name($path);
+ my $first = upper_path($path);
+ my $last  = file_name($path);
 
-  $dir  = abs_path($dir);
-  $path = $dir."/".$file;
- }
- else
- {
-  $path = abs_path($path);
- }
+ $first = abs_path($first);
+ $path  = $first."/".$last;
 
- $path = File::Spec->canonpath($path);
+ $first = File::Spec->canonpath($first);
+ $path  = File::Spec->canonpath($path);
 
  # Check if the path is above the root directory
 
- return if(index($path,$root) == -1);
+ return if(index($path,$root) != 0);
+ return if($first eq $root && $last =~ m!^(/|\\)?\.\.(/|\\)?$!);
 
  # Create short path name