From fd7590d71aeee380e7c87ed77de592df1f30f5ef Mon Sep 17 00:00:00 2001 From: "Paul Buetow (pluto.buetow.org)" Date: Sat, 28 Sep 2013 22:18:24 +0200 Subject: Some small refactoring --- Xerl/Tools/FileIO.pm | 70 +++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) (limited to 'Xerl/Tools/FileIO.pm') diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm index a594694..98765df 100644 --- a/Xerl/Tools/FileIO.pm +++ b/Xerl/Tools/FileIO.pm @@ -10,6 +10,8 @@ package Xerl::Tools::FileIO; use strict; use warnings; +use v5.14.0; + use Xerl::Base; use Xerl::Main::Global; @@ -78,40 +80,6 @@ sub fwriteappend($) { return undef; } -sub _fwrite($;$) { - my Xerl::Tools::FileIO $self = $_[0]; - my $append = $_[1]; - - my ( $path, $filename ) = - ( _SECUREPATH( $self->get_path() ), _SECUREPATH( $self->get_filename() ) ); - - my $path_ = ''; - for ( split /\//, $path ) { - $path_ .= $_ . '/'; - mkdir $path_ - or Xerl::Main::Global::ERROR( $!, $path_, caller() ) - unless -d $path_; - } - - my $f; - if ( $append == 0 ) { - open $f, ">$path$filename" - or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() ); - - } - else { - open $f, ">>$path$filename" - or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() ); - } - - flock $f, 2; - print $f @{ $self->get_array() }; - flock $f, 3; - close $f; - - return undef; -} - sub print($) { my Xerl::Tools::FileIO $self = $_[0]; @@ -153,6 +121,40 @@ sub pop($) { return $pop; } +sub _fwrite($;$) { + my Xerl::Tools::FileIO $self = $_[0]; + my $append = $_[1]; + + my ( $path, $filename ) = + ( _SECUREPATH( $self->get_path() ), _SECUREPATH( $self->get_filename() ) ); + + my $path_ = ''; + for ( split /\//, $path ) { + $path_ .= $_ . '/'; + mkdir $path_ + or Xerl::Main::Global::ERROR( $!, $path_, caller() ) + unless -d $path_; + } + + my $f; + if ( $append == 0 ) { + open $f, ">$path$filename" + or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() ); + + } + else { + open $f, ">>$path$filename" + or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() ); + } + + flock $f, 2; + print $f @{ $self->get_array() }; + flock $f, 3; + close $f; + + return undef; +} + use overload '+' => \&merge; sub _SECUREPATH($) { -- cgit v1.2.3