ncurses 5.9 - patch 20111217

[ncurses.git] / ncurses / tinfo / setbuf.c

diff --git a/ncurses/tinfo/setbuf.c b/ncurses/tinfo/setbuf.c
index 5610913d35b05e17d25d49e3020ef7418b5b148f..75b952fb33a248c0a95b8de42f88cc12b72faf86 100644 (file)
--- a/ncurses/tinfo/setbuf.c
+++ b/ncurses/tinfo/setbuf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: setbuf.c,v 1.14 2009/05/09 23:09:00 tom Exp $")
+MODULE_ID("$Id: setbuf.c,v 1.17 2011/10/22 16:34:50 tom Exp $")
 
 /*
  * If the output file descriptor is connected to a tty (the typical case) it
@@ -100,8 +100,17 @@ MODULE_ID("$Id: setbuf.c,v 1.14 2009/05/09 23:09:00 tom Exp $")
  * buffer.  So we disable this by default (there may yet be a workaround).
  */
 NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
+NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, int buffered)
 {
+    int Cols;
+    int Lines;
+
+    if (0 == SP_PARM)
+       return;
+
+    Cols = *(ptrCols(SP_PARM));
+    Lines = *(ptrLines(SP_PARM));
+
     /* optional optimization hack -- do before any output to ofp */
 #if HAVE_SETVBUF || HAVE_SETBUFFER
     if (SP_PARM->_buffered != buffered) {
@@ -116,7 +125,7 @@ NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
        setmode(ofp, O_BINARY);
 #endif
        if (buffered != 0) {
-           buf_len = min(LINES * (COLS + 6), 2800);
+           buf_len = (unsigned) min(Lines * (Cols + 6), 2800);
            if ((buf_ptr = SP_PARM->_setbuf) == 0) {
                if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
                      return;
@@ -140,7 +149,7 @@ NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
 #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);
+       (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, (size_t) buf_len);
 #endif
 #elif HAVE_SETBUFFER
        (void) setbuffer(ofp, buf_ptr, (int) buf_len);
@@ -153,8 +162,8 @@ NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(void)
-_nc_set_buffer(FILE *ofp, bool buffered)
+_nc_set_buffer(FILE *ofp, int buffered)
 {
-    return NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered);
+    NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered);
 }
 #endif