X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=1fdf8ed689bb821475d0731575a853241b92003c;hp=789d20003b2d8aeca1ca532593a21cd089afe5c5;hb=998c4d2d1020020695aa033199851674e8292146;hpb=7186c8d363ef93076d057dd6105ed309db24ebbf
diff --git a/src/shared/pager.c b/src/shared/pager.c
index 789d20003..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,19 +17,26 @@
along with systemd; If not, see .
***/
-#include
+#include
+#include
+#include
+#include
+#include
#include
-#include
#include
#include
+#include
+#include "copy.h"
+#include "fd-util.h"
+#include "locale-util.h"
+#include "log.h"
+#include "macro.h"
#include "pager.h"
-#include "util.h"
#include "process-util.h"
-#include "macro.h"
-#include "terminal-util.h"
#include "signal-util.h"
-#include "copy.h"
+#include "string-util.h"
+#include "terminal-util.h"
static pid_t pager_pid = 0;
@@ -47,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)
@@ -150,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);
@@ -167,8 +170,7 @@ bool pager_have(void) {
return pager_pid > 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int show_man_page(const char *desc, bool null_stdio) {
const char *args[4] = { "man", NULL, NULL, NULL };
char *e = NULL;