X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fssic.pl;h=db7a39f047c033c381daa95e3fc40c7037069b94;hb=6ada252e60e6e9904764eeff808e7b0a265840ca;hp=30f1f255371f92a821cd2ee09feb76dc3608d922;hpb=54231a8541deca709baeb49e35e62a4d7ecea00a;p=ssic.git

diff --git a/src/ssic.pl b/src/ssic.pl
index 30f1f25..db7a39f 100644
--- a/src/ssic.pl
+++ b/src/ssic.pl
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Getopt::Std;
+use Getopt::Long;
 use CGI::SSI;
 
 sub main
@@ -14,8 +14,16 @@ sub main
 
 	$SIG{'__WARN__'} = \&warning;
 
-	if (not getopts('o:hV', \%opts)) {
+	Getopt::Long::Configure("no_ignore_case", "bundling", "gnu_compat",
+		"no_getopt_compat");
+	if (not GetOptions(\%opts,
+			"o=s",
+			"D=s%",
+			"h|help",
+			"V|version",
+		)) {
 		usage(*STDERR);
+		exit(4);
 	}
 
 	if (exists($opts{'h'})) {
@@ -34,12 +42,12 @@ sub main
 		if ($#ARGV gt 0) {
 			error(4, "Cannot specify -o with multiple files\n");
 		}
-		compile($ARGV[0], $opts{'o'});
+		compile($ARGV[0], $opts{'o'}, $opts{'D'});
 	} else {
 		for $input (@ARGV) {
 			$output = $input;
 			$output =~ s/\.[^.]+$/.html/;
-			compile($input, $output);
+			compile($input, $output, $opts{'D'});
 		}
 	}
 }
@@ -57,9 +65,10 @@ sub help
 
 	usage($fh);
 	print("Options:\n");
-	print("  -o <output>  Place the output into <output>\n");
-	print("  -h           Display this information\n");
-	print("  -V           Display compiler version information\n");
+	print("  -D <name>=<value>  Set the variable <name> to <value>\n");
+	print("  -o <output>        Place the output into <output>\n");
+	print("  -h, --help         Display this information\n");
+	print("  -V, --version      Display compiler version information\n");
 }
 
 sub version
@@ -77,35 +86,53 @@ sub version
 
 sub warning
 {
-	my ($fmt, $args) = @_;
+	my ($fmt, @args) = @_;
 
-	printf("ssic: Warning: " . $fmt, $args);
+	printf("ssic: Warning: " . $fmt, @args);
 }
 
 sub error
 {
-	my ($status, $fmt, $args) = @_;
+	my ($status, $fmt, @args) = @_;
 
-	printf("ssic: Error: " . $fmt, $args);
+	printf("ssic: Error: " . $fmt, @args);
 	exit($status);
 }
 
 sub compile
 {
-	my ($input, $output) = @_;
+	my ($input, $output, $vars) = @_;
 	my $input_fh;
 	my $output_fh;
 	my $ssi;
+	my $var_name;
+	my $var_value;
 
 	if ($input eq $output) {
 		error(4, "Input and output files are equal\n");
 	}
 
-	open($input_fh, "<", $input);
-	open($output_fh, ">", $output);
+	if (not open($input_fh, "<", $input)) {
+		error(4, "%s: %s\n", $input, $!);
+	}
+	if (not open($output_fh, ">", $output)) {
+		error(4, "%s: %s\n", $output, $!);
+	}
+
+	%ENV = (
+		"DOCUMENT_NAME" => $input,
+		"DOCUMENT_URI" => $input,
+	);
 
 	$CGI::SSI::DEBUG = 0;
-	$ssi = CGI::SSI->new();
+	$ssi = CGI::SSI->new(
+		"DOCUMENT_NAME" => $input,
+		"DOCUMENT_URI" => $input,
+	);
+
+	while (($var_name, $var_value) = each(%{$vars})) {
+		$ssi->set($var_name => $var_value);
+	}
 
 	print($output_fh $ssi->process(<$input_fh>));
 }