use signal safe ust_safe_snprintf()

[ust.git] / include / usterr.h

diff --git a/include/usterr.h b/include/usterr.h
index 87e4e7f2331dce57c3208d7be4b19ca0cb740cc0..6b8817764803f66f55bb2b19ddac83d8987f34bb 100644 (file)
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -23,6 +23,8 @@
  * signal handlers, so we must use a print method which is signal safe.
  */
 
+extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
+
 #define sigsafe_print_err(fmt, args...) \
 { \
        /* Can't use dynamic allocation. Limit ourselves to 250 chars. */ \
@@ -32,7 +34,7 @@
        /* Save the errno. */ \
        ____saved_errno = errno; \
 \
-       snprintf(____buf, sizeof(____buf), fmt, ## args); \
+       ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
 \
        /* Add end of string in case of buffer overflow. */ \
        ____buf[sizeof(____buf)-1] = 0; \
@@ -50,8 +52,10 @@
 
 #ifdef UST_DEBUG
 # define DBG(fmt, args...) ERRMSG(fmt, ## args)
+# define DBG_raw(fmt, args...) do { sigsafe_print_err(fmt, ## args); fflush(stderr); } while(0)
 #else
 # define DBG(fmt, args...) do {} while(0)
+# define DBG_raw(fmt, args...) do {} while(0)
 #endif
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)