X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_tputs.c;h=3f24a53d63b248d283255929e0a6d57cc2f976b3;hp=0d5cb5c654f119e3c4614886b10e788a296558b3;hb=eb952c651feed0502ec0d7ecaefc4931968eb358;hpb=c885a3fdd089f784f17dd2e9c03d8eb774072dc9

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 0d5cb5c6..3f24a53d 100644
--- 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-2018,2019 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 +51,7 @@
 #include <termcap.h>		/* ospeed */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tputs.c,v 1.99 2016/12/17 20:47:21 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.102 2019/03/17 21:57:04 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -125,6 +125,7 @@ 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);
 
@@ -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);
@@ -426,7 +430,7 @@ NCURSES_EXPORT(int)
 _nc_outc_wrapper(SCREEN *sp, int c)
 {
     if (0 == sp) {
-	return (ERR);
+	return fputc(c, stdout);
     } else {
 	return sp->jump(c);
     }