This commit was manufactured by cvs2svn to create branch 'version_2_3_x'.

[devedit.git] / modules / File / Access.pm

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 4c4d0daafd56f3b32fb73c93e501383c560c7c6f..ad2bc13091da3884db25a4bccaf82d72278281a8 100644 (file)
--- 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-02-10
+# Last modified: 2005-02-16
 #
 
 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);
   }
@@ -151,7 +151,6 @@ sub file_read($;$)
 
  read(FILE, my $content, -s $file);
 
- file_lock(FILE,LOCK_UN)      or do { close(FILE); return };
  close(FILE)                  or return;
 
  return \$content;
@@ -179,7 +178,6 @@ sub file_save($$;$)
 
  print FILE $$content                             or do { close(FILE); return };
 
- file_lock(FILE,LOCK_UN)                          or do { close(FILE); return };
  close(FILE)                                      or return;
 
  return 1;