X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Flib_tracemse.c;h=e062a26af52371c2352287999c89bf35cb890f3a;hp=1afd15d2e785075527d44aeb70b44709980f88a8;hb=91fa4688e82518794fcf0c32a36f3fcca5e4c2d5;hpb=70322aa06a4a97ebff76d2869ad923cdf51ee0a9

diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c
index 1afd15d2..e062a26a 100644
--- a/ncurses/trace/lib_tracemse.c
+++ b/ncurses/trace/lib_tracemse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
@@ -38,7 +38,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $")
+MODULE_ID("$Id: lib_tracemse.c,v 1.20 2012/02/22 22:40:24 tom Exp $")
 
 #ifdef TRACE
 
@@ -47,7 +47,11 @@ MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $")
 static char *
 _trace_mmask_t(SCREEN *sp, mmask_t code)
 {
-#define SHOW(m, s) if ((code & m) == m) strcat(strcat(my_buffer, s), ", ")
+#define SHOW(m, s) \
+    if ((code & m) == m) { \
+	_nc_STRCAT(my_buffer, s, sizeof(my_buffer)); \
+	_nc_STRCAT(my_buffer, ", ", sizeof(my_buffer)); \
+    }
 
     SHOW(BUTTON1_RELEASED, "release-1");
     SHOW(BUTTON1_PRESSED, "press-1");
@@ -110,15 +114,16 @@ _trace_mmask_t(SCREEN *sp, mmask_t code)
 NCURSES_EXPORT(char *)
 _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
 {
-    (void) sprintf(my_buffer, TRACEMSE_FMT,
-		   ep->id,
-		   ep->x,
-		   ep->y,
-		   ep->z,
-		   (unsigned long) ep->bstate);
+    _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer))
+		TRACEMSE_FMT,
+		ep->id,
+		ep->x,
+		ep->y,
+		ep->z,
+		(unsigned long) ep->bstate);
 
     (void) _trace_mmask_t(sp, ep->bstate);
-    (void) strcat(my_buffer, "}");
+    _nc_STRCAT(my_buffer, "}", sizeof(my_buffer));
     return (my_buffer);
 }