1 files changed, 24 insertions, 11 deletions

diff --git a/src/lib/libc/stdlib/abort.c b/src/lib/libc/stdlib/abort.c
index c298e016b4..2430c124f9 100644
--- a/src/lib/libc/stdlib/abort.c
+++ b/src/lib/libc/stdlib/abort.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,26 +28,43 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)abort.c      5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: abort.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
+static char *rcsid = "$OpenBSD: abort.c,v 1.13 2004/01/20 19:35:17 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "thread_private.h"
+#include "atexit.h"
 
 void
-abort()
+abort(void)
 {
+        struct atexit *p = __atexit;
+        static int cleanup_called = 0;
         sigset_t mask;
 
+
         sigfillset(&mask);
         /*
          * don't block SIGABRT to give any handler a chance; we ignore
          * any errors -- X311J doesn't allow abort to return anyway.
          */
         sigdelset(&mask, SIGABRT);
-        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+
+        /*
+         * POSIX requires we flush stdio buffers on abort
+         */
+        if (cleanup_called == 0) {
+                while (p != NULL && p->next != NULL)
+                        p = p->next;
+                if (p != NULL && p->fns[0] != NULL) {
+                        cleanup_called = 1;
+                        (*p->fns[0])();
+                }
+        }
+
         (void)kill(getpid(), SIGABRT);
 
         /*
@@ -59,7 +72,7 @@ abort()
          * it again, only harder.
          */
         (void)signal(SIGABRT, SIG_DFL);
-        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
         (void)kill(getpid(), SIGABRT);
-        exit(1);
+        _exit(1);
 }