X-Git-Url: https://jxself.org/git/?p=ssic.git;a=blobdiff_plain;f=src%2Fssic.pl;h=750c77be6b9021a72284ed8cec2d844390c52c5d;hp=553f83d00162787b840086237886d91e2df5ff4b;hb=efba28621cc2c3e93a750a1150c4a08170d56a65;hpb=87ad3d52c3d06311e0fdd87dc654408ee746c45c

diff --git a/src/ssic.pl b/src/ssic.pl
index 553f83d..750c77b 100644
--- a/src/ssic.pl
+++ b/src/ssic.pl
@@ -19,6 +19,7 @@ sub main
 	if (not GetOptions(\%opts,
 			"o=s",
 			"D=s%",
+			"I=s",
 			"h|help",
 			"V|version",
 		)) {
@@ -42,12 +43,12 @@ sub main
 		if ($#ARGV gt 0) {
 			error(4, "Cannot specify -o with multiple files\n");
 		}
-		compile($ARGV[0], $opts{'o'}, $opts{'D'});
+		compile($ARGV[0], $opts{'o'}, $opts{'D'}, $opts{'I'});
 	} else {
 		for $input (@ARGV) {
 			$output = $input;
 			$output =~ s/\.[^.]+$/.html/;
-			compile($input, $output, $opts{'D'});
+			compile($input, $output, $opts{'D'}, $opts{'I'});
 		}
 	}
 }
@@ -66,6 +67,7 @@ sub help
 	usage($fh);
 	print("Options:\n");
 	print("  -D <name>=<value>  Set the variable <name> to <value>\n");
+	print("  -I <directory>     Set the document root to <directory>\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");
@@ -86,48 +88,63 @@ 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, $vars) = @_;
+	my ($input, $output, $vars, $root) = @_;
 	my $input_fh;
+	my $input_abs;
 	my $output_fh;
 	my $ssi;
 	my $var_name;
 	my $var_value;
 
-	if ($input eq $output) {
-		error(4, "Input and output files are equal\n");
+	if ($input eq $output and $input ne "-") {
+		warning("Input and output files are equal\n");
 	}
 
-	if (not open($input_fh, "<", $input)) {
-		error(4, "%s: %s\n", $input, $!);
+	if ($input eq "-") {
+		$input_fh = *STDIN;
+		$input_abs = File::Spec->rel2abs(".");
+	} else {
+		if (not open($input_fh, "<", $input)) {
+			error(4, "%s: %s\n", $input, $!);
+		}
+		$input_abs = File::Spec->rel2abs($input);
 	}
-	if (not open($output_fh, ">", $output)) {
-		error(4, "%s: %s\n", $output, $!);
+	if ($output eq "-") {
+		$output_fh = *STDOUT;
+	} else {
+		if (not open($output_fh, ">", $output . "~")) {
+			error(4, "%s: %s\n", $output . "~", $!);
+		}
 	}
 
+	# CGI::SSI uses SCRIPT_FILENAME to determine the value of LAST_MODIFIED.
 	%ENV = (
 		"DOCUMENT_NAME" => $input,
 		"DOCUMENT_URI" => $input,
+		"DOCUMENT_ROOT" => $root,
+		"SCRIPT_FILENAME" => $input_abs,
 	);
 
 	$CGI::SSI::DEBUG = 0;
 	$ssi = CGI::SSI->new(
 		"DOCUMENT_NAME" => $input,
 		"DOCUMENT_URI" => $input,
+		"DOCUMENT_ROOT" => $root,
 	);
 
 	while (($var_name, $var_value) = each(%{$vars})) {
@@ -135,6 +152,17 @@ sub compile
 	}
 
 	print($output_fh $ssi->process(<$input_fh>));
+
+	if ($input ne "-") {
+		close($input_fh);
+	}
+	if ($output ne "-") {
+		close($output_fh);
+	}
+
+	if (not rename($output . "~", $output)) {
+		error(4, "%s: %s\n", $output, $!);
+	}
 }
 
 main();