Also pass --install to the second invocation of autoreconf, to let automake install...

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 973ff2994e43a6b8ae1d48eb462e665e353886a2..fd14d946b15fb3c74cc8dd50a41f8edb18b8021d 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001 Free Software Foundation, Inc.

 
    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
 
    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


@@ -19,14 +19,10 @@
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
+#include "system.h"

 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC

-# if __STDC__
+# ifdef __STDC__

 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else
 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else


@@ -45,20 +41,67 @@
 void exit ();
 #endif
 
 void exit ();
 #endif
 

+/* To get error_one_per_line. */
+#include "error.h"
+

 #include "complain.h"
 
 #include "complain.h"
 

+#ifndef HAVE_DECL_STRERROR_R
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRERROR_R
+char *strerror_r ();
+#endif
+

 #ifndef _
 # define _(String) String
 #endif
 
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */
 #ifndef _
 # define _(String) String
 #endif
 
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */

+

 # define program_name program_invocation_name
 # define program_name program_invocation_name

+# include <errno.h>
+
+/* In GNU libc we want do not want to use the common name `error' directly.
+   Instead make it a weak alias.  */
+# define error __error
+# define error_at_line __error_at_line
+
+# ifdef USE_IN_LIBIO
+#  include <libio/iolibio.h>
+#  define fflush(s) _IO_fflush (s)
+# endif
+

 #else /* not _LIBC */
 #else /* not _LIBC */

+

 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;

-#endif
+
+# ifdef HAVE_STRERROR_R
+#  define __strerror_r strerror_r
+# else
+#  if HAVE_STRERROR
+#   ifndef strerror            /* On some systems, strerror is a macro */
+char *strerror ();
+#   endif
+#  else
+static char *
+private_strerror (errnum)
+     int errnum;
+{
+  extern char *sys_errlist[];
+  extern int sys_nerr;
+
+  if (errnum > 0 && errnum <= sys_nerr)
+    return _(sys_errlist[errnum]);
+  return _("Unknown system error");
+}
+#   define strerror private_strerror
+#  endif /* HAVE_STRERROR */
+# endif        /* HAVE_STRERROR_R */
+#endif /* not _LIBC */

 
 /* This variable is incremented each time `warn' is called.  */
 unsigned int warn_message_count;
 
 /* This variable is incremented each time `warn' is called.  */
 unsigned int warn_message_count;


@@ -66,16 +109,13 @@ unsigned int warn_message_count;
 /* This variable is incremented each time `complain' is called.  */
 unsigned int complain_message_count;
 
 /* This variable is incremented each time `complain' is called.  */
 unsigned int complain_message_count;
 

-/* Sometimes we want to have at most one error per line.  This
-   variable controls whether this mode is selected or not.  */
-int error_one_per_line;

 \f
 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 void
 \f
 /*--------------------------------.
 | Report a warning, and proceed.  |
 `--------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 warn (const char *message, ...)
 #else
 warn (message, va_alist)
 warn (const char *message, ...)
 #else
 warn (message, va_alist)


@@ -90,7 +130,7 @@ warn (message, va_alist)
   if (error_one_per_line)
     {
       static const char *old_infile;
   if (error_one_per_line)
     {
       static const char *old_infile;

-      static unsigned int old_lineno;
+      static int old_lineno;

 
       if (old_lineno == lineno &&
          (infile == old_infile || !strcmp (old_infile, infile)))
 
       if (old_lineno == lineno &&
          (infile == old_infile || !strcmp (old_infile, infile)))


@@ -127,7 +167,7 @@ warn (message, va_alist)
 `-----------------------------------------------------------*/
 
 void
 `-----------------------------------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 complain (const char *message, ...)
 #else
 complain (message, va_alist)
 complain (const char *message, ...)
 #else
 complain (message, va_alist)


@@ -142,7 +182,7 @@ complain (message, va_alist)
   if (error_one_per_line)
     {
       static const char *old_infile;
   if (error_one_per_line)
     {
       static const char *old_infile;

-      static unsigned int old_lineno;
+      static int old_lineno;

 
       if (old_lineno == lineno &&
          (infile == old_infile || !strcmp (old_infile, infile)))
 
       if (old_lineno == lineno &&
          (infile == old_infile || !strcmp (old_infile, infile)))


@@ -177,7 +217,7 @@ complain (message, va_alist)
 `-------------------------------------------------*/
 
 void
 `-------------------------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 fatal (const char *message, ...)
 #else
 fatal (message, va_alist)
 fatal (const char *message, ...)
 #else
 fatal (message, va_alist)


@@ -208,62 +248,3 @@ fatal (message, va_alist)
   fflush (stderr);
   exit (1);
 }
   fflush (stderr);
   exit (1);
 }

-\f
-/*------------------------------------------------------------------.
-| A severe error has occurred, we cannot proceed. Exit with STATUS, |
-| and report the error message of the errno ERRNUM.                 |
-`------------------------------------------------------------------*/
-
-void
-#if defined VA_START && __STDC__
-error (int status, int errnum,
-       const char *message, ...)
-#else
-error (status, errnum, message, va_alist)
-     int status;
-     int errnum;
-     char *message;
-     va_dcl
-#endif
-{
-#ifdef VA_START
-  va_list args;
-#endif
-
-  fflush (stdout);
-  if (infile != NULL)
-    fprintf (stderr, "%s:%d: ", infile, lineno);
-  else
-    fprintf (stderr, "%s:", program_name);
-
-  fputs (_("fatal error: "), stderr);
-
-#ifdef VA_START
-  VA_START (args, message);
-  vfprintf (stderr, message, args);
-  va_end (args);
-#else
-  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-
-  if (errnum)
-    {
-#if defined HAVE_STRERROR_R || _LIBC
-      char errbuf[1024];
-# if HAVE_WORKING_STRERROR_R || _LIBC
-      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
-# else
-      /* Don't use __strerror_r's return value because on some systems
-        (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
-      __strerror_r (errnum, errbuf, sizeof errbuf);
-      fprintf (stderr, ": %s", errbuf);
-# endif
-#else
-      fprintf (stderr, ": %s", strerror (errnum));
-#endif
-    }
-  putc ('\n', stderr);
-  fflush (stderr);
-  if (status)
-    exit (status);
-}