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;
use strict;
use warnings;
-use Test::More tests => 20;
+use Test::More tests => 21;
use Test::NoWarnings;
use autodie;
testfileset('remove regex', $BASICBODY, [undef, qr/^re/], 2);
testfileset('remove all', $BASICBODY, [undef, qr/./], 4, '');
+testfileset('add unconditionally', "$/0$/", ['0', undef], 1, "$/0$/0$/");
testfileset('add string', "foo$/", ['bar'], 1, "foo$/bar$/");
testfileset('keep string', "foo$/bar$/", ['foo'], 0, "foo$/bar$/");
testfileset('replace string', "1$/2$/3$/", [4, 1], 2, "2$/3$/4$/");
testfileset('replace pair', $SAMPLE2, [['fooo','barr'], ['bar','foo']], 4, "$/and$/.$/fooo$/barr$/");
testfileset('mixed arrays', $SAMPLE2, [['bar','foo','.'],['ignore',qr/a/]], 3, "$/foo$/bar$/.$/foo$/.$/");
-is(remove_tree($target), 18, 'no unexpected files');
+is(remove_tree($target), 19, 'no unexpected files');