use "use open" pragma to avoid manually needing to specify utf8 everywhere

and also to set default stdio mode

change filetype to return undef, not "unknown"

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 39ceec04e449c3a9863c1fa1a0a92f97791d8a38..c2c3aac83825aef47f8b8733ee561c3e2f9f2fbc 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
 package IkiWiki;
 use warnings;
 use strict;

-use encoding "utf8"; # force use of utf8 for io layer

 use Encode;
 use Encode;

+use open qw{:utf8 :std};

 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};


@@ -126,7 +126,7 @@ sub pagetype ($) { #{{{
        if ($page =~ /\.(.*)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }
        if ($page =~ /\.(.*)$/) {
                return $1 if exists $hooks{htmlize}{$1};
        }

-       return "unknown";
+       return undef;

 } #}}}
 
 sub pagename ($) { #{{{
 } #}}}
 
 sub pagename ($) { #{{{


@@ -134,7 +134,7 @@ sub pagename ($) { #{{{
 
        my $type=pagetype($file);
        my $page=$file;
 
        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;
 } #}}}
 
        return $page;
 } #}}}
 


@@ -162,12 +162,7 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
        
        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;
        my $ret=<IN>;
        close IN;
        return $ret;


@@ -199,12 +194,7 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
        }
        
        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;
 } #}}}
        print OUT $content;
        close OUT;
 } #}}}


@@ -340,7 +330,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
 } #}}}
 
 sub loadindex () { #{{{

-       open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
+       open (IN, "$config{wikistatedir}/index") || return;

        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;
        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;


@@ -372,7 +362,7 @@ sub saveindex () { #{{{
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
        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};
                error("cannot write to $config{wikistatedir}/index: $!");
        foreach my $page (keys %oldpagemtime) {
                next unless $oldpagemtime{$page};

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 73afe2468edaaa7c3c73fbb2cb427183e2a63ca9..5e7f771719945155c01dcb1def77651dcb6dd599 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;

-use encoding 'utf8'; # force use of utf8 for io layer
+use open qw{:utf8 :std};

 use Encode;
 
 package IkiWiki;
 use Encode;
 
 package IkiWiki;

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc9d5f01cc0044a0b728159fb68e0fb841d25734..dc167043f05e7aab0884f70d84fd51851297fa63 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -101,7 +101,7 @@ sub get_inline_content ($$) { #{{{
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);

-       if ($type ne 'unknown') {
+       if (defined $type) {

                return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
        }
        else {
                return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
        }
        else {

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8a4fb89eb955f113d1d15059f52ea0390738be71..40472693084d905b00373f504a57a1069aff871b 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -255,7 +255,7 @@ sub render ($) { #{{{
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);
        
        my $type=pagetype($file);
        my $srcfile=srcfile($file);

-       if ($type ne 'unknown') {
+       if (defined $type) {

                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};
                my $content=readfile($srcfile);
                my $page=pagename($file);
                delete $depends{$page};