commit f2934de9c1b17cc95ad99cede1a54a20509bae5a
author Bart Van Assche <bvanassche@google.com> Mon Nov 21 18:08:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 21 18:08:35 2022 +0000
tree d1d7b4eaa8cae4b8209a287cea4cbfa68e75211e
parent 27630f0d0f92cc3e1ac7dd007fa13910007e2490
parent 987391656f5d5fe97166f06ad71d48ceff67edf9

Merge "init: Introduce RequiresConsole()"

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);