ncurses 6.1 - patch 20190126

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 39a4832b86969b039f29af3a44772363c636fe4a..e309be2a50d61d728013c0fc555c26fe5ddf22f0 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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.98 2016/05/28 21:58:45 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.101 2018/12/15 23:54: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 */


@@ -141,6 +141,8 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
                }
            }
        }
                }
            }
        }

+    } else {
+       fflush(stdout);

     }
 }
 
     }
 }
 


@@ -272,11 +274,14 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 #ifdef TRACE
     if (USE_TRACEF(TRACE_TPUTS)) {
        char addrbuf[32];
 #ifdef TRACE
     if (USE_TRACEF(TRACE_TPUTS)) {
        char addrbuf[32];

+       TR_FUNC_BFR(1);

 
 

-       if (outc == NCURSES_SP_NAME(_nc_outch))
+       if (outc == NCURSES_SP_NAME(_nc_outch)) {

            _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
            _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));

-       else
-           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", TR_FUNC(outc));
+       } else {
+           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%s",
+                       TR_FUNC_ARG(0, 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);


@@ -424,7 +429,7 @@ NCURSES_EXPORT(int)
 _nc_outc_wrapper(SCREEN *sp, int c)
 {
     if (0 == sp) {
 _nc_outc_wrapper(SCREEN *sp, int c)
 {
     if (0 == sp) {

-       return (ERR);
+       return fputc(c, stdout);

     } else {
        return sp->jump(c);
     }
     } else {
        return sp->jump(c);
     }