git-tar-tree: no more void pointer arithmetic

[git.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index a1ccda3..2f03f99 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -267,12 +267,17 @@ static int upload(char *dir)
 static int execute(void)
 {
        static char line[1000];
-       int len;
+       int pktlen, len;
 
        alarm(init_timeout ? init_timeout : timeout);
-       len = packet_read_line(0, line, sizeof(line));
+       pktlen = packet_read_line(0, line, sizeof(line));
        alarm(0);
 
+       len = strlen(line);
+       if (pktlen != len)
+               loginfo("Extended attributes (%d bytes) exist <%.*s>",
+                       (int) pktlen - len,
+                       (int) pktlen - len, line + len + 1);
        if (len && line[len-1] == '\n')
                line[--len] = 0;
 
@@ -535,7 +540,7 @@ static int socksetup(int port, int **socklist_p)
 
                if (set_reuse_addr(sockfd)) {
                        close(sockfd);
-                       return 0;       /* not fatal */
+                       continue;
                }
 
                if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {