c1212d2f09
* cpplib.c (my_strerror, cpp_error, cpp_error_with_line, cpp_error_from_errno, cpp_warning, cpp_warning_with_line, cpp_pedwarn, cpp_pedwarn_with_line, cpp_pedwarn_with_file_and_line): Move to cpperror.c. (cpp_print_file_and_line, v_cpp_error, v_cpp_warning, v_cpp_error_with_line, v_cpp_warning_with_line, cpp_message_from_errno, cpp_perror_with_name): Delete. * cpperror.c (cpp_print_containing_files): Take starting buffer as argument. (cpp_file_line_for_message): Rename to cpp_print_file_and_line. (v_cpp_message): Now called directly by all entry points. Remove -1 case. (cpp_pfatal_with_name, cpp_message): Delete. (cpp_notice_from_errno, cpp_ice): New functions. (cpp_notice): Is now for reporting error conditions, just without an associated file. (cpp_error, cpp_error_with_line): Don't do anything if opts->inhibit_errors is on. (cpp_pedwarn_with_file_and_line): Take column argument also. * cpplib.h: Update prototypes of exported functions. (struct cpp_options): Add inhibit_errors. * cppalloc.c, cppfiles.c: Use fprintf not cpp_notice for non-error messages. Include intl.h. * cppinit.c, cppmain.c: Likewise. Also, use cpp_notice_from_errno instead of cpp_perror_with_name or cpp_pfatal_with_name, and cpp_notice instead of cpp_message. * cppexp.c, cpphash.c, cppinit.c, cpplib.c: Use cpp_ice to report internal errors. * cpplib.c (do_define): Switch bcopy to memcpy. Give cpp_pedwarn_with_file_and_line a dummy column argument. From-SVN: r31829
478 lines
11 KiB
C
478 lines
11 KiB
C
/* Default error handlers for CPP Library.
|
|
Copyright (C) 1986, 87, 89, 92-95, 98, 99, 2000
|
|
Free Software Foundation, Inc.
|
|
Written by Per Bothner, 1994.
|
|
Based on CCCP program by Paul Rubin, June 1986
|
|
Adapted to ANSI C, Richard Stallman, Jan 1987
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
In other words, you are welcome to use, share and improve this program.
|
|
You are forbidden to forbid anyone else to use, share and improve
|
|
what you give them. Help stamp out software-hoarding! */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "cpplib.h"
|
|
#include "intl.h"
|
|
|
|
static const char *my_strerror PARAMS ((int));
|
|
static void cpp_print_containing_files PARAMS ((cpp_reader *, cpp_buffer *));
|
|
static void cpp_print_file_and_line PARAMS ((const char *, long, long));
|
|
static void v_cpp_message PARAMS ((cpp_reader *, int,
|
|
const char *, long, long,
|
|
const char *, va_list));
|
|
|
|
/* my_strerror - return the descriptive text associated with an
|
|
`errno' code.
|
|
XXX - link with libiberty so we can use its strerror(). */
|
|
|
|
static const char *
|
|
my_strerror (errnum)
|
|
int errnum;
|
|
{
|
|
const char *result;
|
|
|
|
#ifndef VMS
|
|
#ifndef HAVE_STRERROR
|
|
result = (char *) ((errnum < sys_nerr) ? sys_errlist[errnum] : 0);
|
|
#else
|
|
result = strerror (errnum);
|
|
#endif
|
|
#else /* VMS */
|
|
/* VAXCRTL's strerror() takes an optional second argument, which only
|
|
matters when the first argument is EVMSERR. However, it's simplest
|
|
just to pass it unconditionally. `vaxc$errno' is declared in
|
|
<errno.h>, and maintained by the library in parallel with `errno'.
|
|
We assume that caller's `errnum' either matches the last setting of
|
|
`errno' by the library or else does not have the value `EVMSERR'. */
|
|
|
|
result = strerror (errnum, vaxc$errno);
|
|
#endif
|
|
|
|
if (!result)
|
|
result = "errno = ?";
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Print the file names and line numbers of the #include
|
|
commands which led to the current file. */
|
|
|
|
static void
|
|
cpp_print_containing_files (pfile, ip)
|
|
cpp_reader *pfile;
|
|
cpp_buffer *ip;
|
|
{
|
|
int first = 1;
|
|
|
|
/* If stack of files hasn't changed since we last printed
|
|
this info, don't repeat it. */
|
|
if (pfile->input_stack_listing_current)
|
|
return;
|
|
|
|
/* Find the other, outer source files. */
|
|
for (ip = CPP_PREV_BUFFER (ip);
|
|
ip != CPP_NULL_BUFFER (pfile);
|
|
ip = CPP_PREV_BUFFER (ip))
|
|
if (ip->fname != NULL)
|
|
{
|
|
long line;
|
|
cpp_buf_line_and_col (ip, &line, NULL);
|
|
if (first)
|
|
{
|
|
first = 0;
|
|
fprintf (stderr, _("In file included from %s:%ld"),
|
|
ip->nominal_fname, line);
|
|
}
|
|
else
|
|
/* Translators note: this message is used in conjunction
|
|
with "In file included from %s:%ld" and some other
|
|
tricks. We want something like this:
|
|
|
|
In file included from sys/select.h:123,
|
|
from sys/types.h:234,
|
|
from userfile.c:31:
|
|
bits/select.h:45: <error message here>
|
|
|
|
The trailing comma is at the beginning of this message,
|
|
and the trailing colon is not translated. */
|
|
fprintf (stderr, _(",\n from %s:%ld"),
|
|
ip->nominal_fname, line);
|
|
}
|
|
if (first == 0)
|
|
fputs (":\n", stderr);
|
|
|
|
/* Record we have printed the status as of this time. */
|
|
pfile->input_stack_listing_current = 1;
|
|
}
|
|
|
|
static void
|
|
cpp_print_file_and_line (filename, line, column)
|
|
const char *filename;
|
|
long line, column;
|
|
{
|
|
if (filename == 0 || *filename == '\0')
|
|
filename = "<stdin>";
|
|
if (line <= 0)
|
|
fputs (_("<command line>: "), stderr);
|
|
else if (column > 0)
|
|
fprintf (stderr, "%s:%ld:%ld: ", filename, line, column);
|
|
else
|
|
fprintf (stderr, "%s:%ld: ", filename, line);
|
|
}
|
|
|
|
/* IS_ERROR is 3 for ICE, 2 for merely "fatal" error,
|
|
1 for error, 0 for warning. */
|
|
|
|
static void
|
|
v_cpp_message (pfile, is_error, file, line, col, msg, ap)
|
|
cpp_reader *pfile;
|
|
int is_error;
|
|
const char *file;
|
|
long line;
|
|
long col;
|
|
const char *msg;
|
|
va_list ap;
|
|
{
|
|
cpp_buffer *ip = cpp_file_buffer (pfile);
|
|
|
|
if (ip)
|
|
{
|
|
if (file == NULL)
|
|
file = ip->nominal_fname;
|
|
if (line == -1)
|
|
cpp_buf_line_and_col (ip, &line, &col);
|
|
|
|
cpp_print_containing_files (pfile, ip);
|
|
cpp_print_file_and_line (file, line, col);
|
|
}
|
|
else
|
|
fprintf (stderr, "%s: ", progname);
|
|
|
|
switch (is_error)
|
|
{
|
|
case 0:
|
|
fprintf (stderr, _("warning: "));
|
|
break;
|
|
case 1:
|
|
if (pfile->errors < CPP_FATAL_LIMIT)
|
|
pfile->errors++;
|
|
break;
|
|
case 2:
|
|
pfile->errors = CPP_FATAL_LIMIT;
|
|
break;
|
|
case 3:
|
|
fprintf (stderr, _("internal error: "));
|
|
pfile->errors = CPP_FATAL_LIMIT;
|
|
break;
|
|
default:
|
|
cpp_ice (pfile, "bad is_error(%d) in v_cpp_message", is_error);
|
|
}
|
|
|
|
vfprintf (stderr, _(msg), ap);
|
|
putc ('\n', stderr);
|
|
}
|
|
|
|
/* Exported interface. */
|
|
|
|
/* For reporting internal errors. Prints "internal error: " for you,
|
|
otherwise identical to cpp_fatal. */
|
|
|
|
void
|
|
cpp_ice VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
v_cpp_message (pfile, 3, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Same as cpp_error, except we consider the error to be "fatal",
|
|
such as inconsistent options. I.e. there is little point in continuing.
|
|
(We do not exit, to support use of cpplib as a library.
|
|
Instead, it is the caller's responsibility to check
|
|
CPP_FATAL_ERRORS. */
|
|
|
|
void
|
|
cpp_fatal VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
v_cpp_message (pfile, 2, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_error VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START(ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_errors)
|
|
return;
|
|
|
|
v_cpp_message (pfile, 1, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_error_with_line VPARAMS ((cpp_reader *pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_errors)
|
|
return;
|
|
|
|
v_cpp_message (pfile, 1, NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Error including a message from `errno'. */
|
|
void
|
|
cpp_error_from_errno (pfile, name)
|
|
cpp_reader *pfile;
|
|
const char *name;
|
|
{
|
|
cpp_error (pfile, "%s: %s", name, my_strerror (errno));
|
|
}
|
|
|
|
void
|
|
cpp_warning VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_cpp_message (pfile, 0, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_warning_with_line VPARAMS ((cpp_reader * pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_cpp_message (pfile, 0, NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_pedwarn VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_pedwarn_with_line VPARAMS ((cpp_reader * pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Report a warning (or an error if pedantic_errors)
|
|
giving specified file name and line number, not current. */
|
|
|
|
void
|
|
cpp_pedwarn_with_file_and_line VPARAMS ((cpp_reader *pfile,
|
|
const char *file, int line, int col,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *file;
|
|
int line;
|
|
int col;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
file = va_arg (ap, const char *);
|
|
line = va_arg (ap, int);
|
|
col = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
file, line, col, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Print an error message not associated with a file. */
|
|
void
|
|
cpp_notice VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (pfile->errors < CPP_FATAL_LIMIT)
|
|
pfile->errors++;
|
|
|
|
vfprintf (stderr, _(msgid), ap);
|
|
putc('\n', stderr);
|
|
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_notice_from_errno (pfile, name)
|
|
cpp_reader *pfile;
|
|
const char *name;
|
|
{
|
|
cpp_notice (pfile, "%s: %s", name, my_strerror (errno));
|
|
}
|