mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
1997-08-20 05:30 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catclose): Use __munmap instead of munmap. * catgets/gencat.c (read_input_file): Fix typo. * dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN. * elf/dl-load.c: Fix case of missing DT_RPATH in object which gets executed (e.g., when it is a static binary). * intl/bindtextdomain.c: Use strdup in glibc. Correct comment. * intl/dcgettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/gettext.h: Likewise. * intl/hash-string.h: Likewise. * intl/l10nflist.c: Likewise. * intl/libintl.h: Likewise. * intl/loadinfo.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. Unify libio sources with code in libg++. * libio/fcloseall.c: Update and reformat copyright. Protect use of weak_alias. Use _IO_* thread macros instead of __libc_*. * libio/feof.c: Likewise. * libio/feof_u.c: Likewise. * libio/ferror.c: Likewise. * libio/ferror_u.c: Likewise. * libio/fgetc.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileno.c: Likewise. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/fputc_u.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/genops.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofprintf.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/iosprintf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/obprintf.c: Likewise. * libio/pclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strfile.h: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * manual/libc.texinfo: Add menu entries for chapter on message translation. * manual/locale.texi: Correct next entry in @node for new chapter. * manual/search.texi: Likewise for previous link. * manual/message.texi: New file. * manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH, setenv, unsetenv, and clearenv. * manual/string.texi: Fix typos. Patch by Jim Meyering. * math/Makefile (test-longdouble-yes): Enable. We want long double tests now. Crusade against strcat. * nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat. * stdlib/canonicalize.c: Likewise. * posix/glob.h: Define __const if necessary. Use __const in all prototypes. * sysdeps/generic/stpcpy.c: Use K&R form to allow use in other GNU packages. * posix/wordexp.c: Completely reworked buffer handling for much better performance. Patch by Tim Waugh. * socket/sys/sochet.h (getpeername): Fix type of LEN parameter, it must be socklen_t. * sysdeps/libm-i387/e_remainder.S: Pretty print. * sysdeps/libm-i387/e_remainderf.S: Likewise. * sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack. * sysdeps/libm-i387/s_cexp.S: Little optimization. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>. 1997-08-18 15:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak in cleanup code. 1997-08-17 Paul Eggert <eggert@twinsun.com> * tzset.c (__tzset_internal): Fix memory leak when the user specifies a TZ value that uses a default rule file. Do not assume US DST rules when the user specifies that there is no DST. 1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c: Tidy up. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if using stub code. (if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it. (if_nameindex): Use alloca() rather than malloc(); use SIOCGIFCOUNT ioctl if the kernel supports it. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros, they operate on internal kernel structures and have no place in a user header. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so): Depend on $(+preinit) and $(+postinit). (build-shlib): Filter them out of $^. 1997-08-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c (_dl_signal_error): Fix error message. 1997-08-16 04:06 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [__USE_GNU]: Undefine assert_perror. Reported by Theodore C. Belding <Ted.Belding@umich.edu>. 1997-08-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb] to avoid conflict with PO files. * Makerules: Likewise. * Rules: Likewise. * elf/Makefile: Likewise. * extra-lib.mk: Likewise. * gmon/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * resolv/Makefile: Likewise. * rpm/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/sparc/elf/Makefile: Likewise. * sysdeps/sparc64/elf/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. (ASFLAGS-.os): Renamed from as-FLAGS.os.
408 lines
9.3 KiB
C
408 lines
9.3 KiB
C
/* Handle aliases for locale names.
|
|
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
|
the C library, however.
|
|
|
|
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
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#else
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
#pragma alloca
|
|
# else
|
|
# ifndef alloca
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#else
|
|
char *getenv ();
|
|
# ifdef HAVE_MALLOC_H
|
|
# include <malloc.h>
|
|
# else
|
|
void free ();
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
# ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
# endif
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
# ifndef memcpy
|
|
# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
|
|
# endif
|
|
#endif
|
|
#if !HAVE_STRCHR && !defined _LIBC
|
|
# ifndef strchr
|
|
# define strchr index
|
|
# endif
|
|
#endif
|
|
|
|
#include "gettext.h"
|
|
#include "gettextP.h"
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
#ifdef _LIBC
|
|
/* Rename the non ANSI C functions. This is required by the standard
|
|
because some ANSI C functions will require linking with this object
|
|
file and the name space must not be polluted. */
|
|
# define strcasecmp __strcasecmp
|
|
# define strdup __strdup
|
|
|
|
/* We need locking here since we can be called from different palces. */
|
|
# include <libc-lock.h>
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
|
#endif
|
|
|
|
|
|
/* For those loosing systems which don't have `alloca' we have to add
|
|
some additional code emulating it. */
|
|
#ifdef HAVE_ALLOCA
|
|
/* Nothing has to be done. */
|
|
# define ADD_BLOCK(list, address) /* nothing */
|
|
# define FREE_BLOCKS(list) /* nothing */
|
|
#else
|
|
struct block_list
|
|
{
|
|
void *address;
|
|
struct block_list *next;
|
|
};
|
|
# define ADD_BLOCK(list, addr) \
|
|
do { \
|
|
struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
|
|
/* If we cannot get a free block we cannot add the new element to \
|
|
the list. */ \
|
|
if (newp != NULL) { \
|
|
newp->address = (addr); \
|
|
newp->next = (list); \
|
|
(list) = newp; \
|
|
} \
|
|
} while (0)
|
|
# define FREE_BLOCKS(list) \
|
|
do { \
|
|
while (list != NULL) { \
|
|
struct block_list *old = list; \
|
|
list = list->next; \
|
|
free (old); \
|
|
} \
|
|
} while (0)
|
|
# undef alloca
|
|
# define alloca(size) (malloc (size))
|
|
#endif /* have alloca */
|
|
|
|
|
|
struct alias_map
|
|
{
|
|
const char *alias;
|
|
const char *value;
|
|
};
|
|
|
|
|
|
static struct alias_map *map;
|
|
static size_t nmap = 0;
|
|
static size_t maxmap = 0;
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static size_t read_alias_file PARAMS ((const char *fname, int fname_len));
|
|
static void extend_alias_table PARAMS ((void));
|
|
static int alias_compare PARAMS ((const struct alias_map *map1,
|
|
const struct alias_map *map2));
|
|
|
|
|
|
const char *
|
|
_nl_expand_alias (name)
|
|
const char *name;
|
|
{
|
|
static const char *locale_alias_path = LOCALE_ALIAS_PATH;
|
|
struct alias_map *retval;
|
|
const char *result = NULL;
|
|
size_t added;
|
|
|
|
#ifdef _LIBC
|
|
__libc_lock_lock (lock);
|
|
#endif
|
|
|
|
do
|
|
{
|
|
struct alias_map item;
|
|
|
|
item.alias = name;
|
|
|
|
if (nmap > 0)
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
sizeof (struct alias_map),
|
|
(int (*) PARAMS ((const void *,
|
|
const void *))
|
|
) alias_compare);
|
|
else
|
|
retval = NULL;
|
|
|
|
/* We really found an alias. Return the value. */
|
|
if (retval != NULL)
|
|
{
|
|
result = retval->value;
|
|
break;
|
|
}
|
|
|
|
/* Perhaps we can find another alias file. */
|
|
added = 0;
|
|
while (added == 0 && locale_alias_path[0] != '\0')
|
|
{
|
|
const char *start;
|
|
|
|
while (locale_alias_path[0] == ':')
|
|
++locale_alias_path;
|
|
start = locale_alias_path;
|
|
|
|
while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
|
|
++locale_alias_path;
|
|
|
|
if (start < locale_alias_path)
|
|
added = read_alias_file (start, locale_alias_path - start);
|
|
}
|
|
}
|
|
while (added != 0);
|
|
|
|
#ifdef _LIBC
|
|
__libc_lock_unlock (lock);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static size_t
|
|
read_alias_file (fname, fname_len)
|
|
const char *fname;
|
|
int fname_len;
|
|
{
|
|
#ifndef HAVE_ALLOCA
|
|
struct block_list *block_list = NULL;
|
|
#endif
|
|
FILE *fp;
|
|
char *full_fname;
|
|
size_t added;
|
|
static const char aliasfile[] = "/locale.alias";
|
|
|
|
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
|
|
ADD_BLOCK (block_list, full_fname);
|
|
memcpy (full_fname, fname, fname_len);
|
|
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
|
|
|
|
fp = fopen (full_fname, "r");
|
|
if (fp == NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
return 0;
|
|
}
|
|
|
|
added = 0;
|
|
while (!feof (fp))
|
|
{
|
|
/* It is a reasonable approach to use a fix buffer here because
|
|
a) we are only interested in the first two fields
|
|
b) these fields must be usable as file names and so must not
|
|
be that long
|
|
*/
|
|
char buf[BUFSIZ];
|
|
char *alias;
|
|
char *value;
|
|
char *cp;
|
|
|
|
if (fgets (buf, BUFSIZ, fp) == NULL)
|
|
/* EOF reached. */
|
|
break;
|
|
|
|
cp = buf;
|
|
/* Ignore leading white space. */
|
|
while (isspace (cp[0]))
|
|
++cp;
|
|
|
|
/* A leading '#' signals a comment line. */
|
|
if (cp[0] != '\0' && cp[0] != '#')
|
|
{
|
|
alias = cp++;
|
|
while (cp[0] != '\0' && !isspace (cp[0]))
|
|
++cp;
|
|
/* Terminate alias name. */
|
|
if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Now look for the beginning of the value. */
|
|
while (isspace (cp[0]))
|
|
++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
{
|
|
char *tp;
|
|
size_t len;
|
|
|
|
value = cp++;
|
|
while (cp[0] != '\0' && !isspace (cp[0]))
|
|
++cp;
|
|
/* Terminate value. */
|
|
if (cp[0] == '\n')
|
|
{
|
|
/* This has to be done to make the following test
|
|
for the end of line possible. We are looking for
|
|
the terminating '\n' which do not overwrite here. */
|
|
*cp++ = '\0';
|
|
*cp = '\n';
|
|
}
|
|
else if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
if (nmap >= maxmap)
|
|
extend_alias_table ();
|
|
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
map[nmap].alias = strdup (alias);
|
|
map[nmap].value = strdup (value);
|
|
if (map[nmap].alias == NULL || map[nmap].value == NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
return added;
|
|
}
|
|
#else
|
|
len = strlen (alias) + 1;
|
|
tp = (char *) malloc (len);
|
|
if (tp == NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
return added;
|
|
}
|
|
memcpy (tp, alias, len);
|
|
map[nmap].alias = tp;
|
|
|
|
len = strlen (value) + 1;
|
|
tp = (char *) malloc (len);
|
|
if (tp == NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
return added;
|
|
}
|
|
memcpy (tp, value, len);
|
|
map[nmap].value = tp;
|
|
#endif
|
|
|
|
++nmap;
|
|
++added;
|
|
}
|
|
}
|
|
|
|
/* Possibly not the whole line fits into the buffer. Ignore
|
|
the rest of the line. */
|
|
while (strchr (cp, '\n') == NULL)
|
|
{
|
|
cp = buf;
|
|
if (fgets (buf, BUFSIZ, fp) == NULL)
|
|
/* Make sure the inner loop will be left. The outer loop
|
|
will exit at the `feof' test. */
|
|
*cp = '\n';
|
|
}
|
|
}
|
|
|
|
/* Should we test for ferror()? I think we have to silently ignore
|
|
errors. --drepper */
|
|
fclose (fp);
|
|
|
|
if (added > 0)
|
|
qsort (map, nmap, sizeof (struct alias_map),
|
|
(int (*) PARAMS ((const void *, const void *))) alias_compare);
|
|
|
|
FREE_BLOCKS (block_list);
|
|
return added;
|
|
}
|
|
|
|
|
|
static void
|
|
extend_alias_table ()
|
|
{
|
|
size_t new_size;
|
|
struct alias_map *new_map;
|
|
|
|
new_size = maxmap == 0 ? 100 : 2 * maxmap;
|
|
new_map = (struct alias_map *) malloc (new_size
|
|
* sizeof (struct alias_map));
|
|
if (new_map == NULL)
|
|
/* Simply don't extend: we don't have any more core. */
|
|
return;
|
|
|
|
memcpy (new_map, map, nmap * sizeof (struct alias_map));
|
|
|
|
if (maxmap != 0)
|
|
free (map);
|
|
|
|
map = new_map;
|
|
maxmap = new_size;
|
|
}
|
|
|
|
|
|
static int
|
|
alias_compare (map1, map2)
|
|
const struct alias_map *map1;
|
|
const struct alias_map *map2;
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRCASECMP
|
|
return strcasecmp (map1->alias, map2->alias);
|
|
#else
|
|
const unsigned char *p1 = (const unsigned char *) map1->alias;
|
|
const unsigned char *p2 = (const unsigned char *) map2->alias;
|
|
unsigned char c1, c2;
|
|
|
|
if (p1 == p2)
|
|
return 0;
|
|
|
|
do
|
|
{
|
|
/* I know this seems to be odd but the tolower() function in
|
|
some systems libc cannot handle nonalpha characters. */
|
|
c1 = isupper (*p1) ? tolower (*p1) : *p1;
|
|
c2 = isupper (*p2) ? tolower (*p2) : *p2;
|
|
if (c1 == '\0')
|
|
break;
|
|
++p1;
|
|
++p2;
|
|
}
|
|
while (c1 == c2);
|
|
|
|
return c1 - c2;
|
|
#endif
|
|
}
|