ncurses 6.2 - patch 20200906
[ncurses.git] / ncurses / tinfo / lib_tputs.c
index 39d901d7deae8d724f159e409a779d0b98cc471c..30944d35f2859e4a2eadbc4926e515e48b5f3f2f 100644 (file)
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 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            *
@@ -51,7 +52,7 @@
 #include <termcap.h>           /* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.100 2017/06/24 15:15:55 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.104 2020/09/05 18:08:11 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -125,9 +126,9 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
            size_t amount = SP->out_inuse;
 
            SP->out_inuse = 0;
+           TR(TRACE_CHARPUT, ("flushing %ld bytes", (unsigned long) amount));
            while (amount) {
                ssize_t res = write(SP_PARM->_ofd, buf, amount);
-
                if (res > 0) {
                    /* if the write was incomplete, try again */
                    amount -= (size_t) res;
@@ -274,11 +275,14 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
 #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));
-       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);