X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/929b9de9c2b0f3ed1a0c9e006d084519bd5e0479..437825b25a4553dba993264ef40db2215e007284:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7be1c7f58..4964f97a1 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,12 @@
 package IkiWiki;
 use warnings;
 use strict;
-use encoding "utf8"; # force use of utf8 for io layer
 use Encode;
+use open qw{:utf8 :std};
+
+# Optimisation.
+use Memoize;
+memoize("abs2rel");
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -16,7 +20,7 @@ sub defaultconfig () { #{{{
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	verbose => 0,
 	wikiname => "wiki",
-	default_pageext => ".mdwn",
+	default_pageext => "mdwn",
 	cgi => 0,
 	rcs => 'svn',
 	notify => 0,
@@ -30,6 +34,7 @@ sub defaultconfig () { #{{{
 	rebuild => 0,
 	refresh => 0,
 	getctime => 0,
+	w3mmode => 0,
 	wrapper => undef,
 	wrappermode => undef,
 	svnrepo => undef,
@@ -42,11 +47,20 @@ sub defaultconfig () { #{{{
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
-	plugin => [qw{inline htmlscrubber}],
+	plugin => [qw{mdwn inline htmlscrubber}],
 	timeformat => '%c',
 } #}}}
-	    
+   
 sub checkconfig () { #{{{
+	if ($config{w3mmode}) {
+		eval q{use Cwd q{abs_path}};
+		$config{srcdir}=possibly_foolish_untaint(abs_path($config{srcdir}));
+		$config{destdir}=possibly_foolish_untaint(abs_path($config{destdir}));
+		$config{cgiurl}="file:///\$LIB/ikiwiki-w3m.cgi/".$config{cgiurl}
+			unless $config{cgiurl} =~ m!file:///!;
+		$config{url}="file://".$config{destdir};
+	}
+
 	if ($config{cgi} && ! length $config{url}) {
 		error("Must specify url to wiki with --url when using --cgi\n");
 	}
@@ -123,12 +137,10 @@ sub dirname ($) { #{{{
 sub pagetype ($) { #{{{
 	my $page=shift;
 	
-	if ($page =~ /\.mdwn$/) {
-		return ".mdwn";
-	}
-	else {
-		return "unknown";
+	if ($page =~ /\.([^.]+)$/) {
+		return $1 if exists $hooks{htmlize}{$1};
 	}
+	return undef;
 } #}}}
 
 sub pagename ($) { #{{{
@@ -136,7 +148,7 @@ sub pagename ($) { #{{{
 
 	my $type=pagetype($file);
 	my $page=$file;
-	$page=~s/\Q$type\E*$// unless $type eq 'unknown';
+	$page=~s/\Q.$type\E*$// if defined $type;
 	return $page;
 } #}}}
 
@@ -164,12 +176,7 @@ sub readfile ($;$) { #{{{
 	
 	local $/=undef;
 	open (IN, $file) || error("failed to read $file: $!");
-	if (! $binary) {
-		binmode(IN, ":utf8");
-	}
-	else {
-		binmode(IN);
-	}
+	binmode(IN) if ($binary);
 	my $ret=<IN>;
 	close IN;
 	return $ret;
@@ -201,12 +208,7 @@ sub writefile ($$$;$) { #{{{
 	}
 	
 	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-	if (! $binary) {
-		binmode(OUT, ":utf8");
-	}
-	else {
-		binmode(OUT);
-	}
+	binmode(OUT) if ($binary);
 	print OUT $content;
 	close OUT;
 } #}}}
@@ -272,6 +274,19 @@ sub styleurl (;$) { #{{{
 	return $page."style.css";
 } #}}}
 
+sub abs2rel ($$) {
+	# Work around very innefficient behavior in File::Spec if abs2rel
+	# is passed two relative paths. It's much faster if paths are
+	# absolute!
+	my $path="/".shift;
+	my $base="/".shift;
+
+	require File::Spec;
+	my $ret=File::Spec->abs2rel($path, $base);
+	$ret=~s/^// if defined $ret;
+	return $ret;
+}
+
 sub htmllink ($$$;$$$) { #{{{
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
@@ -304,8 +319,7 @@ sub htmllink ($$$;$$$) { #{{{
 			"\">?</a>$linktext</span>"
 	}
 	
-	require File::Spec;
-	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
+	$bestlink=abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
@@ -342,7 +356,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
-	open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
+	open (IN, "$config{wikistatedir}/index") || return;
 	while (<IN>) {
 		$_=possibly_foolish_untaint($_);
 		chomp;
@@ -374,7 +388,7 @@ sub saveindex () { #{{{
 	if (! -d $config{wikistatedir}) {
 		mkdir($config{wikistatedir});
 	}
-	open (OUT, ">:utf8", "$config{wikistatedir}/index") || 
+	open (OUT, ">$config{wikistatedir}/index") || 
 		error("cannot write to $config{wikistatedir}/index: $!");
 	foreach my $page (keys %oldpagemtime) {
 		next unless $oldpagemtime{$page};