-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/prctl.h>
#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 "strv.h"
#include "terminal-util.h"
-#include "util.h"
static pid_t pager_pid = 0;
_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)
pager = getenv("PAGER");
/* If the pager is explicitly turned off, honour it */
- if (pager && (pager[0] == 0 || streq(pager, "cat")))
+ if (pager && STR_IN_SET(pager, "", "cat"))
return 0;
/* Determine and cache number of columns before we spawn the
return;
/* Inform pager that we are done */
-#if defined(__GLIBC__)
+#ifdef __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
+ safe_fclose(stdout);
+ safe_fclose(stderr);
+#endif // __GLIBC__
(void) kill(pager_pid, SIGCONT);
(void) wait_for_terminate(pager_pid, NULL);