ncurses 6.1 - patch 20190406

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

diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c
index ce1eaf5669cb9cbb49a5d395b0273ebf056fb7c1..48ab9777a2c767ae8edb310e2ea5e923a0743470 100644 (file)
--- a/ncurses/tinfo/comp_error.c
+++ b/ncurses/tinfo/comp_error.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -40,55 +41,71 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: comp_error.c,v 1.25 2002/09/07 20:05:07 tom Exp $")
+MODULE_ID("$Id: comp_error.c,v 1.39 2019/01/20 02:31:22 tom Exp $")

 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
 NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
 
 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
 NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
 

-static const char *sourcename;
-static char *termtype;
+#define SourceName     _nc_globals.comp_sourcename
+#define TermType       _nc_globals.comp_termtype
+
+NCURSES_EXPORT(const char *)
+_nc_get_source(void)
+{
+    return SourceName;
+}

 
 NCURSES_EXPORT(void)
 _nc_set_source(const char *const name)
 {
 
 NCURSES_EXPORT(void)
 _nc_set_source(const char *const name)
 {

-    sourcename = name;
+    FreeIfNeeded(SourceName);
+    SourceName = strdup(name);

 }
 
 NCURSES_EXPORT(void)
 _nc_set_type(const char *const name)
 {
 }
 
 NCURSES_EXPORT(void)
 _nc_set_type(const char *const name)
 {

-    if (termtype == 0)
-       termtype = typeMalloc(char, MAX_NAME_SIZE + 1);
-    if (termtype != 0) {
-       termtype[0] = '\0';
-       if (name)
-           strncat(termtype, name, MAX_NAME_SIZE);
+#define MY_SIZE (size_t) MAX_NAME_SIZE
+    if (TermType == 0)
+       TermType = typeMalloc(char, MY_SIZE + 1);
+    if (TermType != 0) {
+       TermType[0] = '\0';
+       if (name) {
+           _nc_STRNCAT(TermType, name, MY_SIZE, MY_SIZE);
+       }

     }
 }
 
 NCURSES_EXPORT(void)
 _nc_get_type(char *name)
 {
     }
 }
 
 NCURSES_EXPORT(void)
 _nc_get_type(char *name)
 {

-    strcpy(name, termtype != 0 ? termtype : "");
+#if NO_LEAKS
+    if (name == 0 && TermType != 0) {
+       FreeAndNull(TermType);
+       return;
+    }
+#endif
+    if (name != 0)
+       _nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE);

 }
 
 }
 

-static inline void
+static NCURSES_INLINE void

 where_is_problem(void)
 {
 where_is_problem(void)
 {

-    fprintf(stderr, "\"%s\"", sourcename);
+    fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?");

     if (_nc_curr_line >= 0)
        fprintf(stderr, ", line %d", _nc_curr_line);
     if (_nc_curr_col >= 0)
        fprintf(stderr, ", col %d", _nc_curr_col);
     if (_nc_curr_line >= 0)
        fprintf(stderr, ", line %d", _nc_curr_line);
     if (_nc_curr_col >= 0)
        fprintf(stderr, ", col %d", _nc_curr_col);

-    if (termtype != 0 && termtype[0] != '\0')
-       fprintf(stderr, ", terminal '%s'", termtype);
+    if (TermType != 0 && TermType[0] != '\0')
+       fprintf(stderr, ", terminal '%s'", TermType);

     fputc(':', stderr);
     fputc(' ', stderr);
 }
 
 NCURSES_EXPORT(void)
     fputc(':', stderr);
     fputc(' ', stderr);
 }
 
 NCURSES_EXPORT(void)

-_nc_warning(const char *const fmt,...)
+_nc_warning(const char *const fmt, ...)

 {
     va_list argp;
 
 {
     va_list argp;
 


@@ -103,7 +120,7 @@ _nc_warning(const char *const fmt,...)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-_nc_err_abort(const char *const fmt,...)
+_nc_err_abort(const char *const fmt, ...)

 {
     va_list argp;
 
 {
     va_list argp;
 


@@ -116,7 +133,7 @@ _nc_err_abort(const char *const fmt,...)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-_nc_syserr_abort(const char *const fmt,...)
+_nc_syserr_abort(const char *const fmt, ...)

 {
     va_list argp;
 
 {
     va_list argp;
 


@@ -126,14 +143,25 @@ _nc_syserr_abort(const char *const fmt,...)
     fprintf(stderr, "\n");
     va_end(argp);
 
     fprintf(stderr, "\n");
     va_end(argp);
 

+#if defined(TRACE) || !defined(NDEBUG)

     /* If we're debugging, try to show where the problem occurred - this
      * will dump core.
      */
     /* If we're debugging, try to show where the problem occurred - this
      * will dump core.
      */

-#if defined(TRACE) || !defined(NDEBUG)
-    abort();
-#else
+#ifndef USE_ROOT_ENVIRON
+    if (getuid() != ROOT_UID)
+#endif
+       abort();
+#endif

     /* Dumping core in production code is not a good idea.
      */
     exit(EXIT_FAILURE);
     /* Dumping core in production code is not a good idea.
      */
     exit(EXIT_FAILURE);

-#endif

 }
 }

+
+#if NO_LEAKS
+NCURSES_EXPORT(void)
+_nc_comp_error_leaks(void)
+{
+    FreeAndNull(SourceName);
+    FreeAndNull(TermType);
+}
+#endif