- Check if unlocking of the list of files in use was successful

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 31377d9f55438ead8802f2cdffbe34dcc856a6b4..4c4d0daafd56f3b32fb73c93e501383c560c7c6f 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -3,11 +3,11 @@ package File::Access;
 #
 # Dev-Editor - Module File::Access
 #
 #
 # Dev-Editor - Module File::Access
 #

-# Some simple routines for doing things with files
-# with only one command
+# Some simple routines for doing things with files by
+# using only one command

 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

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

 #
 
 use strict;
 #
 
 use strict;


@@ -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)

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


@@ -134,17 +134,20 @@ 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);
 


@@ -189,16 +192,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 ;-)