]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
add O_NOCTTY to a few open calls
authorRay Strode <rstrode@redhat.com>
Thu, 24 May 2007 00:05:51 +0000 (20:05 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 24 May 2007 00:05:51 +0000 (20:05 -0400)
src/ply-terminal-session.c

index ca5c288f3c418120bb49133c21d32999ba9a07a2..ffc51fa0d72818f6d7bfde47e07efb2a8c672fcd 100644 (file)
@@ -182,7 +182,7 @@ ply_terminal_session_redirect_console (ply_terminal_session_t *session)
 
   assert (terminal_name != NULL);
 
-  fd = open (terminal_name, O_RDWR); 
+  fd = open (terminal_name, O_RDWR | O_NOCTTY); 
 
   if (fd < 0)
     return false;
@@ -208,9 +208,9 @@ ply_terminal_session_unredirect_console (ply_terminal_session_t *session)
   assert (session != NULL);
   assert (session->console_is_redirected);
 
-  fd = open ("/dev/console", O_RDWR);
-
-  ioctl (fd, TIOCCONS);
+  fd = open ("/dev/console", O_RDWR | O_NOCTTY);
+  if (fd >= 0)
+    ioctl (fd, TIOCCONS);
 
   session->console_is_redirected = false;
 }
@@ -336,7 +336,7 @@ ply_terminal_session_start_logging (ply_terminal_session_t *session)
                            (ply_event_handler_t)
                            ply_terminal_session_on_hangup, session);
 
-  ply_logger_set_output_fd (session->logger, open ("/dev/tty1", O_WRONLY));
+  ply_logger_set_output_fd (session->logger, open ("/dev/tty1", O_WRONLY | O_NOCTTY));
   ply_logger_flush (session->logger);
 }