Parse the {IF} block "gmt" only once

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 0b1159d5b1386e5cb990ded06bc9369bb9eeb9ce..1f72b754670b9ba005eb8519733b67d5cab8e9cb 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-01-07
+# Last modified: 2005-01-08

 #
 
 use strict;
 #
 
 use strict;


@@ -66,31 +66,13 @@ sub check_path($$)
  my $last  = file_name($path);
  $last     = '' if($last eq '.');
 
  my $last  = file_name($path);
  $last     = '' if($last eq '.');
 

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

  {
  {

-  $first = upper_path($first);
+  $first = abs_path($first.'/'.$last);

   $last  = '';
  }
   $last  = '';
  }

- elsif($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!)
- {
-  # Windows allows to go upwards in a path using things like
-  # "..." and "...." and so on
-
-  for(my $x=0;$x<length($last)-1;$x++)
-  {
-   unless($first =~ m!^[a-z]{1}:(/|\\)$!i)
-   {
-    $first = upper_path($first);
-   }
-  }
-
-  $last = '';
- }
-
- $path  = $first.'/'.$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
 
 
  # Check if the path is above the root directory
 


@@ -241,7 +223,7 @@ sub file_name($)
  my $path =  shift;
  $path    =~ tr!\\!/!;
 
  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);
  {
   $path =~ s!/+$!!;
   $path =  substr($path,rindex($path,'/')+1);


@@ -301,7 +283,7 @@ sub upper_path($)
  my $path =  shift;
  $path    =~ tr!\\!/!;
 
  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);
  {
   $path =~ s!/+$!!;
   $path =  substr($path,0,rindex($path,'/')+1);