sync blead with Update Archive::Extract 0.34

[p5sagit/p5-mst-13.2.git] / lib / FileCache.pm

diff --git a/lib/FileCache.pm b/lib/FileCache.pm
index a64ed9a..09583b0 100644 (file)
--- a/lib/FileCache.pm
+++ b/lib/FileCache.pm
@@ -1,6 +1,6 @@
 package FileCache;
 
-our $VERSION = '1.04_01';
+our $VERSION = '1.08';
 
 =head1 NAME
 
@@ -8,6 +8,8 @@ FileCache - keep more files open than the system permits
 
 =head1 SYNOPSIS
 
+    no strict 'refs';
+
     use FileCache;
     # or
     use FileCache maxopen => 16;
@@ -52,6 +54,8 @@ append them to the command string as you would system EXPR.
 Returns EXPR on success for convenience. You may neglect the
 return value and manipulate EXPR as the filehandle directly if you prefer.
 
+=back
+
 =head1 CAVEATS
 
 While it is permissible to C<close> a FileCache managed file,
@@ -69,6 +73,9 @@ FileCache does not store the current file offset if it finds it necessary to
 close a file.  When the file is reopened, the offset will be as specified by the
 original C<open> file mode.  This could be construed to be a bug.
 
+The module functionality relies on symbolic references, so things will break
+under 'use strict' unless 'no strict "refs"' is also specified.
+
 =head1 BUGS
 
 F<sys/param.h> lies with its C<NOFILE> define on some systems,
@@ -78,36 +85,37 @@ so you may have to set I<maxopen> yourself.
 
 require 5.006;
 use Carp;
-use Config;
 use strict;
 no strict 'refs';
+
 # These are not C<my> for legacy reasons.
 # Previous versions requested the user set $cacheout_maxopen by hand.
 # Some authors fiddled with %saw to overcome the clobber on initial open.
-use vars qw(%saw $cacheout_maxopen @EXPORT);
+use vars qw(%saw $cacheout_maxopen);
+$cacheout_maxopen = 16;
+
+use base 'Exporter';
+our @EXPORT = qw[cacheout cacheout_close];
+
+
 my %isopen;
 my $cacheout_seq = 0;
 
 sub import {
     my ($pkg,%args) = @_;
 
-    # Not using Exporter is naughty.
-    # Also, using caller(1) is just wrong.
-    #$pkg = caller(1);
-    #*{$pkg.'::cacheout'} = \&cacheout;
-    #*{$pkg.'::close'}    = \&cacheout_close;
-
     # Use Exporter. %args are for us, not Exporter.
     # Make sure to up export_to_level, or we will import into ourselves,
     # rather than our calling package;
-    use base 'Exporter';
-    @EXPORT = qw[cacheout cacheout_close];
 
     __PACKAGE__->export_to_level(1);
     Exporter::import( $pkg );
 
     # Truth is okay here because setting maxopen to 0 would be bad
     return $cacheout_maxopen = $args{maxopen} if $args{maxopen};
+
+    # XXX This code is crazy.  Why is it a one element foreach loop?
+    # Why is it using $param both as a filename and filehandle?
     foreach my $param ( '/usr/include/sys/param.h' ){
       if (open($param, '<', $param)) {
        local ($_, $.);
@@ -133,7 +141,7 @@ sub cacheout_open {
 sub cacheout_close {
   # Short-circuit in case the filehandle disappeared
   my $pkg = caller($_[1]||0);
-  fileno(*{$pkg . '::' . $_[0]}) &&
+  defined fileno(*{$pkg . '::' . $_[0]}) &&
     CORE::close(*{$pkg . '::' . $_[0]});
   delete $isopen{$_[0]};
 }
@@ -153,7 +161,7 @@ sub cacheout {
     if( $isopen{$file} && ($mode||'>') ne $isopen{$file}->[1] ){
       &cacheout_close($file, 1);
     }
-    
+
     if( $isopen{$file}) {
       $ret = $file;
       $isopen{$file}->[0]++;
@@ -172,7 +180,7 @@ sub cacheout {
       }
       #XXX should we just return the value from cacheout_open, no croak?
       $ret = cacheout_open($mode, $file) or croak("Can't create $file: $!");
-      
+
       $isopen{$file} = [++$cacheout_seq, $mode];
     }
     return $ret;