mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
86d2c878ac
* elf/linux-compat.c: New file. * elf/Makefile (distribute): Add linux-compat.c. (generated): Add librtld.so. [$(config-os)=linux*] (extra-objs): Add linux-compat.so. [$(config-os)=linux*] (extra-objs): Add ld-linux.so.1. (librtld.so): New target. (ld.so, ld-linux.so.1): Make from librtld.so. * elf/rtld.c (dl_main): Instead of weak call to _dl_compat_init, call our own DT_INIT if we have one (and then clear it). (__dgettext): New weak function. * intl/localealias.c (read_alias_file): Avoid sprintf; use memcpy by hand instead. * sysdeps/generic/_strerror.c (_strerror_internal): Use _itoa instead of snprintf. * sysdeps/mach/_strerror.c (_strerror_internal): Don't write BUF[BUFLEN]. * elf/rtld.c (rtld_map): New static variable. (_dl_start): Use a differently named local BOOTSTRAP_MAP for the bootstrapping. Then copy data into `rtld_map'. (dl_main): Finish filling in rtld_map and link it into the chain, instead of allocating a new structure. (dl_main): Call _dl_compat_init if it is defined (use weak ref). * elf/dlsym.c: Fix last change: move REF out of `doit'. control. using it. and cwdir ports. functions. these. $(libdir)(rtld-installed-name). leading zeroes. in the rhs. pattern rule. never know. (fork): Use symbol_set_* macros for _hurd_fork_locks. * sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S (__syscall_error): instead of unix/sysv. -dynamic-linker. (__printf_fp): Last arg ARGS is now `const void **const'; locale/C-ctype.c. * sysdeps/mach/hurd/sigsuspend.c: Likewise. * sysdeps/mach/hurd/mips/sigreturn.c: Likewise. alias gethostname. setitmr setpgrp (_S_msg_get_exec_flags, _S_msg_set_exec_flags, (abort_thread, abort_rpcs): Take same new arg and pass it through.
318 lines
7.1 KiB
C
318 lines
7.1 KiB
C
/* localealias.c -- handle aliases for locale names
|
|
Copyright (C) 1995 Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; 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
|
|
#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
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#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
|
|
#endif
|
|
|
|
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 __P ((const char *fname, int fname_len));
|
|
static void extend_alias_table __P ((void));
|
|
static int alias_compare __P ((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;
|
|
size_t added;
|
|
|
|
do
|
|
{
|
|
struct alias_map item;
|
|
|
|
item.alias = name;
|
|
|
|
if (nmap > 0)
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
sizeof (struct alias_map),
|
|
(int (*) (const void *,
|
|
const void *))
|
|
alias_compare);
|
|
else
|
|
retval = NULL;
|
|
|
|
/* We really found an alias. Return the value. */
|
|
if (retval != NULL)
|
|
return retval->value;
|
|
|
|
/* 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] != '\0' && 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);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static size_t
|
|
read_alias_file (fname, fname_len)
|
|
const char *fname;
|
|
int fname_len;
|
|
{
|
|
FILE *fp;
|
|
char *full_fname;
|
|
size_t added;
|
|
static const char aliasfile[] = "/locale.alias";
|
|
|
|
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
|
|
memcpy (full_fname, fname, fname_len);
|
|
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
|
|
|
|
fp = fopen (full_fname, "r");
|
|
if (fp == NULL)
|
|
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 ();
|
|
|
|
/* We cannot depend on strdup available in the libc. Sigh! */
|
|
len = strlen (alias) + 1;
|
|
tp = (char *) malloc (len);
|
|
if (tp == NULL)
|
|
return added;
|
|
memcpy (tp, alias, len);
|
|
map[nmap].alias = tp;
|
|
|
|
len = strlen (value) + 1;
|
|
tp = (char *) malloc (len);
|
|
if (tp == NULL)
|
|
return added;
|
|
memcpy (tp, value, len);
|
|
map[nmap].value = tp;
|
|
|
|
++nmap;
|
|
++added;
|
|
}
|
|
}
|
|
|
|
/* Possibily 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 (*) (const void *, const void *)) alias_compare);
|
|
|
|
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 = isalpha (*p1) ? tolower (*p1) : *p1;
|
|
c2 = isalpha (*p2) ? tolower (*p2) : *p2;
|
|
if (c1 == '\0')
|
|
break;
|
|
}
|
|
while (c1 == c2);
|
|
|
|
return c1 - c2;
|
|
#endif
|
|
}
|