- When composing the temporary virtual path for a new file, don't call

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

diff --git a/modules/File/UseList.pm b/modules/File/UseList.pm
index 22d1bcc87320a2568decae829eabfa64d68e101b..29db2983f39ff69f8fa9655c1e1e3c5a7f21b6c5 100644 (file)
--- a/modules/File/UseList.pm
+++ b/modules/File/UseList.pm
@@ -1,18 +1,19 @@
 package File::UseList;
 
 #
 package File::UseList;
 
 #

-# File::UseList 1.1.1
+# File::UseList 1.3

 #
 # Run a list with files that are currently in use
 # (bases on Filing::UseList by Roland Bluethgen <calocybe@web.de>)
 #
 #
 # Run a list with files that are currently in use
 # (bases on Filing::UseList by Roland Bluethgen <calocybe@web.de>)
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2003-10-17
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-03

 #
 
 use strict;
 
 use Carp qw(croak);
 #
 
 use strict;
 
 use Carp qw(croak);

+use Fcntl;

 
 # new()
 #
 
 # new()
 #


@@ -95,11 +96,8 @@ sub unlock
 
  if($self->{'locked'})
  {
 
  if($self->{'locked'})
  {

-  unless(-f $lockfile)
-  {
-   open(LOCKFILE,">",$lockfile) or return;
-   close(LOCKFILE)              or return;
-  }
+  sysopen(LOCKFILE,$lockfile,O_WRONLY | O_CREAT | O_TRUNC) or return;
+  close(LOCKFILE)                                          or return;

 
   $self->{'locked'} = 0;
   return 1;
 
   $self->{'locked'} = 0;
   return 1;


@@ -126,9 +124,9 @@ sub load
 
  # Read out the file and split the content line-per-line
 
 
  # Read out the file and split the content line-per-line
 

- 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;

 
  my @files = split(/\015\012|\012|\015/,$content);
 
 
  my @files = split(/\015\012|\012|\015/,$content);
 


@@ -165,11 +163,11 @@ sub save
 
  my $data = (@$files) ? join("\n",@$files) : '';
 
 
  my $data = (@$files) ? join("\n",@$files) : '';
 

- open(FILE,">",$temp) or return;
- print FILE $data     or do { close(FILE); return };
- close(FILE)          or return;
+ sysopen(FILE,$temp,O_WRONLY | O_CREAT | O_TRUNC) or return;
+ print FILE $data                                 or do { close(FILE); return };
+ close(FILE)                                      or return;

 
 

- rename($temp,$file)  or return;
+ rename($temp,$file)                              or return;

 
  return 1;
 }
 
  return 1;
 }


@@ -179,6 +177,8 @@ sub save
 # Add a file to the list
 #
 # Params: File
 # Add a file to the list
 #
 # Params: File

+#
+# Return: Status code (Boolean)

 
 sub add_file($)
 {
 
 sub add_file($)
 {


@@ -190,6 +190,7 @@ sub add_file($)
  return if($self->in_use($file));
 
  push(@$files,$file);
  return if($self->in_use($file));
 
  push(@$files,$file);

+ return 1;

 }
 
 # remove_file()
 }
 
 # remove_file()


@@ -197,6 +198,8 @@ sub add_file($)
 # Remove a file from the list
 #
 # Params: File
 # Remove a file from the list
 #
 # Params: File

+#
+# Return: Status code (Boolean)

 
 sub remove_file($)
 {
 
 sub remove_file($)
 {


@@ -214,11 +217,28 @@ sub remove_file($)
   if($files->[$x] eq $file)
   {
    splice(@$files,$x,1);
   if($files->[$x] eq $file)
   {
    splice(@$files,$x,1);

-   last;
+   return 1;

   }
  }
 }
 
   }
  }
 }
 

+# remove_all()
+#
+# Remove all files from the list
+#
+# Params: -nothing-
+#
+# Return: -nothing-
+
+sub remove_all
+{
+ my $self = shift;
+
+ $self->{'files'} = [];
+
+ return;
+}
+

 # in_use()
 #
 # Check if a file is in the list
 # in_use()
 #
 # Check if a file is in the list