about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile6
-rw-r--r--stdio-common/asprintf.c4
-rw-r--r--stdio-common/dprintf.c4
-rw-r--r--stdio-common/psignal.c6
-rw-r--r--stdio-common/snprintf.c7
-rw-r--r--stdio-common/vasprintf.c86
-rw-r--r--stdio-common/vdprintf.c51
-rw-r--r--stdio-common/vsnprintf.c56
-rw-r--r--stdio-common/vsprintf.c50
-rw-r--r--stdio-common/vsscanf.c58
10 files changed, 11 insertions, 317 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 6ca6c7d1d3..3afb555458 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -26,10 +26,8 @@ headers	:= stdio_lim.h printf.h
 routines	:=							      \
 	ctermid cuserid							      \
 	vfprintf vprintf printf_fp reg-printf printf-prs _itoa		      \
-	vsnprintf vsprintf vasprintf	      				      \
-	fprintf printf snprintf sprintf asprintf			      \
-	dprintf vdprintf						      \
-	vfscanf vscanf vsscanf						      \
+	fprintf printf snprintf sprintf asprintf dprintf		      \
+	vfscanf vscanf 							      \
 	fscanf scanf sscanf						      \
 	perror psignal							      \
 	tmpfile tmpnam tempnam tempname					      \
diff --git a/stdio-common/asprintf.c b/stdio-common/asprintf.c
index 85ab7b1041..dd9eec5ba1 100644
--- a/stdio-common/asprintf.c
+++ b/stdio-common/asprintf.c
@@ -27,9 +27,7 @@ Cambridge, MA 02139, USA.  */
    allocated with malloc and stored in *STRING_PTR.  */
 /* VARARGS2 */
 int
-asprintf (string_ptr, format)
-     char **string_ptr;
-     const char *format;
+asprintf (char **string_ptr, const char *format, ...)
 {
   va_list arg;
   int done;
diff --git a/stdio-common/dprintf.c b/stdio-common/dprintf.c
index 5746d49841..611a6030a1 100644
--- a/stdio-common/dprintf.c
+++ b/stdio-common/dprintf.c
@@ -26,9 +26,7 @@ Cambridge, MA 02139, USA.  */
 /* Write formatted output to D, according to the format string FORMAT.  */
 /* VARARGS2 */
 int
-dprintf (d, format)
-     int d;
-     const char *format;
+dprintf (int d, const char *format, ...)
 {
   va_list arg;
   int done;
diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index 8997a2ecdf..f82bed6933 100644
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -43,7 +43,7 @@ DEFUN(psignal, (sig, s), int sig AND register CONST char *s)
     colon = ": ";
 
   if (sig >= 0 && sig < NSIG)
-    (void) fprintf(stderr, "%s%s%s\n", s, colon, _sys_siglist[sig]);
+    (void) fprintf (stderr, "%s%s%s\n", s, colon, _(_sys_siglist[sig]));
   else
-    (void) fprintf(stderr, "%s%sUnknown signal %d\n", s, colon, sig);
+    (void) fprintf (stderr, _("%s%sUnknown signal %d\n"), s, colon, sig);
 }
diff --git a/stdio-common/snprintf.c b/stdio-common/snprintf.c
index 00b85f3175..a7a6e722ee 100644
--- a/stdio-common/snprintf.c
+++ b/stdio-common/snprintf.c
@@ -20,14 +20,14 @@ Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 
 #ifdef USE_IN_LIBIO
-# define vsnprintf _IO_vsnprintf
+# define __vsnprintf _IO_vsnprintf
 #endif
 
 /* Write formatted output into S, according to the format
    string FORMAT, writing no more than MAXLEN characters.  */
 /* VARARGS3 */
 int
-snprintf (s, maxlen, format)
+__snprintf (s, maxlen, format)
       char *s;
       size_t maxlen;
       const char *format;
@@ -36,8 +36,9 @@ snprintf (s, maxlen, format)
   int done;
 
   va_start (arg, format);
-  done = vsnprintf (s, maxlen, format, arg);
+  done = __vsnprintf (s, maxlen, format, arg);
   va_end (arg);
 
   return done;
 }
+weak_alias (__snprintf, snprintf)
diff --git a/stdio-common/vasprintf.c b/stdio-common/vasprintf.c
deleted file mode 100644
index d2ad6b1da6..0000000000
--- a/stdio-common/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;
-}
diff --git a/stdio-common/vdprintf.c b/stdio-common/vdprintf.c
deleted file mode 100644
index 9df4e537bc..0000000000
--- a/stdio-common/vdprintf.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1991, 1992, 1993 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 <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-
-/* Write formatted output to file descriptor D according to the format string
-   FORMAT, using the argument list in ARG.  */
-int
-DEFUN(vdprintf, (d, format, arg),
-      int d AND CONST char *format AND va_list arg)
-{
-  int done;
-  FILE f;
-
-  /* Create an unbuffered stream talking to D on the stack.  */
-  memset ((PTR) &f, 0, sizeof(f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__write = 1;
-  f.__cookie = (PTR) (long int) d; /* Casting to long quiets GCC on Alpha.  */
-  f.__room_funcs = __default_room_functions;
-  f.__io_funcs = __default_io_functions;
-  f.__seen = 1;
-  f.__userbuf = 1;
-
-  /* vfprintf will use a buffer on the stack for the life of the call,
-     and flush it when finished.  */
-  done = vfprintf (&f, format, arg);
-
-  return done;
-}
diff --git a/stdio-common/vsnprintf.c b/stdio-common/vsnprintf.c
deleted file mode 100644
index a02c259131..0000000000
--- a/stdio-common/vsnprintf.c
+++ /dev/null
@@ -1,56 +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 <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-
-/*
- * Write formatted output to S according to the format string
- * FORMAT, using the argument list in ARG, writing no more
- * than MAXLEN characters.
- */
-int
-DEFUN(vsnprintf, (s, maxlen, format, arg),
-	char *s AND size_t maxlen AND CONST char *format AND va_list arg)
-{
-  int done;
-  FILE f;
-
-  memset((PTR) &f, 0, sizeof(f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__write = 1;
-  /* The buffer size is one less than MAXLEN
-     so we have space for the null terminator.  */
-  f.__bufp = f.__buffer = (char *) s;
-  f.__bufsize = maxlen - 1;
-  f.__put_limit = f.__buffer + f.__bufsize;
-  f.__get_limit = f.__buffer;
-  /* After the buffer is full (MAXLEN characters have been written),
-     any more characters written will go to the bit bucket.  */
-  f.__room_funcs = __default_room_functions;
-  f.__io_funcs.__write = NULL;
-  f.__seen = 1;
-
-  done = vfprintf(&f, format, arg);
-  *f.__bufp = '\0';
-
-  return done;
-}
diff --git a/stdio-common/vsprintf.c b/stdio-common/vsprintf.c
deleted file mode 100644
index 82be90f1fa..0000000000
--- a/stdio-common/vsprintf.c
+++ /dev/null
@@ -1,50 +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 <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-
-/* Write formatted output to S according to the format string
-   FORMAT, using the argument list in ARG.  */
-int
-DEFUN(vsprintf, (s, format, arg),
-      char *s AND CONST char *format AND va_list arg)
-{
-  int done;
-  FILE f;
-
-  memset((PTR) &f, 0, sizeof(f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__write = 1;
-  f.__bufp = f.__buffer = (char *) s;
-  f.__put_limit = (char *) ULONG_MAX;
-  f.__bufsize = (size_t) (f.__put_limit - f.__bufp);
-  f.__get_limit = f.__buffer;
-  f.__room_funcs.__output = NULL;
-  f.__seen = 1;
-
-  done = vfprintf(&f, format, arg);
-  *f.__bufp = '\0';
-
-  return done;
-}
diff --git a/stdio-common/vsscanf.c b/stdio-common/vsscanf.c
deleted file mode 100644
index 6f027d5065..0000000000
--- a/stdio-common/vsscanf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995 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 <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#undef	vsscanf
-
-
-/* Read formatted input from S according to the format
-   string FORMAT, using the argument list in ARG.  */
-int
-DEFUN(__vsscanf, (s, format, arg),
-      CONST char *s AND CONST char *format AND va_list arg)
-{
-  FILE f;
-
-  if (s == NULL)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  memset((PTR) &f, 0, sizeof(f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__read = 1;
-  f.__bufp = f.__buffer = (char *) s;
-  f.__bufsize = strlen(s);
-  f.__get_limit = f.__buffer + f.__bufsize;
-  f.__put_limit = f.__buffer;
-  /* After the buffer is empty (strlen(S) characters have been read),
-     any more read attempts will get EOF.  */
-  f.__room_funcs.__input = NULL;
-  f.__seen = 1;
-
-  return __vfscanf(&f, format, arg);
-}
-
-
-weak_alias (__vsscanf, vsscanf)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-01 11:11:46 +0000