X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/548d69a4ee38cc59612e787f479ac198d5c37741..c1339294a28926ba7593adbd3d48ef9f1bcf6dfa:/modules/File/Access.pm?ds=sidebyside diff --git a/modules/File/Access.pm b/modules/File/Access.pm index 4fa468d..dd6403b 100644 --- a/modules/File/Access.pm +++ b/modules/File/Access.pm @@ -7,7 +7,7 @@ package File::Access; # using only one command # # Author: Patrick Canterino <patrick@patshaping.de> -# Last modified: 2005-01-06 +# Last modified: 2005-02-12 # use strict; @@ -46,7 +46,7 @@ $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 }; # Params: Directory # # Return: Hash reference: dirs => directories -# files => files +# files => files and symbolic links sub dir_read($) { @@ -72,7 +72,7 @@ sub dir_read($) { next if($entry eq '.' || $entry eq '..'); - if(-d $dir.'/'.$entry) + if(-d $dir.'/'.$entry && not -l $dir.'/'.$entry) { push(@dirs,$entry); } @@ -134,17 +134,20 @@ sub file_lock(*$) # # Read out a file completely # -# Params: File +# Params: 1. File +# 2. true => open in binary mode +# false => open in normal mode (default) # # Return: Contents of the file (Scalar Reference) -sub file_read($) +sub file_read($;$) { - my $file = shift; + my ($file,$binary) = @_; local *FILE; sysopen(FILE,$file,O_RDONLY) or return; file_lock(FILE,LOCK_SH) or do { close(FILE); return }; + binmode(FILE) if($binary); read(FILE, my $content, -s $file); @@ -189,16 +192,16 @@ sub file_save($$;$) # Params: 1. File::UseList object # 2. File to remove # -# Return: -nothing- +# Return: Status code (Boolean) sub file_unlock($$) { my ($uselist,$file) = @_; - $uselist->remove_file($file); - $uselist->save; + $uselist->remove_file($file) or return; + $uselist->save or return; - return; + return 1; } # it's true, baby ;-)