This file testing order before saving a file makes more sense

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 3a43ffcd9005a5d3a65708b63e0c39feefcade77..baaff16d8d8aedd6d697ef125cb745649690fbcc 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -5,8 +5,8 @@ package Tool;
 #
 # Some shared sub routines
 #
 #
 # Some shared sub routines
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-28
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-11-13

 #
 
 use strict;
 #
 
 use strict;


@@ -35,7 +35,7 @@ use base qw(Exporter);
 
 # check_path()
 #
 
 # 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
 # (currently no check if the path exists - check otherwise!)
 #
 # Params: 1. Virtual root directory


@@ -56,27 +56,21 @@ sub check_path($$)
  $path =~ s!^/{1}!!;
  $path = $root."/".$path;
 
  $path =~ s!^/{1}!!;
  $path = $root."/".$path;
 

- unless(-d $path)
- {
-  # The path points to a file
-  # We have to extract the directory name and create the absolute path
+ # We extract the last part of the path and create the absolute path

 
 

-  my $dir  = upper_path($path);
-  my $file = file_name($path);
+ my $first = upper_path($path);
+ my $last  = file_name($path);

 
 

-  $dir  = abs_path($dir);
-  $path = $dir."/".$file;
- }
- else
- {
-  $path = abs_path($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
 
 
  # 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
 
 
  # Create short path name
 


@@ -204,42 +198,38 @@ sub file_name($)
 
 # mode_string()
 #
 
 # mode_string()
 #

-# Convert a binary file mode string into a human
-# readable string (rwxr-x-r-x)
+# Convert a file mode number into a human readable string (rwxr-x-r-x)
+# (also supports SetUID, SetGID and Sticky Bit)

 #
 #

-# Params: Binary file mode string
+# Params: File mode number

 #
 #

-# Return: Humand readable mode string
+# Return: Human readable mode string

 
 sub mode_string($)
 {
 
 sub mode_string($)
 {

- my $mode = shift;
-
+ my $mode   = shift;

  my $string = "";
 
  my $string = "";
 

-  # Owner
-  $string .= (($mode & 0x0100) ? 'r' : '-') .
-         (($mode & 0x0080) ? 'w' : '-') .
-         (($mode & 0x0040) ?
-           (($mode & 0x0800) ? 's' : 'x' ) :
-           (($mode & 0x0800) ? 'S' : '-')
-         );
-
-  # Group
-  $string .= (($mode & 0x0020) ? 'r' : '-') .
-         (($mode & 0x0010) ? 'w' : '-') .
-         (($mode & 0x0008) ?
-           (($mode & 0x0400) ? 's' : 'x') :
-           (($mode & 0x0400) ? 'S' : '-')
-         );
-
-  # World
-  $string .= (($mode & 0x0004) ? 'r' : '-') .
-         (($mode & 0x0002) ? 'w' : '-') .
-         (($mode & 0x0001) ?
-           (($mode & 0x0200) ? 't' : 'x' ) :
-           (($mode & 0x0200) ? 'T' : '-')
-         );
+ # User
+
+ $string  = ($mode & 00400) ? "r" : "-";
+ $string .= ($mode & 00200) ? "w" : "-";
+ $string .= ($mode & 00100) ? (($mode & 04000) ? "s" : "x") :
+                               ($mode & 04000) ? "S" : "-";
+
+ # Group
+
+ $string .= ($mode & 00040) ? "r" : "-";
+ $string .= ($mode & 00020) ? "w" : "-";
+ $string .= ($mode & 00010) ? (($mode & 02000) ? "s" : "x") :
+                               ($mode & 02000) ? "S" : "-";
+
+ # Other
+
+ $string .= ($mode & 00004) ? "r" : "-";
+ $string .= ($mode & 00002) ? "w" : "-";
+ $string .= ($mode & 00001) ? (($mode & 01000) ? "t" : "x") :
+                               ($mode & 01000) ? "T" : "-";

 
  return $string;
 }
 
  return $string;
 }