X-Git-Url: http://git.shiar.net/perl/file-rewrite.git/blobdiff_plain/46841d08dc662113df30cf49e072b0ba04d4d9aa..2c5f91d126b25f072566844ec4657d8521c4b337:/lib/File/Rewrite.pm

diff --git a/lib/File/Rewrite.pm b/lib/File/Rewrite.pm
index 784542d..90c30f4 100644
--- a/lib/File/Rewrite.pm
+++ b/lib/File/Rewrite.pm
@@ -9,16 +9,22 @@ use Exporter 'import';
 our @EXPORT_OK = qw(fileset);
 
 sub fileset {
-	my ($filename, $replace, $search) = @_;
-	$search = $replace if not defined $search;
+	my ($filename, $search, $replace) = @_;
 	my $tmpname = "$filename.$$.tmp";
 	my $changes = 0;
 
+	$replace = $search if @_ < 3;
+
+	# generate a single regex to emulate smart match
+	$search = [$search] unless ref $search eq 'ARRAY';
+	@$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 ($_ =~ (ref $search ? $search : qr/^\Q$search\E$/)) {
+		if (defined $search and $_ =~ /$search/s) {
 			if (ref $replace eq 'ARRAY') {
 				if (@$replace and $_ eq $replace->[0]) {
 					shift @$replace;
@@ -65,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