ncurses 5.9 - patch 20120616

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 35f4817486bfc09dede9ada20b6ce2ab069fbdd7..a61597bc198685134773649be3db6c06f2853aa1 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            *
  *                                                                          *
  * 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>
 
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tputs.c,v 1.79 2009/10/24 21:56:58 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.84 2012/02/22 22:40:24 tom Exp $")

 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */


@@ -75,9 +75,12 @@ _nc_set_no_padding(SCREEN *sp)
 #endif
 
 #if NCURSES_SP_FUNCS
 #endif
 
 #if NCURSES_SP_FUNCS

-#define my_outch SP_PARM->_outch
+#define SetOutCh(func) if (SP_PARM) SP_PARM->_outch = func; else _nc_prescreen._outch = func
+#define GetOutCh()     (SP_PARM ? SP_PARM->_outch : _nc_prescreen._outch)

 #else
 #else

-static NCURSES_SP_OUTC my_outch = NCURSES_SP_NAME(_nc_outch);
+#define SetOutCh(func) static_outch = func
+#define GetOutCh()     static_outch
+static NCURSES_SP_OUTC static_outch = NCURSES_SP_NAME(_nc_outch);

 #endif
 
 NCURSES_EXPORT(int)
 #endif
 
 NCURSES_EXPORT(int)


@@ -92,6 +95,7 @@ NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
        NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
        napms(ms);
     } else {
        NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
        napms(ms);
     } else {

+       NCURSES_SP_OUTC my_outch = GetOutCh();

        register int nullcount;
 
        nullcount = (ms * _nc_baudrate(ospeed)) / (BAUDBYTE * 1000);
        register int nullcount;
 
        nullcount = (ms * _nc_baudrate(ospeed)) / (BAUDBYTE * 1000);


@@ -141,7 +145,7 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch)
         * POSIX says write() is safe in a signal handler, but the
         * buffered I/O is not.
         */
         * 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)
+       if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, (size_t) 1) == -1)

            rc = ERR;
     } else {
        if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF)
            rc = ERR;
     } else {
        if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF)


@@ -199,6 +203,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
                        int affcnt,
                        NCURSES_SP_OUTC outc)
 {
                        int affcnt,
                        NCURSES_SP_OUTC outc)
 {

+    NCURSES_SP_OUTC my_outch = GetOutCh();

     bool always_delay;
     bool normal_delay;
     int number;
     bool always_delay;
     bool normal_delay;
     int number;


@@ -211,9 +216,9 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 
     if (USE_TRACEF(TRACE_TPUTS)) {
        if (outc == NCURSES_SP_NAME(_nc_outch))
 
     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
        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);
        if (_nc_tputs_trace) {
            _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
                    _nc_visbuf(string), affcnt, addrbuf);


@@ -280,7 +285,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
     }
 #endif /* BSD_TPUTS */
 
     }
 #endif /* BSD_TPUTS */
 

-    my_outch = outc;           /* redirect delay_output() */
+    SetOutCh(outc);            /* redirect delay_output() */

     while (*string) {
        if (*string != '$')
            (*outc) (NCURSES_SP_ARGx *string);
     while (*string) {
        if (*string != '$')
            (*outc) (NCURSES_SP_ARGx *string);


@@ -352,7 +357,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
        delay_output(trailpad / 10);
 #endif /* BSD_TPUTS */
 
        delay_output(trailpad / 10);
 #endif /* BSD_TPUTS */
 

-    my_outch = NCURSES_SP_NAME(_nc_outch);
+    SetOutCh(my_outch);

     return OK;
 }
 
     return OK;
 }