chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pager: don't start pager if the terminal is explicitly set to TERM=dumb
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 0e21065076e50cf0676fd85b52bf5886220a5928..1fdf8ed689bb821475d0731575a853241b92003c 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-52,16
+52,19
@@
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("SYSTEMD_PAGER");
if (!pager)
@@
-155,13
+158,8
@@
void pager_close(void) {
return;
/* Inform pager that we are done */
return;
/* Inform pager that we are done */
-#if defined(__GLIBC__)
stdout = safe_fclose(stdout);
stderr = safe_fclose(stderr);
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);
(void) kill(pager_pid, SIGCONT);
(void) wait_for_terminate(pager_pid, NULL);