ncurses 6.1 - patch 20200118

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

diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 37553f712394c2718ac6260db5c787adc6cd9cf2..4173d74efcddac2ab79791ce5125cbf19a8405f8 100644 (file)
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000-2003,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 2000-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            *
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <termcap.h>
 
-MODULE_ID("$Id: lib_tgoto.c,v 1.12 2006/11/26 00:26:24 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.18 2019/10/26 22:43:48 tom Exp $")
 
 #if !PURE_TERMINFO
 static bool
@@ -125,10 +125,17 @@ tgoto_internal(const char *string, int x, int y)
                        *value += 1;
                        need_BC = TRUE;
                    } else {
-                       *value = 0200;  /* tputs will treat this as \0 */
+                       /* tputs will pretend this is \0, which will almost
+                        * always work since ANSI-compatible terminals ignore
+                        * the character.  ECMA-48 does not document a C1
+                        * control for this value.  A few (obsolete) terminals
+                        * can use this value in special cases, such as cursor
+                        * addressing using single-byte coordinates.
+                        */
+                       *value = 0200;
                    }
                }
-               result[used++] = *value++;
+               result[used++] = (char) *value++;
                break;
            case '%':
                result[used++] = *string;
@@ -159,7 +166,8 @@ tgoto_internal(const char *string, int x, int y)
                break;
            }
            if (fmt != 0) {
-               sprintf(result + used, fmt, *value++);
+               _nc_SPRINTF(result + used, _nc_SLIMIT(length - used)
+                           fmt, *value++);
                used += strlen(result + used);
                fmt = 0;
            }
@@ -174,7 +182,7 @@ tgoto_internal(const char *string, int x, int y)
     }
     if (result != 0) {
        if (need_BC) {
-           strcpy(result + used, BC);
+           _nc_STRCPY(result + used, BC, length - used);
            used += strlen(BC);
        }
        result[used] = '\0';
@@ -198,6 +206,6 @@ tgoto(const char *string, int x, int y)
        result = tgoto_internal(string, x, y);
     else
 #endif
-       result = TPARM_2((NCURSES_CONST char *) string, y, x);
+       result = TPARM_2(string, y, x);
     returnPtr(result);
 }