From 792ca745e77f8ae6ea0c9a1494a3154bb1a95318 Mon Sep 17 00:00:00 2001 From: YeongJong Lee Date: Sun, 25 Jun 2017 08:54:30 +0100 Subject: [PATCH] Fix build warning Summary: Add some error log Reviewers: ajwillia.ms Reviewed By: ajwillia.ms Differential Revision: https://phab.enlightenment.org/D4917 --- src/bin/edi_build_main.c | 3 ++- src/bin/edi_consolepanel.c | 4 +++- src/bin/edi_debugpanel.c | 6 +++--- src/lib/edi_build_provider_cmake.c | 9 ++++++--- src/lib/edi_build_provider_make.c | 15 ++++++++++----- src/lib/edi_build_provider_python.c | 3 ++- src/lib/edi_create.c | 4 +++- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/bin/edi_build_main.c b/src/bin/edi_build_main.c index 8fade98..b3230ab 100644 --- a/src/bin/edi_build_main.c +++ b/src/bin/edi_build_main.c @@ -154,7 +154,8 @@ main(int argc, char **argv) goto end; } - getcwd(path, PATH_MAX); + if (!getcwd(path, PATH_MAX)) + goto end; edi_project_set(path); if (!edi_builder_can_build()) diff --git a/src/bin/edi_consolepanel.c b/src/bin/edi_consolepanel.c index 45541b6..6a90400 100644 --- a/src/bin/edi_consolepanel.c +++ b/src/bin/edi_consolepanel.c @@ -228,7 +228,9 @@ _edi_test_line_parse_suite(const char *path) pathlength = strlen(path); snprintf(logfile, pathlength + 4 + 1, "%s.log", path); - realpath(logfile, logpath); + if (!realpath(logfile, logpath)) + ERR("Log file not found: %s", logfile); + if (_current_test_dir) eina_stringshare_del(_current_test_dir); _current_test_dir = eina_stringshare_add(dirname(logpath)); diff --git a/src/bin/edi_debugpanel.c b/src/bin/edi_debugpanel.c index fd3331c..f074ed3 100644 --- a/src/bin/edi_debugpanel.c +++ b/src/bin/edi_debugpanel.c @@ -207,8 +207,9 @@ _edi_debug_process_id(int *state) snprintf(path, sizeof(path), "/proc/%d/cmdline", pid); f = fopen(path, "r"); if (!f) continue; - fgets(buf, sizeof(buf), f); + p = fgets(buf, sizeof(buf), f); fclose(f); + if (!p) continue; temp_name = ecore_file_file_get(buf); if (!strcmp(temp_name, program_name)) { @@ -220,8 +221,7 @@ _edi_debug_process_id(int *state) if (f) { count = 0; - fgets(buf, sizeof(buf), f); - p = buf; + p = fgets(buf, sizeof(buf), f); while (*p++ != '\0') { if (p[0] == ' ') { count++; p++; } diff --git a/src/lib/edi_build_provider_cmake.c b/src/lib/edi_build_provider_cmake.c index 3bee684..37b97a1 100644 --- a/src/lib/edi_build_provider_cmake.c +++ b/src/lib/edi_build_provider_cmake.c @@ -37,7 +37,8 @@ _cmake_file_hidden_is(const char *file) static void _cmake_build(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("mkdir -p build && cd build && cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 .. && make && cd ..", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR | @@ -47,7 +48,8 @@ _cmake_build(void) static void _cmake_test(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("env CK_VERBOSITY=verbose make 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); @@ -56,7 +58,8 @@ _cmake_test(void) static void _cmake_clean(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("make clean", 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); diff --git a/src/lib/edi_build_provider_make.c b/src/lib/edi_build_provider_make.c index 8870828..82aaa82 100644 --- a/src/lib/edi_build_provider_make.c +++ b/src/lib/edi_build_provider_make.c @@ -44,7 +44,8 @@ _make_file_hidden_is(const char *file) static void _make_build_make(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run(BEAR_COMMAND MAKE_COMMAND, 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); @@ -53,7 +54,8 @@ _make_build_make(void) static void _make_build_configure(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("./configure && " BEAR_COMMAND MAKE_COMMAND, ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR | @@ -63,7 +65,8 @@ _make_build_configure(void) static void _make_build_autogen(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("./autogen.sh && " BEAR_COMMAND MAKE_COMMAND, ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR | @@ -84,7 +87,8 @@ _make_build(void) static void _make_test(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("env CK_VERBOSITY=verbose make 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); @@ -93,7 +97,8 @@ _make_test(void) static void _make_clean(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) !=0) + ERR("Could not chdir"); ecore_exe_pipe_run("make clean", 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); diff --git a/src/lib/edi_build_provider_python.c b/src/lib/edi_build_provider_python.c index a5b36e5..bc46be2 100644 --- a/src/lib/edi_build_provider_python.c +++ b/src/lib/edi_build_provider_python.c @@ -44,7 +44,8 @@ _python_file_hidden_is(const char *file) static void _python_test(void) { - chdir(edi_project_get()); + if (chdir(edi_project_get()) != 0) + ERR("Could not chdir"); ecore_exe_pipe_run("python -m unittest", 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); diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c index ec408e4..fe0df4d 100644 --- a/src/lib/edi_create.c +++ b/src/lib/edi_create.c @@ -160,7 +160,9 @@ _edi_create_filter_file_done(void *data, int type EINA_UNUSED, void *event EINA_ handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _edi_create_project_done, data); create->handler = handler; - chdir(create->path); + if (chdir(create->path) != 0) + ERR("Could not chdir"); + ecore_exe_run("sh -c 'git init && git add .'", data); return ECORE_CALLBACK_PASS_ON;