diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | argp/argp-help.c | 4 | ||||
| -rw-r--r-- | argp/argp-parse.c | 4 | ||||
| -rw-r--r-- | inet/getnameinfo.c | 10 | ||||
| -rw-r--r-- | inet/rexec.c | 2 | ||||
| -rw-r--r-- | misc/daemon.c | 2 | ||||
| -rw-r--r-- | misc/regexp.c | 6 | ||||
| -rw-r--r-- | nss/digits_dots.c | 2 | ||||
| -rw-r--r-- | posix/regex.c | 4 |
9 files changed, 34 insertions, 11 deletions
@@ -1,5 +1,16 @@ 2000-10-27 Ulrich Drepper <drepper@redhat.com> + * posix/regex.c (gettext): Use correct translation domain for glibc. + + * argp/argp-parse.c: Use __dcgettext instead of dcgettext for glibc. + * argp/argp-help.c: Likewise. + * inet/getnameinfo.c (getnameinfo): Use __snprintf instead of snprintf. + * inet/rexec.c (rexec_af): Use __snprintf instead of snprintf. + * misc/regexp.c (__step): Use __regexec instead of regexec. + (__advance): Likewise. + * nss/digits_dots.c: Use __inet_aton instead of inet_aton. + * misc/daemon.c (daemon): Use __fork instead of fork. + * stdlib/fmtmsg.c (fmtmsg): Change output format slightly to make it look better and bring it closer to SysV behavior. * stdlib/Makefile (distribute): Add tst-fmtmsg.sh. diff --git a/argp/argp-help.c b/argp/argp-help.c index d378faa4a5..5810e70329 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -57,6 +57,10 @@ char *alloca (); /* This is for other GNU distributions with internationalized messages. */ # if defined HAVE_LIBINTL_H || defined _LIBC # include <libintl.h> +# ifdef _LIBC +# undef dgettext +# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) +# endif # else # define dgettext(domain, msgid) (msgid) # endif diff --git a/argp/argp-parse.c b/argp/argp-parse.c index 71b3fb298b..e16b2f78e5 100644 --- a/argp/argp-parse.c +++ b/argp/argp-parse.c @@ -33,6 +33,10 @@ When compiling libc, the _ macro is predefined. */ # if defined HAVE_LIBINTL_H || defined _LIBC # include <libintl.h> +# ifdef _LIBC +# undef dgettext +# define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES) +# endif # else # define dgettext(domain, msgid) (msgid) # define gettext(msgid) (msgid) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 0811f2775f..6beeba0a19 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -318,11 +318,11 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, size_t scopelen; scopebuf[0] = SCOPE_DELIMITER; - scopelen = 1 + snprintf (scopeptr, - (scopebuf - + sizeof scopebuf - - scopeptr), - "%u", scopeid); + scopelen = 1 + __snprintf (scopeptr, + (scopebuf + + sizeof scopebuf + - scopeptr), + "%u", scopeid); real_hostlen = __strnlen (host, hostlen); if (real_hostlen + scopelen + 1 > hostlen) diff --git a/inet/rexec.c b/inet/rexec.c index 4eae8f79ee..30b7cca22c 100644 --- a/inet/rexec.c +++ b/inet/rexec.c @@ -65,7 +65,7 @@ rexec_af(ahost, rport, name, pass, cmd, fd2p, af) int gai; char servbuff[NI_MAXSERV]; - snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport)); + __snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport)); servbuff[sizeof(servbuff) - 1] = '\0'; memset(&hints, 0, sizeof(hints)); diff --git a/misc/daemon.c b/misc/daemon.c index dddb765daf..8cffdde1ce 100644 --- a/misc/daemon.c +++ b/misc/daemon.c @@ -44,7 +44,7 @@ daemon(nochdir, noclose) { int fd; - switch (fork()) { + switch (__fork()) { case -1: return (-1); case 0: diff --git a/misc/regexp.c b/misc/regexp.c index 34019aeb1a..fbc32e74d0 100644 --- a/misc/regexp.c +++ b/misc/regexp.c @@ -1,5 +1,5 @@ /* Define function and variables for the obsolete <regexp.h> interface. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -41,7 +41,7 @@ __step (const char *string, const char *expbuf) expbuf += __alignof (regex_t *); expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *); - if (regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL) + if (__regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL) == REG_NOMATCH) return 0; @@ -63,7 +63,7 @@ __advance (const char *string, const char *expbuf) expbuf += __alignof__ (regex_t *); expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *); - if (regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL) + if (__regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL) == REG_NOMATCH /* We have to check whether the check is at the beginning of the buffer. */ diff --git a/nss/digits_dots.c b/nss/digits_dots.c index 045bf8a661..a439207191 100644 --- a/nss/digits_dots.c +++ b/nss/digits_dots.c @@ -126,7 +126,7 @@ 255.255.255.255? The test below will succeed spuriously... ??? */ if (af == AF_INET) - ok = inet_aton (name, (struct in_addr *) host_addr); + ok = __inet_aton (name, (struct in_addr *) host_addr); else { assert (af == AF_INET6); diff --git a/posix/regex.c b/posix/regex.c index 8cce459a0b..440194a201 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -89,6 +89,10 @@ /* This is for other GNU distributions with internationalized messages. */ #if HAVE_LIBINTL_H || defined _LIBC # include <libintl.h> +# ifdef _LIBC +# undef gettext +# define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES) +# endif #else # define gettext(msgid) (msgid) #endif |