Version 1.1.1:

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 47b73e660dcf5069cc2de8b1b1c2f0431970d402..9e89e43e6ad71e0ad1e13cafe1c06bad5d428ef8 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,17 +6,14 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-22-2003
+# Last modified: 2003-10-03
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
-use Carp qw(croak);
-
 use Cwd qw(abs_path);
-use File::Basename;
 use File::Spec;
 
 ### Export ###
@@ -25,7 +22,7 @@ use base qw(Exporter);
 
 @EXPORT = qw(check_path
              clean_path
-             filemode
+             file_name
              upper_path);
 
 # check_path()
@@ -56,17 +53,11 @@ sub check_path($$)
   # The path points to a file
   # We have to extract the directory name and create the absolute path
 
-  my @pathinfo = fileparse($path);
-
-  # This is only to avoid errors
-
-  my $basename = $pathinfo[0] || '';
-  my $dir      = $pathinfo[1] || '';
-  my $ext      = $pathinfo[2] || '';
-
-  $dir = abs_path($dir);
+  my $dir  = upper_path($path);
+  my $file = file_name($path);
 
-  $path = $dir."/".$basename.$ext;
+  $dir  = abs_path($dir);
+  $path = $dir."/".$file;
  }
  else
  {
@@ -107,32 +98,26 @@ sub clean_path($)
  return $path;
 }
 
-# filemode()
+# file_name()
 #
-# Creates a readable string of a UNIX filemode number
-# (copied from Tool.pm of Dev-Editor 0.1.4)
+# Returns the last path of a filename
 #
-# Params: Filemode as number
+# Params: Path
 #
-# Return: Filemode as readable string
+# Return: Last part of the path
 
-sub filemode($)
+sub file_name($)
 {
-    my ($modestring, $ur, $uw, $ux, $gr, $gw, $gx, $or, $ow, $ox);
-    my $mode = shift;
-
-    $ur = ($mode & 0400) ? "r" : "-";       # User Read
-    $uw = ($mode & 0200) ? "w" : "-";       # User Write
-    $ux = ($mode & 0100) ? "x" : "-";       # User eXecute
-    $gr = ($mode & 0040) ? "r" : "-";       # Group Read
-    $gw = ($mode & 0020) ? "w" : "-";       # Group Write
-    $gx = ($mode & 0010) ? "x" : "-";       # Group eXecute
-    $or = ($mode & 0004) ? "r" : "-";       # Other Read
-    $ow = ($mode & 0002) ? "w" : "-";       # Other Write
-    $ox = ($mode & 0001) ? "x" : "-";       # Other eXecute
-
-    # build a readable mode string (rwxrwxrwx)
-    return $ur . $uw . $ux . $gr . $gw . $gx . $or . $ow . $ox;
+ my $path =  shift;
+ $path    =~ tr!\\!/!;
+
+ unless($path eq "/")
+ {
+  $path = substr($path,0,-1) if($path =~ m!/$!);
+  $path = substr($path,rindex($path,"/")+1);
+ }
+
+ return $path;
 }
 
 # upper_path()