From 023127bf6f76cd173e9a06d1aee0b5bc5d294ef9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jan 2018 16:46:26 -0500 Subject: [PATCH] quicklaunch: return child pid from elm_quicklaunch_fork() on success --- src/lib/elementary/elm_general.h | 2 +- src/lib/elementary/elm_main.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h index 5696f3e78a..a8b63d7494 100644 --- a/src/lib/elementary/elm_general.h +++ b/src/lib/elementary/elm_general.h @@ -242,7 +242,7 @@ EAPI Eina_Bool efl_quicklaunch_prepare(int argc, char **argv, const char *cwd); /** * Exposed symbol used only by macros and should not be used by apps */ -EAPI Eina_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (*postfork_func) (void *data), void *postfork_data); +EAPI int elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (*postfork_func) (void *data), void *postfork_data); /** * Exposed symbol used only by macros and should not be used by apps diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 7819b11b0d..cc24c177de 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1086,7 +1086,7 @@ efl_quicklaunch_prepare(int argc, #endif } -EAPI Eina_Bool +EAPI int elm_quicklaunch_fork(int argc, char **argv, char *cwd, @@ -1104,11 +1104,11 @@ elm_quicklaunch_fork(int argc, WRN("No main function found."); child = fork(); - if (child > 0) return EINA_TRUE; + if (child > 0) return child; else if (child < 0) { perror("could not fork"); - return EINA_FALSE; + return 0; } setsid(); if (chdir(cwd) != 0) perror("could not chdir"); @@ -1123,11 +1123,11 @@ elm_quicklaunch_fork(int argc, INF("Main function found (legacy: %p, efl: %p)", qr_main, qre_main); child = fork(); - if (child > 0) return EINA_TRUE; + if (child > 0) return child; else if (child < 0) { perror("could not fork"); - return EINA_FALSE; + return 0; } if (postfork_func) postfork_func(postfork_data); @@ -1217,9 +1217,9 @@ elm_quicklaunch_fork(int argc, exit(ret); } - return EINA_TRUE; + return 1; #else - return EINA_FALSE; + return 0; (void)argc; (void)argv; (void)cwd;