core: inherit TERM from PID 1 for all services started on /dev/console

[elogind.git] / src / shared / pager.c

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 82bca83f576ff30b4bceccbde4312d404ef90c2a..bb3e17fee2af206041162b7f0297c9cde520a461 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -63,7 +63,7 @@ int pager_open(bool no_pager, bool jump_to_end) {
         if (pager_pid > 0)
                 return 1;
 
-        if (!on_tty())
+        if (terminal_is_dumb())
                 return 0;
 
         pager = getenv("SYSTEMD_PAGER");
@@ -158,8 +158,13 @@ void pager_close(void) {
                 return;
 
         /* Inform pager that we are done */
+#ifdef __GLIBC__
         stdout = safe_fclose(stdout);
         stderr = safe_fclose(stderr);
+#else
+        safe_fclose(stdout);
+        safe_fclose(stderr);
+#endif // __GLIBC__
 
         (void) kill(pager_pid, SIGCONT);
         (void) wait_for_terminate(pager_pid, NULL);