From: Jarkko Hietaniemi Date: Thu, 16 Jan 2003 22:53:23 +0000 (+0000) Subject: Integrate from maint-5.6: X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a53a623d22845c6a34d5eb25a0d3d7e0a1755fff;p=p5sagit%2Fp5-mst-13.2.git Integrate from maint-5.6: [ 18477] search utility doesn't skip exe/lib/pdb files properly on windows p4raw-link: @18477 on //depot/maint-5.6/perl: 37af9f487a3ad816fb4a9e8724e9b7e9e9985df2 p4raw-id: //depot/perl@18502 p4raw-integrated: from //depot/maint-5.6/perl@18501 'copy in' win32/bin/search.pl (@9312..) --- diff --git a/win32/bin/search.pl b/win32/bin/search.pl index f647b84..2ceffa7 100644 --- a/win32/bin/search.pl +++ b/win32/bin/search.pl @@ -634,8 +634,8 @@ sub read_rc ## no RC file -- use this default. @default = split(/\n/,<<'--------INLINE_LITERAL_TEXT'); magic: 32 : $H =~ m/[\x00-\x06\x10-\x1a\x1c-\x1f\x80\xff]{2}/ - option: -skip '.a .COM .elc .EXE .gz .o .pbm .xbm .dvi' - option: -iskip '.tarz .zip .z .lzh .jpg .jpeg .gif .uu' + option: -skip '.a .elc .gz .o .pbm .xbm .dvi' + option: -iskip '.com .exe .lib .pdb .tarz .zip .z .lzh .jpg .jpeg .gif .uu' option: -skip '~ #' --------INLINE_LITERAL_TEXT }