ncurses 6.2 - patch 20200404

[ncurses.git] / ncurses / base / new_pair.c

diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c
index f13d16f4575421c1cac5c9345b8c6ab06dfc257c..547ab28180668bed49f2562ef8f91640680d3886 100644 (file)
--- a/ncurses/base/new_pair.c
+++ b/ncurses/base/new_pair.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 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            *
@@ -48,7 +49,7 @@
 #define MaxColors      max_colors
 #endif
 
-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS
 
 /* fix redefinition versys tic.h */
 #undef entry
@@ -60,9 +61,9 @@
 
 #endif
 
-MODULE_ID("$Id: new_pair.c,v 1.14 2017/08/11 18:20:22 tom Exp $")
+MODULE_ID("$Id: new_pair.c,v 1.19 2020/02/02 23:34:34 tom Exp $")
 
-#if USE_NEW_PAIR
+#if NCURSES_EXT_COLORS
 
 #ifdef NEW_PAIR_DEBUG
 
@@ -102,13 +103,17 @@ dumpit(SCREEN *sp, int pair, const char *tag)
     char bigbuf[256 * 20];
     char *p = bigbuf;
     int n;
-    sprintf(p, "%s", tag);
-    p += strlen(p);
+    size_t have = sizeof(bigbuf);
+
+    _nc_STRCPY(p, tag, have);
     for (n = 0; n < sp->_pair_limit; ++n) {
        if (list[n].mode != cpFREE) {
-           sprintf(p, " %d%c(%d,%d)",
-                   n, n == pair ? '@' : ':', list[n].next, list[n].prev);
            p += strlen(p);
+           if ((size_t) (p - bigbuf) + 50 > have)
+               break;
+           _nc_SPRINTF(p, _nc_SLIMIT(have - (p - bigbuf))
+                       " %d%c(%d,%d)",
+                       n, n == pair ? '@' : ':', list[n].next, list[n].prev);
        }
     }
     T(("(%d/%d) %ld - %s",
@@ -193,7 +198,8 @@ _nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next)
 {
     colorpair_t *last;
     if (ValidPair(sp, pair)) {
-       last = _nc_reserve_pairs(sp, pair);
+       ReservePairs(sp, pair);
+       last = &(sp->_color_pairs[pair]);
        delink_color_pair(sp, pair);
        if (last->mode > cpFREE &&
            (last->fg != next->fg || last->bg != next->bg)) {
@@ -277,7 +283,8 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg)
            }
            if (!found && (SP_PARM->_pair_alloc < SP_PARM->_pair_limit)) {
                pair = SP_PARM->_pair_alloc;
-               if (_nc_reserve_pairs(sp, pair) == 0) {
+               ReservePairs(SP_PARM, pair);
+               if (SP_PARM->_color_pairs == 0) {
                    pair = -1;
                } else {
                    found = TRUE;
@@ -376,4 +383,4 @@ void
 _nc_new_pair(void)
 {
 }
-#endif /* USE_NEW_PAIR */
+#endif /* NCURSES_EXT_COLORS */