ncurses 6.2 - patch 20210418

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 586f2cd0ca5a2d8990bf40d2fcf0feadd7ccd2df..4b89a19ed9ddd1b97607cef676a921960dd69a06 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright 2018-2020,2021 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.88 2012/12/08 20:01:20 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.107 2021/04/03 18:45:53 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,17 +120,42 @@ 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) {
        if (SP_PARM->out_inuse) {

+           char *buf = SP_PARM->out_buffer;

            size_t amount = SP->out_inuse;
            size_t amount = SP->out_inuse;

-           /*
-            * Help a little, if the write is interrupted, by first resetting
-            * our amount.
-            */
+

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

-           IGNORE_RC(write(SP_PARM->_ofd, SP_PARM->out_buffer, amount));
+           TR(TRACE_CHARPUT, ("flushing %ld/%ld bytes",
+                              (unsigned long) amount, _nc_outchars));
+           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;
+                   buf += res;
+               } else if (errno == EAGAIN) {
+                   continue;
+               } else if (errno == EINTR) {
+                   continue;
+               } else {
+                   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


@@ -178,13 +204,48 @@ _nc_outch(int ch)
 }
 #endif
 
 }
 #endif
 

+/*
+ * This is used for the putp special case.
+ */
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(_nc_putchar) (NCURSES_SP_DCLx int ch)
+{
+    (void) SP_PARM;
+    return putchar(ch);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+_nc_putchar(int ch)
+{
+    return putchar(ch);
+}
+#endif
+
+/*
+ * putp is special - per documentation it calls tputs with putchar as the
+ * parameter for outputting characters.  This means that it uses stdio, which
+ * is not signal-safe.  Applications call this entrypoint; we do not call it
+ * from within the library.
+ */

 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(putp) (NCURSES_SP_DCLx const char *string)
 {
     return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(putp) (NCURSES_SP_DCLx const char *string)
 {
     return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx

-                                  string, 1, NCURSES_SP_NAME(_nc_outch));
+                                  string, 1, NCURSES_SP_NAME(_nc_putchar));

 }
 
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+putp(const char *string)
+{
+    return NCURSES_SP_NAME(putp) (CURRENT_SCREEN, string);
+}
+#endif
+
+/*
+ * Use these entrypoints rather than "putp" within the library.
+ */

 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
                           const char *name GCC_UNUSED,
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
                           const char *name GCC_UNUSED,


@@ -194,18 +255,13 @@ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx
 
     if (string != 0) {
        TPUTS_TRACE(name);
 
     if (string != 0) {
        TPUTS_TRACE(name);

-       rc = NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx string);
+       rc = NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+                                    string, 1, NCURSES_SP_NAME(_nc_outch));

     }
     return rc;
 }
 
 #if NCURSES_SP_FUNCS
     }
     return rc;
 }
 
 #if NCURSES_SP_FUNCS

-NCURSES_EXPORT(int)
-putp(const char *string)
-{
-    return NCURSES_SP_NAME(putp) (CURRENT_SCREEN, string);
-}
-

 NCURSES_EXPORT(int)
 _nc_putp(const char *name, const char *string)
 {
 NCURSES_EXPORT(int)
 _nc_putp(const char *name, const char *string)
 {


@@ -228,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", 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);


@@ -370,7 +429,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
      */
     if (trailpad > 0
        && (always_delay || normal_delay))
      */
     if (trailpad > 0
        && (always_delay || normal_delay))

-       delay_output(trailpad / 10);
+       NCURSES_SP_NAME(delay_output) (NCURSES_SP_ARGx trailpad / 10);

 #endif /* BSD_TPUTS */
 
     SetOutCh(my_outch);
 #endif /* BSD_TPUTS */
 
     SetOutCh(my_outch);


@@ -382,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);
     }