* src/files.c (open_files): Fix the computation of short_base_name

in the case of `-o foo.tab.c'.
This commit is contained in:
Akim Demaille
2000-12-20 12:41:52 +00:00
parent 337bab46f2
commit 956dba3a7c
4 changed files with 16 additions and 8 deletions

View File

@@ -1,10 +1,11 @@
Makefile configure
Makefile.in Makefile Makefile.in
aclocal.m4 aclocal.m4
config.cache config.cache
config.h config.h config.hin
config.log config.log
config.status config.status
intl intl
stamp-h stamp-h
bison-*.tar.gz bison-*.tar.gz
patches update-log

View File

@@ -1,3 +1,8 @@
2000-12-20 Akim Demaille <akim@epita.fr>
* src/files.c (open_files): Fix the computation of short_base_name
in the case of `-o foo.tab.c'.
2000-12-20 Akim Demaille <akim@epita.fr> 2000-12-20 Akim Demaille <akim@epita.fr>
* src/reader.c (copy_string, copy_comment, copy_comment2, copy_at) * src/reader.c (copy_string, copy_comment, copy_comment2, copy_at)

View File

@@ -185,11 +185,11 @@ compute_base_names (void)
base_length = strlen (spec_outfile); base_length = strlen (spec_outfile);
if (strsuffix (spec_outfile, ".c")) if (strsuffix (spec_outfile, ".c"))
base_length -= 2; base_length -= 2;
base_name = strndup (spec_outfile, base_length);
/* SHORT_BASE_LENGTH includes neither ".tab" nor ".c". */ /* SHORT_BASE_LENGTH includes neither ".tab" nor ".c". */
short_base_length = base_length; short_base_length = base_length;
if (strsuffix (spec_outfile, ".tab") || strsuffix (spec_outfile, "_tab")) if (strsuffix (base_name, ".tab") || strsuffix (base_name, "_tab"))
short_base_length -= 4; short_base_length -= 4;
base_name = strndup (spec_outfile, base_length);
short_base_name = strndup (spec_outfile, short_base_length); short_base_name = strndup (spec_outfile, short_base_length);
return; return;

View File

@@ -1,6 +1,7 @@
Makefile Makefile
at-check-line Makefile.in
at-setup-line at-*
debug-*
atconfig atconfig
empty empty
experr experr
@@ -8,5 +9,6 @@ expout
stderr stderr
stdout stdout
testsuite testsuite
calc.[ch] calc.[chy]
calc.c.*
calc calc