Changed version number

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 9ba39c2690a1138f6c965045a0b045c5f85e3493..23770a14bc8ab1ddcbd6ca9fd107f08e879df2a4 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-02-13

 #
 
 use strict;
 #
 
 use strict;


@@ -66,28 +66,11 @@ 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
-
-  my $count = length($last)-1;
-
-  for(my $x=0;$x<$count;$x++)
-  {
-   unless($first =~ m!^[a-z]{1}:(/|\\)$!i)
-   {
-    $first = upper_path($first);
-   }
-  }
-
-  $last = '';
- }

 
  $path = File::Spec->canonpath($first.'/'.$last);
 
 
  $path = File::Spec->canonpath($first.'/'.$last);
 


@@ -100,7 +83,7 @@ sub check_path($$)
  my $short_path = substr($path,length($root));
  $short_path =~ tr!\\!/!;
  $short_path = '/'.$short_path if($short_path !~ m!^/!);
  my $short_path = substr($path,length($root));
  $short_path =~ tr!\\!/!;
  $short_path = '/'.$short_path if($short_path !~ m!^/!);

- $short_path = $short_path.'/' if($short_path !~ m!/$! && -d $path);
+ $short_path = $short_path.'/' if($short_path !~ m!/$! && -d $path && not -l $path);

 
  return ($path,$short_path);
 }
 
  return ($path,$short_path);
 }


@@ -240,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]:/+$!i))

  {
   $path =~ s!/+$!!;
   $path =  substr($path,rindex($path,'/')+1);
  {
   $path =~ s!/+$!!;
   $path =  substr($path,rindex($path,'/')+1);


@@ -289,7 +272,8 @@ sub mode_string($)
 
 # upper_path()
 #
 
 # upper_path()
 #

-# Cut away the last part of a path
+# Remove the last part of a path
+# (the resulting path contains a trailing slash)

 #
 # Params: Path
 #
 #
 # Params: Path
 #


@@ -300,7 +284,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]:/+$!i))

  {
   $path =~ s!/+$!!;
   $path =  substr($path,0,rindex($path,'/')+1);
  {
   $path =~ s!/+$!!;
   $path =  substr($path,0,rindex($path,'/')+1);