ncurses 6.2 - patch 20200404

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index b97332ebc990c007f33975cfdc4eca57ac1db062..2a89a866c3744a2af67bbe97b38e403fac511675 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -47,10 +48,10 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: comp_parse.c,v 1.105 2018/04/14 20:33:44 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.110 2020/02/29 15:46:00 anonymous.maarten Exp $")

 
 static void sanity_check2(TERMTYPE2 *, bool);
 
 static void sanity_check2(TERMTYPE2 *, bool);

-NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;

 
 static void fixup_acsc(TERMTYPE2 *, int);
 
 
 static void fixup_acsc(TERMTYPE2 *, int);
 


@@ -80,7 +81,7 @@ force_bar(char *dst, char *src)
        size_t len = strlen(src);
        if (len > MAX_NAME_SIZE)
            len = MAX_NAME_SIZE;
        size_t len = strlen(src);
        if (len > MAX_NAME_SIZE)
            len = MAX_NAME_SIZE;

-       _nc_STRNCPY(dst, src, len);
+       _nc_STRNCPY(dst, src, MAX_NAME_SIZE);

        _nc_STRCPY(dst + len, "|", NAMEBUFFER_SIZE - len);
        src = dst;
     }
        _nc_STRCPY(dst + len, "|", NAMEBUFFER_SIZE - len);
        src = dst;
     }


@@ -180,11 +181,11 @@ remove_collision(char *n1, char *n2)
                        ++qend;
                    while ((*qstart++ = *qend++) != '\0') ;
                    fprintf(stderr, "...now\t%s\n", p2);
                        ++qend;
                    while ((*qstart++ = *qend++) != '\0') ;
                    fprintf(stderr, "...now\t%s\n", p2);

+                   removed = TRUE;

                } else {
                    fprintf(stderr, "Cannot remove alias '%.*s'\n",
                            (int) (qend - qstart), qstart);
                }
                } else {
                    fprintf(stderr, "Cannot remove alias '%.*s'\n",
                            (int) (qend - qstart), qstart);
                }

-               removed = TRUE;

                break;
            }
        }
                break;
            }
        }


@@ -724,6 +725,6 @@ NCURSES_EXPORT(void)
 _nc_free_tic(int code)
 {
     _nc_leaks_tic();
 _nc_free_tic(int code)
 {
     _nc_leaks_tic();

-    _nc_free_tinfo(code);
+    exit_terminfo(code);

 }
 #endif
 }
 #endif