* defs.h (xsnprintf): New prototype.

* utils.c (xsnprintf): New function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c62956c5feb9734e39a0b3d981184213ba18b69..d4b85eaa6395c994e746bf8e22b79c7459d478ae 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-17  Mark Kettenis  <kettenis@gnu.org>
 
+       * defs.h (xsnprintf): New prototype.
+       * utils.c (xsnprintf): New function.
+
        * corelow.c (get_core_register_section): Replace usage of sprintf
        and strcpy with xstrprintf and xstrdup.
 

diff --git a/gdb/defs.h b/gdb/defs.h
index c14321a42a99a526e9656c74d8b9c4f49d1412da..fa012a4d28b6ab6054a99cb568ef5575f04b2f97 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -879,6 +879,10 @@ extern void xvasprintf (char **ret, const char *format, va_list ap);
 extern char *xstrprintf (const char *format, ...) ATTR_FORMAT (printf, 1, 2);
 extern char *xstrvprintf (const char *format, va_list ap);
 
+/* Like snprintf, but throw an error if the output buffer is too small.  */
+extern int xsnprintf (char *str, size_t size, const char *format, ...)
+     ATTR_FORMAT (printf, 3, 4);
+
 extern int parse_escape (char **);
 
 /* Message to be printed before the error message, when an error occurs.  */

diff --git a/gdb/utils.c b/gdb/utils.c
index 7ee20617e38f830b5756cf8b3f822f04696d0814..0c45108889077454386f5fb48afe2dee914a68f5 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1079,6 +1079,20 @@ xstrvprintf (const char *format, va_list ap)
   return ret;
 }
 
+int
+xsnprintf (char *str, size_t size, const char *format, ...)
+{
+  va_list args;
+  int ret;
+
+  va_start (args, format);
+  ret = vsnprintf (str, size, format, args);
+  gdb_assert (ret < size);
+  va_end (args);
+
+  return ret;
+}
+
 /* My replacement for the read system call.
    Used like `read' but keeps going if `read' returns too soon.  */