Return false from is_terminal_for_pgrp when not our controlling terminal

Author: bjorn3

src/exec/use_pty/parent.rs

@@ -105,7 +105,7 @@ pub(in crate::exec) fn exec_pty(
     // FIXME: Here's where we should intercept the IO streams if we want to implement IO logging.
     // FIXME: ogsudo creates pipes for the IO streams and uses events to read from the strams to
     // the pipes. Investigate why.
-    if !io::stdin().is_terminal_for_pgrp(parent_pgrp)? {
+    if !io::stdin().is_terminal_for_pgrp(parent_pgrp) {
         dev_info!("stdin is not a terminal, command will inherit it");
         if io::stdin().is_pipe() {
             exec_bg = true;
@@ -120,7 +120,7 @@ pub(in crate::exec) fn exec_pty(
         }
     }
 
-    if !io::stdout().is_terminal_for_pgrp(parent_pgrp)? {
+    if !io::stdout().is_terminal_for_pgrp(parent_pgrp) {
         dev_info!("stdout is not a terminal, command will inherit it");
         if io::stdout().is_pipe() {
             exec_bg = true;
@@ -129,7 +129,7 @@ pub(in crate::exec) fn exec_pty(
         command.stdout(Stdio::inherit());
     }
 
-    if !io::stderr().is_terminal_for_pgrp(parent_pgrp)? {
+    if !io::stderr().is_terminal_for_pgrp(parent_pgrp) {
         dev_info!("stderr is not a terminal, command will inherit it");
         command.stderr(Stdio::inherit());
     }

src/system/term/mod.rs

@@ -176,7 +176,7 @@ mod sealed {
 }
 
 pub(crate) trait Terminal: sealed::Sealed {
-    fn is_terminal_for_pgrp(&self, pgrp: ProcessId) -> io::Result<bool>;
+    fn is_terminal_for_pgrp(&self, pgrp: ProcessId) -> bool;
     fn tcgetpgrp(&self) -> io::Result<ProcessId>
     where
         Self: sealed::SafeTty;
@@ -196,14 +196,16 @@ pub(crate) trait Terminal: sealed::Sealed {
 impl<F: AsFd> Terminal for F {
     /// Check if the foreground process group ID associated with this terminal is `pgrp`.
     /// Returns false if this is not actually a terminal.
-    fn is_terminal_for_pgrp(&self, pgrp: ProcessId) -> io::Result<bool> {
+    fn is_terminal_for_pgrp(&self, pgrp: ProcessId) -> bool {
         if !safe_isatty(self.as_fd()) {
-            return Ok(false);
+            return false;
         }
 
         // SAFETY: tcgetpgrp cannot cause UB
-        let id = cerr(unsafe { libc::tcgetpgrp(self.as_fd().as_raw_fd()) })?;
-        Ok(ProcessId::new(id) == pgrp)
+        let Ok(id) = cerr(unsafe { libc::tcgetpgrp(self.as_fd().as_raw_fd()) }) else {
+            return false;
+        };
+        ProcessId::new(id) == pgrp
     }
     /// Get the foreground process group ID associated with this terminal.
     fn tcgetpgrp(&self) -> io::Result<ProcessId> {