commit 987391656f5d5fe97166f06ad71d48ceff67edf9
author Bart Van Assche <bvanassche@google.com> Mon Nov 14 16:54:03 2022 -0800
committer Bart Van Assche <bvanassche@google.com> Fri Nov 18 09:49:43 2022 -0800
tree 252c8b208faabb544c42296f16fd75d5ffe52609
parent c8f34254b82e0746c1f17cc64c58b3584c4a4f9d

init: Introduce RequiresConsole()

Prepare for adding more code in the parent process that depends on
whether or not a console is required.

Bug: 213617178
Change-Id: I066ede32fcd4ce09d06be23158f3c1970064a697
Signed-off-by: Bart Van Assche <bvanassche@google.com>

init/service_utils.cpp

diff --git a/init/service_utils.cpp b/init/service_utils.cpp
index 52e6615..16eab9e 100644
--- a/init/service_utils.cpp
+++ b/init/service_utils.cpp
@@ -240,7 +240,7 @@
         }
     }
 
-    if (!attr.console.empty()) {
+    if (RequiresConsole(attr)) {
         setsid();
         OpenConsole(attr.console);
     } else {

init/service_utils.h

diff --git a/init/service_utils.h b/init/service_utils.h
index 228ae2b..5af779c 100644
--- a/init/service_utils.h
+++ b/init/service_utils.h
@@ -95,6 +95,11 @@
     int priority;
     bool stdio_to_kmsg;
 };
+
+inline bool RequiresConsole(const ProcessAttributes& attr) {
+    return !attr.console.empty();
+}
+
 Result<void> SetProcessAttributes(const ProcessAttributes& attr);
 
 Result<void> WritePidToFiles(std::vector<std::string>* files);