X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=daemon.c;h=74a1934dc2f1746a0985331eab26bb2ce53d3af3;hb=87a81c834bf48f8cbf8778cae78ed553f3bbd32c;hp=315a74bf108dc648fd9b86b40a4257fe27df907e;hpb=a87e8be2aece466e3f41dfde81c80709e1d56cd3;p=git.git

diff --git a/daemon.c b/daemon.c
index 315a74bf..74a1934d 100644
--- a/daemon.c
+++ b/daemon.c
@@ -3,7 +3,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-static const char daemon_usage[] = "git-daemon [--port=n]";
+static const char daemon_usage[] = "git-daemon [--inetd | --port=n]";
 
 static int upload(char *dir, int dirlen)
 {
@@ -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)
@@ -96,6 +96,7 @@ static int serve(int port)
 int main(int argc, char **argv)
 {
 	int port = DEFAULT_GIT_PORT;
+	int inetd_mode = 0;
 	int i;
 
 	for (i = 1; i < argc; i++) {
@@ -110,8 +111,17 @@ int main(int argc, char **argv)
 				continue;
 			}
 		}
+
+		if (!strcmp(arg, "--inetd")) {
+			inetd_mode = 1;
+			continue;
+		}
+
 		usage(daemon_usage);
 	}
 
+	if (inetd_mode)
+		return execute();
+
 	return serve(port);
 }