Re: [msysGit] [PATCH/RFC 08/11] daemon: use explicit file descriptor

This patch adds support to specify an explicit file
descriotor for communication with the client, instead
of using stdin/stdout.

This will be useful for the Windows port, because it
will use threads instead of fork() to serve multiple
clients, making it impossible to reuse stdin/stdout.

Signed-off-by: Erik Faye-Lund <redacted>
---
 daemon.c |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/daemon.c b/daemon.c
index 07d7356..a0aead5 100644
--- a/daemon.c
+++ b/daemon.c

@@ -263,7 +263,7 @@ static char *path_ok(char *directory)
 	return NULL;		/* Fallthrough. Deny by default */
 }

-typedef int (*daemon_service_fn)(void);
+typedef int (*daemon_service_fn)(int);
 struct daemon_service {
 	const char *name;
 	const char *config_name;

@@ -287,7 +287,7 @@ static int git_daemon_config(const char *var, const

char *value, void *cb) return 0;
 }

-static int run_service(char *dir, struct daemon_service *service)
+static int run_service(int fd, char *dir, struct daemon_service *service)
 {
 	const char *path;
 	int enabled = service->enabled;

@@ -340,7 +340,7 @@ static int run_service(char *dir, struct daemon_service

*service) */
 	signal(SIGTERM, SIG_IGN);

-	return service->fn();
+	return service->fn(fd);
 }

 static void copy_to_log(int fd)

@@ -364,7 +364,7 @@ static void copy_to_log(int fd)
 	fclose(fp);
 }

-static int run_service_command(const char **argv)
+static int run_service_command(int fd, const char **argv)
 {
 	struct child_process cld;

@@ -372,37 +372,35 @@ static int run_service_command(const char **argv)
 	cld.argv = argv;
 	cld.git_cmd = 1;
 	cld.err = -1;
+	cld.in = cld.out = fd;