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

xdg-app-helper: Add -S fd support 

This just takes an fd and ensures it is passed down to the pid 1 of
the sandbox. This can be uses do sync something to the the lifetime of
the app.
tingping/wmclass
Alexander Larsson 2015-05-07 17:38:36 +02:00
parent 16251bbb63
commit 3835a4d8ab
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xdg-app-helper.c
View File

@ -1274,11 +1274,17 @@ block_sigchild (void)
static int
close_extra_fds (void *data, int fd)
{
int event_fd = (int) (ssize_t) (data);
int *extra_fds = (int *)data;
int i;
if (fd >= 3 && fd != event_fd)
close (fd);
for (i = 0; extra_fds[i] != -1; i++)
if (fd == extra_fds[i])
return 0;
if (fd <= 2)
return 0;
close (fd);
return 0;
}
@ -1298,10 +1304,11 @@ monitor_child (int event_fd)
sigset_t mask;
struct pollfd fds[2];
struct signalfd_siginfo fdsi;
int dont_close[] = { event_fd, -1 };
/* Close all extra fds in the monitoring process.
Any passed in fds have been passed on to the child anyway. */
fdwalk (close_extra_fds, (void *)(ssize_t)event_fd);
fdwalk (close_extra_fds, dont_close);
sigemptyset (&mask);
sigaddset (&mask, SIGCHLD);
@ -1467,6 +1474,8 @@ main (int argc,
int c, i;
pid_t pid;
int event_fd;
int sync_fd = -1;
char *endp;
/* Get the capabilities we need, drop root */
acquire_caps ();
@ -1475,7 +1484,7 @@ main (int argc,
if (prctl (PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0)
die_with_error ("prctl(PR_SET_NO_NEW_CAPS) failed");
while ((c = getopt (argc, argv, "+inWweEsfFHa:m:b:p:x:ly:d:D:v:I:g")) >= 0)
while ((c = getopt (argc, argv, "+inWweEsfFHa:m:b:p:x:ly:d:D:v:I:gS:")) >= 0)
{
switch (c)
{
@ -1566,6 +1575,12 @@ main (int argc,
share_shm = TRUE;
break;
case 'S':
sync_fd = strtol (optarg, &endp, 10);
if (endp == optarg || *endp != 0)
die ("Invalid fd argument");
break;
case 'v':
var_path = optarg;
break;
@ -1870,6 +1885,9 @@ main (int argc,
{
__debug__(("launch executable %s\n", args[0]));
if (sync_fd != -1)
close (sync_fd);
if (execvp (args[0], args) == -1)
die_with_error ("execvp %s", args[0]);
return 0;
@ -1877,7 +1895,10 @@ main (int argc,
/* Close all extra fds in pid 1.
Any passed in fds have been passed on to the child anyway. */
fdwalk (close_extra_fds, (void *)(ssize_t)event_fd);
{
int dont_close[] = { event_fd, sync_fd, -1 };
fdwalk (close_extra_fds, dont_close);
}
strncpy (argv[0], "xdg-app-init\0", strlen (argv[0]));
return do_init (event_fd, pid);