From 4ce15bf491bf119c67a3469b4a4bbee42f0457e1 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 12 May 2015 07:22:57 +0000 Subject: vm_dump.c: statement for crash report log * vm_dump.c (preface_dump): move the statement to include crash report log file from REPORTBUG_MSG in error.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 3 --- vm_dump.c | 11 ++++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/error.c b/error.c index 9d31975c8d..bb7cb1c4af 100644 --- a/error.c +++ b/error.c @@ -47,9 +47,6 @@ static const char REPORTBUG_MSG[] = " or extension libraries.\n" \ "Bug reports are welcome.\n" \ "" -#if defined __APPLE__ - "Don't forget to include the above Crash Report log file.\n" -#endif "For details: http://www.ruby-lang.org/bugreport.html\n\n" \ ; diff --git a/vm_dump.c b/vm_dump.c index 7766c27296..2c920b51d7 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -949,6 +949,7 @@ preface_dump(void) " * ~/Library/Logs/DiagnosticReports\n" " * /Library/Logs/DiagnosticReports\n" " for more details.\n" + "Don't forget to include the above Crash Report log file in bug reports.\n" "\n"; const char *const endmsg = msg + sizeof(msg) - 1; const char *p = msg; @@ -959,18 +960,14 @@ preface_dump(void) if (isatty(fileno(stderr))) { const char *e = strchr(p, '\n'); const int w = (int)(e - p); - fputs(RED, stderr); - fwrite(p, 1, w, stderr); - fputs(RESET, stderr); - fputc('\n', stderr); - while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1) { + do { int i = (int)(e - p); - fputs(GREEN, stderr); + fputs(*p == ' ' ? GREEN : RED, stderr); fwrite(p, 1, e - p, stderr); for (; i < w; ++i) fputc(' ', stderr); fputs(RESET, stderr); fputc('\n', stderr); - } + } while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1); } fwrite(p, 1, endmsg - p, stderr); #endif -- cgit v1.2.3