From 809f5f2b2fac8bc90d73506711906b20c8970bc3 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Sun, 29 Mar 2009 22:29:52 +0000 Subject: only test regexp if exclusion were defined, because the empty pattern always matches... --- fix_eol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fix_eol b/fix_eol index 7158713..8634b46 100755 --- a/fix_eol +++ b/fix_eol @@ -13,12 +13,12 @@ die "Invalid build root" unless -d $buildroot; # normalize build root $buildroot =~ s|/$||; -my $exclude_pattern = join('|', +my $exclude_string = join('|', map { '(:?' . quotemeta($_) . ')' } $ENV{EXCLUDE_FROM_EOL_CONVERSION} ? split(' ', $ENV{EXCLUDE_FROM_EOL_CONVERSION}) : () ); -$exclude_pattern = qr/$exclude_pattern/; +my $exclude_pattern = qr/$exclude_string/; find(\&convert, $buildroot); @@ -30,7 +30,7 @@ sub convert { # skip binary files return unless -T $_; # skip excluded files - return if $File::Find::name =~ $exclude_pattern; + return if $exclude_string && $File::Find::name =~ $exclude_pattern; # check if first line has less than 80 characters and ends with \r\n open(my $in, '<', $_) or die "Unable to open file $_: $!"; -- cgit v1.2.1