Don't overwrite the input file.

* src/files.c (output_file_name_check): Fatal error if using input file
for output.
* tests/output.at: (AT_CHECK_CONFLICTING_OUTPUT): Add return status
argument.
(Conflicting output files): Add test.
This commit is contained in:
Di-an Jan
2008-10-28 21:38:32 -04:00
committed by Joel E. Denny
parent 482dc52fb7
commit c0ee9e2115
3 changed files with 19 additions and 3 deletions

View File

@@ -1,3 +1,12 @@
2008-10-28 Di-an Jan <dianj@freeshell.org> (tiny change)
Don't overwrite the input file.
* src/files.c (output_file_name_check): Fatal error if using input file
for output.
* tests/output.at: (AT_CHECK_CONFLICTING_OUTPUT): Add return status
argument.
(Conflicting output files): Add test.
2008-10-28 Akim Demaille <demaille@gostai.com> 2008-10-28 Akim Demaille <demaille@gostai.com>
Space changes. Space changes.

View File

@@ -351,6 +351,8 @@ compute_output_file_names (void)
void void
output_file_name_check (char const *file_name) output_file_name_check (char const *file_name)
{ {
if (0 == strcmp (file_name, grammar_file))
fatal (_("refusing to overwrite the input file %s"), quote (file_name));
{ {
int i; int i;
for (i = 0; i < file_names_count; i++) for (i = 0; i < file_names_count; i++)

View File

@@ -117,8 +117,9 @@ AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose],
[], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])]) [], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])])
# AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR) # AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR,
# ----------------------------------------------------------------------------- # [EXIT-STATUS])
# ------------------------------------------------------------------
m4_define([AT_CHECK_CONFLICTING_OUTPUT], m4_define([AT_CHECK_CONFLICTING_OUTPUT],
[AT_SETUP([Conflicting output files: $2 $3]) [AT_SETUP([Conflicting output files: $2 $3])
case "$1" in case "$1" in
@@ -130,7 +131,7 @@ AT_DATA([$1],
foo: {}; foo: {};
]]) ]])
AT_BISON_CHECK([$3 $1], 0, [], [$4]) AT_BISON_CHECK([$3 $1], $5, [], [$4])
AT_CLEANUP AT_CLEANUP
]) ])
@@ -149,6 +150,10 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y],
[foo.y: warning: conflicting outputs to file `location.hh' [foo.y: warning: conflicting outputs to file `location.hh'
]) ])
AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],
[foo.y: fatal error: refusing to overwrite the input file `foo.y'
], 1)
# AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS]) # AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS])
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------