From 19c62faa48bbb493d36d3c2be15c79a2330a8696 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Fri, 9 Jun 2017 10:36:09 -0700 Subject: [PATCH] console: Fix error highlighting for builds Also avoid potential crash on non-gnu systems --- src/bin/edi_consolepanel.c | 2 ++ src/lib/edi_build_provider_make.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/edi_consolepanel.c b/src/bin/edi_consolepanel.c index 45541b6..286b801 100644 --- a/src/bin/edi_consolepanel.c +++ b/src/bin/edi_consolepanel.c @@ -91,6 +91,8 @@ _edi_consolepanel_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event) unsigned int length; line = (Elm_Code_Line *)event->info; + if (!line->data) + return; content = elm_code_line_text_get(line, &length); terminated = malloc(sizeof(char) * (length + 1)); diff --git a/src/lib/edi_build_provider_make.c b/src/lib/edi_build_provider_make.c index 8870828..85966f3 100644 --- a/src/lib/edi_build_provider_make.c +++ b/src/lib/edi_build_provider_make.c @@ -13,7 +13,7 @@ #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__) #define MAKE_COMMAND " gmake" #else - #define MAKE_COMMAND " make" + #define MAKE_COMMAND " make -w" #endif @@ -85,7 +85,7 @@ static void _make_test(void) { chdir(edi_project_get()); - ecore_exe_pipe_run("env CK_VERBOSITY=verbose make check", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | + ecore_exe_pipe_run("env CK_VERBOSITY=verbose" MAKE_COMMAND " check", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR | ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL); }