chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: merge pager_open_if_enabled() to the pager_open()
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 0e21065076e50cf0676fd85b52bf5886220a5928..8d60f8a7a10993614f26eecb8552c1b2ea48ff17 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-52,11
+52,14
@@
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;