Typo

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 81b6851b9226a8a63a539551f8941b87ce1ebcce..9dcd7e54677c9b1e45a25194746f9c8b46c527cf 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -7,7 +7,7 @@ package File::Access;
 # with only one command
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # with only one command
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 09-20-2003
+# Last modified: 2004-02-06

 #
 
 use strict;
 #
 
 use strict;


@@ -15,7 +15,6 @@ use strict;
 use vars qw(@EXPORT);
 
 use Carp qw(croak);
 use vars qw(@EXPORT);
 
 use Carp qw(croak);

-use File::Spec;

 
 ### Export ###
 
 
 ### Export ###
 


@@ -24,7 +23,8 @@ use base qw(Exporter);
 @EXPORT = qw(dir_read
              file_create
              file_read
 @EXPORT = qw(dir_read
              file_create
              file_read

-             file_save);
+             file_save
+             file_unlock);

 
 # dir_read()
 #
 
 # dir_read()
 #


@@ -59,7 +59,7 @@ sub dir_read($)
  {
   next if($entry eq "." || $entry eq "..");
 
  {
   next if($entry eq "." || $entry eq "..");
 

-  if(-d File::Spec->canonpath($dir."/".$entry))
+  if(-d $dir."/".$entry)

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


@@ -88,8 +88,8 @@ sub file_create($)
 
  return if(-e $file);
 
 
  return if(-e $file);
 

- open(FILE,">",$file) or return;
- close(FILE)          or return;
+ open(FILE,">$file") or return;
+ close(FILE)         or return;

 
  return 1;
 }
 
  return 1;
 }


@@ -107,9 +107,9 @@ sub file_read($)
  my $file = shift;
  local *FILE;
 
  my $file = shift;
  local *FILE;
 

- open(FILE,"<",$file);
+ open(FILE,"<$file") or return;

  read(FILE, my $content, -s $file);
  read(FILE, my $content, -s $file);

- close(FILE);
+ close(FILE)         or return;

 
  return \$content;
 }
 
  return \$content;
 }


@@ -121,23 +121,39 @@ sub file_read($)
 # Params: 1. File
 #         2. File content as Scalar Reference
 #
 # Params: 1. File
 #         2. File content as Scalar Reference
 #

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

 
 sub file_save($$)
 {
  my ($file,$content) = @_;
 
 sub file_save($$)
 {
  my ($file,$content) = @_;

- my $temp            = $file.".temp";

  local *FILE;
 
  local *FILE;
 

- open(FILE,">",$temp) or return;
- print FILE $$content;
- close(FILE) or return;
-
- rename($temp,$file) or return;
+ open(FILE,">$file")  or return;
+ print FILE $$content or do { close(FILE); return };
+ close(FILE)          or return;

 
  return 1;
 }
 
 
  return 1;
 }
 

+# file_unlock()
+#
+# Remove a file from the list of files in use
+#
+# Params: 1. File::UseList object
+#         2. File to remove
+#
+# Return: -nothing-
+
+sub file_unlock($$)
+{
+ my ($uselist,$file) = @_;
+
+ $uselist->remove_file($file);
+ $uselist->save;
+
+ return;
+}
+

 # it's true, baby ;-)
 
 1;
 # it's true, baby ;-)
 
 1;