diff options
| -rw-r--r-- | logwrapper/include/logwrap/logwrap.h | 5 | ||||
| -rw-r--r-- | logwrapper/logwrap.c | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/logwrapper/include/logwrap/logwrap.h b/logwrapper/include/logwrap/logwrap.h index 44523e3..2be8736 100644 --- a/logwrapper/include/logwrap/logwrap.h +++ b/logwrapper/include/logwrap/logwrap.h @@ -37,7 +37,8 @@ __BEGIN_DECLS * arguments as separate strings. argv does not need to be * NULL-terminated * status: the equivalent child status as populated by wait(status). This - * value is only valid when logwrap successfully completes + * value is only valid when logwrap successfully completes. If NULL + * the return value of the child will be the function's return value. * ignore_int_quit: set to true if you want to completely ignore SIGINT and * SIGQUIT while logwrap is running. This may force the end-user to * send a signal twice to signal the caller (once for the child, and @@ -47,6 +48,8 @@ __BEGIN_DECLS * Return value: * 0 when logwrap successfully run the child process and captured its status * -1 when an internal error occurred + * -ECHILD if status is NULL and the child didn't exit properly + * the return value of the child if it exited properly and status is NULL * */ int android_fork_execvp(int argc, char* argv[], int *status, bool ignore_int_quit, diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c index a04097d..a756eb3 100644 --- a/logwrapper/logwrap.c +++ b/logwrapper/logwrap.c @@ -155,12 +155,17 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid, if (WEXITSTATUS(status)) ALOG(LOG_INFO, "logwrapper", "%s terminated by exit(%d)", btag, WEXITSTATUS(status)); - } else if (WIFSIGNALED(status)) { - ALOG(LOG_INFO, "logwrapper", "%s terminated by signal %d", btag, - WTERMSIG(status)); - } else if (WIFSTOPPED(status)) { - ALOG(LOG_INFO, "logwrapper", "%s stopped by signal %d", btag, - WSTOPSIG(status)); + if (chld_sts == NULL) + rc = WEXITSTATUS(status); + } else { + if (chld_sts == NULL) + rc = -ECHILD; + if (WIFSIGNALED(status)) + ALOG(LOG_INFO, "logwrapper", "%s terminated by signal %d", btag, + WTERMSIG(status)); + else if (WIFSTOPPED(status)) + ALOG(LOG_INFO, "logwrapper", "%s stopped by signal %d", btag, + WSTOPSIG(status)); } if (chld_sts != NULL) *chld_sts = status; |