ncurses 6.0 - patch 20160213

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

diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c
index 523678210da69211ba893501dd41ac8e6eb68090..a7e4afa987c9e9051f59f58e99cbf5e5f4babc2f 100644 (file)
--- a/ncurses/tinfo/lib_tputs.c
+++ b/ncurses/tinfo/lib_tputs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 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.93 2013/01/12 20:57:32 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.97 2016/01/23 21:32:00 tom Exp $")
 
 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
@@ -121,13 +121,26 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
 {
     if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
        if (SP_PARM->out_inuse) {
+           char *buf = SP_PARM->out_buffer;
            size_t amount = SP->out_inuse;
-           /*
-            * Help a little, if the write is interrupted, by first resetting
-            * our amount.
-            */
+           ssize_t res;
+
            SP->out_inuse = 0;
-           IGNORE_RC(write(SP_PARM->_ofd, SP_PARM->out_buffer, amount));
+           while (amount) {
+               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 */
+               }
+           }
        }
     }
 }
@@ -264,7 +277,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx
        if (outc == NCURSES_SP_NAME(_nc_outch))
            _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf));
        else
-           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc);
+           _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", TR_FUNC(outc));
        if (_nc_tputs_trace) {
            _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace,
                    _nc_visbuf(string), affcnt, addrbuf);