aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2019-10-07 14:01:03 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2019-10-07 14:01:17 +0200
commit1f9cf874062a81bdcdbb06fce030fa887ead15a9 (patch)
tree924fb943718cd08f37cf9ee887fc7e6cc4e44dc2
parent2e8ca04ce3f407da2bd9e892d1498de05d18f559 (diff)
downloadmansrv-master.tar.gz
mansrv-master.tar.bz2
Allow for multiple template escapes on a single line.HEADmaster
-rwxr-xr-xmansrv2
1 files changed, 1 insertions, 1 deletions
diff --git a/mansrv b/mansrv
index b4d3cca..25e56e7 100755
--- a/mansrv
+++ b/mansrv
@@ -128,25 +128,25 @@ sub interpret_file($$) {
128 128
129 open($ifd, $file) or syserror("cannot open $file: $!"); 129 open($ifd, $file) or syserror("cannot open $file: $!");
130 my $s = new Safe 'Root' ; 130 my $s = new Safe 'Root' ;
131 %{$s->varglob('ENV')} = %ENV; 131 %{$s->varglob('ENV')} = %ENV;
132 ${$s->varglob('TITLE')} = $ARGV[1]; 132 ${$s->varglob('TITLE')} = $ARGV[1];
133 ${$s->varglob('SECTION')} = $ARGV[0]; 133 ${$s->varglob('SECTION')} = $ARGV[0];
134 ${$s->varglob('PACKAGE')} = $package_name; 134 ${$s->varglob('PACKAGE')} = $package_name;
135 ${$s->varglob('VERSION')} = $VERSION; 135 ${$s->varglob('VERSION')} = $VERSION;
136 ${$s->varglob('SERVER')} = "$ENV{REQUEST_SCHEME}://$ENV{SERVER_NAME}"; 136 ${$s->varglob('SERVER')} = "$ENV{REQUEST_SCHEME}://$ENV{SERVER_NAME}";
137 137
138 while (<$ifd>) { 138 while (<$ifd>) {
139 chomp; 139 chomp;
140 s/\{%(.*)%\}/expand_template($s, $1, $file, $.)/ex; 140 s/\{%(.*?)%\}/expand_template($s, $1, $file, $.)/gex;
141 print $ofd "$_\n"; 141 print $ofd "$_\n";
142 } 142 }
143 close($ifd); 143 close($ifd);
144} 144}
145 145
146sub interpret { 146sub interpret {
147 my $fd = shift; 147 my $fd = shift;
148 foreach my $file (@_) { 148 foreach my $file (@_) {
149 interpret_file($fd, $file); 149 interpret_file($fd, $file);
150 } 150 }
151} 151}
152 152

Return to:

Send suggestions and report system problems to the System administrator.