Libc-763.13.tar.gz

[apple/libc.git] / gen / assert-fbsd.c

diff --git a/gen/assert-fbsd.c b/gen/assert-fbsd.c
index 8dc39b79c240ce3d52b0c8b9b0a0da5227d5f42c..2e1c0b1581269b87f3ebd99c078d1aa879fe2e43 100644 (file)
--- a/gen/assert-fbsd.c
+++ b/gen/assert-fbsd.c
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,11 +31,13 @@
 static char sccsid[] = "@(#)assert.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include "CrashReporterClient.h"
+#include "_simple.h"
 
 void
 __assert_rtn(func, file, line, failedexpr)
@@ -47,14 +45,49 @@ __assert_rtn(func, file, line, failedexpr)
        int line;
        const char *failedexpr;
 {
-       if (func == NULL)
-               (void)fprintf(stderr,
+       if (func == (const char *)-1L) {
+               /* 8462256: special case to replace __eprintf */
+               _simple_dprintf(STDERR_FILENO,
+                    "%s:%u: failed assertion `%s'\n", file, line, failedexpr);
+               if (!CRGetCrashLogMessage()) {
+                       _SIMPLE_STRING s = _simple_salloc();
+                       if (s) {
+                               _simple_sprintf(s,
+                                 "%s:%u: failed assertion `%s'\n",
+                                 file, line, failedexpr);
+                               CRSetCrashLogMessage(_simple_string(s));
+                       } else
+                               CRSetCrashLogMessage(failedexpr);
+               }
+       } else if (func == NULL) {
+               _simple_dprintf(STDERR_FILENO,
                     "Assertion failed: (%s), file %s, line %d.\n", failedexpr,
                     file, line);
-       else
-               (void)fprintf(stderr,
+               if (!CRGetCrashLogMessage()) {
+                       _SIMPLE_STRING s = _simple_salloc();
+                       if (s) {
+                               _simple_sprintf(s,
+                                 "Assertion failed: (%s), file %s, line %d.\n",
+                                 failedexpr, file, line);
+                               CRSetCrashLogMessage(_simple_string(s));
+                       } else
+                               CRSetCrashLogMessage(failedexpr);
+               }
+       } else {
+               _simple_dprintf(STDERR_FILENO,
                     "Assertion failed: (%s), function %s, file %s, line %d.\n",
                     failedexpr, func, file, line);
+               if (!CRGetCrashLogMessage()) {
+                       _SIMPLE_STRING s = _simple_salloc();
+                       if (s) {
+                               _simple_sprintf(s,
+                                 "Assertion failed: (%s), function %s, file %s, line %d.\n",
+                                 failedexpr, func, file, line);
+                               CRSetCrashLogMessage(_simple_string(s));
+                       } else
+                               CRSetCrashLogMessage(failedexpr);
+               }
+       }
        abort();
        /* NOTREACHED */
 }