Removed the race condition in file_create() which could set a file to 0 if it

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 6f84b3fb61f6e11c73c60f9b058d11ab5c59c522..3bfd50db657431210d5560456a6ca246eaea9b4f 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -7,23 +7,44 @@ 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: 2003-10-13
+# Last modified: 2004-08-05

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

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

 
 ### Export ###
 
 use base qw(Exporter);
 
 
 ### Export ###
 
 use base qw(Exporter);
 

-@EXPORT = qw(dir_read
+@EXPORT = qw(chgrp
+             dir_read

              file_create
              file_read
              file_create
              file_read

-             file_save);
+             file_save
+             file_unlock);
+
+# chgrp()
+#
+# Change the group of files or directories
+#
+# Params: 1. Group name
+#         2. List of files
+#
+# Return: Number of files group successfully changed
+#         (or false)
+
+sub chgrp($@)
+{
+ my ($group,@files) = @_;
+ my $gid = ($group !~ /^\d+$/) ? getgrnam($group) : $group;
+
+ return unless($gid);
+ return chown(-1,$gid,@files);
+}

 
 # dir_read()
 #
 
 # dir_read()
 #


@@ -49,7 +70,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;


@@ -87,8 +108,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 +127,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;
 }


@@ -125,18 +146,34 @@ sub file_read($)
 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 or do { close(FILE); return };
- close(FILE)          or return;
-
- rename($temp,$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;