diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-06 22:36:10 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-06 22:36:10 -0700 |
commit | fd4c6cc9d6f6a4a8bd9f4f2825675261f5d91c9c (patch) | |
tree | 5b187e08ee55ef11225336c54f7beaa6c06bc5f7 /daemon.c | |
parent | Merge branch 'jc/lockfile' into next (diff) | |
parent | http-fetch: fix possible segfault (diff) | |
download | tgif-fd4c6cc9d6f6a4a8bd9f4f2825675261f5d91c9c.tar.xz |
Merge branch 'master' into next
* master:
http-fetch: fix possible segfault
Refactor git_tcp_connect() functions a little.
builtin-grep: pass ignore case option to external grep
Diffstat (limited to 'daemon.c')
-rw-r--r-- | daemon.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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; |