fileset: explicit undef search to match unconditionally

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

diff --git a/lib/File/Rewrite.pm b/lib/File/Rewrite.pm
index 2b05ded11175fc09025378089fa0fb67e8f64d6e..b3bf3d74019bc72ed127ef8015338b2464e674bf 100644 (file)
--- a/lib/File/Rewrite.pm
+++ b/lib/File/Rewrite.pm
@@ -13,17 +13,18 @@ sub fileset {
        my $tmpname = "$filename.$$.tmp";
        my $changes = 0;
 
-       $search = $replace if not defined $search;
+       $search = $replace 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;