X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fsetbuf.c;h=ba910e8983a4b12af55f13f43ea17baad4a92009;hp=c0e7356569074cd9af3f2f3f2dcc5225d2f16b29;hb=e6c7286022d8a7a7ea7f15a6ffa7f9addb00e42d;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/tinfo/setbuf.c b/ncurses/tinfo/setbuf.c
index c0e73565..ba910e89 100644
--- a/ncurses/tinfo/setbuf.c
+++ b/ncurses/tinfo/setbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,8 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **	setbuf.c
 **
@@ -42,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: setbuf.c,v 1.5 1999/02/27 20:00:15 tom Exp $")
+MODULE_ID("$Id: setbuf.c,v 1.13 2007/05/12 19:04:02 tom Exp $")
 
 /*
  * If the output file descriptor is connected to a tty (the typical case) it
@@ -99,46 +97,54 @@ MODULE_ID("$Id: setbuf.c,v 1.5 1999/02/27 20:00:15 tom Exp $")
  * do indeed get confused by changing setbuf on/off, and will overrun the
  * buffer.  So we disable this by default (there may yet be a workaround).
  */
-void _nc_set_buffer(FILE *ofp, bool buffered)
+NCURSES_EXPORT(void)
+_nc_set_buffer(FILE *ofp, bool buffered)
 {
-	/* optional optimization hack -- do before any output to ofp */
+    /* optional optimization hack -- do before any output to ofp */
 #if HAVE_SETVBUF || HAVE_SETBUFFER
+    if (SP->_buffered != buffered) {
 	unsigned buf_len;
 	char *buf_ptr;
 
 	if (getenv("NCURSES_NO_SETBUF") != 0)
-		return;
+	    return;
 
 	fflush(ofp);
-	if ((SP->_buffered = buffered) != 0) {
-		buf_len = min(LINES * (COLS + 6), 2800);
-	 	if ((buf_ptr = SP->_setbuf) == 0) {
-			if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
-				return;
-			SP->_setbuf = buf_ptr;
-			/* Don't try to free this! */
-		}
+#ifdef __DJGPP__
+	setmode(ofp, O_BINARY);
+#endif
+	if (buffered != 0) {
+	    buf_len = min(LINES * (COLS + 6), 2800);
+	    if ((buf_ptr = SP->_setbuf) == 0) {
+		if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
+		      return;
+		SP->_setbuf = buf_ptr;
+		/* Don't try to free this! */
+	    }
 #if !USE_SETBUF_0
-		else return;
+	    else
+		return;
 #endif
 	} else {
 #if !USE_SETBUF_0
-		return;
+	    return;
 #else
-		buf_len = 0;
-		buf_ptr = 0;
+	    buf_len = 0;
+	    buf_ptr = 0;
 #endif
 	}
 
 #if HAVE_SETVBUF
-#ifdef SETVBUF_REVERSED	/* pre-svr3? */
+#ifdef SETVBUF_REVERSED		/* pre-svr3? */
 	(void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF);
 #else
 	(void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len);
 #endif
 #elif HAVE_SETBUFFER
-	(void) setbuffer(ofp, buf_ptr, (int)buf_len);
+	(void) setbuffer(ofp, buf_ptr, (int) buf_len);
 #endif
 
+	SP->_buffered = buffered;
+    }
 #endif /* HAVE_SETVBUF || HAVE_SETBUFFER */
 }