This file testing order before saving a file makes more sense

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

diff --git a/modules/File/UseList.pm b/modules/File/UseList.pm
index 22d1bcc87320a2568decae829eabfa64d68e101b..6f7ff627334b4a6bca6629d74be6e44771ed0ccf 100644 (file)
--- a/modules/File/UseList.pm
+++ b/modules/File/UseList.pm
@@ -1,13 +1,13 @@
 package File::UseList;
 
 #
 package File::UseList;
 
 #

-# File::UseList 1.1.1
+# File::UseList 1.2

 #
 # 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>
 #
 # 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
+# Last modified: 2003-11-21

 #
 
 use strict;
 #
 
 use strict;


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

-  unless(-f $lockfile)
-  {
-   open(LOCKFILE,">",$lockfile) or return;
-   close(LOCKFILE)              or return;
-  }
+  open(LOCKFILE,">$lockfile") or return;
+  close(LOCKFILE)             or return;

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


@@ -126,9 +123,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;
+ open(FILE,"<$file") 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 +162,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;
+ open(FILE,">$temp") 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 +176,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 +189,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 +197,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,7 +216,7 @@ sub remove_file($)
   if($files->[$x] eq $file)
   {
    splice(@$files,$x,1);
   if($files->[$x] eq $file)
   {
    splice(@$files,$x,1);

-   last;
+   return 1;

   }
  }
 }
   }
  }
 }