ncurses 5.9 - patch 20111022

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

diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c
index 4fef57eecedb67d07329ca237c5949d59316165f..3768d098e8a76222a0ba4f59ea57b5482286d039 100644 (file)
--- a/ncurses/trace/trace_buf.c
+++ b/ncurses/trace/trace_buf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey                 1997-on                        *
  ****************************************************************************/
 /*
  *     trace_buf.c - Tracing/Debugging buffers (attributes)
@@ -35,50 +35,85 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_buf.c,v 1.11 2002/07/14 00:08:08 tom Exp $")
+MODULE_ID("$Id: trace_buf.c,v 1.18 2011/10/22 15:46:06 tom Exp $")
 
-typedef struct {
-    char *text;
-    size_t size;
-} LIST;
+#ifdef TRACE
 
-NCURSES_EXPORT(char *)
-_nc_trace_buf(int bufnum, size_t want)
+#define MyList _nc_globals.tracebuf_ptr
+#define MySize _nc_globals.tracebuf_used
+
+static char *
+_nc_trace_alloc(int bufnum, size_t want)
 {
     char *result = 0;
-    static LIST *list;
-    static size_t have;
 
     if (bufnum >= 0) {
-       if ((size_t) (bufnum + 1) > have) {
-           size_t need = (bufnum + 1) * 2;
-           if ((list = typeRealloc(LIST, need, list)) == 0)
-               return (0);
-           while (need > have)
-               list[have++].text = 0;
+       if ((size_t) (bufnum + 1) > MySize) {
+           size_t need = (size_t) (bufnum + 1) * 2;
+           if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != 0) {
+               while (need > MySize)
+                   MyList[MySize++].text = 0;
+           }
        }
 
-       if (list[bufnum].text == 0
-           || want > list[bufnum].size) {
-           if ((list[bufnum].text = typeRealloc(char, want, list[bufnum].text))
-               != 0)
-                 list[bufnum].size = want;
+       if (MyList != 0) {
+           if (MyList[bufnum].text == 0
+               || want > MyList[bufnum].size) {
+               MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text);
+               if (MyList[bufnum].text != 0)
+                   MyList[bufnum].size = want;
+           }
+           result = MyList[bufnum].text;
        }
-
-       if (list[bufnum].text != 0)
-           *(list[bufnum].text) = '\0';
-       result = list[bufnum].text;
     }
 #if NO_LEAKS
     else {
-       if (have) {
-           while (have--) {
-               if (list[have].text != 0)
-                   free(list[have].text);
+       if (MySize) {
+           if (MyList) {
+               while (MySize--) {
+                   if (MyList[MySize].text != 0) {
+                       free(MyList[MySize].text);
+                   }
+               }
+               free(MyList);
+               MyList = 0;
            }
-           free(list);
+           MySize = 0;
        }
     }
 #endif
     return result;
 }
+
+/*
+ * (re)Allocate a buffer big enough for the caller's wants.
+ */
+NCURSES_EXPORT(char *)
+_nc_trace_buf(int bufnum, size_t want)
+{
+    char *result = _nc_trace_alloc(bufnum, want);
+    if (result != 0)
+       *result = '\0';
+    return result;
+}
+
+/*
+ * Append a new string to an existing buffer.
+ */
+NCURSES_EXPORT(char *)
+_nc_trace_bufcat(int bufnum, const char *value)
+{
+    char *buffer = _nc_trace_alloc(bufnum, (size_t) 0);
+    if (buffer != 0) {
+       size_t have = strlen(buffer);
+
+       buffer = _nc_trace_alloc(bufnum, 1 + have + strlen(value));
+       if (buffer != 0)
+           (void) strcpy(buffer + have, value);
+
+    }
+    return buffer;
+}
+#else
+EMPTY_MODULE(_nc_empty_trace_buf)
+#endif /* TRACE */