From 9f36aa6846d795c39d453726b868dfb6e3c5b78d Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 10 Apr 2012 19:32:48 +0200 Subject: move pager.[ch] to shared/ --- Makefile.am | 13 ++---- src/pager.c | 134 ----------------------------------------------------- src/pager.h | 28 ----------- src/shared/pager.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/shared/pager.h | 28 +++++++++++ 5 files changed, 167 insertions(+), 170 deletions(-) delete mode 100644 src/pager.c delete mode 100644 src/pager.h create mode 100644 src/shared/pager.c create mode 100644 src/shared/pager.h diff --git a/Makefile.am b/Makefile.am index 1172125d9..a8f2150bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -579,7 +579,9 @@ libsystemd_basic_la_SOURCES = \ src/shared/utf8.c \ src/shared/utf8.h \ src/shared/cgroup-util.c \ - src/shared/cgroup-util.h + src/shared/cgroup-util.h \ + src/shared/pager.c \ + src/shared/pager.h libsystemd_basic_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -755,7 +757,6 @@ libsystemd_core_la_SOURCES = \ src/shutdownd.h \ src/umount.h \ src/ask-password-api.h \ - src/pager.h \ src/sysfs-show.h \ src/polkit.h \ src/dbus-loop.h \ @@ -1055,7 +1056,6 @@ systemctl_SOURCES = \ src/path-lookup.c \ src/cgroup-show.c \ src/unit-name.c \ - src/pager.c \ src/install.c \ src/spawn-agent.c \ src/logs-show.c @@ -1098,8 +1098,7 @@ systemd_reply_password_LDADD = \ # ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ src/cgls.c \ - src/cgroup-show.c \ - src/pager.c + src/cgroup-show.c systemd_cgls_LDADD = \ libsystemd-basic.la @@ -1930,7 +1929,6 @@ systemd_cat_LDADD = \ journalctl_SOURCES = \ src/journal/journalctl.c \ - src/pager.c \ src/logs-show.c journalctl_LDADD = \ @@ -2536,8 +2534,7 @@ loginctl_SOURCES = \ src/login/loginctl.c \ src/login/sysfs-show.c \ src/dbus-common.c \ - src/cgroup-show.c \ - src/pager.c + src/cgroup-show.c loginctl_CFLAGS = \ $(AM_CFLAGS) \ diff --git a/src/pager.c b/src/pager.c deleted file mode 100644 index 3fc81820e..000000000 --- a/src/pager.c +++ /dev/null @@ -1,134 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include -#include - -#include "pager.h" -#include "util.h" -#include "macro.h" - -static pid_t pager_pid = 0; - -_noreturn_ static void pager_fallback(void) { - ssize_t n; - do { - n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0); - } while (n > 0); - if (n < 0) { - log_error("Internal pager failed: %m"); - _exit(EXIT_FAILURE); - } - _exit(EXIT_SUCCESS); -} - -void pager_open(void) { - int fd[2]; - const char *pager; - pid_t parent_pid; - - if (pager_pid > 0) - return; - - if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER"))) - if (!*pager || streq(pager, "cat")) - return; - - if (isatty(STDOUT_FILENO) <= 0) - return; - - /* Determine and cache number of columns before we spawn the - * pager so that we get the value from the actual tty */ - columns(); - - if (pipe(fd) < 0) { - log_error("Failed to create pager pipe: %m"); - return; - } - - parent_pid = getpid(); - - pager_pid = fork(); - if (pager_pid < 0) { - log_error("Failed to fork pager: %m"); - close_pipe(fd); - return; - } - - /* In the child start the pager */ - if (pager_pid == 0) { - - dup2(fd[0], STDIN_FILENO); - close_pipe(fd); - - setenv("LESS", "FRSX", 0); - - /* Make sure the pager goes away when the parent dies */ - if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0) - _exit(EXIT_FAILURE); - - /* Check whether our parent died before we were able - * to set the death signal */ - if (getppid() != parent_pid) - _exit(EXIT_SUCCESS); - - if (pager) { - execlp(pager, pager, NULL); - execl("/bin/sh", "sh", "-c", pager, NULL); - } - - /* Debian's alternatives command for pagers is - * called 'pager'. Note that we do not call - * sensible-pagers here, since that is just a - * shell script that implements a logic that - * is similar to this one anyway, but is - * Debian-specific. */ - execlp("pager", "pager", NULL); - - execlp("less", "less", NULL); - execlp("more", "more", NULL); - - pager_fallback(); - /* not reached */ - } - - /* Return in the parent */ - if (dup2(fd[1], STDOUT_FILENO) < 0) - log_error("Failed to duplicate pager pipe: %m"); - - close_pipe(fd); -} - -void pager_close(void) { - - if (pager_pid <= 0) - return; - - /* Inform pager that we are done */ - fclose(stdout); - kill(pager_pid, SIGCONT); - wait_for_terminate(pager_pid, NULL); - pager_pid = 0; -} diff --git a/src/pager.h b/src/pager.h deleted file mode 100644 index b5b499844..000000000 --- a/src/pager.h +++ /dev/null @@ -1,28 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#ifndef foopagerhfoo -#define foopagerhfoo - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with systemd; If not, see . -***/ - -void pager_open(void); -void pager_close(void); - -#endif diff --git a/src/shared/pager.c b/src/shared/pager.c new file mode 100644 index 000000000..3fc81820e --- /dev/null +++ b/src/shared/pager.c @@ -0,0 +1,134 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include + +#include "pager.h" +#include "util.h" +#include "macro.h" + +static pid_t pager_pid = 0; + +_noreturn_ static void pager_fallback(void) { + ssize_t n; + do { + n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0); + } while (n > 0); + if (n < 0) { + log_error("Internal pager failed: %m"); + _exit(EXIT_FAILURE); + } + _exit(EXIT_SUCCESS); +} + +void pager_open(void) { + int fd[2]; + const char *pager; + pid_t parent_pid; + + if (pager_pid > 0) + return; + + if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER"))) + if (!*pager || streq(pager, "cat")) + return; + + if (isatty(STDOUT_FILENO) <= 0) + return; + + /* Determine and cache number of columns before we spawn the + * pager so that we get the value from the actual tty */ + columns(); + + if (pipe(fd) < 0) { + log_error("Failed to create pager pipe: %m"); + return; + } + + parent_pid = getpid(); + + pager_pid = fork(); + if (pager_pid < 0) { + log_error("Failed to fork pager: %m"); + close_pipe(fd); + return; + } + + /* In the child start the pager */ + if (pager_pid == 0) { + + dup2(fd[0], STDIN_FILENO); + close_pipe(fd); + + setenv("LESS", "FRSX", 0); + + /* Make sure the pager goes away when the parent dies */ + if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0) + _exit(EXIT_FAILURE); + + /* Check whether our parent died before we were able + * to set the death signal */ + if (getppid() != parent_pid) + _exit(EXIT_SUCCESS); + + if (pager) { + execlp(pager, pager, NULL); + execl("/bin/sh", "sh", "-c", pager, NULL); + } + + /* Debian's alternatives command for pagers is + * called 'pager'. Note that we do not call + * sensible-pagers here, since that is just a + * shell script that implements a logic that + * is similar to this one anyway, but is + * Debian-specific. */ + execlp("pager", "pager", NULL); + + execlp("less", "less", NULL); + execlp("more", "more", NULL); + + pager_fallback(); + /* not reached */ + } + + /* Return in the parent */ + if (dup2(fd[1], STDOUT_FILENO) < 0) + log_error("Failed to duplicate pager pipe: %m"); + + close_pipe(fd); +} + +void pager_close(void) { + + if (pager_pid <= 0) + return; + + /* Inform pager that we are done */ + fclose(stdout); + kill(pager_pid, SIGCONT); + wait_for_terminate(pager_pid, NULL); + pager_pid = 0; +} diff --git a/src/shared/pager.h b/src/shared/pager.h new file mode 100644 index 000000000..b5b499844 --- /dev/null +++ b/src/shared/pager.h @@ -0,0 +1,28 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#ifndef foopagerhfoo +#define foopagerhfoo + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see . +***/ + +void pager_open(void); +void pager_close(void); + +#endif -- cgit v1.2.3