aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-04-24 16:29:28 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2011-04-24 16:29:28 +0300
commite68bb718eb37adc37d9fc13ec0cd4299429ed87c (patch)
treeb263adcdbb8c395d09c1f5d32e12c219785d4391
parenta85df0cad318d645bcb334cbafbb8010f0f829a9 (diff)
downloadslb-e68bb718eb37adc37d9fc13ec0cd4299429ed87c.tar.gz
slb-e68bb718eb37adc37d9fc13ec0cd4299429ed87c.tar.bz2
Minor change.
* src/output.c (slb_set_output_defaults): Restore to its state before ddf46208. * src/slb.c (main): Prefer output_file_option in test mode.
-rw-r--r--src/output.c2
-rw-r--r--src/slb.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/output.c b/src/output.c
index 2e76e93..2d7ba27 100644
--- a/src/output.c
+++ b/src/output.c
@@ -56,7 +56,7 @@ slb_add_outfd(fd_set *fdset)
void
slb_set_output_defaults()
{
- output_file = output_file_option ? output_file_option : "-";
+ output_file = "-";
}
/* Spec. | Replaced with
diff --git a/src/slb.c b/src/slb.c
index 648c0ba..04ff4a6 100644
--- a/src/slb.c
+++ b/src/slb.c
@@ -437,7 +437,10 @@ main(int argc, char **argv)
if (test_option) {
int rc;
- slb_set_output_defaults();
+ if (output_file_option)
+ output_file = output_file_option;
+ else
+ slb_set_output_defaults();
slb_open_output();
rc = slb_test(argv[asgn_index]);
slb_close_output();

Return to:

Send suggestions and report system problems to the System administrator.