Some cleanings

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index d9a20f7ea72bccea4401552fe4872def65c0e823..2f72d1a10dcf20f60197529fa5dde92732411cd3 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,15 @@ 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-06-10
+# Last modified: 2011-01-05
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2011 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 1.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).

 #
 
 use strict;
 #
 
 use strict;


@@ -32,11 +40,19 @@ use base qw(Exporter);
              encode_html
              equal_url
              file_name
              encode_html
              equal_url
              file_name

+             in_array
+             is_archive
+             is_disabled_command

              is_forbidden_file
              mode_string
              multi_string
              upper_path);
 
              is_forbidden_file
              mode_string
              multi_string
              upper_path);
 

+my @archive_exts = ('.zip',     '.tar', '.gz',
+                    '.tar.gz',  '.tgz', '.bz2',
+                    '.tar.bz2', '.tbz', '.tbz2',
+                    '.Z');
+

 # check_path()
 #
 # Check if a virtual path is above a virtual root directory
 # check_path()
 #
 # Check if a virtual path is above a virtual root directory


@@ -68,8 +84,9 @@ sub check_path($$)
  $first    = abs_path($first);
 
  my $last  = file_name($path);
  $first    = abs_path($first);
 
  my $last  = file_name($path);

+ $last     = '' if($last eq '.');

 
 

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

  {
   $first = abs_path($first.'/'.$last);
   $last  = '';
  {
   $first = abs_path($first.'/'.$last);
   $last  = '';


@@ -80,6 +97,7 @@ sub check_path($$)
  # Check if the path is above the root directory
 
  return if(index($path,$root) != 0);
  # Check if the path is above the root directory
 
  return if(index($path,$root) != 0);

+ return if(substr($path,length($root)) && not File::Spec->file_name_is_absolute(substr($path,length($root))));

 
  # Create short path name
 
 
  # Create short path name
 


@@ -181,6 +199,8 @@ sub dos_wildcard_match($$)
 {
  my ($pattern,$string) = @_;
 
 {
  my ($pattern,$string) = @_;
 

+ return 1 if($pattern eq '*');
+

  # The following part is stolen from File::DosGlob
 
  # escape regex metachars but not glob chars
  # The following part is stolen from File::DosGlob
 
  # escape regex metachars but not glob chars


@@ -255,6 +275,70 @@ sub file_name($)
  return $path;
 }
 
  return $path;
 }
 

+# in_array()
+#
+# Check if a value is in an array
+#
+# Params: 1. Value to find
+#         2. Array
+#
+# Return: Status code (Boolean)
+
+sub in_array($$)
+{
+ my ($string,$array) = @_;
+
+ foreach my $element(@{$array})
+ {
+  return 1 if($string eq $element);
+ }
+
+ return;
+}
+
+# is_archive()
+#
+# Check if a file is an archive
+# (currently only by file extension)
+#
+# Params: Archive file name
+#
+# Return: Status code (Boolean)
+
+sub is_archive($)
+{
+ my $file = shift;
+
+ foreach my $ext(@archive_exts)
+ {
+  return 1 if(lc(substr($file,length($file)-length($ext),length($ext))) eq lc($ext));
+ }
+
+ return;
+}
+
+# is_disabled_command()
+#
+# Check if a command is disabled
+#
+# Params: 1. Array Reference containing the list
+#         2. Command to check
+#
+# Return: Status code (Boolean)
+
+sub is_disabled_command($$)
+{
+ my ($list,$command) = @_;
+ $command =~ s!/+$!!g;
+
+ foreach my $entry(@$list)
+ {
+  return 1 if(lc($command) eq lc($entry));
+ }
+
+ return;
+}
+

 # is_forbidden_file()
 #
 # Check if a file is in the list of forbidden files
 # is_forbidden_file()
 #
 # Check if a file is in the list of forbidden files