X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=daemon.c;h=4c8346d5a1fe1325de2dd335a4e61a2dad994211;hb=aeb2aaa7712f7af8237d5bceb725a7db8c2d4620;hp=d2a4e023e895d57db798be76450b77afb2ac49be;hpb=f29db856e7a736dd5109223d71c548367bc127ae;p=git.git

diff --git a/daemon.c b/daemon.c
index d2a4e023e..4c8346d5a 100644
--- a/daemon.c
+++ b/daemon.c
@@ -660,7 +660,7 @@ static void check_dead_children(void)
 static char **cld_argv;
 static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 {
-	struct child_process cld = { 0 };
+	struct child_process cld = { NULL };
 	char addrbuf[300] = "REMOTE_ADDR=", portbuf[300];
 	char *env[] = { addrbuf, portbuf, NULL };
 
@@ -1226,9 +1226,10 @@ int main(int argc, char **argv)
 
 	/* prepare argv for serving-processes */
 	cld_argv = xmalloc(sizeof (char *) * (argc + 2));
-	for (i = 0; i < argc; ++i)
-		cld_argv[i] = argv[i];
-	cld_argv[argc] = "--serve";
+	cld_argv[0] = argv[0];	/* git-daemon */
+	cld_argv[1] = "--serve";
+	for (i = 1; i < argc; ++i)
+		cld_argv[i+1] = argv[i];
 	cld_argv[argc+1] = NULL;
 
 	return serve(&listen_addr, listen_port, cred);