X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/91dc65a53fbe7dc79a983a51f330033b343cba36..d3a034178ca60c1a856535f0ed57fbb54ada0ebb:/modules/Tool.pm?ds=sidebyside diff --git a/modules/Tool.pm b/modules/Tool.pm index 8d578ef..baaff16 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -5,8 +5,8 @@ package Tool; # # Some shared sub routines # -# Author: Patrick Canterino -# Last modified: 2004-11-04 +# Author: Patrick Canterino +# 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 @@ -64,11 +64,13 @@ sub check_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