chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time: time_t is signed, and mktime() is happy to return negative time
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 789d20003b2d8aeca1ca532593a21cd089afe5c5..184a0f57846dcb520ed79cd6fec9adc93bcafa36 100644
(file)
--- 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.
/***
This file is part of systemd.
@@
-19,19
+17,27
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
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 <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <sys/prctl.h>
#include <string.h>
#include <sys/prctl.h>
+#include <unistd.h>
+#include "copy.h"
+#include "fd-util.h"
+#include "locale-util.h"
+#include "log.h"
+#include "macro.h"
#include "pager.h"
#include "pager.h"
-#include "util.h"
#include "process-util.h"
#include "process-util.h"
-#include "macro.h"
-#include "terminal-util.h"
#include "signal-util.h"
#include "signal-util.h"
-#include "copy.h"
+#include "string-util.h"
+#include "strv.h"
+#include "terminal-util.h"
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
@@
-47,23
+53,26
@@
noreturn static void pager_fallback(void) {
_exit(EXIT_SUCCESS);
}
_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;
_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 (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 */
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 0;
/* Determine and cache number of columns before we spawn the
@@
-150,13
+159,13
@@
void pager_close(void) {
return;
/* Inform pager that we are done */
return;
/* Inform pager that we are done */
-#if
defined(__GLIBC__)
+#if
def __GLIBC__
stdout = safe_fclose(stdout);
stderr = safe_fclose(stderr);
#else
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);
(void) kill(pager_pid, SIGCONT);
(void) wait_for_terminate(pager_pid, NULL);
@@
-167,8
+176,7
@@
bool pager_have(void) {
return pager_pid > 0;
}
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;
int show_man_page(const char *desc, bool null_stdio) {
const char *args[4] = { "man", NULL, NULL, NULL };
char *e = NULL;