gitweb: Replace some presentational HTML by CSS

[git.git] / pager.c

diff --git a/pager.c b/pager.c
index b063353d96eb6d526438c1fa22cacd28bc12b0c1..dcb398da8e703de2999badb976dee7322eff470b 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -8,21 +8,26 @@
 static void run_pager(const char *pager)
 {
        execlp(pager, pager, NULL);
+       execl("/bin/sh", "sh", "-c", pager, NULL);
 }
 
 void setup_pager(void)
 {
        pid_t pid;
        int fd[2];
-       const char *pager = getenv("PAGER");
+       const char *pager = getenv("GIT_PAGER");
 
        if (!isatty(1))
                return;
+       if (!pager)
+               pager = getenv("PAGER");
        if (!pager)
                pager = "less";
        else if (!*pager || !strcmp(pager, "cat"))
                return;
 
+       pager_in_use = 1; /* means we are emitting to terminal */
+
        if (pipe(fd) < 0)
                return;
        pid = fork();
@@ -45,7 +50,8 @@ void setup_pager(void)
        close(fd[0]);
        close(fd[1]);
 
-       setenv("LESS", "-S", 0);
+       setenv("LESS", "-RS", 0);
        run_pager(pager);
+       die("unable to execute pager '%s'", pager);
        exit(255);
 }