From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 10 Mar 2006 09:21:14 +0000 (+0000)
Subject: clarity
X-Git-Tag: 1.0~551
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eeb4e694d324b3c78a585b2e80202a03b3cda405;p=ikiwiki.git

clarity
---

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 (<IN>) {
-		($_)=/(.*)/; # 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');