luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio-launch-desktop: Only replace fds that point to the Journal

Browse Source 
If stdout is the Journal but stderr is not, then we probably only want
to redirect stdout, or vice versa.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-07-25 09:59:17 +01:00
parent 30c840a755
commit 94e05f7f28
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gio-launch-desktop.c
View File

@ -187,11 +187,16 @@ fail:
static void
set_up_journal (const char *argv1)
{
int stdout_is_journal;
int stderr_is_journal;
const char *identifier;
const char *slash;
int fd;
if (!_g_fd_is_journal (STDOUT_FILENO) && !_g_fd_is_journal (STDERR_FILENO))
stdout_is_journal = _g_fd_is_journal (STDOUT_FILENO);
stderr_is_journal = _g_fd_is_journal (STDERR_FILENO);
if (!stdout_is_journal && !stderr_is_journal)
return;
identifier = getenv ("GIO_LAUNCHED_DESKTOP_FILE");
@ -210,14 +215,14 @@ set_up_journal (const char *argv1)
if (fd < 0)
return;
if (dup2 (fd, STDOUT_FILENO) != STDOUT_FILENO)
if (stdout_is_journal && dup2 (fd, STDOUT_FILENO) != STDOUT_FILENO)
fprintf (stderr,
"gio-launch-desktop[%d]: Unable to redirect \"%s\" to Journal: %s",
getpid (),
identifier,
strerror (errno));
if (dup2 (fd, STDERR_FILENO) != STDERR_FILENO)
if (stderr_is_journal && dup2 (fd, STDERR_FILENO) != STDERR_FILENO)
fprintf (stderr,
"gio-launch-desktop[%d]: Unable to redirect \"%s\" to Journal: %s",
getpid (),