Merge branch 'jc/setlinebuf-setvbuf'

* jc/setlinebuf-setvbuf:
daemon.c: avoid setlinebuf()

diff --git a/daemon.c b/daemon.c
index c315932ced825f96f669003616a9fb304309c75d..0e026f65ecc089c869979069b33aabc1008d3f68 100644 (file)
--- 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");