From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 15 Jul 2005 16:27:05 +0000 (-0700)
Subject: git-daemon: re-organize code a bit for --inetd flag
X-Git-Tag: v0.99.1~16
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7d80694af1a68ee1915e36bad9b26fa9fe054f06;p=git.git

git-daemon: re-organize code a bit for --inetd flag

Alexey Nezhdanov sent a patch that made git-daemon usable from inetd (ie
where inetd has already done the accept on the new connection, the fork,
and the setup of stdin/stdout).  I wanted to organize the thing slightly
differently, though.
---

diff --git a/daemon.c b/daemon.c
index 315a74bf..c5a46b73 100644
--- a/daemon.c
+++ b/daemon.c
@@ -28,8 +28,16 @@ static int upload(char *dir, int dirlen)
 	return -1;
 }
 
-static int execute(char *line, int len)
+static int execute(void)
 {
+	static char line[1000];
+	int len;
+
+	len = packet_read_line(0, line, sizeof(line));
+
+	if (len && line[len-1] == '\n')
+		line[--len] = 0;
+
 	if (!strncmp("git-upload-pack /", line, 17))
 		return upload(line + 16, len - 16);
 
@@ -39,9 +47,6 @@ static int execute(char *line, int len)
 
 static void handle(int incoming, struct sockaddr_in *addr, int addrlen)
 {
-	static char line[1000];
-	int len;
-
 	if (fork()) {
 		close(incoming);
 		return;
@@ -50,12 +55,7 @@ static void handle(int incoming, struct sockaddr_in *addr, int addrlen)
 	dup2(incoming, 0);
 	dup2(incoming, 1);
 	close(incoming);
-	len = packet_read_line(0, line, sizeof(line));
-
-	if (len && line[len-1] == '\n')
-		line[--len] = 0;
-
-	exit(execute(line, len));
+	exit(execute());
 }
 
 static int serve(int port)