3 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 09b52feae..f81694476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
    <wayne@blorf.net>
  - (bal) ./configure support to disable SIA on OSF1.  Patch by
    Chris Adams <cmadams@hiwaay.net>
+ - (bal) Updates from the Sony NEWS-OS platform by NAKAJI Hiroyuki 
+   <nakaji@tutrp.tut.ac.jp>
 
 20010508
  - (bal) Fixed configure test for USE_SIA.  
@@ -5382,4 +5384,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1213 2001/05/09 00:02:52 mouring Exp $
+$Id: ChangeLog,v 1.1214 2001/05/09 00:38:19 mouring Exp $
diff --git a/defines.h b/defines.h
index c40096d31..ebe8812ae 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.62 2001/04/05 17:15:08 stevesk Exp $ */
+/* $Id: defines.h,v 1.63 2001/05/09 00:38:21 mouring Exp $ */
 
 /* Some platforms need this for the _r() functions */
 #if !defined(_REENTRANT) && !defined(SNI)
@@ -92,8 +92,12 @@ enum
 #endif
 
 #ifndef NGROUPS_MAX     /* Disable groupaccess if NGROUP_MAX is not set */
+#ifdef NGROUPS
+#define NGROUPS_MAX NGROUPS
+#else
 #define NGROUPS_MAX 0
 #endif
+#endif
 
 #ifndef O_NONBLOCK      /* Non Blocking Open */
 # define O_NONBLOCK      00004
diff --git a/sftp-int.c b/sftp-int.c
index 46e405e0d..03b229999 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -889,8 +889,13 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
                         return;
                 }
         }
+#if HAVE_SETVBUF
         setvbuf(stdout, NULL, _IOLBF, 0);
         setvbuf(infile, NULL, _IOLBF, 0);
+#else
+        setlinebuf(stdout);
+        setlinebuf(infile);
+#endif
 
         for(;;) {
                 char *cp;