fragment: properly handle quotes in assignments in EnvironmentFile= files

[elogind.git] / src / systemctl.c

diff --git a/src/systemctl.c b/src/systemctl.c
index 0908b6ae02e69304493135f93d6210c18d43804c..4f4ee961726ed7a6595bab372cc21f2294771e4d 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -118,6 +118,12 @@ 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;
 
@@ -5328,8 +5334,7 @@ static void pager_open(void) {
                 dup2(fd[0], STDIN_FILENO);
                 close_pipe(fd);
 
-                if (!getenv("LESS"))
-                        setenv("LESS", "FRSX", 0);
+                setenv("LESS", "FRSX", 0);
 
                 prctl(PR_SET_PDEATHSIG, SIGTERM);
 
@@ -5337,7 +5342,14 @@ static void pager_open(void) {
                         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);
                 }