* src/files.c (compute_base_names): Add extensions computing when

`--file-prefix' used.
Standardize function calls.
This commit is contained in:
Marc Autret
2001-08-14 10:38:12 +00:00
parent 78d09da9a5
commit 95fb566259
2 changed files with 19 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
2001-08-14 Marc Autret <autret_m@epita.fr>
* src/files.c (compute_base_names): Add extensions computing when
`--file-prefix' used.
Standardize function calls.
2001-08-13 Marc Autret <autret_m@epita.fr> 2001-08-13 Marc Autret <autret_m@epita.fr>
* src/bison.simple (YYSTACK_USE_ALLOCA): Changed to allow users * src/bison.simple (YYSTACK_USE_ALLOCA): Changed to allow users

View File

@@ -264,11 +264,11 @@ compute_base_names (void)
/* if the initial segment of extension contains 'c' or a 'C', I assume /* if the initial segment of extension contains 'c' or a 'C', I assume
that it is a C or C++ source file */ that it is a C or C++ source file */
if (ext_index) if (ext_index)
ext_index = (strspn(spec_outfile + ext_index + 1, "cC")) ? ext_index : 0; ext_index = (strspn (spec_outfile + ext_index + 1, "cC")) ? ext_index : 0;
if (ext_index) if (ext_index)
{ {
base_length -= strlen (spec_outfile + ext_index); base_length -= strlen (spec_outfile + ext_index);
compute_exts_from_src(spec_outfile + ext_index); compute_exts_from_src (spec_outfile + ext_index);
} }
base_name = strndup (spec_outfile, base_length); base_name = strndup (spec_outfile, base_length);
@@ -295,6 +295,15 @@ compute_base_names (void)
strlen (short_base_name) + strlen (EXT_TAB) + 1); strlen (short_base_name) + strlen (EXT_TAB) + 1);
stpcpy (stpcpy (base_name, short_base_name), EXT_TAB); stpcpy (stpcpy (base_name, short_base_name), EXT_TAB);
/* Computes the extensions from the garmmar file name. */
ext_index = get_extension_index (infile);
/* if the initial segment of extension contains a 'y' or a 'Y', I assume
that it is a yacc or bison grammar file */
if (ext_index)
ext_index = (strspn (infile + ext_index + 1, "yY")) ? ext_index : 0;
if (ext_index)
compute_exts_from_gf (infile + ext_index);
return; return;
} }
@@ -314,11 +323,11 @@ compute_base_names (void)
/* if the initial segment of extension contains a 'y' or a 'Y', I assume /* if the initial segment of extension contains a 'y' or a 'Y', I assume
that it is a yacc or bison grammar file */ that it is a yacc or bison grammar file */
if (ext_index) if (ext_index)
ext_index = (strspn(name_base + ext_index + 1, "yY")) ? ext_index : 0; ext_index = (strspn (name_base + ext_index + 1, "yY")) ? ext_index : 0;
if (ext_index) if (ext_index)
{ {
base_length -= strlen (name_base + ext_index); base_length -= strlen (name_base + ext_index);
compute_exts_from_gf(name_base + ext_index); compute_exts_from_gf (name_base + ext_index);
} }
short_base_length = base_length; short_base_length = base_length;