From eeb4e694d324b3c78a585b2e80202a03b3cda405 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 10 Mar 2006 09:21:14 +0000 Subject: [PATCH] clarity --- ikiwiki | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ikiwiki b/ikiwiki index cb8295cf9..771590718 100755 --- a/ikiwiki +++ b/ikiwiki @@ -37,6 +37,12 @@ sub mtime ($) { return (stat($page))[9]; } +sub possibly_foolish_untaint ($) { + my $tainted=shift; + my ($untainted)=$tainted=~/(.*)/; + return $untainted; +} + sub basename { my $file=shift; @@ -281,7 +287,7 @@ sub render ($) { sub loadindex () { open (IN, "$srcdir/.index") || return; while () { - ($_)=/(.*)/; # untaint + $_=possibly_foolish_untaint($_); chomp; my ($mtime, $file, $rendered, @links)=split(' ', $_); my $page=pagename($file); @@ -500,8 +506,8 @@ if (grep /^-/, @ARGV) { ) || usage(); } usage() unless @ARGV == 2; -($srcdir) = shift =~ /(.*)/; # untaint -($destdir) = shift =~ /(.*)/; # untaint +($srcdir) = possibly_foolish_untaint(shift); +($destdir) = possibly_foolish_untaint(shift); gen_wrapper($offline, $rebuild) if $gen_wrapper; memoize('pagename'); -- 2.26.2