X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fssic.pl;h=750c77be6b9021a72284ed8cec2d844390c52c5d;hb=efba28621cc2c3e93a750a1150c4a08170d56a65;hp=c12ff210b4046ae9cc72645def51ac4d1076f093;hpb=66789c72d83f31b6b6f725d27937967fcce00c32;p=ssic.git diff --git a/src/ssic.pl b/src/ssic.pl index c12ff21..750c77b 100644 --- a/src/ssic.pl +++ b/src/ssic.pl @@ -105,34 +105,39 @@ sub compile { 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 ($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 ($output eq "-") { $output_fh = *STDOUT; } else { - if (not open($output_fh, ">", $output)) { - error(4, "%s: %s\n", $output, $!); + 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; @@ -147,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();