X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e9690142325711b320ef444768fdd40a087d02f7..026816664ff8283a55f91915843a8ff0ac5cf86c:/src/files.c?ds=sidebyside diff --git a/src/files.c b/src/files.c index 4693b754..76aa7fe3 100644 --- a/src/files.c +++ b/src/files.c @@ -1,6 +1,6 @@ /* Open and close files for Bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software + Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -33,7 +34,7 @@ #include "getargs.h" #include "gram.h" -/* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is +/* Initializing some values below (such SPEC_NAME_PREFIX to 'yy') is tempting, but don't do that: for the time being our handling of the %directive vs --option leaves precedence to the options by deciding that if a %directive sets a variable which is really set (i.e., not @@ -57,20 +58,20 @@ uniqstr grammar_file = NULL; uniqstr current_file = NULL; /* If --output=dir/foo.c was specified, - DIR_PREFIX is `dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are `dir/foo'. + DIR_PREFIX is 'dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'dir/foo'. - If --output=dir/foo.tab.c was specified, DIR_PREFIX is `dir/', - ALL_BUT_EXT is `dir/foo.tab', and ALL_BUT_TAB_EXT is `dir/foo'. + If --output=dir/foo.tab.c was specified, DIR_PREFIX is 'dir/', + ALL_BUT_EXT is 'dir/foo.tab', and ALL_BUT_TAB_EXT is 'dir/foo'. If --output was not specified but --file-prefix=dir/foo was specified, - ALL_BUT_EXT = `foo.tab' and ALL_BUT_TAB_EXT = `foo'. + ALL_BUT_EXT = 'foo.tab' and ALL_BUT_TAB_EXT = 'foo'. If neither --output nor --file was specified but the input grammar - is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are `foo'. + is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'foo'. If neither --output nor --file was specified, DIR_PREFIX is the empty string (meaning the current directory); otherwise it is - `dir/'. */ + 'dir/'. */ char *all_but_ext; static char *all_but_tab_ext; @@ -78,7 +79,7 @@ char *dir_prefix; /* C source file extension (the parser source). */ static char *src_extension = NULL; -/* Header file extension (if option ``-d'' is specified). */ +/* Header file extension (if option '`-d'' is specified). */ static char *header_extension = NULL; /*-----------------------------------------------------------------. @@ -109,7 +110,8 @@ xfopen (const char *name, const char *mode) ptr = fopen_safer (name, mode); if (!ptr) - error (EXIT_FAILURE, get_errno (), _("cannot open file `%s'"), name); + error (EXIT_FAILURE, get_errno (), + _("%s: cannot open"), quotearg_colon (name)); return ptr; } @@ -125,13 +127,25 @@ xfclose (FILE *ptr) return; if (ferror (ptr)) - error (EXIT_FAILURE, 0, _("I/O error")); + error (EXIT_FAILURE, 0, _("input/output error")); if (fclose (ptr) != 0) error (EXIT_FAILURE, get_errno (), _("cannot close file")); } +FILE * +xfdopen (int fd, char const *mode) +{ + FILE *res = fdopen (fd, mode); + if (! res) + error (EXIT_FAILURE, get_errno (), + /* On a separate line to please the "unmarked_diagnostics" + syntax-check. */ + "fdopen"); + return res; +} + /*------------------------------------------------------------------. | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. | `------------------------------------------------------------------*/ @@ -140,7 +154,7 @@ xfclose (FILE *ptr) static void compute_exts_from_gf (const char *ext) { - if (strcmp (ext, ".y") == 0) + if (STREQ (ext, ".y")) { src_extension = xstrdup (language->src_extension); header_extension = xstrdup (language->header_extension); @@ -177,7 +191,7 @@ compute_exts_from_src (const char *ext) *EXT points to the last period in the basename, or NULL if none. If there is no *EXT, *TAB is NULL. Otherwise, *TAB points to - `.tab' or `_tab' if present right before *EXT, or is NULL. *TAB + '.tab' or '_tab' if present right before *EXT, or is NULL. *TAB cannot be equal to *BASE. None are allocated, they are simply pointers to parts of FILE_NAME. @@ -205,18 +219,17 @@ file_name_split (const char *file_name, *base = last_component (file_name); /* Look for the extension, i.e., look for the last dot. */ - *ext = mbsrchr (*base, '.'); + *ext = strrchr (*base, '.'); *tab = NULL; - /* If there is an extension, check if there is a `.tab' part right + /* If there is an extension, check if there is a '.tab' part right before. */ if (*ext) { size_t baselen = *ext - *base; - size_t dottablen = 4; + size_t dottablen = sizeof (TAB_EXT) - 1; if (dottablen < baselen - && (strncmp (*ext - dottablen, ".tab", dottablen) == 0 - || strncmp (*ext - dottablen, "_tab", dottablen) == 0)) + && STRPREFIX_LIT (TAB_EXT, *ext - dottablen)) *tab = *ext - dottablen; } } @@ -257,7 +270,7 @@ compute_file_name_parts (void) if (spec_file_prefix) { - /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'. */ + /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = 'foo'. */ dir_prefix = xstrndup (spec_file_prefix, last_component (spec_file_prefix) - spec_file_prefix); @@ -265,14 +278,14 @@ compute_file_name_parts (void) } else if (yacc_flag) { - /* If --yacc, then the output is `y.tab.c'. */ + /* 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 - grammar: `foo/bar.yy' => `bar'. */ + grammar: 'foo/bar.yy' => 'bar'. */ dir_prefix = xstrdup (""); all_but_tab_ext = xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0))); @@ -345,9 +358,9 @@ void output_file_name_check (char **file_name) { bool conflict = false; - if (0 == strcmp (*file_name, grammar_file)) + if (STREQ (*file_name, grammar_file)) { - complain (_("refusing to overwrite the input file %s"), + complain (NULL, complaint, _("refusing to overwrite the input file %s"), quote (*file_name)); conflict = true; } @@ -355,10 +368,10 @@ output_file_name_check (char **file_name) { int i; for (i = 0; i < file_names_count; i++) - if (0 == strcmp (file_names[i], *file_name)) + if (STREQ (file_names[i], *file_name)) { - warn (_("conflicting outputs to file %s"), - quote (*file_name)); + complain (NULL, Wother, _("conflicting outputs to file %s"), + quote (*file_name)); conflict = true; } }