X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/dff53f21c8fccc7585f785fec893a5773e78a1b6..c1339294a28926ba7593adbd3d48ef9f1bcf6dfa:/devedit.pl?ds=sidebyside diff --git a/devedit.pl b/devedit.pl index ee4f5fc..237cf34 100644 --- 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 -# Last modified: 2005-01-06 +# Last modified: 2005-02-13 # 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! @@ -69,7 +69,7 @@ if($newfile ne '' && $newfile !~ /^\s+$/) # ... check if the directory exists ... - unless(-d clean_path($config->{'fileroot'}.'/'.$dir)) + unless(-d clean_path($config->{'fileroot'}.'/'.$dir) && not -l clean_path($config->{'fileroot'}.'/'.$dir)) { abort($config->{'errors'}->{'dir_not_exist'},'/'); } @@ -97,7 +97,7 @@ 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)) +if(-e clean_path($config->{'fileroot'}.'/'.$file) || -l clean_path($config->{'fileroot'}.'/'.$file)) { if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file)) { @@ -110,8 +110,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 +122,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... - $uselist->unlock; # ... unlock the list with files in use... - print $$output; # ... and show the output of 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 or abort($config->{'errors'}->{'unlock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}}); + print $$output; } else {