fix error message formatting. All tests pass now

parrot · Dec 4, 2010 · f6b62ed · f6b62ed
1 parent e1ced3e
commit f6b62ed
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main.c b/src/main.c
@@ -72,7 +72,8 @@ static void parseflags_minimal(
 static void print_parrot_string(
     Parrot_PMC interp,
     FILE *vector,
-    Parrot_String str);
+    Parrot_String str,
+    int newline);
 
 static void show_last_error_and_exit(Parrot_PMC interp);
 static void usage(ARGMOD(FILE *fp))
@@ -176,21 +177,21 @@ show_last_error_and_exit(Parrot_PMC interp)
         exit(EXIT_FAILURE);
     }
 
-    print_parrot_string(interp, stderr, errmsg);
-    print_parrot_string(interp, stderr, backtrace);
+    print_parrot_string(interp, stderr, errmsg, 1);
+    print_parrot_string(interp, stderr, backtrace, 0);
 
     exit(exit_code);
 }
 
 static void
-print_parrot_string(Parrot_PMC interp, FILE *vector, Parrot_String str)
+print_parrot_string(Parrot_PMC interp, FILE *vector, Parrot_String str, int newline)
 {
     char * msg_raw;
     if (!str)
         return;
     Parrot_api_string_export_ascii(interp, str, &msg_raw);
     if (msg_raw) {
-        fprintf(vector, "%s\n", msg_raw);
+        fprintf(vector, "%s%s", msg_raw, newline ? "\n" : "");
         Parrot_api_string_free_exported_ascii(interp, msg_raw);
     }
 }