ncurses 6.2 - patch 20201227

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index a7e4afa987c9e9051f59f58e99cbf5e5f4babc2f..3eb19d2d966202e1995ed53cd049da91740ce255 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2016,2017 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 +52,7 @@
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tputs.c,v 1.97 2016/01/23 21:32:00 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.106 2020/11/29 00:40:08 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 */


@@ -119,16 +120,21 @@ delay_output(int ms)
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {

+    T((T_CALLED("_nc_flush(%p)"), (void *) SP_PARM));

     if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
     if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {

+       TR(TRACE_CHARPUT, ("ofd:%d inuse:%lu buffer:%p",
+                          SP_PARM->_ofd,
+                          (unsigned long) SP_PARM->out_inuse,
+                          SP_PARM->out_buffer));

        if (SP_PARM->out_inuse) {
            char *buf = SP_PARM->out_buffer;
            size_t amount = SP->out_inuse;
        if (SP_PARM->out_inuse) {
            char *buf = SP_PARM->out_buffer;
            size_t amount = SP->out_inuse;

-           ssize_t res;

 
            SP->out_inuse = 0;
 
            SP->out_inuse = 0;

+           TR(TRACE_CHARPUT, ("flushing %ld/%ld bytes",
+                              (unsigned long) amount, _nc_outchars));

            while (amount) {
            while (amount) {

-               res = write(SP_PARM->_ofd, buf, amount);
-
+               ssize_t res = write(SP_PARM->_ofd, buf, amount);

                if (res > 0) {
                    /* if the write was incomplete, try again */
                    amount -= (size_t) res;
                if (res > 0) {
                    /* if the write was incomplete, try again */
                    amount -= (size_t) res;


@@ -141,8 +147,15 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
                    break;      /* an error we can not recover from */
                }
            }
                    break;      /* an error we can not recover from */
                }
            }

+       } else if (SP_PARM->out_buffer == 0) {
+           TR(TRACE_CHARPUT, ("flushing stdout"));
+           fflush(stdout);

        }
        }

+    } else {
+       TR(TRACE_CHARPUT, ("flushing stdout"));
+       fflush(stdout);

     }
     }

+    returnVoid;

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -271,13 +284,16 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 #endif /* BSD_TPUTS */
 
 #ifdef TRACE
 #endif /* BSD_TPUTS */
 
 #ifdef TRACE

-    char addrbuf[32];
-

     if (USE_TRACEF(TRACE_TPUTS)) {
     if (USE_TRACEF(TRACE_TPUTS)) {

-       if (outc == NCURSES_SP_NAME(_nc_outch))
+       char addrbuf[32];
+       TR_FUNC_BFR(1);
+
+       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);


@@ -425,7 +441,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);
     }