clarity
parent
d5566303d6
commit
eeb4e694d3
12
ikiwiki
12
ikiwiki
|
@ -37,6 +37,12 @@ sub mtime ($) {
|
||||||
return (stat($page))[9];
|
return (stat($page))[9];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub possibly_foolish_untaint ($) {
|
||||||
|
my $tainted=shift;
|
||||||
|
my ($untainted)=$tainted=~/(.*)/;
|
||||||
|
return $untainted;
|
||||||
|
}
|
||||||
|
|
||||||
sub basename {
|
sub basename {
|
||||||
my $file=shift;
|
my $file=shift;
|
||||||
|
|
||||||
|
@ -281,7 +287,7 @@ sub render ($) {
|
||||||
sub loadindex () {
|
sub loadindex () {
|
||||||
open (IN, "$srcdir/.index") || return;
|
open (IN, "$srcdir/.index") || return;
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
($_)=/(.*)/; # untaint
|
$_=possibly_foolish_untaint($_);
|
||||||
chomp;
|
chomp;
|
||||||
my ($mtime, $file, $rendered, @links)=split(' ', $_);
|
my ($mtime, $file, $rendered, @links)=split(' ', $_);
|
||||||
my $page=pagename($file);
|
my $page=pagename($file);
|
||||||
|
@ -500,8 +506,8 @@ if (grep /^-/, @ARGV) {
|
||||||
) || usage();
|
) || usage();
|
||||||
}
|
}
|
||||||
usage() unless @ARGV == 2;
|
usage() unless @ARGV == 2;
|
||||||
($srcdir) = shift =~ /(.*)/; # untaint
|
($srcdir) = possibly_foolish_untaint(shift);
|
||||||
($destdir) = shift =~ /(.*)/; # untaint
|
($destdir) = possibly_foolish_untaint(shift);
|
||||||
|
|
||||||
gen_wrapper($offline, $rebuild) if $gen_wrapper;
|
gen_wrapper($offline, $rebuild) if $gen_wrapper;
|
||||||
memoize('pagename');
|
memoize('pagename');
|
||||||
|
|
Loading…
Reference in New Issue