When using the vsnprintf() implementation, '\0'-terminate the resulting

1999-04-20  Havoc Pennington  <hp@pobox.com>

	* gutils.c (g_vsnprintf):  When using the vsnprintf()
		implementation, '\0'-terminate the resulting string
			and return its length rather than -1.

ChangeLog

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-0

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-10

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-12

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-2

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-4

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-6

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

ChangeLog.pre-2-8

@@ -1,3 +1,9 @@
+1999-04-20  Havoc Pennington  <hp@pobox.com>
+
+	* gutils.c (g_vsnprintf):  When using the vsnprintf()
+	implementation, '\0'-terminate the resulting string
+	and return its length rather than -1.
+
 Mon Apr 19 13:42:21 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gmain.c (g_main_iterate): Added missing

glib/gutils.c

@@ -175,6 +175,12 @@ g_vsnprintf (gchar	 *str,
   
   retval = vsnprintf (str, n, fmt, args);
   
+  if (retval < 0)
+    {
+      str[n-1] = '\0';
+      retval = strlen (str);
+    }
+
   return retval;
 #else	/* !HAVE_VSNPRINTF */
   gchar *printed;

gutils.c

@@ -175,6 +175,12 @@ g_vsnprintf (gchar	 *str,
   
   retval = vsnprintf (str, n, fmt, args);
   
+  if (retval < 0)
+    {
+      str[n-1] = '\0';
+      retval = strlen (str);
+    }
+
   return retval;
 #else	/* !HAVE_VSNPRINTF */
   gchar *printed;