- Changed names of some {IF} blocks (make use of negations)

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 9ba39c2690a1138f6c965045a0b045c5f85e3493..5ee6d8b2e11005e27ab0f26fdebae937323ad48b 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>
-# Last modified: 2005-01-07
+# Last modified: 2005-04-22
 #
 
 use strict;
@@ -29,9 +29,11 @@ use base qw(Exporter);
              clean_path
              devedit_reload
              dos_wildcard_match
+             encode_html
              equal_url
              file_name
              mode_string
+             multi_string
              upper_path);
 
 # check_path()
@@ -61,33 +63,17 @@ sub check_path($$)
  # We extract the last part of the path and create the absolute path
 
  my $first = upper_path($path);
+ $first    = File::Spec->canonpath($first);
  $first    = abs_path($first);
 
  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  = '';
  }
- 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);
 
@@ -100,7 +86,7 @@ sub check_path($$)
  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);
 }
@@ -206,6 +192,26 @@ sub dos_wildcard_match($$)
  return ($string =~ m|^$pattern$|is);
 }
 
+# encode_html()
+#
+# Encode HTML control characters (< > " &)
+#
+# Params: String to encode
+#
+# Return: Encoded string
+
+sub encode_html($)
+{
+ my $string = shift;
+
+ $string =~ s/&/&amp;/g;
+ $string =~ s/</&lt;/g;
+ $string =~ s/>/&gt;/g;
+ $string =~ s/"/&quot;/g;
+
+ return $string;
+}
+
 # equal_url()
 #
 # Create URL equal to a file or directory
@@ -240,7 +246,7 @@ sub file_name($)
  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);
@@ -287,9 +293,33 @@ sub mode_string($)
  return $string;
 }
 
+# multi_string()
+#
+# Create a Hash Reference containing three forms of a string
+#
+# Params: String
+#
+# Return: Hash Reference:
+#         normal => Normal form of the string
+#         html   => HTML encoded form (see encode_html())
+#         url    => URL encoded form
+
+sub multi_string($)
+{
+ my $string = shift;
+ my %multi;
+
+ $multi{'normal'} = $string;
+ $multi{'html'}   = encode_html($string);
+ $multi{'url'}    = escape($string);
+
+ return \%multi;
+}
+
 # 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
 #
@@ -300,7 +330,7 @@ sub upper_path($)
  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);