commit 4ad24540ab5194cdb4b7bd90d56d14c258629faa
from: Omar Polo <op@omarpolo.com>
date: Sat Aug 27 07:12:49 2022 UTC

refactor how external file are slurped

commit - 7d4298433581a746b52e8eead214a1a7377a3457
commit + 4ad24540ab5194cdb4b7bd90d56d14c258629faa
blob - 44da0108cbf11fbc8acc45ebd1e69f18d0d950d9
blob + badf5fee6fc3764161b6bda537b33b0b2726b108
--- GotMArc.pm
+++ GotMArc.pm
@@ -5,15 +5,8 @@ use v5.32;
 use Exporter;
 
 our @ISA = qw(Exporter);
-our @EXPORT_OK = qw($logo san parse initpage endpage);
+our @EXPORT_OK = qw(san parse small_logo initpage endpage);
 
-our $logo = do {
-	local $/ = undef;
-	open my $fh, "<", "logo-small.html"
-	    or die "can't open logo-small.html: $!";
-	<$fh>;
-};
-
 sub san {
 	my $str = shift;
 	$str =~ s/&/\&amp;/g;
@@ -56,25 +49,27 @@ sub parse {
 	return ($level, $fname, $mid, $date, $from, $subj);
 }
 
-my $hdr = do {
+sub readall {
+	my $path = shift;
 	local $/ = undef;
-	open my $fh, "<", "head.html"
-	    or die "can't open head.html: $!";
+	open my $fh, "<", $path or die "can't open $path: $!";
 	<$fh>;
-};
+}
 
+my $small_logo = readall "logo-small.html";
+my $hdr = readall "head.html";
+my $foot = readall "foot.html";
+
+sub small_logo {
+	my $fh = shift;
+	print $fh $small_logo;
+}
+
 sub initpage {
 	my ($fh, $title) = @_;
 	say $fh $hdr =~ s/TITLE/$title/r;
 }
 
-my $foot = do {
-	local $/ = undef;
-	open my $fh, "<", "foot.html"
-	    or die "can't open foot.html: $!";
-	<$fh>;
-};
-
 sub endpage {
 	my $fh = shift;
 	say $fh $foot;
blob - cada50b35df5cddd491c36eecb6a107ede0c199f
blob + bd30bf3bafb6fd09ef6b4eaa4215ae9e2400f5b4
--- mexp
+++ mexp
@@ -10,7 +10,7 @@ use OpenBSD::Pledge;
 use OpenBSD::Unveil;
 
 use lib ".";
-use GotMArc qw(parse san $logo initpage endpage);
+use GotMArc qw(parse san small_logo initpage endpage);
 
 my $outdir = $ENV{'OUTDIR'};
 die 'Set $OUTDIR' unless defined $outdir;
@@ -47,7 +47,7 @@ while (<>) {
 
 	print $fh "<header class='mail-header'>";
 	print $fh "<p>";
-	print $fh $logo;
+	small_logo $fh;
 	print $fh "<a href='/'>Index</a>";
 	print $fh " | ";
 	print $fh "<a href='/thread/$tid.html#$mid'>Thread</a>";
blob - bd3185571f60d1257b368a66add89ec2868f79b4
blob + b97eae00c4b3d12047fd9c18de9b0c2fc12feef9
--- mkindex
+++ mkindex
@@ -10,7 +10,7 @@ use OpenBSD::Pledge;
 use OpenBSD::Unveil;
 
 use lib ".";
-use GotMArc qw($logo parse san initpage endpage);
+use GotMArc qw(parse san small_logo initpage endpage);
 
 my $outdir = $ENV{'OUTDIR'};
 die 'Set $OUTDIR' unless defined $outdir;
@@ -141,7 +141,7 @@ sub nextthread {
 
 	print $tfh "<header class='mail-header'>";
 	print $tfh "<p>";
-	print $tfh $logo;
+	small_logo $tfh;
 	print $tfh "<a href='/'>Index</a>";
 	print $tfh "</p>";
 	print $tfh "<dl><dt>Thread:</dt><dd>$subj</dd></dl>";