static bool private_bus = false;
+static pid_t pager_pid = 0;
+
static int daemon_reload(DBusConnection *bus, char **args, unsigned n);
+static void pager_open(void);
static bool on_tty(void) {
static int t = -1;
+ /* Note that this is invoked relatively early, before we start
+ * the pager. That means the value we return reflects whether
+ * we originally were started on a tty, not if we currently
+ * are. But this is intended, since we want color, and so on
+ * when run in our own pager. */
+
if (_unlikely_(t < 0))
t = isatty(STDOUT_FILENO) > 0;
assert(bus);
+ pager_open();
+
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
assert(bus);
+ pager_open();
+
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
show_properties = !streq(args[0], "status");
+ if (show_properties)
+ pager_open();
+
if (show_properties && n <= 1) {
/* If not argument is specified inspect the manager
* itself */
dbus_error_init(&error);
+ pager_open();
+
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
dbus_error_init(&error);
+ pager_open();
+
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
}
static void pager_open(void) {
- pid_t pid;
int fd[2];
const char *pager;
+ if (pager_pid > 0)
+ return;
+
if (!on_tty() || arg_no_pager)
return;
return;
}
- pid = fork();
- if (pid < 0) {
+ pager_pid = fork();
+ if (pager_pid < 0) {
log_error("Failed to fork pager: %m");
close_pipe(fd);
return;
}
- /* The original process turns into the PAGER */
- if (pid != 0) {
+ /* In the child start the pager */
+ if (pager_pid == 0) {
dup2(fd[0], STDIN_FILENO);
close_pipe(fd);
- if (!getenv("LESS"))
- setenv("LESS", "FRSX", 0);
+ setenv("LESS", "FRSX", 0);
+
+ prctl(PR_SET_PDEATHSIG, SIGTERM);
if (pager) {
execlp(pager, pager, NULL);
execl("/bin/sh", "sh", "-c", pager, NULL);
} else {
- execlp("sensible-pager", "sensible-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);
}
_exit(EXIT_FAILURE);
}
- /* Return in the child */
+ /* Return in the parent */
if (dup2(fd[1], STDOUT_FILENO) < 0)
log_error("Failed to duplicate pager pipe: %m");
close_pipe(fd);
}
+static void pager_close(void) {
+ siginfo_t dummy;
+
+ if (pager_pid <= 0)
+ return;
+
+ /* Inform pager that we are done */
+ fclose(stdout);
+ wait_for_terminate(pager_pid, &dummy);
+ pager_pid = 0;
+}
+
int main(int argc, char*argv[]) {
int r, retval = EXIT_FAILURE;
DBusConnection *bus = NULL;
goto finish;
}
- pager_open();
-
/* /sbin/runlevel doesn't need to communicate via D-Bus, so
* let's shortcut this */
if (arg_action == ACTION_RUNLEVEL) {
strv_free(arg_property);
+ pager_close();
+
return retval;
}