X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=de30de9e75e255a63d5779df7190731e57288991;hb=bccdfb431a266e7671d518fd5a42362a5ce724c9;hp=bc2d0372c86983d70b622745af8ed79c174ec469;hpb=d2338db3145922b1dfcb3b458e5bce2568a9347a;p=elogind.git diff --git a/src/shared/pager.c b/src/shared/pager.c index bc2d0372c..de30de9e7 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -21,17 +21,20 @@ #include #include -#include #include #include +#include +#include "copy.h" +#include "fd-util.h" +#include "locale-util.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" +#include "util.h" static pid_t pager_pid = 0; @@ -150,8 +153,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);