improve portability of slurp function in Mojo::Util

mojolicious · Aug 31, 2015 · 1c448e3 · 1c448e3
1 parent 20bb97d
commit 1c448e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-6.18  2015-08-29
+6.18  2015-08-31
+  - Improved portability of slurp function in Mojo::Util.
   - Fixed Makefile.PL to be compliant with version 2 of the CPAN distribution
     metadata specification. (Grinnz)
 

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -233,9 +233,12 @@ sub sha1_sum   { sha1_hex @_ }
 
 sub slurp {
   my $path = shift;
+
   open my $file, '<', $path or croak qq{Can't open file "$path": $!};
-  defined $file->sysread(my $content, -s $file, 0)
-    or croak qq{Can't read from file "$path": $!};
+  my $ret = my $content = '';
+  while ($ret = $file->sysread(my $buffer, 131072, 0)) { $content .= $buffer }
+  croak qq{Can't read from file "$path": $!} unless defined $ret;
+
   return $content;
 }