ncurses 5.9 - patch 20120616

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

diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c
index aa74fb1f3a48acb2f83a586bb6be9ecc430ee485..e062a26af52371c2352287999c89bf35cb890f3a 100644 (file)
--- a/ncurses/trace/lib_tracemse.c
+++ b/ncurses/trace/lib_tracemse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2010 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.17 2011/01/01 22:31:53 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.17 2011/01/01 22:31:53 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);
 }