[Lxr-commits] CVS: lxr diff,1.9,1.10 find,1.17,1.18 ident,1.16,1.17 search,1.18,1.19 source,1.38,1.3
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr diff,1.9,1.10 find,1.17,1.18 ident,1.16,1.17 search,1.18,1.19 source,1.38,1.39
|
From: Dave B. <bro...@us...> - 2004-07-15 14:41:24
|
Update of /cvsroot/lxr/lxr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15328 Modified Files: diff find ident search source Log Message: allow all special characters through http parms so we we can do rexeps. but using taint checking now and handle quotes properly in forms Index: diff =================================================================== RCS file: /cvsroot/lxr/lxr/diff,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- diff 18 Mar 2002 14:55:43 -0000 1.9 +++ diff 15 Jul 2004 14:41:04 -0000 1.10 @@ -26,7 +26,7 @@ $CVSID = '$Id$ '; use strict; -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; +use lib '.'; use LXR::Common qw(:html); use Local; @@ -101,6 +101,7 @@ } fflush; + $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; unless (open(DIFF, "-|")){ open(STDERR, ">&STDOUT"); exec('diff', '-U0', $origtemp, $difftemp); Index: find =================================================================== RCS file: /cvsroot/lxr/lxr/find,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- find 14 Jul 2004 14:43:38 -0000 1.17 +++ find 15 Jul 2004 14:41:04 -0000 1.18 @@ -26,8 +26,7 @@ $CVSID = '$Id$ '; use strict; -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; - +use lib '.'; use LXR::Common qw(:html); use LXR::Config; @@ -133,6 +132,7 @@ (variables => sub { varinputs(@_) }, advancedchecked => sub { return $advanced ? "checked" : "" }, searchtext => sub { return $searchtext }, + searchtext_escaped => sub { $_ = $searchtext; s/\"/"/g; return $_;}, casesensitivechecked => sub { return $casesensitive ? "checked" : "" }, results => sub { printresults(@_, @results) }, resultcount => sub { return scalar @results }, Index: ident =================================================================== RCS file: /cvsroot/lxr/lxr/ident,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ident 1 Jul 2004 14:24:16 -0000 1.16 +++ ident 15 Jul 2004 14:41:04 -0000 1.17 @@ -26,7 +26,7 @@ $CVSID = '$Id$ '; use strict; -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; +use lib '.'; use LXR::Common qw(:html); use Local; @@ -144,6 +144,7 @@ print(expandtemplate($templ, (variables => \&varinputs, identifier => sub { return $identifier }, + identifier_escaped => sub { $_ = $identifier; s/\"/"/g; return $_;}, refs => sub { refexpand(@_) }, ))); print $declare_hits; Index: search =================================================================== RCS file: /cvsroot/lxr/lxr/search,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- search 14 Jul 2004 14:49:30 -0000 1.18 +++ search 15 Jul 2004 14:41:04 -0000 1.19 @@ -26,7 +26,7 @@ $CVSID = '$Id$ '; use strict; -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; +use lib '.'; use LXR::Common qw(:html); use LXR::Config; @@ -53,6 +53,7 @@ sub glimpsesearch { my ($searchtext) = @_; + $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; unless (open(GLIMPSE, "-|")) { open(STDERR, ">&STDOUT"); $!=''; @@ -121,11 +122,12 @@ return; } + $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; unless (open(SWISH, "-|")) { open(STDERR, ">&STDOUT"); exec($config->swishsearch, "-f", $config->swishdir."/".$release.".index", - "-m", $maxhits, "-w", $searchtext); + "-m", $maxhits, "-w", "'" . $searchtext . "'"); print(STDERR "Couldn't exec ".$config->swishsearch.": $!\n"); kill(9, $$); @@ -217,6 +219,7 @@ print expandtemplate($templ, (variables => sub { varinputs(@_) }, searchtext => sub { return $searchtext }, + searchtext_escaped => sub { $_ = $searchtext; s/\"/"/g; return $_;}, maxhits_message => sub { return @results == $maxhits ? "<b>Too many hits, displaying first $maxhits</b><br>" : "" }, results => sub { printresults(@_, @results) }, Index: source =================================================================== RCS file: /cvsroot/lxr/lxr/source,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- source 13 Jul 2004 19:16:56 -0000 1.38 +++ source 15 Jul 2004 14:41:04 -0000 1.39 @@ -27,7 +27,7 @@ $CVSID = '$Id$ '; use strict; -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; +use lib '.'; use LXR::Common qw(:html); use Local; |
