summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-14 02:33:51 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-14 03:12:25 +0100
commit0a27cf3f32403f48059396cb43ad25d0a12ef64b (patch)
tree22a42034117c7135b9b811c966a40627d76f6fd0
parent46824d0e6b2aae8f503464368d02c1da992f56f1 (diff)
util: return exit status in wait_for_terminate_and_warn()
-rw-r--r--src/quotacheck.c2
-rw-r--r--src/util.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quotacheck.c b/src/quotacheck.c
index 55c2f0c6d6..da2da3b2e0 100644
--- a/src/quotacheck.c
+++ b/src/quotacheck.c
@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
_exit(1); /* Operational error */
}
- r = wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ r = wait_for_terminate_and_warn("quotacheck", pid) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
finish:
return r;
diff --git a/src/util.c b/src/util.c
index ee6217d64c..b2baa1ba29 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3616,7 +3616,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) {
if (status.si_code == CLD_EXITED) {
if (status.si_status != 0) {
log_warning("%s failed with error code %i.", name, status.si_status);
- return -EPROTO;
+ return status.si_status;
}
log_debug("%s succeeded.", name);