added perms.t test to test write_file's perms option

[urisagit/Perl-Docs.git] / lib / File / Slurp.pm

diff --git a/lib/File/Slurp.pm b/lib/File/Slurp.pm
index 1d043c3..6becb10 100755 (executable)
--- a/lib/File/Slurp.pm
+++ b/lib/File/Slurp.pm
@@ -20,6 +20,8 @@ use vars qw( %EXPORT_TAGS @EXPORT_OK $VERSION @EXPORT ) ;
 
 $VERSION = '9999.14';
 
+our $max_fast_slurp_size = 1024 * 100 ;
+
 my $is_win32 = $^O =~ /win32/i ;
 
 # Install subs for various constants that aren't set in older perls
@@ -78,7 +80,7 @@ sub read_file {
        my( $file_name, %args ) = @_ ;
 
        if ( !ref $file_name && 0 &&
-            -e $file_name && -s _ < 10000 && ! %args && !wantarray ) {
+            -e $file_name && -s _ < $max_fast_slurp_size && ! %args && !wantarray ) {
 
                local( *FH ) ;
 
@@ -154,7 +156,6 @@ ERR
 # a regular file. set the sysopen mode
 
                my $mode = O_RDONLY ;
-               $mode |= O_BINARY if $args{'binmode'} ;
 
 #printf "RD: BINARY %x MODE %x\n", O_BINARY, $mode ;
 
@@ -166,6 +167,10 @@ ERR
                        goto &_error ;
                }
 
+               if ( my $binmode = $args{'binmode'} ) {
+                       binmode( $read_fh, $binmode ) ;
+               }
+
 # get the size of the file for use in the read loop
 
                $size_left = -s $read_fh ;
@@ -336,7 +341,6 @@ sub write_file {
 # set the mode for the sysopen
 
                my $mode = O_WRONLY | O_CREAT ;
-               $mode |= O_BINARY if $args->{'binmode'} ;
                $mode |= O_APPEND if $args->{'append'} ;
                $mode |= O_EXCL if $args->{'no_clobber'} ;
 
@@ -351,6 +355,10 @@ sub write_file {
                }
        }
 
+       if ( my $binmode = $args->{'binmode'} ) {
+               binmode( $write_fh, $binmode ) ;
+       }
+
        sysseek( $write_fh, 0, SEEK_END ) if $args->{'append'} ;
 
 
@@ -579,14 +587,11 @@ The options are:
 
 =head3 binmode
 
-If you set the binmode option, then the file will be slurped in binary
-mode.
+If you set the binmode option, then the option will be passed to a
+binmode call on the opened filehandle.
 
        my $bin_data = read_file( $bin_file, binmode => ':raw' ) ;
-
-NOTE: this actually sets the O_BINARY mode flag for sysopen. It
-probably should call binmode and pass its argument to support other
-file modes.
+       my $utf_text = read_file( $bin_file, binmode => ':utf8' ) ;
 
 =head3 array_ref