1 files changed, 95 insertions, 31 deletions

diff --git a/pager.c b/pager.c
index 1364e15d23..975955ba82 100644
--- a/pager.c
+++ b/pager.c
@@ -1,48 +1,112 @@
 #include "cache.h"
+#include "run-command.h"
+#include "sigchain.h"
+
+#ifndef DEFAULT_PAGER
+#define DEFAULT_PAGER "less"
+#endif
 
 /*
- * This is split up from the rest of git so that we might do
- * something different on Windows, for example.
+ * This is split up from the rest of git so that we can do
+ * something different on Windows.
  */
 
-static void run_pager(void)
+#ifndef WIN32
+static void pager_preexec(void)
 {
-	const char *prog = getenv("PAGER");
-	if (!prog)
-		prog = "less";
-	setenv("LESS", "-S", 0);
-	execlp(prog, prog, NULL);
+	/*
+	 * Work around bug in "less" by not starting it until we
+	 * have real input
+	 */
+	fd_set in;
+
+	FD_ZERO(&in);
+	FD_SET(0, &in);
+	select(1, &in, NULL, &in, NULL);
 }
+#endif
 
-void setup_pager(void)
+static const char *pager_argv[] = { NULL, NULL };
+static struct child_process pager_process;
+
+static void wait_for_pager(void)
 {
-	pid_t pid;
-	int fd[2];
+	fflush(stdout);
+	fflush(stderr);
+	/* signal EOF to pager */
+	close(1);
+	close(2);
+	finish_command(&pager_process);
+}
 
-	if (!isatty(1))
-		return;
-	if (pipe(fd) < 0)
-		return;
-	pid = fork();
-	if (pid < 0) {
-		close(fd[0]);
-		close(fd[1]);
-		return;
+static void wait_for_pager_signal(int signo)
+{
+	wait_for_pager();
+	sigchain_pop(signo);
+	raise(signo);
+}
+
+const char *git_pager(int stdout_is_tty)
+{
+	const char *pager;
+
+	if (!stdout_is_tty)
+		return NULL;
+
+	pager = getenv("GIT_PAGER");
+	if (!pager) {
+		if (!pager_program)
+			git_config(git_default_config, NULL);
+		pager = pager_program;
 	}
+	if (!pager)
+		pager = getenv("PAGER");
+	if (!pager)
+		pager = DEFAULT_PAGER;
+	else if (!*pager || !strcmp(pager, "cat"))
+		pager = NULL;
+
+	return pager;
+}
+
+void setup_pager(void)
+{
+	const char *pager = git_pager(isatty(1));
 
-	/* return in the child */
-	if (!pid) {
-		dup2(fd[1], 1);
-		close(fd[0]);
-		close(fd[1]);
+	if (!pager)
 		return;
+
+	setenv("GIT_PAGER_IN_USE", "true", 1);
+
+	/* spawn the pager */
+	pager_argv[0] = pager;
+	pager_process.use_shell = 1;
+	pager_process.argv = pager_argv;
+	pager_process.in = -1;
+	if (!getenv("LESS")) {
+		static const char *env[] = { "LESS=FRSX", NULL };
+		pager_process.env = env;
 	}
+#ifndef WIN32
+	pager_process.preexec_cb = pager_preexec;
+#endif
+	if (start_command(&pager_process))
+		return;
 
-	/* The original process turns into the PAGER */
-	dup2(fd[0], 0);
-	close(fd[0]);
-	close(fd[1]);
+	/* original process continues, but writes to the pipe */
+	dup2(pager_process.in, 1);
+	if (isatty(2))
+		dup2(pager_process.in, 2);
+	close(pager_process.in);
 
-	run_pager();
-	exit(255);
+	/* this makes sure that the parent terminates after the pager */
+	sigchain_push_common(wait_for_pager_signal);
+	atexit(wait_for_pager);
+}
+
+int pager_in_use(void)
+{
+	const char *env;
+	env = getenv("GIT_PAGER_IN_USE");
+	return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;
 }