3 files changed, 2 insertions, 4 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 267e5896..824c7e29 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -897,8 +897,6 @@ io_loop(void)
   sock *s;
   node *n, *p;
 
-  /* FIXME: Use poll() if available */
-
   FD_ZERO(&rd);
   FD_ZERO(&wr);
   for(;;)
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index b4a028da..fa2902e6 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -184,4 +184,6 @@ log_init_debug(char *f)
     dbgf = stderr;
   else if (!(dbgf = fopen(f, "a")))
     log(L_ERR "Error opening debug file `%s': %m", f);
+  if (dbgf)
+    setvbuf(dbgf, NULL, _IONBF, 0);
 }
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 58fffda4..c6f48936 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -385,8 +385,6 @@ main(int argc, char **argv)
     dmalloc_debug(0x2f03d00);
 #endif
 
-  setvbuf(stdout, NULL, _IONBF, 0);	/* FIXME: Kill some day. */
-  setvbuf(stderr, NULL, _IONBF, 0);
   parse_args(argc, argv);
   if (debug_flag == 1)
     log_init_debug("");