mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 01:40:26 +00:00
0ed99ce46d
2000-02-27 Ulrich Drepper <drepper@redhat.com> * conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h, varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h, termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h, sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h, sys/sem.h, and sys/resource.h. Implement handling of allow-header. * conform/data/fcntl.h-data: Correct various bugs. * conform/data/fnmatch.h-data: Likewise. * conform/data/math.h-data: Likewise. * conform/data/ndbm.h-data: Likewise. * conform/data/nl_types.h-data: Likewise. * conform/data/poll.h-data: Likewise. * conform/data/pthread.h-data: Likewise. * conform/data/semaphore.h-data: Likewise. * conform/data/setjmp.h-data: Likewise. * conform/data/signal.h-data: Likewise. * conform/data/stdarg.h-data: Likewise. * conform/data/stddef.h-data: Likewise. * conform/data/stdio.h-data: Likewise. * conform/data/stdlib.h-data: Likewise. * conform/data/string.h-data: Likewise. * conform/data/strings.h-data: Likewise. * conform/data/stropts.h-data: Likewise. * conform/data/syslog.h-data: Likewise. * conform/data/sys/ipc.h-data: Likewise. * conform/data/sys/mman.h-data: Likewise. * conform/data/sys/msg.h-data: Likewise. * conform/data/tar.h-data: New file. * conform/data/termios.h-data: New file. * conform/data/time.h-data: New file. * conform/data/ucontext.h-data: New file. * conform/data/ulimit.h-data: New file. * conform/data/unistd.h-data: New file. * conform/data/utime.h-data: New file. * conform/data/utmpx.h-data: New file. * conform/data/varargs.h-data: New file. * conform/data/wchar.h-data: New file. * conform/data/wctype.h-data: New file. * conform/data/wordexp.h-data: New file. * conform/data/sys/resource.h-data: New file. * conform/data/sys/sem.h-data: New file. * conform/data/sys/shm.h-data: New file. * conform/data/sys/stat.h-data: New file. * conform/data/sys/statvfs.h-data: New file. * conform/data/sys/time.h-data: New file. * conform/data/sys/timeb.h-data: New file. * conform/data/sys/times.h-data: New file. * conform/data/sys/types.h-data: New file. * conform/data/sys/uio.h-data: New file. * conform/data/sys/wait.h-data: New file. * grp/grp.h (getgrent_r): Declare only if __USE_GNU. * include/sys/time.h (__itimes): Fix type of second parameter. * io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN. (S_ISVTX): Likewise. * io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t. * locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL, MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN, NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES, P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN, N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR, NOEXPR, YESSTR, and NOSTR only available if __USE_GNU. * math/bits/mathcalls.h: Don't declare tgamma and scalbn if only __USE_XOPEN. * posix/unistd.h: Don't define ptrdiff_t. (sbrk): Correct type of parameter. * sysdeps/generic/sbrk.c: Likewise. * sysdeps/mach/hurd/sbrk.c: Likewise. * posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and fsfilcnt_t being defined elsewhere. * resource/sys/resource.h: Define id_t. If __USE_XOPEN use int for type of first parameter if getrlimit, getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and setpriority. * sysdeps/generic/getpriority.c: Fix type of second parameter. * sysdeps/generic/setpriority.c: Likewise. * sysdeps/mach/hurd/getpriority.c: Likewise. * sysdeps/mach/hurd/setpriority.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/getpriority.c: Likewise. * sysdeps/generic/utimes.c: Fix parameter of third parameter. * sysdeps/mach/hurd/utimes.c: Likewise. * sysdeps/posix/utimes.c: Likewise. * sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in struct shmid_ds definition. * sysdeps/gnu/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise. * sysvipc/sys/shm.h: Define time_t. * sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned. * sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and struct sem_undo to struct __sem_queue and struct __sem_undo resp. * time/time.h: Define suseconds_t if not already done. * sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare. * sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise. * sysdeps/unix/sysv/linux/statvfs64.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise. * intl/bindtextdom.c: Use rwlock to avoid surprising results in multithreaded applications. * intl/dcigettext.c: Likewise. * intl/textdomain.c: Likewise. * intl/*.c: Update copyright. * sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs. 2000-02-27 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as prefix especially. 2000-02-27 Ulrich Drepper <drepper@redhat.com> * po/de.po: Update from translation team. * po/ko.po: Likewise.
214 lines
5.6 KiB
C
214 lines
5.6 KiB
C
/* Implementation of the bindtextdomain(3) function
|
|
Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
|
|
|
|
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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#else
|
|
# ifdef HAVE_MALLOC_H
|
|
# include <malloc.h>
|
|
# else
|
|
void free ();
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
# ifndef memcpy
|
|
# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgettext.h"
|
|
#endif
|
|
#include "gettext.h"
|
|
#include "gettextP.h"
|
|
|
|
#ifdef _LIBC
|
|
/* We have to handle multi-threaded applications. */
|
|
# include <bits/libc-lock.h>
|
|
#else
|
|
/* Provide dummy implementation if this is outside glibc. */
|
|
# define __libc_lock_define_initialized (CLASS, NAME)
|
|
# define __libc_lock_lock(NAME)
|
|
# define __libc_lock_unlock(NAME)
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
/* Contains the default location of the message catalogs. */
|
|
extern const char _nl_default_dirname[];
|
|
|
|
/* List with bindings of specific domains. */
|
|
extern struct binding *_nl_domain_bindings;
|
|
|
|
/* Lock variable to protect the global data in the gettext implementation. */
|
|
__libc_rwlock_define (extern, _nl_state_lock)
|
|
|
|
|
|
/* Names for the libintl functions are a problem. They must not clash
|
|
with existing names and they should follow ANSI C. But this source
|
|
code is also used in GNU C Library where the names have a __
|
|
prefix. So we have to make a difference here. */
|
|
#ifdef _LIBC
|
|
# define BINDTEXTDOMAIN __bindtextdomain
|
|
# ifndef strdup
|
|
# define strdup(str) __strdup (str)
|
|
# endif
|
|
#else
|
|
# define BINDTEXTDOMAIN bindtextdomain__
|
|
#endif
|
|
|
|
/* Specify that the DOMAINNAME message catalog will be found
|
|
in DIRNAME rather than in the system locale data base. */
|
|
char *
|
|
BINDTEXTDOMAIN (domainname, dirname)
|
|
const char *domainname;
|
|
const char *dirname;
|
|
{
|
|
struct binding *binding;
|
|
char *result;
|
|
|
|
/* Some sanity checks. */
|
|
if (domainname == NULL || domainname[0] == '\0')
|
|
return NULL;
|
|
|
|
__libc_rwlock_wrlock (_nl_state_lock);
|
|
|
|
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
|
|
{
|
|
int compare = strcmp (domainname, binding->domainname);
|
|
if (compare == 0)
|
|
/* We found it! */
|
|
break;
|
|
if (compare < 0)
|
|
{
|
|
/* It is not in the list. */
|
|
binding = NULL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (dirname == NULL)
|
|
/* The current binding has be to returned. */
|
|
result = binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
|
|
else if (binding != NULL)
|
|
{
|
|
/* The domain is already bound. If the new value and the old
|
|
one are equal we simply do nothing. Otherwise replace the
|
|
old binding. */
|
|
result = binding->dirname;
|
|
if (strcmp (dirname, result) != 0)
|
|
{
|
|
if (strcmp (dirname, _nl_default_dirname) == 0)
|
|
result = (char *) _nl_default_dirname;
|
|
else
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = strdup (dirname);
|
|
#else
|
|
size_t len = strlen (dirname) + 1;
|
|
result = (char *) malloc (len);
|
|
if (result != NULL)
|
|
memcpy (result, dirname, len);
|
|
#endif
|
|
}
|
|
|
|
if (result != NULL)
|
|
{
|
|
if (binding->dirname != _nl_default_dirname)
|
|
free (binding->dirname);
|
|
|
|
binding->dirname = result;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* We have to create a new binding. */
|
|
size_t len = strlen (domainname) + 1;
|
|
struct binding *new_binding =
|
|
(struct binding *) malloc (sizeof (*new_binding) + len);
|
|
|
|
if (new_binding == NULL)
|
|
result = NULL;
|
|
else
|
|
{
|
|
memcpy (new_binding->domainname, domainname, len);
|
|
|
|
if (strcmp (dirname, _nl_default_dirname) == 0)
|
|
result = new_binding->dirname = (char *) _nl_default_dirname;
|
|
else
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
result = new_binding->dirname = strdup (dirname);
|
|
#else
|
|
len = strlen (dirname) + 1;
|
|
result = new_binding->dirname = (char *) malloc (len);
|
|
if (result != NULL)
|
|
memcpy (new_binding->dirname, dirname, len);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
if (result != NULL)
|
|
{
|
|
/* Now enqueue it. */
|
|
if (_nl_domain_bindings == NULL
|
|
|| strcmp (domainname, _nl_domain_bindings->domainname) < 0)
|
|
{
|
|
new_binding->next = _nl_domain_bindings;
|
|
_nl_domain_bindings = new_binding;
|
|
}
|
|
else
|
|
{
|
|
binding = _nl_domain_bindings;
|
|
while (binding->next != NULL
|
|
&& strcmp (domainname, binding->next->domainname) > 0)
|
|
binding = binding->next;
|
|
|
|
new_binding->next = binding->next;
|
|
binding->next = new_binding;
|
|
}
|
|
}
|
|
else if (new_binding != NULL)
|
|
free (new_binding);
|
|
}
|
|
|
|
/* For a succesful call we flush the caches. */
|
|
if (result != NULL)
|
|
++_nl_msg_cat_cntr;
|
|
|
|
__libc_rwlock_unlock (_nl_state_lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
/* Alias for function name in GNU C Library. */
|
|
weak_alias (__bindtextdomain, bindtextdomain);
|
|
#endif
|