[vte] pty: Do not pass G_SPAWN_CHILD_INHERITS_STDIN



commit b517d20379c7a665e897f925ca3ecb7b778364f2
Author: Christian Persch <chpe gnome org>
Date:   Fri Nov 25 23:15:46 2016 +0100

    pty: Do not pass G_SPAWN_CHILD_INHERITS_STDIN
    
    This makes no sense at all, since we redirect stdin to the PTY anyway.
    Fixes a FIXME!

 src/pty.cc    |    8 ++------
 src/vte.cc    |    3 ---
 src/vtegtk.cc |    2 --
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/src/pty.cc b/src/pty.cc
index b87838c..5fd1f16 100644
--- a/src/pty.cc
+++ b/src/pty.cc
@@ -1119,7 +1119,7 @@ vte_pty_spawn_async(VtePty *pty,
                     const char *working_directory,
                     char **argv,
                     char **envv,
-                    GSpawnFlags spawn_flags_,
+                    GSpawnFlags spawn_flags,
                     GSpawnChildSetupFunc child_setup,
                     gpointer child_setup_data,
                     GDestroyNotify child_setup_data_destroy,
@@ -1134,13 +1134,9 @@ vte_pty_spawn_async(VtePty *pty,
         g_return_if_fail(cancellable == nullptr || G_IS_CANCELLABLE (cancellable));
         g_return_if_fail(callback);
 
-        /* FIXMEchpe: is this flag needed */
-        guint spawn_flags = (guint)spawn_flags_;
-        spawn_flags |= G_SPAWN_CHILD_INHERITS_STDIN;
-
         auto data = async_spawn_data_new(pty,
                                          working_directory, argv, envv,
-                                         GSpawnFlags(spawn_flags),
+                                         spawn_flags,
                                          child_setup, child_setup_data, child_setup_data_destroy,
                                          timeout);
 
diff --git a/src/vte.cc b/src/vte.cc
index c9d1160..70733a6 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -3369,9 +3369,6 @@ VteTerminalPrivate::spawn_sync(VtePtyFlags pty_flags,
         if (new_pty == nullptr)
                 return false;
 
-        /* FIXMEchpe: is this flag needed */
-        spawn_flags |= G_SPAWN_CHILD_INHERITS_STDIN;
-
         /* We do NOT support this flag. If you want to have some FD open in the child
          * process, simply use a child setup function that unsets the CLOEXEC flag
          * on that FD.
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index c6bc2d4..94f07ac 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -2446,8 +2446,6 @@ vte_terminal_spawn_async(VteTerminal *terminal,
         vte_terminal_set_pty(terminal, pty);
 
         guint spawn_flags = (guint)spawn_flags_;
-        /* FIXMEchpe: is this flag needed */
-        spawn_flags |= G_SPAWN_CHILD_INHERITS_STDIN;
 
         /* We do NOT support this flag. If you want to have some FD open in the child
          * process, simply use a child setup function that unsets the CLOEXEC flag


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]