Small code cleaning

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 4ddc9e1a3c04dbf2d2a92a0fa82c3faf1a9a7c17..54dd3d2e57b990b667f00749c0686b2f98de1ab0 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,12 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
-# Dev-Editor 2.2a
+# Dev-Editor 2.3.1
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-01-06
+# Last modified: 2005-02-14
 #
 
 use strict;
@@ -23,7 +23,7 @@ use Command;
 use Output;
 use Tool;
 
-$VERSION = '2.2a';
+$VERSION = '2.3.1';
 
 # Path to configuration file
 # Change if necessary!
@@ -60,7 +60,7 @@ my $new_virtual  = '';
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
  $curdir  = upper_path($file) if($curdir eq '');
- my $path = $curdir.$newfile;
+ my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...
 
@@ -69,7 +69,9 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  # ... check if the directory exists ...
 
- unless(-d clean_path($config->{'fileroot'}.'/'.$dir))
+ my $temp_path = clean_path($config->{'fileroot'}.'/'.$dir);
+
+ unless(-d $temp_path && not -l $temp_path)
  {
   abort($config->{'errors'}->{'dir_not_exist'},'/');
  }
@@ -97,7 +99,9 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
 # This check has to be performed first or abs_path() will be confused
 
-if(-e clean_path($config->{'fileroot'}.'/'.$file))
+my $temp_path = clean_path($config->{'fileroot'}.'/'.$file);
+
+if(-e $temp_path || -l $temp_path)
 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {
@@ -110,8 +114,8 @@ if(-e clean_path($config->{'fileroot'}.'/'.$file))
   $uselist->lock or abort($config->{'errors'}->{'lock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});
   $uselist->load;
 
-  # Create a hash with data submitted by user
-  # (some other necessary information will also be included)
+  # Create a hash containing data submitted by the user
+  # (some other necessary information are also included)
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
@@ -122,10 +126,14 @@ if(-e clean_path($config->{'fileroot'}.'/'.$file))
               version      => $VERSION,
               configfile   => CONFIGFILE);
 
-  my $output = exec_command($command,\%data,$config); # Execute the command...
+  # Execute the command...
+
+  my $output = exec_command($command,\%data,$config);
+
+  # ... unlock the list with files in use and show the output of the command
 
-  $uselist->unlock; # ... unlock the list with files in use...
-  print $$output;   # ... and show the output of the command
+  $uselist->unlock or abort($config->{'errors'}->{'unlock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});
+  print $$output;
  }
  else
  {