This fixes #60543:

        * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().

        * tests/strfunc-test.c: Add some tests for g_snprintf().

diff --git a/ChangeLog b/ChangeLog
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ddf8a47f3ce9a8f8d6fe576b7ea4f5c2b73b834e..9fb967d2af19580141564718f7de8be0aaa4f7af 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       This fixes #60543:
+
+       * glib/gutils.c (g_snprintf, g_vsnprintf): Switch to C99-[v]snprintf().
+
+       * tests/strfunc-test.c: Add some tests for g_snprintf().
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/gconvert.c, glib/grand.c, glib/ghash.c,

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index cc38554b449579e3b67319b1bd64aedc00a3c0e0..191959ffd6d2a14f3bd1ff03ff854857b5338af4 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-12  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/tmpl/string_utils.sgml: Correct docs for g_[v]snprintf.
+
 2001-12-12  Matthias Clasen  <matthiasc@poet.de>
 
        * glib/tmpl/allocators.sgml, glib/tmpl/arrays.sgml, 

diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index 1955df837ba70ee8b5c8d3fb799e14cdfe2797d2..16ebaaca735c004c3152cb269b34f617512d25a9 100644 (file)
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -173,17 +173,28 @@ See also g_strdup_printf().
 <note>
 <para>
 In versions of GLib prior to 1.2.3, this function may return -1 if the output
-was truncated, and the truncated string may not be nul-terminated.
+was truncated, and the truncated string may not be nul-terminated. 
+In versions prior to 1.3.12, this function returns the length of the output 
+string.
+</para>
+</note>
+<note>
+<para>
+The return value of g_snprintf() conforms to the <function>snprintf()</function>
+function as standardized in ISO C99. Note that this is different from 
+traditional <function>snprintf()</function>, which returns the length of 
+the output string.
 </para>
 </note>
 
 @string: the buffer to hold the output.
-@n: the maximum number of characters to produce (including the terminating null
+@n: the maximum number of characters to produce (including the terminating nul
 character).
-@format: the format string. See the <function>sprintf()</function>
+@format: the format string. See the <function>sprintf()</function>.
 documentation.
 @Varargs: the arguments to insert in the output.
-@Returns: the length of the output string.
+@Returns: the number of characters which would be produced if the buffer was
+large enough.
 
 
 <!-- ##### FUNCTION g_vsnprintf ##### -->
@@ -200,16 +211,27 @@ See also g_strdup_vprintf().
 <para>
 In versions of GLib prior to 1.2.3, this function may return -1 if the output
 was truncated, and the truncated string may not be nul-terminated.
+In versions prior to 1.3.12, this function returns the length of the output 
+string.
+</para>
+</note>
+<note>
+<para>
+The return value of g_vsnprintf() conforms to the <function>vsnprintf()</function>
+function as standardized in ISO C99. Note that this is different from 
+traditional <function>vsnprintf()</function>, which returns the length of 
+the output string.
 </para>
 </note>
 
 @string: the buffer to hold the output.
-@n: the maximum number of characters to produce (including the terminating null
+@n: the maximum number of characters to produce (including the terminating nul
 character).
 @format: the format string. See the <function>sprintf()</function>
 documentation.
 @args: the list of arguments to insert in the output.
-@Returns: the length of the output string.
+@Returns: the number of characters which would be produced if the buffer was
+large enough.
 
 
 <!-- ##### FUNCTION g_printf_string_upper_bound ##### -->

diff --git a/glib/gutils.c b/glib/gutils.c
index 6727181b95a84cacaac6f7a65bb0a02f2848b2a0..66891a12826290d1f757ed6251acce65c106c158 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -341,44 +341,14 @@ g_snprintf (gchar *str,
            gchar const *fmt,
            ...)
 {
-#ifdef HAVE_VSNPRINTF
   va_list args;
   gint retval;
-  
-  g_return_val_if_fail (str != NULL, 0);
-  g_return_val_if_fail (n > 0, 0);
-  g_return_val_if_fail (fmt != NULL, 0);
-
-  va_start (args, fmt);
-  retval = vsnprintf (str, n, fmt, args);
-  va_end (args);
-
-  if (retval < 0)
-    {
-      str[n-1] = '\0';
-      retval = strlen (str);
-    }
-
-  return retval;
-#else  /* !HAVE_VSNPRINTF */
-  gchar *printed;
-  va_list args;
-  
-  g_return_val_if_fail (str != NULL, 0);
-  g_return_val_if_fail (n > 0, 0);
-  g_return_val_if_fail (fmt != NULL, 0);
 
   va_start (args, fmt);
-  printed = g_strdup_vprintf (fmt, args);
+  retval = g_vsnprintf (str, n, fmt, args);
   va_end (args);
   
-  strncpy (str, printed, n);
-  str[n-1] = '\0';
-
-  g_free (printed);
-  
-  return strlen (str);
-#endif /* !HAVE_VSNPRINTF */
+  return retval;
 }
 
 gint
@@ -387,37 +357,30 @@ g_vsnprintf (gchar         *str,
             gchar const *fmt,
             va_list      args)
 {
-#ifdef HAVE_VSNPRINTF
-  gint retval;
-  
-  g_return_val_if_fail (str != NULL, 0);
-  g_return_val_if_fail (n > 0, 0);
+#ifdef HAVE_VSNPRINTF_C99
+  g_return_val_if_fail (n == 0 || str != NULL, 0);
   g_return_val_if_fail (fmt != NULL, 0);
 
-  retval = vsnprintf (str, n, fmt, args);
-  
-  if (retval < 0)
-    {
-      str[n-1] = '\0';
-      retval = strlen (str);
-    }
-
-  return retval;
-#else  /* !HAVE_VSNPRINTF */
+  return vsnprintf (str, n, fmt, args);
+#else  /* !HAVE_VSNPRINTF_C99 */
   gchar *printed;
-  
-  g_return_val_if_fail (str != NULL, 0);
-  g_return_val_if_fail (n > 0, 0);
+  gint retval;
+
+  g_return_val_if_fail (n == 0 || str != NULL, 0);
   g_return_val_if_fail (fmt != NULL, 0);
 
   printed = g_strdup_vprintf (fmt, args);
-  strncpy (str, printed, n);
-  str[n-1] = '\0';
+  retval = strlen (printed);
+  if (n > 0)
+    {
+      strncpy (str, printed, n - 1);
+      str[n-1] = '\0';
+    }
 
   g_free (printed);
   
-  return strlen (str);
-#endif /* !HAVE_VSNPRINTF */
+  return retval;
+#endif /* !HAVE_VSNPRINTF_C99 */
 }
 
 guint       

diff --git a/tests/strfunc-test.c b/tests/strfunc-test.c
index 0c7b5c21571cbbd7d2af4e136a25f9cf159b34ab..73eb86a8ab3866100e3938bda7a70eac83be835a 100644 (file)
--- a/tests/strfunc-test.c
+++ b/tests/strfunc-test.c
@@ -383,5 +383,15 @@ main (int   argc,
 
 #undef S
 
+  {
+    gchar buf[5];
+    
+    TEST (NULL, 3 == g_snprintf (buf, 0, "%s", "abc"));
+    TEST (NULL, 3 == g_snprintf (NULL,0, "%s", "abc"));
+    TEST (NULL, 3 == g_snprintf (buf, 5, "%s", "abc"));
+    TEST (NULL, 4 == g_snprintf (buf, 5, "%s", "abcd"));
+    TEST (NULL, 9 == g_snprintf (buf, 5, "%s", "abcdefghi"));
+  }
+
   return any_failed;
 }