From b3a59f408e7462fbd77289e8c3f50606044a585a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 17 Oct 1995 05:49:48 +0000 Subject: Tue Oct 17 01:21:21 1995 Roland McGrath * stdio-common/psignal.c: Translate signal description strings. * string/strsignal.c: Likewise. * sysdeps/generic/_strerror.c (_strerror_internal): Translate error strings. * sysdeps/mach/_strerror.c: Likewise. * stdio-common/snprintf.c (__snprintf): Renamed from snprintf; call __vsnprintf. (snprintf): Define as weak alias. * stdio/vsnprintf.c (__vsnprintf): Renamed from vsnprintf. (vsnprintf): Define as weak alias. * libc-symbols.h [! ASSEMBLER] (_): New macro. --- ChangeLog | 16 ++++++++- configure | 2 +- libc-symbols.h | 8 +++-- stdio-common/Makefile | 6 ++-- stdio-common/asprintf.c | 4 +-- stdio-common/dprintf.c | 4 +-- stdio-common/psignal.c | 6 ++-- stdio-common/snprintf.c | 7 ++-- stdio-common/vasprintf.c | 86 --------------------------------------------- stdio-common/vdprintf.c | 51 --------------------------- stdio-common/vsnprintf.c | 56 ----------------------------- stdio-common/vsprintf.c | 50 -------------------------- stdio-common/vsscanf.c | 58 ------------------------------ stdio/Makefile | 1 + stdio/vasprintf.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ stdio/vdprintf.c | 51 +++++++++++++++++++++++++++ stdio/vsnprintf.c | 56 +++++++++++++++++++++++++++++ stdio/vsprintf.c | 50 ++++++++++++++++++++++++++ stdio/vsscanf.c | 58 ++++++++++++++++++++++++++++++ string/strsignal.c | 16 ++++----- sysdeps/generic/_strerror.c | 7 ++-- sysdeps/mach/_strerror.c | 13 +++---- 22 files changed, 352 insertions(+), 340 deletions(-) delete mode 100644 stdio-common/vasprintf.c delete mode 100644 stdio-common/vdprintf.c delete mode 100644 stdio-common/vsnprintf.c delete mode 100644 stdio-common/vsprintf.c delete mode 100644 stdio-common/vsscanf.c create mode 100644 stdio/vasprintf.c create mode 100644 stdio/vdprintf.c create mode 100644 stdio/vsnprintf.c create mode 100644 stdio/vsprintf.c create mode 100644 stdio/vsscanf.c diff --git a/ChangeLog b/ChangeLog index ffb6103366..2639dbfbba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Tue Oct 17 01:21:21 1995 Roland McGrath + + * stdio-common/psignal.c: Translate signal description strings. + * string/strsignal.c: Likewise. + * sysdeps/generic/_strerror.c (_strerror_internal): Translate + error strings. + * sysdeps/mach/_strerror.c: Likewise. + + * stdio-common/snprintf.c (__snprintf): Renamed from snprintf; + call __vsnprintf. + (snprintf): Define as weak alias. + * stdio/vsnprintf.c (__vsnprintf): Renamed from vsnprintf. + (vsnprintf): Define as weak alias. + Mon Oct 16 03:22:37 1995 Roland McGrath * Makerules (install-lib): Filter out %_pic.a; install only the @@ -5,7 +19,7 @@ Mon Oct 16 03:22:37 1995 Roland McGrath * locale/Makefile (aux): Add SYS_libc. * locale/SYS_libc.c: New file. - * libc-symbols.h (_): New macro. + * libc-symbols.h [! ASSEMBLER] (_): New macro. * configure.in (libc_cv_asm_set_directive): Link program into conftest instead of letting it default to a.out. diff --git a/configure b/configure index 08609a496e..be1f7b2047 100755 --- a/configure +++ b/configure @@ -1302,7 +1302,7 @@ extern int glibc_conftest_frobozz; main () { printf ("%d\n", glibc_conftest_frobozz); } EOF if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ - conftest.s conftest1.c 1>&5 2>&5; then + -o conftest conftest.s conftest1.c 1>&5 2>&5; then libc_cv_asm_set_directive=yes else libc_cv_asm_set_directive=no diff --git a/libc-symbols.h b/libc-symbols.h index 7997c8d0de..50631d164a 100644 --- a/libc-symbols.h +++ b/libc-symbols.h @@ -48,10 +48,11 @@ Cambridge, MA 02139, USA. */ #define _LIBC 1 /* +*/ - Define the macro `_' for conveniently marking translatable strings - in the libc source code. */ - +#ifndef ASSEMBLER +/* Define the macro `_' for conveniently marking translatable strings + in the libc source code. */ #include extern const char _libc_intl_domainname[]; #ifdef dgettext @@ -62,6 +63,7 @@ extern const char _libc_intl_domainname[]; instead of an optimizing macro. */ #define _(msgid) __dgettext (_libc_intl_domainname, (msgid)) #endif +#endif /* 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 #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 -#include -#include -#include -#include -#include - - - -/* 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 -#include -#include -#include -#include -#include - - -/* 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 -#include -#include -#include - - -/* - * 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 -#include -#include -#include -#include -#include - - -/* 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 -#include -#include -#include -#include - -#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) diff --git a/stdio/Makefile b/stdio/Makefile index a15aa56aff..7d1adf58ee 100644 --- a/stdio/Makefile +++ b/stdio/Makefile @@ -35,6 +35,7 @@ routines := \ fgets gets fputs puts \ getdelim \ fclose fflush \ + vdprintf vsnprintf vsprintf vasprintf vsscanf \ memstream obstream \ internals sysd-stdio pipestream stdio_init libc_fatal aux := defs glue diff --git a/stdio/vasprintf.c b/stdio/vasprintf.c new file mode 100644 index 0000000000..d2ad6b1da6 --- /dev/null +++ b/stdio/vasprintf.c @@ -0,0 +1,86 @@ +/* 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 +#include +#include +#include +#include +#include + + + +/* 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/vdprintf.c b/stdio/vdprintf.c new file mode 100644 index 0000000000..9df4e537bc --- /dev/null +++ b/stdio/vdprintf.c @@ -0,0 +1,51 @@ +/* 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 +#include +#include +#include +#include +#include + + +/* 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/vsnprintf.c b/stdio/vsnprintf.c new file mode 100644 index 0000000000..5de157dc44 --- /dev/null +++ b/stdio/vsnprintf.c @@ -0,0 +1,56 @@ +/* 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 +#include +#include +#include + + +/* + * Write formatted output to S according to the format string + * FORMAT, using the argument list in ARG, writing no more + * than MAXLEN characters. + */ +int +__vsnprintf (char *s, size_t maxlen, const char *format, 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; +} +weak_alias (__vsnprintf, vsnprintf) diff --git a/stdio/vsprintf.c b/stdio/vsprintf.c new file mode 100644 index 0000000000..82be90f1fa --- /dev/null +++ b/stdio/vsprintf.c @@ -0,0 +1,50 @@ +/* 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 +#include +#include +#include +#include +#include + + +/* 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/vsscanf.c b/stdio/vsscanf.c new file mode 100644 index 0000000000..6f027d5065 --- /dev/null +++ b/stdio/vsscanf.c @@ -0,0 +1,58 @@ +/* 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 +#include +#include +#include +#include + +#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) diff --git a/string/strsignal.c b/string/strsignal.c index c2c8835a19..ccd2c0e82f 100644 --- a/string/strsignal.c +++ b/string/strsignal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 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 @@ -36,14 +36,14 @@ DEFUN(strsignal, (signum), int signum) { if (signum < 0 || signum > NSIG) { - static char unknown_signal[] = "Unknown signal 000000000000000000"; - static char fmt[] = "Unknown signal%d"; - size_t len = sprintf(unknown_signal, fmt, signum); - if (len < sizeof(fmt) - 2) + static char buf[512]; + static char fmt[] = ; + int len = __snprintf (buf, sizeof buf, _("Unknown signal %d"), signum); + if (len < 0) return NULL; - unknown_signal[len] = '\0'; - return unknown_signal; + buf[len - 1] = '\0'; + return buf; } - return (char *) _sys_siglist[signum]; + return (char *) _(_sys_siglist[signum]); } diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c index 0d069f84c5..72ebb216bf 100644 --- a/sysdeps/generic/_strerror.c +++ b/sysdeps/generic/_strerror.c @@ -33,13 +33,12 @@ _strerror_internal (errnum, buf, buflen) { if (errnum < 0 || errnum > _sys_nerr) { - static char fmt[] = "Unknown error %d"; - size_t len = snprintf (buf, buflen, fmt, errnum); - if (len < sizeof (fmt) - 2) + int len = __snprintf (buf, buflen, _("Unknown error %d"), errnum); + if (len < 0) return NULL; buf[len - 1] = '\0'; return buf; } - return (char *) _sys_errlist[errnum]; + return (char *) _(_sys_errlist[errnum]); } diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c index f2411122ea..8754f4c047 100644 --- a/sysdeps/mach/_strerror.c +++ b/sysdeps/mach/_strerror.c @@ -40,12 +40,12 @@ _strerror_internal (int errnum, char *buf, size_t buflen) if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { - static const char unk[] = "Error in unknown error system: "; + const char *unk = _("Error in unknown error system: "); + const size_t unklen = strlen (unk); char *p = buf + buflen; *p-- = '\0'; p = _itoa (errnum, p, 16, 1); - p -= sizeof unk - 1; - return memcpy (p, unk, sizeof unk - 1); + return memcpy (p - unklen, unk, unklen); } es = &__mach_error_systems[system]; @@ -55,15 +55,16 @@ _strerror_internal (int errnum, char *buf, size_t buflen) if (code >= es->subsystem[sub].max_code) { - static const char unk[] = "Unknown error "; + const char *unk = _("Unknown error "); + const size_t unklen = strlen (unk); char *p = buf + buflen; size_t len = strlen (es->subsystem[sub].subsys_name); *p-- = '\0'; p = _itoa (errnum, p, 16, 1); *p-- = ' '; p = memcpy (p - len, es->subsystem[sub].subsys_name, len); - return memcpy (p - sizeof unk - 1, unk, sizeof unk - 1); + return memcpy (p - unklen, unk, unklen); } - return (char *) es->subsystem[sub].codes[code]; + return (char *) _(es->subsystem[sub].codes[code]); } -- cgit v1.2.3