summaryrefslogtreecommitdiff
path: root/src/journal/cat.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-02-26 15:41:38 +0100
committerLennart Poettering <lennart@poettering.net>2018-02-28 10:00:50 +0100
commite7685a77b41bbd1b8289aeaf75fccaf4bb68a361 (patch)
tree2a2942015d0168dced4458652d0bd2d79d0f1c99 /src/journal/cat.c
parentc7f9a8d2705ad4d18d1ca43f3a8625575f1186e5 (diff)
downloadsystemd-e7685a77b41bbd1b8289aeaf75fccaf4bb68a361.tar.gz
util: add new safe_close_above_stdio() wrapper
At various places we only want to close fds if they are not stdin/stdout/stderr, i.e. fds 0, 1, 2. Let's add a unified helper call for that, and port everything over.
Diffstat (limited to 'src/journal/cat.c')
-rw-r--r--src/journal/cat.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c
index b2f9ed5010..c87a149a4c 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -141,9 +141,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (fd >= 3)
- safe_close(fd);
- fd = -1;
+ fd = safe_close_above_stdio(fd);
if (argc <= optind)
(void) execl("/bin/cat", "/bin/cat", NULL);