X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=1fdf8ed689bb821475d0731575a853241b92003c;hb=9eaebafed6dec1c3b5d1307b37f1b03a19530527;hp=f2c34459aee65db7c8d2e72878df8fc1634ef3ef;hpb=da2587d5154e11d4e643e326793f3ce2cc48dee6;p=elogind.git
diff --git a/src/shared/pager.c b/src/shared/pager.c
index f2c34459a..1fdf8ed68 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,7 +17,11 @@
along with systemd; If not, see .
***/
-#include
+#include
+#include
+#include
+#include
+#include
#include
#include
#include
@@ -28,13 +30,13 @@
#include "copy.h"
#include "fd-util.h"
#include "locale-util.h"
+#include "log.h"
#include "macro.h"
#include "pager.h"
#include "process-util.h"
#include "signal-util.h"
#include "string-util.h"
#include "terminal-util.h"
-#include "util.h"
static pid_t pager_pid = 0;
@@ -50,16 +52,19 @@ noreturn static void pager_fallback(void) {
_exit(EXIT_SUCCESS);
}
-int pager_open(bool jump_to_end) {
+int pager_open(bool no_pager, bool jump_to_end) {
_cleanup_close_pair_ int fd[2] = { -1, -1 };
const char *pager;
pid_t parent_pid;
+ if (no_pager)
+ return 0;
+
if (pager_pid > 0)
return 1;
- if (!on_tty())
- return 0;
+ if (terminal_is_dumb())
+ return 0;
pager = getenv("SYSTEMD_PAGER");
if (!pager)
@@ -153,13 +158,8 @@ void pager_close(void) {
return;
/* Inform pager that we are done */
-#if defined(__GLIBC__)
stdout = safe_fclose(stdout);
stderr = safe_fclose(stderr);
-#else
- (void) safe_fclose(stdout);
- (void) safe_fclose(stderr);
-#endif // in musl-libc these are const
(void) kill(pager_pid, SIGCONT);
(void) wait_for_terminate(pager_pid, NULL);