X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fvasprintf.c;h=ba94c64ba8bc9f96a1a67f62dd9ceb8852a5d810;hb=02eb9acbac6b05f1d5f3acb89bcc4bbc45215e2a;hp=7c8f212d724d9f5da378a921f174b1c5460487d4;hpb=757bd39e4b07efaefaef3ef11027b7b7b40f5911;p=gnulib.git diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 7c8f212d7..ba94c64ba 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,8 @@ /* Specification. */ #include "vasprintf.h" +#include + #include "vasnprintf.h" int @@ -31,7 +33,10 @@ vasprintf (char **resultp, const char *format, va_list args) char *result = vasnprintf (NULL, &length, format, args); if (result == NULL) return -1; + *resultp = result; - /* Return the number of resulting bytes, excluding the trailing NUL. */ + /* Return the number of resulting bytes, excluding the trailing NUL. + If it wouldn't fit in an 'int', vasnprintf() would have returned NULL + and set errno to EOVERFLOW. */ return length; }