summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-03-05 17:07:47 +0100
committerJunio C Hamano <gitster@pobox.com>2015-03-06 12:45:53 -0800
commitafe5409ddaab8cc22835d3024a58546a6b3deed1 (patch)
tree7ec4641d481de5c3ca19d9a3cb9098836881fa6a
parenta5f64dd6366fec44c6b58f8a521a01abb17d0a60 (diff)
downloadgit-afe5409ddaab8cc22835d3024a58546a6b3deed1.tar.gz
copy_to_log(): use fdopen_with_retry()
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--daemon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon.c b/daemon.c
index c3edd960ec..1d76ccf7de 100644
--- a/daemon.c
+++ b/daemon.c
@@ -421,8 +421,8 @@ static void copy_to_log(int fd)
struct strbuf line = STRBUF_INIT;
FILE *fp;
- fp = fdopen(fd, "r");
- if (fp == NULL) {
+ fp = fdopen_with_retry(fd, "r");
+ if (!fp) {
logerror("fdopen of error channel failed");
close(fd);
return;