X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=0e21065076e50cf0676fd85b52bf5886220a5928;hb=51e8372fb6cca277dc7afc6e83f48a1a2b6d4dbe;hp=bc2d0372c86983d70b622745af8ed79c174ec469;hpb=d2338db3145922b1dfcb3b458e5bce2568a9347a;p=elogind.git
diff --git a/src/shared/pager.c b/src/shared/pager.c
index bc2d0372c..0e2106507 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,19 +17,26 @@
along with systemd; If not, see .
***/
-#include
+#include
+#include
+#include
+#include
+#include
#include
-#include
#include
#include
+#include
+#include "copy.h"
+#include "fd-util.h"
+#include "locale-util.h"
+#include "log.h"
+#include "macro.h"
#include "pager.h"
-#include "util.h"
#include "process-util.h"
-#include "macro.h"
-#include "terminal-util.h"
#include "signal-util.h"
-#include "copy.h"
+#include "string-util.h"
+#include "terminal-util.h"
static pid_t pager_pid = 0;
@@ -150,8 +155,13 @@ void pager_close(void) {
return;
/* Inform pager that we are done */
+#if defined(__GLIBC__)
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);
@@ -162,8 +172,7 @@ bool pager_have(void) {
return pager_pid > 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int show_man_page(const char *desc, bool null_stdio) {
const char *args[4] = { "man", NULL, NULL, NULL };
char *e = NULL;