FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR preprocessor/60736 (Crash in preprocessor including stdc-predef.h when it does not exist on glibc-based systems)

Browse source 
PR preprocessor/60736
	* include/cpplib.h (cpp_errno_filename): New prototype.
	* errors.c (cpp_errno): Don't handle msgid "" specially, use
	_(msgid) instead of msgid as argument to cpp_error.
	(cpp_errno_filename): New function.
	* files.c (read_file_guts): Use cpp_errno_filename instead of
	cpp_errno.
	(open_file_failed): Likewise.  Use file->name if file->path is NULL
	in diagnostics.

From-SVN: r230591
This commit is contained in:
Jakub Jelinek 2015-11-19 09:27:12 +01:00 • committed by Jakub Jelinek
parent ee1326921d
commit 46ce03de3a
4 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libcpp/ChangeLog
View file

@ -1,3 +1,15 @@
2015-11-19 Jakub Jelinek <jakub@redhat.com>
PR preprocessor/60736
* include/cpplib.h (cpp_errno_filename): New prototype.
* errors.c (cpp_errno): Don't handle msgid "" specially, use
_(msgid) instead of msgid as argument to cpp_error.
(cpp_errno_filename): New function.
* files.c (read_file_guts): Use cpp_errno_filename instead of
cpp_errno.
(open_file_failed): Likewise. Use file->name if file->path is NULL
in diagnostics.
2015-11-13 David Malcolm <dmalcolm@redhat.com> 2015-11-13 David Malcolm <dmalcolm@redhat.com>
* errors.c (cpp_diagnostic): Pass pfile->line_table to * errors.c (cpp_diagnostic): Pass pfile->line_table to

18
libcpp/errors.c
View file

@ -230,8 +230,18 @@ cpp_warning_with_line_syshdr (cpp_reader *pfile, int reason,
bool bool
cpp_errno (cpp_reader *pfile, int level, const char *msgid) cpp_errno (cpp_reader *pfile, int level, const char *msgid)
{ {
if (msgid[0] == '\0') return cpp_error (pfile, level, "%s: %s", _(msgid), xstrerror (errno));
msgid = _("stdout"); }
return cpp_error (pfile, level, "%s: %s", msgid, xstrerror (errno)); /* Print a warning or error, depending on the value of LEVEL. Include
information from errno. Unlike cpp_errno, the argument is a filename
that is not localized, but "" is replaced with localized "stdout". */
bool
cpp_errno_filename (cpp_reader *pfile, int level, const char *filename)
{
if (filename[0] == '\0')
filename = _("stdout");
return cpp_error (pfile, level, "%s: %s", filename, xstrerror (errno));
} }

11
libcpp/files.c
View file

@ -715,7 +715,7 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file)
if (count < 0) if (count < 0)
{ {
cpp_errno (pfile, CPP_DL_ERROR, file->path); cpp_errno_filename (pfile, CPP_DL_ERROR, file->path);
free (buf); free (buf);
return false; return false;
} }
@ -1053,7 +1053,8 @@ open_file_failed (cpp_reader *pfile, _cpp_file *file, int angle_brackets)
/* If the preprocessor output (other than dependency information) is /* If the preprocessor output (other than dependency information) is
being used, we must also flag an error. */ being used, we must also flag an error. */
if (CPP_OPTION (pfile, deps.need_preprocessor_output)) if (CPP_OPTION (pfile, deps.need_preprocessor_output))
cpp_errno (pfile, CPP_DL_FATAL, file->path); cpp_errno_filename (pfile, CPP_DL_FATAL,
file->path ? file->path : file->name);
} }
else else
{ {
@ -1067,9 +1068,11 @@ open_file_failed (cpp_reader *pfile, _cpp_file *file, int angle_brackets)
if (CPP_OPTION (pfile, deps.style) == DEPS_NONE if (CPP_OPTION (pfile, deps.style) == DEPS_NONE
|| print_dep || print_dep
|| CPP_OPTION (pfile, deps.need_preprocessor_output)) || CPP_OPTION (pfile, deps.need_preprocessor_output))
cpp_errno (pfile, CPP_DL_FATAL, file->path); cpp_errno_filename (pfile, CPP_DL_FATAL,
file->path ? file->path : file->name);
else else
cpp_errno (pfile, CPP_DL_WARNING, file->path); cpp_errno_filename (pfile, CPP_DL_WARNING,
file->path ? file->path : file->name);
} }
} }

3
libcpp/include/cpplib.h
View file

@ -986,6 +986,9 @@ extern bool cpp_warning_syshdr (cpp_reader *, int, const char *msgid, ...)
/* Output a diagnostic with "MSGID: " preceding the /* Output a diagnostic with "MSGID: " preceding the
error string of errno. No location is printed. */ error string of errno. No location is printed. */
extern bool cpp_errno (cpp_reader *, int, const char *msgid); extern bool cpp_errno (cpp_reader *, int, const char *msgid);
/* Similarly, but with "FILENAME: " instead of "MSGID: ", where
the filename is not localized. */
extern bool cpp_errno_filename (cpp_reader *, int, const char *filename);
/* Same as cpp_error, except additionally specifies a position as a /* Same as cpp_error, except additionally specifies a position as a
(translation unit) physical line and physical column. If the line is (translation unit) physical line and physical column. If the line is