1 files changed, 23 insertions, 2 deletions

diff --git a/src/lib/libc/stdlib/abort.c b/src/lib/libc/stdlib/abort.c
index c298e016b4..41a9f0f48b 100644
--- a/src/lib/libc/stdlib/abort.c
+++ b/src/lib/libc/stdlib/abort.c
@@ -32,26 +32,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.7 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "thread_private.h"
+
+void (*__cleanup)();
 
 void
 abort()
 {
+        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);
+#ifdef _THREAD_SAFE
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#else  /* _THREAD_SAFE */
         (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#endif /* _THREAD_SAFE */
+
+        /*
+         * POSIX requires we flush stdio buffers on abort
+         */
+        if (cleanup_called == 0 && __cleanup != NULL) {
+                cleanup_called = 1;
+                (*__cleanup)();
+        }
+
         (void)kill(getpid(), SIGABRT);
 
         /*
@@ -59,7 +76,11 @@ abort()
          * it again, only harder.
          */
         (void)signal(SIGABRT, SIG_DFL);
+#ifdef _THREAD_SAFE
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#else  /* _THREAD_SAFE */
         (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+#endif /* _THREAD_SAFE */
         (void)kill(getpid(), SIGABRT);
         exit(1);
 }