commit f31f2d787116120b2b16e9aa9a64fab171c0d954
author Ryan Beasley <beasleyr@vmware.com> Thu Jul 02 10:35:31 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 02 10:36:40 2020 -0700
tree 78b912e0231a756237be3b34d0f1109b59653a71
parent 6e2b1a09c8529c78fbc69f6b65628d2f00dff7ab

fixup! Gracefully handle the lack of subreaper support in Linux.

This is a tiny amendment to @philwo's patch for #11637 which fixes up `prctl` error handling.

Resolves #11637

Closes #11698.

PiperOrigin-RevId: 319425717

src/main/tools/process-wrapper-options.cc

diff --git a/src/main/tools/process-wrapper-options.cc b/src/main/tools/process-wrapper-options.cc
index 8f6a782..ab6382c 100644
--- a/src/main/tools/process-wrapper-options.cc
+++ b/src/main/tools/process-wrapper-options.cc
@@ -127,7 +127,8 @@
       case 'W':
 #if defined(__linux__)
         unsigned long result;  // NOLINT(runtime/int) - interface requires long
-        if (prctl(PR_GET_CHILD_SUBREAPER, &result, 0, 0, 0) == EINVAL) {
+        if (prctl(PR_GET_CHILD_SUBREAPER, &result, 0, 0, 0) == -1 &&
+            errno == EINVAL) {
           fprintf(stderr,
                   "warning: The \"wait for subprocesses\" feature requires "
                   "Linux kernel version 3.4 or later.\n");