summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-12-08 21:28:41 +0100
committerJohannes Sixt <johannes.sixt@telecom.at>2008-06-26 08:47:15 +0200
commitbfdd9ffd2f7376ccb8b9d4c4e39e2e0fe97d6b37 (patch)
tree90f3f85f808f959dc2f76ba16c4227e4573e292f
parent0b50b860a505d4a1d6fa595a400f3968333e7128 (diff)
downloadgit-bfdd9ffd2f7376ccb8b9d4c4e39e2e0fe97d6b37.tar.gz
Windows: Make the pager work.
Since we have neither fork() nor exec(), we have to spawn the pager and feed it with the program's output. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
-rw-r--r--pager.c40
1 files changed, 38 insertions, 2 deletions
diff --git a/pager.c b/pager.c
index dbd941421b..6b5c9e44b4 100644
--- a/pager.c
+++ b/pager.c
@@ -1,12 +1,13 @@
#include "cache.h"
/*
- * 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 int spawned_pager;
+#ifndef __MINGW32__
static void run_pager(const char *pager)
{
/*
@@ -22,11 +23,31 @@ static void run_pager(const char *pager)
execlp(pager, pager, NULL);
execl("/bin/sh", "sh", "-c", pager, NULL);
}
+#else
+#include "run-command.h"
+
+static const char *pager_argv[] = { "sh", "-c", NULL, NULL };
+static struct child_process pager_process = {
+ .argv = pager_argv,
+ .in = -1
+};
+static void wait_for_pager(void)
+{
+ fflush(stdout);
+ fflush(stderr);
+ /* signal EOF to pager */
+ close(1);
+ close(2);
+ finish_command(&pager_process);
+}
+#endif
void setup_pager(void)
{
+#ifndef __MINGW32__
pid_t pid;
int fd[2];
+#endif
const char *pager = getenv("GIT_PAGER");
if (!isatty(1))
@@ -45,6 +66,7 @@ void setup_pager(void)
spawned_pager = 1; /* means we are emitting to terminal */
+#ifndef __MINGW32__
if (pipe(fd) < 0)
return;
pid = fork();
@@ -72,6 +94,20 @@ void setup_pager(void)
run_pager(pager);
die("unable to execute pager '%s'", pager);
exit(255);
+#else
+ /* spawn the pager */
+ pager_argv[2] = pager;
+ if (start_command(&pager_process))
+ return;
+
+ /* original process continues, but writes to the pipe */
+ dup2(pager_process.in, 1);
+ dup2(pager_process.in, 2);
+ close(pager_process.in);
+
+ /* this makes sure that the parent terminates after the pager */
+ atexit(wait_for_pager);
+#endif
}
int pager_in_use(void)