diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-01-21 10:00:49 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-01-21 13:36:01 +0800 |
| commit | 2ad0e66f61e8f8488cff208f8bb7f5127ec9f813 (patch) | |
| tree | aa676b143507346dbde4998bdd38f8e375387cb6 | |
| parent | 6acda62401f17924b7004e25d038533e282903a1 (diff) | |
| download | talos-petitboot-2ad0e66f61e8f8488cff208f8bb7f5127ec9f813.tar.gz talos-petitboot-2ad0e66f61e8f8488cff208f8bb7f5127ec9f813.zip | |
lib/process: Add helper for check process clean exit
We have a few incorrect checks for the exit status of a process; this
change adds a helper with the correct WIFEXITED && WEXITSTATUS==0 logic.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
| -rw-r--r-- | discover/paths.c | 4 | ||||
| -rw-r--r-- | lib/pb-config/storage-powerpc-nvram.c | 6 | ||||
| -rw-r--r-- | lib/process/process.c | 6 | ||||
| -rw-r--r-- | lib/process/process.h | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/discover/paths.c b/discover/paths.c index 58fbffd..54774cf 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -86,7 +86,7 @@ static void load_url_process_exit(struct process *process) if (result->status == LOAD_CANCELLED) { load_url_result_cleanup_local(result); - } else if (process->exit_status == 0) { + } else if (process_exit_ok(process)) { result->status = LOAD_OK; } else { result->status = LOAD_ERROR; @@ -131,7 +131,7 @@ static void load_process_to_local_file(struct load_task *task, task->result->status = rc ? LOAD_ERROR : LOAD_ASYNC; } else { rc = process_run_sync(task->process); - if (rc || WEXITSTATUS(task->process->exit_status)) + if (rc || !process_exit_ok(task->process)) task->result->status = LOAD_ERROR; else task->result->status = LOAD_OK; diff --git a/lib/pb-config/storage-powerpc-nvram.c b/lib/pb-config/storage-powerpc-nvram.c index 42de598..4b4b878 100644 --- a/lib/pb-config/storage-powerpc-nvram.c +++ b/lib/pb-config/storage-powerpc-nvram.c @@ -137,8 +137,7 @@ static int parse_nvram(struct powerpc_nvram_storage *nv) rc = process_run_sync(process); - if (rc || !WIFEXITED(process->exit_status) - || WEXITSTATUS(process->exit_status)) { + if (rc || !process_exit_ok(process)) { fprintf(stderr, "nvram process returned " "non-zero exit status\n"); rc = -1; @@ -183,8 +182,7 @@ static int write_nvram(struct powerpc_nvram_storage *nv) talloc_free(paramstr); - if (rc || !WIFEXITED(process->exit_status) - || WEXITSTATUS(process->exit_status)) { + if (rc || !process_exit_ok(process)) { rc = -1; pb_log("nvram update process returned " "non-zero exit status\n"); diff --git a/lib/process/process.c b/lib/process/process.c index 3c81b29..86c7fbb 100644 --- a/lib/process/process.c +++ b/lib/process/process.c @@ -447,3 +447,9 @@ int process_run_simple(void *ctx, const char *name, ...) return rc; } + +bool process_exit_ok(struct process *process) +{ + return WIFEXITED(process->exit_status) && + WEXITSTATUS(process->exit_status) == 0; +} diff --git a/lib/process/process.h b/lib/process/process.h index ae7fe32..f75f197 100644 --- a/lib/process/process.h +++ b/lib/process/process.h @@ -74,4 +74,9 @@ int process_run_simple(void *ctx, const char *name, ...) int process_run_async(struct process *process); void process_stop_async(struct process *process); + +/* helper function to determine if a process exited cleanly, with a non-zero + * exit status */ +bool process_exit_ok(struct process *process); + #endif /* PROCESS_H */ |
