ncurses 6.3 - patch 20220724

[ncurses.git] / ncurses / trace / lib_trace.c

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 4567054a9fd30120b47309d576e258d41033c9d1..b6f2a75e5ed3ee0a821a8bde2768f81261b6cc79 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ * Copyright 2018-2021,2022 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            *
@@ -36,7 +37,7 @@
 /*
  *     lib_trace.c - Tracing/Debugging routines
  *
- * The _tracef() function is originally from pcurses (by Pavel Curtis) in 1982. 
+ * The _tracef() function is originally from pcurses (by Pavel Curtis) in 1982.
  * pcurses allowed one to enable/disable tracing using traceon() and traceoff()
  * functions.  ncurses provides a trace() function which allows one to
  * selectively enable or disable several tracing features.
@@ -47,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.100 2022/07/23 20:08:45 tom Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -87,16 +88,32 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 
 #define MyFP           _nc_globals.trace_fp
 #define MyFD           _nc_globals.trace_fd
+#define MyInit         _nc_globals.trace_opened
 #define MyPath         _nc_globals.trace_fname
 #define MyLevel                _nc_globals.trace_level
 #define MyNested       _nc_globals.nested_tracef
+#endif /* TRACE */
 
-NCURSES_EXPORT(void)
-trace(const unsigned int tracelevel)
+#if USE_REENTRANT
+#define Locked(statement) { \
+       _nc_lock_global(tst_tracef); \
+       statement; \
+       _nc_unlock_global(tst_tracef); \
+    }
+#else
+#define Locked(statement) statement
+#endif
+
+NCURSES_EXPORT(unsigned)
+curses_trace(unsigned tracelevel)
 {
+    unsigned result;
+#if defined(TRACE)
+    Locked(result = _nc_tracing);
     if ((MyFP == 0) && tracelevel) {
+       MyInit = TRUE;
        if (MyFD >= 0) {
-           MyFP = fdopen(MyFD, "wb");
+           MyFP = fdopen(MyFD, BIN_W);
        } else {
            if (MyPath[0] == '\0') {
                size_t size = sizeof(MyPath) - 12;
@@ -111,16 +128,17 @@ trace(const unsigned int tracelevel)
                    _nc_STRCAT(MyPath, ".log", sizeof(MyPath));
                }
            }
+#define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR)
            if (_nc_access(MyPath, W_OK) < 0
-               || (MyFD = open(MyPath, O_CREAT | O_EXCL | O_RDWR, 0600)) < 0
-               || (MyFP = fdopen(MyFD, "wb")) == 0) {
+               || (MyFD = safe_open3(MyPath, SAFE_MODE, 0600)) < 0
+               || (MyFP = fdopen(MyFD, BIN_W)) == 0) {
                ;               /* EMPTY */
            }
        }
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
        /* Try to set line-buffered mode, or (failing that) unbuffered,
         * so that the trace-output gets flushed automatically at the
-        * end of each line.  This is useful in case the program dies. 
+        * end of each line.  This is useful in case the program dies.
         */
        if (MyFP != 0) {
 #if HAVE_SETVBUF               /* ANSI */
@@ -139,11 +157,23 @@ trace(const unsigned int tracelevel)
            fclose(MyFP);
            MyFP = 0;
        }
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
     } else if (_nc_tracing != tracelevel) {
-       _nc_tracing = tracelevel;
+       Locked(_nc_tracing = tracelevel);
        _tracef("tracelevel=%#x", tracelevel);
     }
+#else
+    (void) tracelevel;
+    result = 0;
+#endif
+    return result;
+}
+
+#if defined(TRACE)
+NCURSES_EXPORT(void)
+trace(const unsigned int tracelevel)
+{
+    curses_trace(tracelevel);
 }
 
 static void
@@ -160,7 +190,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 
 #ifdef TRACE
     /* verbose-trace in the command-line utilities relies on this */
-    if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
+    if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
        fp = stderr;
 #endif
 
@@ -194,7 +224,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 # if USE_WEAK_SYMBOLS
        if ((pthread_self))
 # endif
-#ifdef __MINGW32__
+#ifdef _NC_WINDOWS
            fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p);
 #else
            fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self());
@@ -217,7 +247,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 }
 
 NCURSES_EXPORT(void)
-_tracef(const char *fmt,...)
+_tracef(const char *fmt, ...)
 {
     va_list ap;
 
@@ -306,6 +336,39 @@ _nc_retrace_win(WINDOW *code)
     return code;
 }
 
+NCURSES_EXPORT(char *)
+_nc_fmt_funcptr(char *target, const char *source, size_t size)
+{
+    size_t n;
+    char *dst = target;
+    bool leading = TRUE;
+
+    union {
+       int value;
+       char bytes[sizeof(int)];
+    } byteorder;
+
+    byteorder.value = 0x1234;
+
+    *dst++ = '0';
+    *dst++ = 'x';
+
+    for (n = 0; n < size; ++n) {
+       unsigned ch = ((byteorder.bytes[0] == 0x34)
+                      ? UChar(source[size - n - 1])
+                      : UChar(source[n]));
+       if (ch != 0 || (n + 1) >= size)
+           leading = FALSE;
+       if (!leading) {
+           _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (size_t) (dst - target))
+                       "%02x", ch & 0xff);
+           dst += 2;
+       }
+    }
+    *dst = '\0';
+    return target;
+}
+
 #if USE_REENTRANT
 /*
  * Check if the given trace-mask is enabled.
@@ -341,7 +404,7 @@ _nc_use_tracef(unsigned mask)
  * the tracef mutex.
  */
 NCURSES_EXPORT(void)
-_nc_locked_tracef(const char *fmt,...)
+_nc_locked_tracef(const char *fmt, ...)
 {
     va_list ap;