diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-05-31 07:15:22 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:58 +0200 |
| commit | 1a37e9a3f3cb37cc8cb3850592b8ee63729e6d4b (patch) | |
| tree | 938835b225f8e882b47120cf17bf9d53182c282a /src/shared/pager.c | |
| parent | 8331cb6e143dc261fd22af9a2a679196822326a9 (diff) | |
Prep v230: Apply missing upstream fixes and updates (7/8) src/shared.
Diffstat (limited to 'src/shared/pager.c')
| -rw-r--r-- | src/shared/pager.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/shared/pager.c b/src/shared/pager.c index 8d60f8a7a..82bca83f5 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -64,7 +64,7 @@ int pager_open(bool no_pager, bool jump_to_end) { return 1; if (!on_tty()) - return 0; + return 0; pager = getenv("SYSTEMD_PAGER"); if (!pager) @@ -158,13 +158,8 @@ 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); |