diff options
| -rw-r--r-- | Admin/plans | 2 | ||||
| -rw-r--r-- | lib/ChangeLog | 17 | ||||
| -rw-r--r-- | lib/vasprintf.c | 219 |
3 files changed, 236 insertions, 2 deletions
diff --git a/Admin/plans b/Admin/plans index ab08cd8..1826065 100644 --- a/Admin/plans +++ b/Admin/plans @@ -4,8 +4,6 @@ Things we plan to do. Comments welcome. - Update other files from libtool-1.3.5 and autoconf-2.13. -- Restore lib/vasprintf.c. - - For gcc: Making the .pot files is maintainer mode; otherwise building breaks for normal users which don't have all the source. diff --git a/lib/ChangeLog b/lib/ChangeLog index 2c760b1..8ce8ff7 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,20 @@ +2000-12-30 Bruno Haible <haible@clisp.cons.org> + + * vasprintf.c: Include stdlib.h if it exists. + (int_vasprintf): Increase buffer size for float/double values with + positive exponent only. + (main): Add more tests. + +1999-12-27 Geoff Keating <geoffk@cygnus.com> + + * vasprintf.c (int_vasprintf): Don't re-read the format character + as this mishandles strings like '%%s'. + +1998-01-18 Michael Snyder <msnyder@cleaver.cygnus.com> + + * vasprintf.c (int_vasprintf): Increase buffer size for float/double + values. + 2000-05-06 Ulrich Drepper <drepper@redhat.com> * Makefile.am (EXTRA_DIST): Add basename.c. diff --git a/lib/vasprintf.c b/lib/vasprintf.c index e69de29..5ec0282 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -0,0 +1,219 @@ +/* Like vsprintf but provides a pointer to malloc'd storage, which must + be freed by the caller. + Copyright (C) 1994, 1998, 1999, 2000 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 +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include <stdio.h> +#include <string.h> + +#if HAVE_STDLIB_H +# include <stdlib.h> +#else +extern unsigned long strtoul (); +extern char *malloc (); +#endif + +#if __STDC__ +# include <stdarg.h> +#else +# include <varargs.h> +#endif + +#include <math.h> + +#ifdef TEST +int global_total_width; +#endif + +static int +int_vasprintf (result, format, args) + char **result; + const char *format; + va_list *args; +{ + const char *p = format; + /* Add one to make sure that it is never zero, which might cause malloc + to return NULL. */ + int total_width = strlen (format) + 1; + va_list ap; + + memcpy (&ap, args, sizeof (va_list)); + + while (*p != '\0') + { + if (*p++ == '%') + { + while (strchr ("-+ #0", *p)) + ++p; + if (*p == '*') + { + ++p; + total_width += abs (va_arg (ap, int)); + } + else + total_width += strtoul (p, &p, 10); + if (*p == '.') + { + ++p; + if (*p == '*') + { + ++p; + total_width += abs (va_arg (ap, int)); + } + else + total_width += strtoul (p, &p, 10); + } + while (strchr ("hlL", *p)) + ++p; + /* Should be big enough for any format specifier except %s + and floats. */ + total_width += 30; + switch (*p) + { + case 'd': + case 'i': + case 'o': + case 'u': + case 'x': + case 'X': + case 'c': + (void) va_arg (ap, int); + break; + case 'f': + if (fabs (va_arg (ap, double)) >= 1.0) + /* Since an ieee double can have an exponent of 307, we'll + make the buffer wide enough to cover the gross case. */ + total_width += 307; + break; + case 'e': + case 'E': + case 'g': + case 'G': + (void) va_arg (ap, double); + break; + case 's': + total_width += strlen (va_arg (ap, char *)); + break; + case 'p': + case 'n': + (void) va_arg (ap, char *); + break; + } + p++; + } + } +#ifdef TEST + global_total_width = total_width; +#endif + *result = malloc (total_width); + if (*result != NULL) + return vsprintf (*result, format, *args); + else + return 0; +} + +int +vasprintf (result, format, args) + char **result; + const char *format; + va_list args; +{ + return int_vasprintf (result, format, &args); +} + +int +asprintf +#if __STDC__ + (char **result, const char *format, ...) +#else + (result, va_alist) + char **result; + va_dcl +#endif +{ + va_list args; + int done; + +#if __STDC__ + va_start (args, format); +#else + char *format; + va_start (args); + format = va_arg (args, char *); +#endif + done = vasprintf (result, format, args); + va_end (args); + + return done; +} + +/* ========================= test program ========================= */ + +#ifdef TEST + +#include <float.h> + +void +checkit +#if __STDC__ + (const char* format, ...) +#else + (va_alist) + va_dcl +#endif +{ + va_list args; + char *result; + +#if __STDC__ + va_start (args, format); +#else + char *format; + va_start (args); + format = va_arg (args, char *); +#endif + vasprintf (&result, format, args); + if (strlen (result) < global_total_width) + printf ("PASS: "); + else + printf ("FAIL: "); + printf ("%d %s\n", global_total_width, result); +} + +int +main () +{ + checkit ("%d", 0x12345678); + checkit ("%200d", 5); + checkit ("%.300d", 6); + checkit ("%100.150d", 7); + checkit ("%s", "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\ +777777777777777777333333333333366666666666622222222222777777777777733333"); + checkit ("%f%s%d%s", 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx"); + checkit ("%e", DBL_MIN); + checkit ("%e", DBL_MAX); + checkit ("%.400f", DBL_MIN); + checkit ("%f", DBL_MAX); + checkit ("%g", DBL_MIN); + checkit ("%g", DBL_MAX); + return 0; +} + +#endif /* TEST */ |