Typo

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 8958e62fd0d137927d873553d92f3d2495d6ccaf..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>
 # using only one command
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2004-12-17
+# Last modified: 2005-02-16

 #
 
 use strict;
 #
 
 use strict;


@@ -46,7 +46,7 @@ $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 # Params: Directory
 #
 # Return: Hash reference: dirs  => directories
 # Params: Directory
 #
 # Return: Hash reference: dirs  => directories

-#                         files => files
+#                         files => files and symbolic links

 
 sub dir_read($)
 {
 
 sub dir_read($)
 {


@@ -70,9 +70,9 @@ sub dir_read($)
 
  foreach my $entry(@entries)
  {
 
  foreach my $entry(@entries)
  {

-  next if($entry eq "." || $entry eq "..");
+  next if($entry eq '.' || $entry eq '..');

 
 

-  if(-d $dir."/".$entry)
+  if(-d $dir.'/'.$entry && not -l $dir.'/'.$entry)

   {
    push(@dirs,$entry);
   }
   {
    push(@dirs,$entry);
   }


@@ -134,21 +134,23 @@ sub file_lock(*$)
 #
 # Read out a file completely
 #
 #
 # 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)
 
 #
 # 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 };
  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);
 
 
  read(FILE, my $content, -s $file);
 

- file_lock(FILE,LOCK_UN)      or do { close(FILE); return };

  close(FILE)                  or return;
 
  return \$content;
  close(FILE)                  or return;
 
  return \$content;


@@ -176,7 +178,6 @@ sub file_save($$;$)
 
  print FILE $$content                             or do { close(FILE); return };
 
 
  print FILE $$content                             or do { close(FILE); return };
 

- file_lock(FILE,LOCK_UN)                          or do { close(FILE); return };

  close(FILE)                                      or return;
 
  return 1;
  close(FILE)                                      or return;
 
  return 1;


@@ -189,16 +190,16 @@ sub file_save($$;$)
 # Params: 1. File::UseList object
 #         2. File to remove
 #
 # Params: 1. File::UseList object
 #         2. File to remove
 #

-# Return: -nothing-
+# Return: Status code (Boolean)

 
 sub file_unlock($$)
 {
  my ($uselist,$file) = @_;
 
 
 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 ;-)
 }
 
 # it's true, baby ;-)