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 <kusmabite@xxxxxxxxx>
---
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;
if (start_command(&cld))
return -1;
- close(0);
- close(1);
-
copy_to_log(cld.err);
return finish_command(&cld);
}
-static int upload_pack(void)
+static int upload_pack(int fd)
{
/* Timeout as string */
char timeout_buf[64];
const char *argv[] = { "upload-pack", "--strict", timeout_buf, ".", NULL };
snprintf(timeout_buf, sizeof timeout_buf, "--timeout=%u", timeout);
- return run_service_command(argv);
+ return run_service_command(fd, argv);
}
-static int upload_archive(void)
+static int upload_archive(int fd)
{
static const char *argv[] = { "upload-archive", ".", NULL };
- return run_service_command(argv);
+ return run_service_command(fd, argv);
}
-static int receive_pack(void)
+static int receive_pack(int fd)
{
static const char *argv[] = { "receive-pack", ".", NULL };
- return run_service_command(argv);
+ return run_service_command(fd, argv);
}
static struct daemon_service daemon_service[] = {
@@ -532,7 +530,7 @@ static void parse_host_arg(char *extra_args, int buflen)
}
-static int execute(struct sockaddr *addr)
+static int execute(int fd, struct sockaddr *addr)
{
static char line[1000];
int pktlen, len, i;
@@ -565,7 +563,7 @@ static int execute(struct sockaddr *addr)
}
alarm(init_timeout ? init_timeout : timeout);
- pktlen = packet_read_line(0, line, sizeof(line));
+ pktlen = packet_read_line(fd, line, sizeof(line));
alarm(0);
len = strlen(line);
@@ -597,7 +595,7 @@ static int execute(struct sockaddr *addr)
* Note: The directory here is probably context sensitive,
* and might depend on the actual service being performed.
*/
- return run_service(line + namelen + 5, s);
+ return run_service(fd, line + namelen + 5, s);
}
}
@@ -713,7 +711,7 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen)
dup2(incoming, 1);
close(incoming);
- exit(execute(addr));
+ exit(execute(0, addr));
}
static void child_handler(int signo)
@@ -1150,7 +1148,7 @@ int main(int argc, char **argv)
if (getpeername(0, peer, &slen))
peer = NULL;
- return execute(peer);
+ return execute(0, peer);
}
if (detach) {
--
1.6.5.rc2.7.g4f8d3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html