ncurses 5.9 - patch 20121124

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index f90f3554de12819695765254d40aa25e1c444627..5c50500b0a046e88bf5aa29da409843cb00b1d56 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
@@ -51,7 +51,7 @@
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.80 2009/11/21 23:09:31 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.87 2012/09/01 23:34:17 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -119,7 +119,17 @@ delay_output(int ms)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {
-    (void) fflush(NC_OUTPUT(SP_PARM));
+    if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
+       if (SP_PARM->out_inuse) {
+           size_t amount = SP->out_inuse;
+           /*
+            * Help a little, if the write is interrupted, by first resetting
+            * our amount.
+            */
+           SP->out_inuse = 0;
+           (void) write(SP_PARM->_ofd, SP_PARM->out_buffer, amount);
+       }
+    }
 }
 
 #if NCURSES_SP_FUNCS
@@ -138,17 +148,23 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
     COUNT_OUTCHARS(1);
 
     if (HasTInfoTerminal(SP_PARM)
-       && SP_PARM != 0
-       && SP_PARM->_cleanup) {
-       char tmp = (char) ch;
-       /*
-        * POSIX says write() is safe in a signal handler, but the
-        * buffered I/O is not.
-        */
-       if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1) == -1)
-           rc = ERR;
+       && SP_PARM != 0) {
+       if (SP_PARM->out_buffer != 0) {
+           if (SP_PARM->out_inuse + 1 >= SP_PARM->out_limit)
+               NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+           SP_PARM->out_buffer[SP_PARM->out_inuse++] = (char) ch;
+       } else {
+           char tmp = (char) ch;
+           /*
+            * POSIX says write() is safe in a signal handler, but the
+            * buffered I/O is not.
+            */
+           if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, (size_t) 1) == -1)
+               rc = ERR;
+       }
     } else {
-       if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF)
+       char tmp = (char) ch;
+       if (write(fileno(stdout), &tmp, (size_t) 1) == -1)
            rc = ERR;
     }
     return rc;
@@ -216,9 +232,9 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 
     if (USE_TRACEF(TRACE_TPUTS)) {
        if (outc == NCURSES_SP_NAME(_nc_outch))
-           (void) strcpy(addrbuf, "_nc_outch");
+           _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
        else
-           (void) sprintf(addrbuf, "%p", (void *) outc);
+           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc);
        if (_nc_tputs_trace) {
            _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
                    _nc_visbuf(string), affcnt, addrbuf);