summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-18 20:18:27 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-18 20:18:27 -0700
commit4c048e358c0ca39b023d207113624fae464df851 (patch)
tree24bb63b8604ead86b91fc00261f0906c4b2e8470
parent97d7fee2cb068f215a593c6e5623b265db45d3bc (diff)
parent48196afd2827b36ca5768f886f0866b6dfebdd10 (diff)
downloadgit-4c048e358c0ca39b023d207113624fae464df851.tar.gz
Merge branch 'jc/setlinebuf-setvbuf'
* jc/setlinebuf-setvbuf: daemon.c: avoid setlinebuf()
-rw-r--r--daemon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index c315932ced..0e026f65ec 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1083,7 +1083,8 @@ int main(int argc, char **argv)
openlog("git-daemon", LOG_PID, LOG_DAEMON);
set_die_routine(daemon_die);
} else
- setlinebuf(stderr); /* avoid splitting a message in the middle */
+ /* avoid splitting a message in the middle */
+ setvbuf(stderr, NULL, _IOLBF, 0);
if (inetd_mode && (group_name || user_name))
die("--user and --group are incompatible with --inetd");