From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 17:36:00 +0000 (-0400)
Subject: optimise single dot detection
X-Git-Tag: 3.20100831~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=991d01f5b53250b962725110903b0324c93fbfb6;p=ikiwiki.git

optimise single dot detection

Since it already looks for things starting with a dot, I was able to avoid
matching against the string twice.

This also fixes a minor bug; $from may not be defined. Avoid uninitialized
value warnings in this case.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6fd112960..6da281999 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2401,14 +2401,17 @@ package IkiWiki::PageSpec;
 sub derel ($$) {
 	my $path=shift;
 	my $from=shift;
-	if ($path eq '.') {
-		$path = $from;
-	}
 
-	if ($path =~ m!^\./!) {
-		$from=~s#/?[^/]+$## if defined $from;
-		$path=~s#^\./##;
-		$path="$from/$path" if defined $from && length $from;
+	if ($path =~ m!^\.(/|$)!) {
+		if ($1) {
+			$from=~s#/?[^/]+$## if defined $from;
+			$path=~s#^\./##;
+			$path="$from/$path" if defined $from && length $from;
+		}
+		else {
+			$path = $from;
+			$path = "" unless defined $path;
+		}
 	}
 
 	return $path;