- (bal) Updates from the Sony NEWS-OS platform by NAKAJI Hiroyuki

   <nakaji@tutrp.tut.ac.jp>

3 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f07d1ec7..d7e31916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,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.
@@ -5296,4 +5298,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1179.2.12 2001/05/08 20:43:00 mouring Exp $
+$Id: ChangeLog,v 1.1179.2.13 2001/05/09 00:39:18 mouring Exp $
diff --git a/defines.h b/defines.h
index c40096d3..65fd591d 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.62.2.1 2001/05/09 00:39:19 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 46e405e0..03b22999 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;