Avoid a memory allocation when possible.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1c3510dbdfdfb059eb3bed211d401226f89053b6..08659a34df71ca9150dadf6abbe7980c95a18cea 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-07  Bruno Haible  <bruno@clisp.org>
+
+       * snprintf.c (snprintf): Avoid a memory allocation if the result fits
+       into the provided buffer.
+
 2004-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * diacrit.c, diacrit.h: Add GPL notice.

diff --git a/lib/snprintf.c b/lib/snprintf.c
index 667ed9462556311d63b256513d9440cf1aa8af54..9a4edc1f5fb3fb0268ff9e883a96abf3e57351a5 100644 (file)
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -42,19 +42,19 @@ snprintf (char *str, size_t size, const char *format, ...)
   va_list args;
 
   va_start (args, format);
-  output = vasnprintf (NULL, &len, format, args);
+  len = size;
+  output = vasnprintf (str, &len, format, args);
   va_end (args);
 
   if (!output)
     return -1;
 
-  if (str && size > 0)
-    {
-      memcpy (str, output, MIN (len + 1, size));
+  if (str != NULL)
+    if (len > size - 1) /* equivalent to: (size > 0 && len >= size) */
       str[size - 1] = '\0';
-    }
 
-  free (output);
+  if (output != str)
+    free (output);
 
   return len;
 }