[svn:parrot] r40363 - trunk/src

[NotFound at svn.parrot.org]

Author: NotFound
Date: Sat Aug  1 21:12:51 2009
New Revision: 40363
URL: https://trac.parrot.org/parrot/changeset/40363

Log:
[cage] show message of uncatched exceptions throwed before PIO initialization

Modified:
   trunk/src/exceptions.c

Modified: trunk/src/exceptions.c
==============================================================================
--- trunk/src/exceptions.c	Sat Aug  1 19:31:37 2009	(r40362)
+++ trunk/src/exceptions.c	Sat Aug  1 21:12:51 2009	(r40363)
@@ -106,10 +106,13 @@
     STRING * const message     = VTABLE_get_string(interp, exception);
     INTVAL         exit_status = 1;
     const INTVAL   severity    = VTABLE_get_integer_keyed_str(interp, exception, CONST_STRING(interp, "severity"));
+    int use_perr = !PMC_IS_NULL(Parrot_io_STDERR(interp));
 
     /* flush interpreter output to get things printed in order */
-    Parrot_io_flush(interp, Parrot_io_STDOUT(interp));
-    Parrot_io_flush(interp, Parrot_io_STDERR(interp));
+    if (!PMC_IS_NULL(Parrot_io_STDOUT(interp)))
+        Parrot_io_flush(interp, Parrot_io_STDOUT(interp));
+    if (use_perr)
+        Parrot_io_flush(interp, Parrot_io_STDERR(interp));
 
     if (interp->pdb) {
         Interp * interpdeb = interp->pdb->debugger;
@@ -120,7 +123,12 @@
     }
 
     if (Parrot_str_not_equal(interp, message, CONST_STRING(interp, ""))) {
-        Parrot_io_eprintf(interp, "%S\n", message);
+        if (use_perr)
+            Parrot_io_eprintf(interp, "%S\n", message);
+        else {
+            char * const msg = Parrot_str_to_cstring(interp, message);
+            fprintf(stderr, "%s\n", msg);
+        }
 
         /* caution against output swap (with PDB_backtrace) */
         fflush(stderr);