ncurses 6.2 - patch 20200425

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index 2f3b5877b1557f464d5bf6328d0a9726fd7000a2..328bcd6b2772cbf7cb8ca0f379058049dc32f903 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2017,2018 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            *


@@ -48,7 +49,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
 #include <parametrized.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.278 2019/07/27 22:44:21 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.282 2020/02/02 23:34:34 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -218,7 +219,8 @@ write_it(ENTRY * ep)
            while ((ch = *t++) != 0) {
                *d++ = (char) ch;
                if (ch == '\\') {
            while ((ch = *t++) != 0) {
                *d++ = (char) ch;
                if (ch == '\\') {

-                   *d++ = *t++;
+                   if ((*d++ = *t++) == '\0')
+                       break;

                } else if ((ch == '%')
                           && (*t == L_BRACE)) {
                    char *v = 0;
                } else if ((ch == '%')
                           && (*t == L_BRACE)) {
                    char *v = 0;


@@ -2938,6 +2940,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
      * These are probably both or none.
      */
     PAIRED(parm_index, parm_rindex);
      * These are probably both or none.
      */
     PAIRED(parm_index, parm_rindex);

+    PAIRED(parm_ich, parm_dch);

 
     /*
      * These may be mismatched because the terminal description relies on
 
     /*
      * These may be mismatched because the terminal description relies on


@@ -3054,7 +3057,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
      * ncurses handles it.
      */
     if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))
      * ncurses handles it.
      */
     if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))

-       && PRESENT(parm_ich)) {
+       && PRESENT(insert_character)) {

        _nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
     }
 
        _nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
     }