marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builder_host_spawnv: Support G_SUBPROCESS_FLAGS_STDIN_INHERIT 

We used to always inherit stdin when calling to the host, but only
do so when requested.

Closes: #195
Approved by: alexlarsson
auto
Alexander Larsson 2018-08-07 13:40:40 +02:00 committed by Atomic Bot
parent 42d4a14af4
commit 12c29dc5ab
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/builder-utils.c
View File

@ -1618,7 +1618,9 @@ builder_host_spawnv (GFile *dir,
guint sigterm_id = 0, sigint_id = 0;
g_autofree gchar *commandline = NULL;
g_autoptr(GOutputStream) out = NULL;
glnx_fd_close int blocking_stdin_fd = -1;
int pipefd[2];
int stdin_fd;
int i;
commandline = flatpak_quote_argv ((const char **) argv);
@ -1643,7 +1645,20 @@ builder_host_spawnv (GFile *dir,
host_command_exited_cb,
&data, NULL);
stdin_handle = g_unix_fd_list_append (fd_list, 0, error);
if ((flags & G_SUBPROCESS_FLAGS_STDIN_INHERIT) != 0)
stdin_fd = 0;
else
{
blocking_stdin_fd = open ("/dev/null", O_RDONLY| O_CLOEXEC);
if (blocking_stdin_fd == -1)
{
glnx_set_error_from_errno (error);
return FALSE;
}
stdin_fd = blocking_stdin_fd;
}
stdin_handle = g_unix_fd_list_append (fd_list, stdin_fd, error);
if (stdin_handle == -1)
return FALSE;