shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

journal: cat: set JOURNAL_STREAM before exec-ing

Browse Source 
Make the behavior of systemd-cat match
that of core/execute.

Closes #25880
This commit is contained in:
Mike Yuan 2023-02-08 00:21:33 +08:00 committed by Luca Boccassi
parent 010c73c68e
commit 0688bea163
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/journal/cat.c
View File

@ -5,6 +5,7 @@
#include <getopt.h> #include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "sd-journal.h" #include "sd-journal.h"
@ -12,6 +13,7 @@
#include "alloc-util.h" #include "alloc-util.h"
#include "build.h" #include "build.h"
#include "fd-util.h" #include "fd-util.h"
#include "format-util.h"
#include "main-func.h" #include "main-func.h"
#include "parse-argument.h" #include "parse-argument.h"
#include "parse-util.h" #include "parse-util.h"
@ -151,8 +153,23 @@ static int run(int argc, char *argv[]) {
if (argc <= optind) if (argc <= optind)
(void) execl("/bin/cat", "/bin/cat", NULL); (void) execl("/bin/cat", "/bin/cat", NULL);
else else {
_cleanup_free_ char *s = NULL;
struct stat st;
if (fstat(STDERR_FILENO, &st) < 0)
return log_error_errno(errno,
"Failed to fstat(%s): %m",
FORMAT_PROC_FD_PATH(STDERR_FILENO));
if (asprintf(&s, DEV_FMT ":" INO_FMT, st.st_dev, st.st_ino) < 0)
return log_oom();
if (setenv("JOURNAL_STREAM", s, /* overwrite = */ true) < 0)
return log_error_errno(errno, "Failed to set environment variable JOURNAL_STREAM: %m");
(void) execvp(argv[optind], argv + optind); (void) execvp(argv[optind], argv + optind);
}
r = -errno; r = -errno;
/* Let's try to restore a working stderr, so we can print the error message */ /* Let's try to restore a working stderr, so we can print the error message */