aboutsummaryrefslogtreecommitdiff
path: root/stdio/vasprintf.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-10-17 00:41:39 +0000
committerRoland McGrath <roland@gnu.org>1995-10-17 00:41:39 +0000
commitdeab9deadc372fe1a367aef2e78c0d8f2885bf23 (patch)
tree367eaf76a86934f3883f950da5719ca581185ca5 /stdio/vasprintf.c
parent10fd03c6014206b3775be893727f282c4c709ebf (diff)
downloadglibc-deab9deadc372fe1a367aef2e78c0d8f2885bf23.zip
glibc-deab9deadc372fe1a367aef2e78c0d8f2885bf23.tar.gz
glibc-deab9deadc372fe1a367aef2e78c0d8f2885bf23.tar.bz2
* Makefile (subdirs): Replace stdio with stdio-common and $(stdio).
* configure.in: Grok arg --enable-libio. ($stdio = libio): Define USE_IN_LIBIO. * config.h.in (USE_IN_LIBIO): Add #undef. * config.make.in (stdio): New variable, set by configure. * Makeconfig (stdio): New variable. * stdio.h [USE_IN_LIBIO]: Include libio/stdio.h instead of stdio/stdio.h. * stdio-common/Makefile: New file. * stdio/Makefile: Half the contents moved to stdio-common/Makefile. * stdio/_itoa.c: Moved to stdio-common. * stdio/_itoa.h: Moved to stdio-common. * stdio/asprintf.c: Moved to stdio-common. * stdio/bug1.c: Moved to stdio-common. * stdio/bug1.input: Moved to stdio-common. * stdio/bug2.c: Moved to stdio-common. * stdio/bug3.c: Moved to stdio-common. * stdio/bug4.c: Moved to stdio-common. * stdio/bug5.c: Moved to stdio-common. * stdio/bug6.c: Moved to stdio-common. * stdio/bug6.input: Moved to stdio-common. * stdio/bug7.c: Moved to stdio-common. * stdio/dprintf.c: Moved to stdio-common. * stdio/errnobug.c: Moved to stdio-common. * stdio/getline.c: Moved to stdio-common. * stdio/getw.c: Moved to stdio-common. * stdio/perror.c: Moved to stdio-common. * stdio/printf-parse.h: Moved to stdio-common. * stdio/printf-prs.c: Moved to stdio-common. * stdio/printf.c: Moved to stdio-common. * stdio/printf.h: Moved to stdio-common. * stdio/printf_fp.c: Moved to stdio-common. * stdio/psignal.c: Moved to stdio-common. * stdio/putw.c: Moved to stdio-common. * stdio/reg-printf.c: Moved to stdio-common. * stdio/scanf.c: Moved to stdio-common. * stdio/snprintf.c: Moved to stdio-common. * stdio/sprintf.c: Moved to stdio-common. * stdio/sscanf.c: Moved to stdio-common. * stdio/tempnam.c: Moved to stdio-common. * stdio/temptest.c: Moved to stdio-common. * stdio/test-fseek.c: Moved to stdio-common. * stdio/test-fwrite.c: Moved to stdio-common. * stdio/test-popen.c: Moved to stdio-common. * stdio/test_rdwr.c: Moved to stdio-common. * stdio/tmpfile.c: Moved to stdio-common. * stdio/tmpnam.c: Moved to stdio-common. * stdio/tst-fileno.c: Moved to stdio-common. * stdio/tst-printf.c: Moved to stdio-common. * stdio/tstgetln.c: Moved to stdio-common. * stdio/tstgetln.input: Moved to stdio-common. * stdio/tstscanf.c: Moved to stdio-common. * stdio/tstscanf.input: Moved to stdio-common. * stdio/vfprintf.c: Moved to stdio-common. * stdio/vfscanf.c: Moved to stdio-common. * stdio/vprintf.c: Moved to stdio-common. * stdio/xbug.c: Moved to stdio-common. * sysdeps/generic/Makefile (siglist.c rules): Do this in subdir stdio-common instead of stdio. * sysdeps/unix/Makefile (errlist.c rules): Likewise. * stdio-common/asprintf.c [USE_IN_LIBIO]: Call libio primitive function. * stdio-common/dprintf.c: Likewise. * stdio-common/printf.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdio-common/vprintf.c: Likewise. * Makerules: Include $(+depfiles) directly instead of generating depend-$(subdir). (depend-$(subdir)): Target removed. (common-clean): Don't remove depend-$(subdir).
Diffstat (limited to 'stdio/vasprintf.c')
-rw-r--r--stdio/vasprintf.c86
1 files changed, 0 insertions, 86 deletions
diff --git a/stdio/vasprintf.c b/stdio/vasprintf.c
deleted file mode 100644
index d2ad6b1..0000000
--- a/stdio/vasprintf.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-#include <ansidecl.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-
-/* Enlarge STREAM's buffer. */
-static void
-DEFUN(enlarge_buffer, (stream, c),
- register FILE *stream AND int c)
-{
- ptrdiff_t bufp_offset = stream->__bufp - stream->__buffer;
- char *newbuf;
-
- stream->__bufsize += 100;
- newbuf = (char *) realloc ((PTR) stream->__buffer, stream->__bufsize);
- if (newbuf == NULL)
- {
- free ((PTR) stream->__buffer);
- stream->__buffer = stream->__bufp
- = stream->__put_limit = stream->__get_limit = NULL;
- stream->__error = 1;
- }
- else
- {
- stream->__buffer = newbuf;
- stream->__bufp = stream->__buffer + bufp_offset;
- stream->__get_limit = stream->__put_limit;
- stream->__put_limit = stream->__buffer + stream->__bufsize;
- if (c != EOF)
- *stream->__bufp++ = (unsigned char) c;
- }
-}
-
-/* Write formatted output from FORMAT to a string which is
- allocated with malloc and stored in *STRING_PTR. */
-int
-DEFUN(vasprintf, (string_ptr, format, args),
- char **string_ptr AND CONST char *format AND va_list args)
-{
- FILE f;
- int done;
-
- memset ((PTR) &f, 0, sizeof (f));
- f.__magic = _IOMAGIC;
- f.__bufsize = 100;
- f.__buffer = (char *) malloc (f.__bufsize);
- if (f.__buffer == NULL)
- return -1;
- f.__bufp = f.__buffer;
- f.__put_limit = f.__buffer + f.__bufsize;
- f.__mode.__write = 1;
- f.__room_funcs.__output = enlarge_buffer;
- f.__seen = 1;
-
- done = vfprintf (&f, format, args);
- if (done < 0)
- return done;
-
- *string_ptr = realloc (f.__buffer, (f.__bufp - f.__buffer) + 1);
- if (*string_ptr == NULL)
- *string_ptr = f.__buffer;
- (*string_ptr)[f.__bufp - f.__buffer] = '\0';
- return done;
-}