X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Ftrace_buf.c;h=7bf91c674df3369a13c7fc575c191e65aeef2e6e;hp=48f93d43d1ef1a45d204da0ca895346ad188dd6e;hb=c13e57306ae5c4431fddd0fe856c3bcae6aeeb2c;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c
index 48f93d43..7bf91c67 100644
--- a/ncurses/trace/trace_buf.c
+++ b/ncurses/trace/trace_buf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2003,2007 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            *
@@ -35,46 +35,71 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_buf.c,v 1.7 1999/02/27 19:50:58 tom Exp $")
+MODULE_ID("$Id: trace_buf.c,v 1.13 2007/04/21 22:50:08 tom Exp $")
 
-typedef struct {
-	char *text;
-	size_t size;
-} LIST;
+#define MyList _nc_globals.tracebuf_ptr
+#define MySize _nc_globals.tracebuf_used
 
-char * _nc_trace_buf(int bufnum, size_t want)
+static char *
+_nc_trace_alloc(int bufnum, size_t want)
 {
-	static LIST *list;
-	static size_t have;
+    char *result = 0;
 
-#if NO_LEAKS
-	if (bufnum < 0) {
-		if (have) {
-			while (have--) {
-				free(list[have].text);
-			}
-			free(list);
-		}
-		return 0;
+    if (bufnum >= 0) {
+	if ((size_t) (bufnum + 1) > MySize) {
+	    size_t need = (bufnum + 1) * 2;
+	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) == 0)
+		return (0);
+	    while (need > MySize)
+		MyList[MySize++].text = 0;
 	}
-#endif
 
-	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 (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;
 	}
 
-	if (list[bufnum].text == 0
-	 || want > list[bufnum].size)
-	{
-		if ((list[bufnum].text = typeRealloc(char, want, list[bufnum].text)) != 0)
-			list[bufnum].size = want;
+	result = MyList[bufnum].text;
+    }
+#if NO_LEAKS
+    else {
+	if (MySize) {
+	    while (MySize--) {
+		if (MyList[MySize].text != 0)
+		    free(MyList[MySize].text);
+	    }
+	    free(MyList);
 	}
+    }
+#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, 0);
+    size_t have = strlen(buffer);
+
+    buffer = _nc_trace_alloc(bufnum, 1 + have + strlen(value));
+    (void) strcpy(buffer + have, value);
 
-	if (list[bufnum].text != 0)
-		*(list[bufnum].text) = '\0';
-	return list[bufnum].text;
+    return buffer;
 }