t/014utf8.t t/canned/utf8.txt @@ -2,9 +2,11 @@ Revision history for Sysadm::Install ######################################## -0.30 (not yet released) +0.30 2009/08/27 (ms) nhandler(at)ubuntu.com provided a patch to resolve pod2man errors: https://rt.cpan.org/Public/Bug/Display.html?id=47525 + (ms) slurp() and blurt() now use utf8 mode by default if available + (ms) added utf8_available() and is_utf8_data() 0.29 2009/06/25 (ms) Greg Olszewski added proper error handling to print and Changes @@ -23,5 +23,7 @@ t/010carp.t t/011defor.t t/012tap.t t/013download.t +t/014utf8.t t/canned/test.tar t/canned/testa.tar +t/canned/utf8.txt MANIFEST @@ -1,5 +1,5 @@ ###################################################################### - Sysadm::Install 0.30 + Sysadm::Install 0.31 ###################################################################### NAME @@ -447,6 +447,16 @@ DESCRIPTION apparently passed in by value? Modifying $_[0] within the subroutine is an old Perl trick to do exactly that. + "is_utf8_data($data)" + Check if the given string has the utf8 flag turned on. Works just + like Encode.pm's is_utf8() function, except that it silently returns + a false if Encode isn't available, for example when an ancient perl + without proper utf8 support is used. + + "utf8_check($data)" + Check if we're using a perl with proper utf8 support, by verifying + the Encode.pm module is available for loading. + AUTHOR Mike Schilli, <m@perlmeister.com> README @@ -6,7 +6,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '0.30'; +our $VERSION = '0.31'; use File::Copy; use File::Path; @@ -84,6 +84,7 @@ sudo_me bin_find fs_read_open fs_write_open pipe_copy snip password_read nice_time def_or blurt_atomic +is_utf8_data utf8_available ); our %EXPORTABLE = map { $_ => 1 } @EXPORTABLE; @@ -667,6 +668,11 @@ sub pie { open FILE, "<$file" or LOGCROAK("Cannot open $file ($!)"); + + if( utf8_available() ) { + binmode FILE, ":utf8"; + } + while(<FILE>) { $out .= $coderef->($_); } @@ -707,6 +713,11 @@ sub plough { open FILE, "<$file" or LOGCROAK("Cannot open $file ($!)"); + + if( utf8_available() ) { + binmode FILE, ":utf8"; + } + while(<FILE>) { $coderef->($_); } @@ -741,6 +752,9 @@ sub slurp { INFO "Slurping data from $file"; open FILE, "<$file" or LOGCROAK("Cannot open $file ($!)"); + if( utf8_available() ) { + binmode FILE, ":utf8"; + } $data = <FILE>; close FILE; DEBUG "Read ", snip($data, $DATA_SNIPPED_LEN), " from $file"; @@ -778,6 +792,11 @@ sub blurt { open FILE, ">" . ($append ? ">" : "") . $file or LOGCROAK("Cannot open $file for writing ($!)"); + + if( is_utf8_data( $data ) ) { + binmode FILE, ":utf8"; + } + print FILE $data or LOGCROAK("Cannot write to $file ($!)"); @@ -1541,6 +1560,50 @@ sub def_or($$) { } } +=item C<is_utf8_data($data)> + +Check if the given string has the utf8 flag turned on. Works just like +Encode.pm's is_utf8() function, except that it silently returns a +false if Encode isn't available, for example when an ancient perl +without proper utf8 support is used. + +=cut + +############################################### +sub is_utf8_data { +############################################### + my($data) = @_; + + if( !utf8_available() ) { + return 0; + } + + return Encode::is_utf8( $data ); +} + +=item C<utf8_check($data)> + +Check if we're using a perl with proper utf8 support, by verifying the +Encode.pm module is available for loading. + +=cut + +############################################### +sub utf8_available { +############################################### + + eval { + use Encode; + }; + + if($@) { + return 0; + } + + return 1; +} + + =pod =back lib/Sysadm/Install.pm f1600802fc724bfb361158cd8084d0b6606f2d97 mschilli github@perlmeister.com http://github.com/mschilli/sysadm-install-perl/commit/6646c32a04e79857adea8f73224334b43503429c 6646c32a04e79857adea8f73224334b43503429c 2009-08-27T18:47:50-07:00 2009-08-27T18:46:39-07:00 * slurp() and blurt() now use utf8 mode by default if available * added utf8_available() and is_utf8_data() * prepared 0.31 release 1cbde5115bf5adc2d51943330f5610b55d20da77 mschilli github@perlmeister.com