X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2b81e969ea04c1a6502928ba7e847ec8ff7dcb2f..eb095650011f68858e877e3590f6901bc79ba668:/src/files.c diff --git a/src/files.c b/src/files.c index 4acf9e89..951a7acc 100644 --- a/src/files.c +++ b/src/files.c @@ -1,7 +1,7 @@ /* Open and close files for Bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -20,20 +20,20 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#include #include "system.h" #include +#include #include #include +#include #include #include "complain.h" -#include "dirname.h" #include "files.h" #include "getargs.h" #include "gram.h" -#include "stdio-safer.h" struct obstack pre_prologue_obstack; struct obstack post_prologue_obstack; @@ -48,10 +48,10 @@ struct obstack post_prologue_obstack; char const *spec_outfile = NULL; /* for -o. */ char const *spec_file_prefix = NULL; /* for -b. */ char const *spec_name_prefix = NULL; /* for -p. */ -char const *spec_verbose_file = NULL; /* for --verbose. */ -char const *spec_graph_file = NULL; /* for -g. */ -char const *spec_defines_file = NULL; /* for --defines. */ -char const *parser_file_name; +char *spec_verbose_file = NULL; /* for --verbose. */ +char *spec_graph_file = NULL; /* for -g. */ +char *spec_defines_file = NULL; /* for --defines. */ +char *parser_file_name; uniqstr grammar_file = NULL; uniqstr current_file = NULL; @@ -72,14 +72,14 @@ uniqstr current_file = NULL; empty string (meaning the current directory); otherwise it is `dir/'. */ -static char const *all_but_ext; -static char const *all_but_tab_ext; -char const *dir_prefix; +static char *all_but_ext; +static char *all_but_tab_ext; +char *dir_prefix; /* C source file extension (the parser source). */ -static char const *src_extension = NULL; +static char *src_extension = NULL; /* Header file extension (if option ``-d'' is specified). */ -static char const *header_extension = NULL; +static char *header_extension = NULL; /*-----------------------------------------------------------------. | Return a newly allocated string composed of the concatenation of | @@ -136,31 +136,25 @@ xfclose (FILE *ptr) | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. | `------------------------------------------------------------------*/ -/* Replace all characters FROM by TO in the string IN. - and returns a new allocated string. */ +/* In the string S, replace all characters FROM by TO. */ static char * -tr (const char *in, char from, char to) +tr (char *s, char from, char to) { - char *temp; - char *out = xmalloc (strlen (in) + 1); - - for (temp = out; *in; in++, out++) - if (*in == from) - *out = to; - else - *out = *in; - *out = 0; - return (temp); + for (; *s; s++) + if (*s == from) + *s = to; } /* Compute extensions from the grammar file extension. */ static void compute_exts_from_gf (const char *ext) { - src_extension = tr (ext, 'y', 'c'); - src_extension = tr (src_extension, 'Y', 'C'); - header_extension = tr (ext, 'y', 'h'); - header_extension = tr (header_extension, 'Y', 'H'); + src_extension = xstrdup (ext); + header_extension = xstrdup (ext); + tr (src_extension, 'y', 'c'); + tr (src_extension, 'Y', 'C'); + tr (header_extension, 'y', 'h'); + tr (header_extension, 'Y', 'H'); } /* Compute extensions from the given c source file extension. */ @@ -171,8 +165,9 @@ compute_exts_from_src (const char *ext) so the extenions must be computed unconditionally from the file name given by this option. */ src_extension = xstrdup (ext); - header_extension = tr (ext, 'c', 'h'); - header_extension = tr (header_extension, 'C', 'H'); + header_extension = xstrdup (ext); + tr (header_extension, 'c', 'h'); + tr (header_extension, 'C', 'H'); } @@ -208,7 +203,7 @@ static void file_name_split (const char *file_name, const char **base, const char **tab, const char **ext) { - *base = base_name (file_name); + *base = last_component (file_name); /* Look for the extension, i.e., look for the last dot. */ *ext = strrchr (*base, '.'); @@ -263,25 +258,23 @@ compute_file_name_parts (void) if (spec_file_prefix) { - /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = - `foo'. */ - dir_prefix = xstrndup (grammar_file, base - grammar_file); - all_but_tab_ext = xstrdup (spec_file_prefix); + /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'. */ + dir_prefix = xstrndup (grammar_file, base - grammar_file); + all_but_tab_ext = xstrdup (spec_file_prefix); } else if (yacc_flag) { - /* If --yacc, then the output is `y.tab.c'. */ - dir_prefix = ""; - all_but_tab_ext = "y"; + /* If --yacc, then the output is `y.tab.c'. */ + dir_prefix = xstrdup (""); + all_but_tab_ext = xstrdup ("y"); } else { - /* Otherwise, ALL_BUT_TAB_EXT is computed from the input + /* Otherwise, ALL_BUT_TAB_EXT is computed from the input grammar: `foo/bar.yy' => `bar'. */ - dir_prefix = ""; - all_but_tab_ext = - xstrndup (base, - (strlen (base) - (ext ? strlen (ext) : 0))); + dir_prefix = xstrdup (""); + all_but_tab_ext = + xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0))); } all_but_ext = concat2 (all_but_tab_ext, TAB_EXT); @@ -308,24 +301,26 @@ compute_output_file_names (void) /* If not yet done. */ if (!src_extension) - src_extension = ".c"; + src_extension = xstrdup (".c"); if (!header_extension) - header_extension = ".h"; + header_extension = xstrdup (".h"); name[names++] = parser_file_name = - spec_outfile ? spec_outfile : concat2 (all_but_ext, src_extension); + (spec_outfile + ? xstrdup (spec_outfile) + : concat2 (all_but_ext, src_extension)); if (defines_flag) { if (! spec_defines_file) - spec_defines_file = concat2 (all_but_ext, header_extension); + spec_defines_file = concat2 (all_but_ext, header_extension); name[names++] = spec_defines_file; } if (graph_flag) { if (! spec_graph_file) - spec_graph_file = concat2 (all_but_tab_ext, ".vcg"); + spec_graph_file = concat2 (all_but_tab_ext, ".dot"); name[names++] = spec_graph_file; } @@ -339,4 +334,19 @@ compute_output_file_names (void) for (i = 0; i < j; i++) if (strcmp (name[i], name[j]) == 0) warn (_("conflicting outputs to file %s"), quote (name[i])); + + free (all_but_ext); + free (all_but_tab_ext); + free (src_extension); + free (header_extension); +} + +void +output_file_names_free (void) +{ + free (spec_verbose_file); + free (spec_graph_file); + free (spec_defines_file); + free (parser_file_name); + free (dir_prefix); }