chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Removed utmp bits. elogind does not support utmp-wtmp.
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index bc2d0372c86983d70b622745af8ed79c174ec469..de30de9e75e255a63d5779df7190731e57288991 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-21,17
+21,20
@@
#include <fcntl.h>
#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <sys/prctl.h>
#include <string.h>
#include <sys/prctl.h>
+#include <unistd.h>
+#include "copy.h"
+#include "fd-util.h"
+#include "locale-util.h"
+#include "macro.h"
#include "pager.h"
#include "pager.h"
-#include "util.h"
#include "process-util.h"
#include "process-util.h"
-#include "macro.h"
-#include "terminal-util.h"
#include "signal-util.h"
#include "signal-util.h"
-#include "copy.h"
+#include "string-util.h"
+#include "terminal-util.h"
+#include "util.h"
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
@@
-150,8
+153,13
@@
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);