diff options
Diffstat (limited to 'lib')
| -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 |
3 files changed, 13 insertions, 4 deletions
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 */ |
