Factor out readability check in default entries().

diff --git a/blosxom.cgi b/blosxom.cgi
index 11143b198c6da35850928c1b2f77eb6861a2bddb..420a1b6e91ea9c7f4d600dcd240b0aa360cde077 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -555,6 +555,7 @@ $entries = sub {
         sub {
             my $curr_depth = $File::Find::dir =~ tr[/][];
             return if $depth and $curr_depth > $depth;
         sub {
             my $curr_depth = $File::Find::dir =~ tr[/][];
             return if $depth and $curr_depth > $depth;

+            return if !-r $File::Find::name;

 
             if (
 
 
             if (
 


@@ -563,7 +564,7 @@ $entries = sub {
                 =~ m!^$datadir/(?:(.*)/)?(.+)\.$file_extension$!
 
                 # not an index, .file, and is readable
                 =~ m!^$datadir/(?:(.*)/)?(.+)\.$file_extension$!
 
                 # not an index, .file, and is readable

-                and $2 ne 'index' and $2 !~ /^\./ and ( -r $File::Find::name )
+                and $2 ne 'index' and $2 !~ /^\./

                 )
             {
 
                 )
             {
 


@@ -592,7 +593,7 @@ $entries = sub {
             }
 
             # not an entries match
             }
 
             # not an entries match

-            elsif ( !-d $File::Find::name and -r $File::Find::name ) {
+            elsif ( !-d $File::Find::name ) {

                 $others{$File::Find::name} = stat($File::Find::name)->mtime;
             }
         },
                 $others{$File::Find::name} = stat($File::Find::name)->mtime;
             }
         },