fileset: reverse search/replace parameters

[perl/file-rewrite.git] / lib / File / Rewrite.pm

diff --git a/lib/File/Rewrite.pm b/lib/File/Rewrite.pm
index 2b05ded11175fc09025378089fa0fb67e8f64d6e..90c30f4795b93e41d2eaa3bbcf2f761d3815f4d4 100644 (file)
--- a/lib/File/Rewrite.pm
+++ b/lib/File/Rewrite.pm
@@ -9,21 +9,22 @@ use Exporter 'import';
 our @EXPORT_OK = qw(fileset);
 
 sub fileset {
-       my ($filename, $replace, $search) = @_;
+       my ($filename, $search, $replace) = @_;
        my $tmpname = "$filename.$$.tmp";
        my $changes = 0;
 
-       $search = $replace if not defined $search;
+       $replace = $search if @_ < 3;
 
        # generate a single regex to emulate smart match
        $search = [$search] unless ref $search eq 'ARRAY';
-       $search = join('|', map { ref $_ ? $_ : "^\Q$_\E\$" } @$search);
+       @$search = grep { defined } @$search;
+       $search = @$search ? join('|', map { ref $_ ? $_ : "^\Q$_\E\$" } @$search) : undef;
 
        open my $src,  '<', $filename;
        open my $dest, '>', $tmpname;
        while (readline $src) {
                chomp;
-               if ($_ =~ /$search/s) {
+               if (defined $search and $_ =~ /$search/s) {
                        if (ref $replace eq 'ARRAY') {
                                if (@$replace and $_ eq $replace->[0]) {
                                        shift @$replace;
@@ -70,7 +71,7 @@ File::Rewrite
 =head1 SYNOPSIS
 
        use File::Rewrite 'fileset';
-       fileset('/tmp/somefile', undef, qr/match/);
+       fileset('/tmp/somefile', qr/match/ => undef);
 
 =head1 DESCRIPTION