X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/1ffd7f98c787b767995479114622399c6cb51801..4780f42f030a63e97503e82d71ccd5d1c323e550:/devedit.pl diff --git a/devedit.pl b/devedit.pl index eb03292..fc49a71 100644 --- a/devedit.pl +++ b/devedit.pl @@ -1,12 +1,12 @@ #!C:/Programme/Perl/bin/perl.exe -w # -# Dev-Editor 2.3 +# Dev-Editor 2.3.1 # # Dev-Editor's main program # # Author: Patrick Canterino -# Last modified: 2005-01-06 +# Last modified: 2005-02-19 # use strict; @@ -23,7 +23,7 @@ use Command; use Output; use Tool; -$VERSION = '2.3'; +$VERSION = '2.3.1'; # Path to configuration file # Change if necessary! @@ -37,7 +37,7 @@ error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy... # Check if the root directory exists -abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'}); +abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'} && not -l $config->{'fileroot'}); # Check if we are able to access the root directory @@ -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 {