From b3a59f408e7462fbd77289e8c3f50606044a585a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 17 Oct 1995 05:49:48 +0000 Subject: [PATCH] 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/Makefile | 1 + {stdio-common => stdio}/vasprintf.c | 0 {stdio-common => stdio}/vdprintf.c | 0 {stdio-common => stdio}/vsnprintf.c | 6 +++--- {stdio-common => stdio}/vsprintf.c | 0 {stdio-common => stdio}/vsscanf.c | 0 string/strsignal.c | 16 ++++++++-------- sysdeps/generic/_strerror.c | 7 +++---- sysdeps/mach/_strerror.c | 13 +++++++------ 17 files changed, 54 insertions(+), 42 deletions(-) rename {stdio-common => stdio}/vasprintf.c (100%) rename {stdio-common => stdio}/vdprintf.c (100%) rename {stdio-common => stdio}/vsnprintf.c (90%) rename {stdio-common => stdio}/vsprintf.c (100%) rename {stdio-common => stdio}/vsscanf.c (100%) diff --git a/ChangeLog b/ChangeLog index ffb6103..2639dbf 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 08609a4..be1f7b2 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 7997c8d..50631d1 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 6ca6c7d..3afb555 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 85ab7b1..dd9eec5 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 5746d49..611a603 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 8997a2e..f82bed6 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 00b85f3..a7a6e72 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/Makefile b/stdio/Makefile index a15aa56..7d1adf5 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-common/vasprintf.c b/stdio/vasprintf.c similarity index 100% rename from stdio-common/vasprintf.c rename to stdio/vasprintf.c diff --git a/stdio-common/vdprintf.c b/stdio/vdprintf.c similarity index 100% rename from stdio-common/vdprintf.c rename to stdio/vdprintf.c diff --git a/stdio-common/vsnprintf.c b/stdio/vsnprintf.c similarity index 90% rename from stdio-common/vsnprintf.c rename to stdio/vsnprintf.c index a02c259..5de157d 100644 --- a/stdio-common/vsnprintf.c +++ b/stdio/vsnprintf.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 @@ -28,8 +28,7 @@ Cambridge, MA 02139, USA. */ * than MAXLEN characters. */ int -DEFUN(vsnprintf, (s, maxlen, format, arg), - char *s AND size_t maxlen AND CONST char *format AND va_list arg) +__vsnprintf (char *s, size_t maxlen, const char *format, va_list arg) { int done; FILE f; @@ -54,3 +53,4 @@ DEFUN(vsnprintf, (s, maxlen, format, arg), return done; } +weak_alias (__vsnprintf, vsnprintf) diff --git a/stdio-common/vsprintf.c b/stdio/vsprintf.c similarity index 100% rename from stdio-common/vsprintf.c rename to stdio/vsprintf.c diff --git a/stdio-common/vsscanf.c b/stdio/vsscanf.c similarity index 100% rename from stdio-common/vsscanf.c rename to stdio/vsscanf.c diff --git a/string/strsignal.c b/string/strsignal.c index c2c8835..ccd2c0e 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 0d069f8..72ebb21 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 f241112..8754f4c 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]); } -- 2.7.4