Changed my email address (patshaping@gmx.net -> patrick@patshaping.de) in all

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 27277755449578e1ff5eba8cb71a54ddfe2b4e7a..28124cce18e1483381524a25fdf71eb98f1b2c15 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -6,15 +6,15 @@ package File::Access;
 # Some simple routines for doing things with files
 # with only one command
 #
 # Some simple routines for doing things with files
 # with only one command
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2003-11-04
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-10-26

 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 

-use Carp qw(croak);
+use Fcntl;

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


@@ -23,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()
 #


@@ -49,7 +50,7 @@ sub dir_read($)
 
  # Sort the entries
 
 
  # Sort the entries
 

- @entries = sort(@entries);
+ @entries = sort {uc($a) cmp uc($b)} @entries;

 
  my @files;
  my @dirs;
 
  my @files;
  my @dirs;


@@ -73,7 +74,11 @@ sub dir_read($)
 
 # file_create()
 #
 
 # file_create()
 #

-# Create a file
+# Create a file, but only if it doesn't already exist
+#
+# (I wanted to use O_EXCL for this, but `perldoc -f sysopen`
+# doesn't say that it is available on every system - so I
+# created this workaround using O_RDONLY and O_CREAT)

 #
 # Params: File to create
 #
 #
 # Params: File to create
 #


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

- open(FILE,">",$file) or return;
- close(FILE)          or return;
+ sysopen(FILE,$file,O_RDONLY | O_CREAT) or return;
+ close(FILE)                            or return;

 
  return 1;
 }
 
  return 1;
 }


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

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

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

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

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


@@ -127,13 +132,32 @@ sub file_save($$)
  my ($file,$content) = @_;
  local *FILE;
 
  my ($file,$content) = @_;
  local *FILE;
 

- open(FILE,">",$file) or return;
- print FILE $$content or do { close(FILE); return };
- close(FILE)          or return;
+ sysopen(FILE,$file,O_WRONLY | O_CREAT | O_TRUNC) 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;