chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consistently order cleanup attribute before type
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 6a85af33c475b6749911af3d6cf61e27acc6b649..002e3aa37356c7b0f556dd635bcacade31c7d502 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-32,32
+32,36
@@
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
-
_noreturn_
static void pager_fallback(void) {
+
noreturn
static void pager_fallback(void) {
ssize_t n;
ssize_t n;
+
do {
n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
} while (n > 0);
do {
n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
} while (n > 0);
+
if (n < 0) {
log_error("Internal pager failed: %m");
_exit(EXIT_FAILURE);
}
if (n < 0) {
log_error("Internal pager failed: %m");
_exit(EXIT_FAILURE);
}
+
_exit(EXIT_SUCCESS);
}
_exit(EXIT_SUCCESS);
}
-
void pager_open(voi
d) {
+
int pager_open(bool jump_to_en
d) {
int fd[2];
const char *pager;
pid_t parent_pid;
int fd[2];
const char *pager;
pid_t parent_pid;
+ int r;
if (pager_pid > 0)
if (pager_pid > 0)
- return;
+ return
1
;
if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
if (!*pager || streq(pager, "cat"))
if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
if (!*pager || streq(pager, "cat"))
- return;
+ return
0
;
- if (
isatty(STDOUT_FILENO) <= 0
)
- return;
+ if (
!on_tty()
)
+ return
0
;
/* Determine and cache number of columns before we spawn the
* pager so that we get the value from the actual tty */
/* Determine and cache number of columns before we spawn the
* pager so that we get the value from the actual tty */
@@
-65,25
+69,32
@@
void pager_open(void) {
if (pipe(fd) < 0) {
log_error("Failed to create pager pipe: %m");
if (pipe(fd) < 0) {
log_error("Failed to create pager pipe: %m");
- return;
+ return
-errno
;
}
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
}
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
+ r = -errno;
log_error("Failed to fork pager: %m");
log_error("Failed to fork pager: %m");
-
close_pipe
(fd);
- return;
+
safe_close_pair
(fd);
+ return
r
;
}
/* In the child start the pager */
if (pager_pid == 0) {
}
/* In the child start the pager */
if (pager_pid == 0) {
+ const char* less_opts;
dup2(fd[0], STDIN_FILENO);
dup2(fd[0], STDIN_FILENO);
-
close_pipe
(fd);
+
safe_close_pair
(fd);
- setenv("LESS", "FRSX", 0);
+ less_opts = getenv("SYSTEMD_LESS");
+ if (!less_opts)
+ less_opts = "FRSXMK";
+ if (jump_to_end)
+ less_opts = strappenda(less_opts, " +G");
+ setenv("LESS", less_opts, 1);
/* Make sure the pager goes away when the parent dies */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
/* Make sure the pager goes away when the parent dies */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
@@
-115,10
+126,13
@@
void pager_open(void) {
}
/* Return in the parent */
}
/* Return in the parent */
- if (dup2(fd[1], STDOUT_FILENO) < 0)
+ if (dup2(fd[1], STDOUT_FILENO) < 0)
{
log_error("Failed to duplicate pager pipe: %m");
log_error("Failed to duplicate pager pipe: %m");
+ return -errno;
+ }
- close_pipe(fd);
+ safe_close_pair(fd);
+ return 1;
}
void pager_close(void) {
}
void pager_close(void) {
@@
-132,3
+146,7
@@
void pager_close(void) {
wait_for_terminate(pager_pid, NULL);
pager_pid = 0;
}
wait_for_terminate(pager_pid, NULL);
pager_pid = 0;
}
+
+bool pager_have(void) {
+ return pager_pid > 0;
+}