X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffatal.c;h=79e8a346e0ba3c10fc17e22cf10f16fa99a34c8e;hb=9b9bfb49af70f53f177c7a6563fa844a4a50c7db;hp=b5c8b57fa4b919acd397c12642ff705eb5d43520;hpb=862d856cf0083d07c86d56dce8f9be7b207a8dd4;p=gnulib.git

diff --git a/lib/fatal.c b/lib/fatal.c
index b5c8b57fa..79e8a346e 100644
--- a/lib/fatal.c
+++ b/lib/fatal.c
@@ -1,30 +1,32 @@
+/* Fatal exits for noninteractive utilities
+
+   Copyright (C) 2001, 2003 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 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,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-/* FIXME: define EXIT_FAILURE */
+#include "fatal.h"
 
+#include "exit.h"
+#include <stdarg.h>
 #include <stdio.h>
-
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-#else
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-#endif
-
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-void exit ();
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _LIBC
 # define program_name program_invocation_name
@@ -34,23 +36,14 @@ void exit ();
 extern char *program_name;
 #endif
 
-#include "fatal.h"
+#include "unlocked-io.h"
 
 /* Like error, but always exit with EXIT_FAILURE.  */
 
 void
-#if defined VA_START && __STDC__
 fatal (int errnum, const char *message, ...)
-#else
-fatal (errnum, message, va_alist)
-     int errnum;
-     char *message;
-     va_dcl
-#endif
 {
-#ifdef VA_START
   va_list args;
-#endif
 
   if (error_print_progname)
     (*error_print_progname) ();
@@ -60,11 +53,10 @@ fatal (errnum, message, va_alist)
       fprintf (stderr, "%s: ", program_name);
     }
 
-#ifdef VA_START
-  VA_START (args, message);
+  va_start (args, message);
   error (EXIT_FAILURE, errnum, message, args);
+
+  /* The following code isn't reachable, but pacifies some compilers.  */
   va_end (args);
-#else
-  error (EXIT_FAILURE, errnum, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
+  abort ();
 }