summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--defines.h6
-rw-r--r--sftp-int.c5
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 @@
22 <wayne@blorf.net> 22 <wayne@blorf.net>
23 - (bal) ./configure support to disable SIA on OSF1. Patch by 23 - (bal) ./configure support to disable SIA on OSF1. Patch by
24 Chris Adams <cmadams@hiwaay.net> 24 Chris Adams <cmadams@hiwaay.net>
25 - (bal) Updates from the Sony NEWS-OS platform by NAKAJI Hiroyuki
26 <nakaji@tutrp.tut.ac.jp>
25 27
2620010508 2820010508
27 - (bal) Fixed configure test for USE_SIA. 29 - (bal) Fixed configure test for USE_SIA.
@@ -5382,4 +5384,4 @@
5382 - Wrote replacements for strlcpy and mkdtemp 5384 - Wrote replacements for strlcpy and mkdtemp
5383 - Released 1.0pre1 5385 - Released 1.0pre1
5384 5386
5385$Id: ChangeLog,v 1.1213 2001/05/09 00:02:52 mouring Exp $ 5387$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 @@
1#ifndef _DEFINES_H 1#ifndef _DEFINES_H
2#define _DEFINES_H 2#define _DEFINES_H
3 3
4/* $Id: defines.h,v 1.62 2001/04/05 17:15:08 stevesk Exp $ */ 4/* $Id: defines.h,v 1.63 2001/05/09 00:38:21 mouring Exp $ */
5 5
6/* Some platforms need this for the _r() functions */ 6/* Some platforms need this for the _r() functions */
7#if !defined(_REENTRANT) && !defined(SNI) 7#if !defined(_REENTRANT) && !defined(SNI)
@@ -92,8 +92,12 @@ enum
92#endif 92#endif
93 93
94#ifndef NGROUPS_MAX /* Disable groupaccess if NGROUP_MAX is not set */ 94#ifndef NGROUPS_MAX /* Disable groupaccess if NGROUP_MAX is not set */
95#ifdef NGROUPS
96#define NGROUPS_MAX NGROUPS
97#else
95#define NGROUPS_MAX 0 98#define NGROUPS_MAX 0
96#endif 99#endif
100#endif
97 101
98#ifndef O_NONBLOCK /* Non Blocking Open */ 102#ifndef O_NONBLOCK /* Non Blocking Open */
99# define O_NONBLOCK 00004 103# 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)
889 return; 889 return;
890 } 890 }
891 } 891 }
892#if HAVE_SETVBUF
892 setvbuf(stdout, NULL, _IOLBF, 0); 893 setvbuf(stdout, NULL, _IOLBF, 0);
893 setvbuf(infile, NULL, _IOLBF, 0); 894 setvbuf(infile, NULL, _IOLBF, 0);
895#else
896 setlinebuf(stdout);
897 setlinebuf(infile);
898#endif
894 899
895 for(;;) { 900 for(;;) {
896 char *cp; 901 char *cp;