summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/journal/journalctl.c7
-rw-r--r--src/shared/pager.c22
-rw-r--r--src/shared/pager.h3
-rw-r--r--src/systemctl/systemctl.c5
4 files changed, 23 insertions, 14 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5185b4b398..d6f19e900a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -840,7 +840,6 @@ int main(int argc, char *argv[]) {
bool need_seek = false;
sd_id128_t previous_boot_id;
bool previous_boot_id_valid = false;
- bool have_pager;
unsigned n_shown = 0;
log_parse_environment();
@@ -984,7 +983,9 @@ int main(int argc, char *argv[]) {
}
on_tty();
- have_pager = !arg_no_pager && !arg_follow && pager_open();
+
+ if (!arg_no_pager && !arg_follow)
+ pager_open();
if (!arg_quiet) {
usec_t start, end;
@@ -1048,7 +1049,7 @@ int main(int argc, char *argv[]) {
flags =
arg_all * OUTPUT_SHOW_ALL |
- (!on_tty() || have_pager) * OUTPUT_FULL_WIDTH |
+ (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH |
on_tty() * OUTPUT_COLOR;
r = output_journal(stdout, j, arg_output, 0, flags);
diff --git a/src/shared/pager.c b/src/shared/pager.c
index 36b409c070..6799787e85 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -44,20 +44,21 @@ _noreturn_ static void pager_fallback(void) {
_exit(EXIT_SUCCESS);
}
-bool pager_open(void) {
+int pager_open(void) {
int fd[2];
const char *pager;
pid_t parent_pid;
+ int r;
if (pager_pid > 0)
- return false;
+ return 1;
if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
if (!*pager || streq(pager, "cat"))
- return false;
+ return 0;
if (isatty(STDOUT_FILENO) <= 0)
- return false;
+ return 0;
/* Determine and cache number of columns before we spawn the
* pager so that we get the value from the actual tty */
@@ -65,16 +66,17 @@ bool pager_open(void) {
if (pipe(fd) < 0) {
log_error("Failed to create pager pipe: %m");
- return false;
+ return -errno;
}
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
+ r = -errno;
log_error("Failed to fork pager: %m");
close_pipe(fd);
- return false;
+ return r;
}
/* In the child start the pager */
@@ -117,11 +119,11 @@ bool pager_open(void) {
/* Return in the parent */
if (dup2(fd[1], STDOUT_FILENO) < 0) {
log_error("Failed to duplicate pager pipe: %m");
- return false;
+ return -errno;
}
close_pipe(fd);
- return true;
+ return 1;
}
void pager_close(void) {
@@ -135,3 +137,7 @@ void pager_close(void) {
wait_for_terminate(pager_pid, NULL);
pager_pid = 0;
}
+
+bool pager_have(void) {
+ return pager_pid > 0;
+}
diff --git a/src/shared/pager.h b/src/shared/pager.h
index 0b4afc04b8..5e7b5ab91e 100644
--- a/src/shared/pager.h
+++ b/src/shared/pager.h
@@ -23,5 +23,6 @@
#include <stdbool.h>
-bool pager_open(void);
+int pager_open(void);
void pager_close(void);
+bool pager_have(void);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7d6a6a24f3..82c801e4d9 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2293,9 +2293,10 @@ static void print_status_info(UnitStatusInfo *i) {
if (i->id && arg_transport != TRANSPORT_SSH) {
int flags =
arg_all * OUTPUT_SHOW_ALL |
+ (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH |
+ on_tty() * OUTPUT_COLOR |
arg_follow * OUTPUT_FOLLOW |
- !arg_quiet * OUTPUT_WARN_CUTOFF |
- on_tty() * OUTPUT_COLOR;
+ !arg_quiet * OUTPUT_WARN_CUTOFF;
printf("\n");
show_journal_by_unit(stdout,