Changing the mode of inaccessible directories works again

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

diff --git a/modules/File/Access.pm b/modules/File/Access.pm
index 8958e62fd0d137927d873553d92f3d2495d6ccaf..e0f4e557e91163d12b252c85365567e9ea09e5f8 100644 (file)
--- a/modules/File/Access.pm
+++ b/modules/File/Access.pm
@@ -7,7 +7,7 @@ package File::Access;
 # using only one command
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # using only one command
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2004-12-17
+# Last modified: 2005-07-05

 #
 
 use strict;
 #
 
 use strict;


@@ -18,16 +18,18 @@ use vars qw(@EXPORT
 use Fcntl qw(:DEFAULT
              :flock);
 
 use Fcntl qw(:DEFAULT
              :flock);
 

+use File::Copy;
+

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

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

              file_create
              file_lock
              file_read
              file_save
              file_create
              file_lock
              file_read
              file_save

-             file_unlock

 
              LOCK_SH
              LOCK_EX
 
              LOCK_SH
              LOCK_EX


@@ -39,6 +41,49 @@ use base qw(Exporter);
 
 $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 
 
 $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 

+# dir_copy()
+#
+# Copy a directory
+#
+# Params: 1. Directory to copy
+#         2. Target
+#
+# Return: Status code (Boolean)
+
+sub dir_copy($$)
+{
+ my ($dir,$target) = @_;
+
+ return unless(-d $dir);
+
+ my $entries = dir_read($dir) or return;
+
+ my $dirs    = $entries->{'dirs'};
+ my $files   = $entries->{'files'};
+
+ mkdir($target,0777) unless(-d $target);
+
+ foreach my $directory(@$dirs)
+ {
+  unless(-d $target.'/'.$directory)
+  {
+   mkdir($target.'/'.$directory,0777) or next;
+  }
+
+  if(-r $target.'/'.$directory && -x $target.'/'.$directory)
+  {
+   dir_copy($dir.'/'.$directory,$target.'/'.$directory) or next;
+  }
+ }
+
+ foreach my $file(@$files)
+ {
+  copy($dir.'/'.$file,$target.'/'.$file) or next;
+ }
+
+ return 1;
+}
+

 # dir_read()
 #
 # Collect the files and directories in a directory
 # dir_read()
 #
 # Collect the files and directories in a directory


@@ -46,7 +91,7 @@ $has_flock = eval { local $SIG{'__DIE__'}; flock(STDOUT,0); 1 };
 # Params: Directory
 #
 # Return: Hash reference: dirs  => directories
 # Params: Directory
 #
 # Return: Hash reference: dirs  => directories

-#                         files => files
+#                         files => files and symbolic links

 
 sub dir_read($)
 {
 
 sub dir_read($)
 {


@@ -70,9 +115,9 @@ sub dir_read($)
 
  foreach my $entry(@entries)
  {
 
  foreach my $entry(@entries)
  {

-  next if($entry eq "." || $entry eq "..");
+  next if($entry eq '.' || $entry eq '..');

 
 

-  if(-d $dir."/".$entry)
+  if(-d $dir.'/'.$entry && not -l $dir.'/'.$entry)

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


@@ -134,21 +179,23 @@ sub file_lock(*$)
 #
 # Read out a file completely
 #
 #
 # Read out a file completely
 #

-# Params: File
+# Params: 1. File
+#         2. true  => open in binary mode
+#            false => open in normal mode (default)

 #
 # Return: Contents of the file (Scalar Reference)
 
 #
 # Return: Contents of the file (Scalar Reference)
 

-sub file_read($)
+sub file_read($;$)

 {
 {

- my $file = shift;
+ my ($file,$binary) = @_;

  local *FILE;
 
  sysopen(FILE,$file,O_RDONLY) or return;
  file_lock(FILE,LOCK_SH)      or do { close(FILE); return };
  local *FILE;
 
  sysopen(FILE,$file,O_RDONLY) or return;
  file_lock(FILE,LOCK_SH)      or do { close(FILE); return };

+ binmode(FILE) if($binary);

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

- file_lock(FILE,LOCK_UN)      or do { close(FILE); return };

  close(FILE)                  or return;
 
  return \$content;
  close(FILE)                  or return;
 
  return \$content;


@@ -176,31 +223,11 @@ sub file_save($$;$)
 
  print FILE $$content                             or do { close(FILE); return };
 
 
  print FILE $$content                             or do { close(FILE); return };
 

- file_lock(FILE,LOCK_UN)                          or do { close(FILE); return };

  close(FILE)                                      or return;
 
  return 1;
 }
 
  close(FILE)                                      or return;
 
  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;