From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 15 Jul 2005 16:32:16 +0000 (-0700)
Subject: Add "--inetd" flag to git-daemon
X-Git-Tag: v0.99.1~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e64e1b79d7c50a234e97d59aadc7a4911de91efe;p=git.git

Add "--inetd" flag to git-daemon

All credit go to Alexey Nezhdanov <snake@penza-gsm.ru>, I just ended up
re-implementing his idea.
---

diff --git a/daemon.c b/daemon.c
index c5a46b73..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)
 {
@@ -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);
 }