ncurses 5.7 - patch 20091031

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index e3dc8d328977f20b1f7a10b95c45cc7ec3386423..35f4817486bfc09dede9ada20b6ce2ab069fbdd7 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -48,11 +48,10 @@
 #endif
 
 #include <ctype.h>
-#include <term.h>              /* padding_baud_rate, xon_xoff */
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.73 2009/05/10 00:54:17 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.79 2009/10/24 21:56:58 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -84,7 +83,10 @@ static NCURSES_SP_OUTC my_outch = NCURSES_SP_NAME(_nc_outch);
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
 {
-    T((T_CALLED("delay_output(%p,%d)"), SP_PARM, ms));
+    T((T_CALLED("delay_output(%p,%d)"), (void *) SP_PARM, ms));
+
+    if (!HasTInfoTerminal(SP_PARM))
+       returnCode(ERR);
 
     if (no_pad_char) {
        NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
@@ -127,20 +129,25 @@ _nc_flush(void)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
 {
+    int rc = OK;
+
     COUNT_OUTCHARS(1);
 
-    if (SP_PARM != 0
+    if (HasTInfoTerminal(SP_PARM)
+       && SP_PARM != 0
        && SP_PARM->_cleanup) {
-       char tmp = ch;
+       char tmp = (char) ch;
        /*
         * POSIX says write() is safe in a signal handler, but the
         * buffered I/O is not.
         */
-       write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1);
+       if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1) == -1)
+           rc = ERR;
     } else {
-       putc(ch, NC_OUTPUT(SP_PARM));
+       if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF)
+           rc = ERR;
     }
-    return OK;
+    return rc;
 }
 
 #if NCURSES_SP_FUNCS
@@ -158,12 +165,32 @@ NCURSES_SP_NAME(putp) (NCURSES_SP_DCLx const char *string)
                                   string, 1, NCURSES_SP_NAME(_nc_outch));
 }
 
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
+                          const char *name GCC_UNUSED,
+                          const char *string)
+{
+    int rc = ERR;
+
+    if (string != 0) {
+       TPUTS_TRACE(name);
+       rc = NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx string);
+    }
+    return rc;
+}
+
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 putp(const char *string)
 {
     return NCURSES_SP_NAME(putp) (CURRENT_SCREEN, string);
 }
+
+NCURSES_EXPORT(int)
+_nc_putp(const char *name, const char *string)
+{
+    return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, string);
+}
 #endif
 
 NCURSES_EXPORT(int)
@@ -186,7 +213,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
        if (outc == NCURSES_SP_NAME(_nc_outch))
            (void) strcpy(addrbuf, "_nc_outch");
        else
-           (void) sprintf(addrbuf, "%p", outc);
+           (void) sprintf(addrbuf, "%p", (void *) outc);
        if (_nc_tputs_trace) {
            _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
                    _nc_visbuf(string), affcnt, addrbuf);
@@ -198,10 +225,19 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
     }
 #endif /* TRACE */
 
+    if (SP_PARM != 0 && !HasTInfoTerminal(SP_PARM))
+       return ERR;
+
     if (!VALID_STRING(string))
        return ERR;
 
-    if (cur_term == 0) {
+    if (
+#if NCURSES_SP_FUNCS
+          (SP_PARM != 0 && SP_PARM->_term == 0)
+#else
+          cur_term == 0
+#endif
+       ) {
        always_delay = FALSE;
        normal_delay = TRUE;
     } else {