1997-02-15 04:31:36 +00:00
|
|
|
/* Handle aliases for locale names.
|
|
|
|
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
1995-09-28 18:42:29 +00:00
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
1997-08-20 03:53:21 +00:00
|
|
|
the C library, however.
|
1995-09-28 18:42:29 +00:00
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
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.
|
* locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS.
* locale/programs/ld-collate.c (collate_finish): Use error_at_line
instead of error_with_loc.
* locale/weight.h: Use u_int32_t instead of u32_t.
* string/strxfrm.c: Likewise.
* string/strxfrm.c: Find weight.h in ../locale; don't #include
"localeinfo.h".
* string/strcoll.c: Likewise.
* locale/programs/simple-hash.c, locale/programs/simple-hash.h,
locale/programs/xmalloc.c, locale/programs/xstrdup.c: Helper functions
for locale related programs.
locale/programs/charmap.c, locale/programs/charset.c,
locale/programs/charset.h, locale/programs/config.h,
locale/programs/ctypedump.c, locale/programs/ld-collate.c,
locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
locale/programs/ld-time.c, locale/programs/linereader.c,
locale/programs/linereader.h, locale/programs/locale.c,
locale/programs/localedef.c, locale/programs/locales.h,
locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
locale/programs/locfile-token.h, locale/programs/locfile.c,
locale/programs/locfile.h, locale/programs/stringtrans.c,
locale/programs/stringtrans.h: Implementation of locale related
programs.
1996-03-28 09:16:15 +00:00
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
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.
|
1995-09-28 18:42:29 +00:00
|
|
|
|
1997-02-15 04:31:36 +00:00
|
|
|
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. */
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
# define alloca __builtin_alloca
|
1996-06-04 06:48:18 +00:00
|
|
|
# define HAVE_ALLOCA 1
|
1995-09-28 18:42:29 +00:00
|
|
|
#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
|
1996-07-12 02:01:17 +00:00
|
|
|
# ifndef _GNU_SOURCE
|
|
|
|
# define _GNU_SOURCE 1
|
|
|
|
# endif
|
1995-09-28 18:42:29 +00:00
|
|
|
# include <string.h>
|
|
|
|
#else
|
|
|
|
# include <strings.h>
|
1997-08-02 21:00:51 +00:00
|
|
|
# ifndef memcpy
|
|
|
|
# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
|
|
|
|
# endif
|
1995-09-28 18:42:29 +00:00
|
|
|
#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
|
1997-08-20 03:53:21 +00:00
|
|
|
# define strdup __strdup
|
|
|
|
|
|
|
|
/* We need locking here since we can be called from different palces. */
|
Update.
1997-08-24 12:24 Ulrich Drepper <drepper@cygnus.com>
* configure.in (INSTALL): Quote `$'.
* libc.map: Add __xpg_basename.
* csu/Makefile (initfini.s): Disable optimization.
* elf/dl-deps.c: Implement handling of DL_FILTER.
* elf/dl-load.c (_dl_init_paths): Add error check.
* intl/finddomain.c (_nl_find_domain): Correct comment.
* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.
* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
Change extern inline functions to work correctly in C++.
* locale/iso-4217.def: Update for more recent ISO 4217 version.
* locale/loadlocale.c (_nl_load_locale): Add cast.
* manual/message.texi: Finish gettext section.
* posix/getopt_init.c: Don't use relative #include path.
(__getopt_clean_environment): Change function to take pointer to
environment as argument. Optimize generation of test string a bit.
* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
with additional argument.
* poisx/glob.c: Add prototype for next_brace_sub.
* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
vector.
* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
to not generate relocation entry. Suggested by Richard Henderson.
(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
(elf_machine_runtime_setup): Add .aligns.
* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.
* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
1997-08-14 03:14. gcc 2.7.2* is really broken in some aspects.
* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
* sysdeps/standalone/i960/i960ca.h: Likewise.
1997-08-22 19:04 Richard Henderson <rth@cygnus.com>
* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
undocumented test addition in _dl_map_object.
Support ET_EXEC versions of ld.so, for debugging at least:
* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
called despite the DT_SONAME != NULL test, segfaulting. Simplify
the code here as well.
* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
(_dl_setup_hash): Likewise for hash tables.
* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
* elf/rtld.c (_dl_start): Likewise for rpath.
(_dl_rtld_libname2): New variable.
(dl_main): Use it to add an soname for ourselves when we don't have
one of our own. Base it on the target's .interp.
(dl_main): Again, skip printing of objects that don't have strtabs.
Sparc 32 merge:
* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
(fixup): Simplify code. Use ELF_FIXUP_RETURN_VALUE.
(profile_fixup): Likewise, though this still needs fixing for
Sparc32 and PPC.
* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
to ELF_FIXUP_RETURN_VALUE.
* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
Fix up _dl_start_user to handle _dl_skip_args properly.
Use _dl_hwcap to determine if "flush" is available/needed.
* sysdeps/sparc/configure.in: Remove. It doesn't actually do
anything anymore, and what it did do is done somewhere else.
* sysdeps/sparc/configure: Likewise.
* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.
* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.
* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
in divrem expansions.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
definitions for assembly syntax differences.
* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
"system". Use %g2,%g3 instead. Use new local label macro.
* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
and LOC for proper assembly headers/footers.
* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/sparc/sparc32/dotmul.S: Likewise.
* sysdeps/sparc/sparc32/lshift.S: Likewise.
* sysdeps/sparc/sparc32/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/rshift.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/sub_n.S: Likewise.
* sysdeps/sparc/sparc32/submul_1.S: Likewise.
* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
* sysdeps/sparc/sparc32/umul.S: Likewise.
* sysdeps/sparc/sparc32/divrem.m4: Likewise.
* sysdeps/sparc/sparc32/rem.S: Regenerate.
* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
* sysdeps/sparc/sparc32/udiv.S: Regenerate.
* sysdeps/sparc/sparc32/urem.S: Regenerate.
* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.
* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.
* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
Clean up PIC code.
* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
from the sparc64 version.
* sysdeps/sparc/sparc32/elf/start.c: Removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
assembly based on the sparc64 version.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh. Use proper syntax
for manipulating %fsr.
* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
be the default.
* elf/elf.h (HWCAP_SPARC_*): New definitions.
* elf/rtld.c (_dl_hwcap): New variable.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.
* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
Attempt to get hold of the page size based on what we might have
been told at startup time in _dl_pagesize. This will be obsolete
when I finish the kernel hooks for a proper sysconf(), stay tuned.
Sparc 64 merge:
* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
Figure out the right thing to return based on the .plt format.
* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
Should have been 64-bits wide.
* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
optimize for branch delay slot usage.
1997-08-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
change.
1997-08-20 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (identities): Change epsilon.
* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
fabsf, fabsl, __fabsl.
* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
1997-08-24 10:55:18 +00:00
|
|
|
# include <bits/libc-lock.h>
|
1997-08-20 03:53:21 +00:00
|
|
|
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
1995-09-28 18:42:29 +00:00
|
|
|
#endif
|
|
|
|
|
1996-06-03 22:46:17 +00:00
|
|
|
|
|
|
|
/* 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)
|
1996-07-12 02:01:17 +00:00
|
|
|
# undef alloca
|
|
|
|
# define alloca(size) (malloc (size))
|
1996-06-03 22:46:17 +00:00
|
|
|
#endif /* have alloca */
|
|
|
|
|
|
|
|
|
1995-09-28 18:42:29 +00:00
|
|
|
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. */
|
1996-02-19 20:54:38 +00:00
|
|
|
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));
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
_nl_expand_alias (name)
|
|
|
|
const char *name;
|
|
|
|
{
|
|
|
|
static const char *locale_alias_path = LOCALE_ALIAS_PATH;
|
|
|
|
struct alias_map *retval;
|
1997-08-20 03:53:21 +00:00
|
|
|
const char *result = NULL;
|
1995-09-28 18:42:29 +00:00
|
|
|
size_t added;
|
|
|
|
|
1997-08-20 03:53:21 +00:00
|
|
|
#ifdef _LIBC
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
#endif
|
|
|
|
|
1995-09-28 18:42:29 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
struct alias_map item;
|
|
|
|
|
|
|
|
item.alias = name;
|
|
|
|
|
|
|
|
if (nmap > 0)
|
|
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
|
|
sizeof (struct alias_map),
|
1996-02-19 20:54:38 +00:00
|
|
|
(int (*) PARAMS ((const void *,
|
|
|
|
const void *))
|
|
|
|
) alias_compare);
|
1995-09-28 18:42:29 +00:00
|
|
|
else
|
|
|
|
retval = NULL;
|
|
|
|
|
|
|
|
/* We really found an alias. Return the value. */
|
|
|
|
if (retval != NULL)
|
1997-08-20 03:53:21 +00:00
|
|
|
{
|
|
|
|
result = retval->value;
|
|
|
|
break;
|
|
|
|
}
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
/* Perhaps we can find another alias file. */
|
|
|
|
added = 0;
|
|
|
|
while (added == 0 && locale_alias_path[0] != '\0')
|
|
|
|
{
|
|
|
|
const char *start;
|
|
|
|
|
1995-11-10 20:38:31 +00:00
|
|
|
while (locale_alias_path[0] == ':')
|
1995-09-28 18:42:29 +00:00
|
|
|
++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);
|
|
|
|
|
1997-08-20 03:53:21 +00:00
|
|
|
#ifdef _LIBC
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return result;
|
1995-09-28 18:42:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
read_alias_file (fname, fname_len)
|
|
|
|
const char *fname;
|
|
|
|
int fname_len;
|
|
|
|
{
|
1996-06-03 22:46:17 +00:00
|
|
|
#ifndef HAVE_ALLOCA
|
1996-07-12 02:01:17 +00:00
|
|
|
struct block_list *block_list = NULL;
|
1996-06-03 22:46:17 +00:00
|
|
|
#endif
|
1995-09-28 18:42:29 +00:00
|
|
|
FILE *fp;
|
|
|
|
char *full_fname;
|
|
|
|
size_t added;
|
1995-11-07 21:46:52 +00:00
|
|
|
static const char aliasfile[] = "/locale.alias";
|
1995-09-28 18:42:29 +00:00
|
|
|
|
1995-11-07 21:46:52 +00:00
|
|
|
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
|
1996-06-03 22:46:17 +00:00
|
|
|
ADD_BLOCK (block_list, full_fname);
|
1995-11-07 21:46:52 +00:00
|
|
|
memcpy (full_fname, fname, fname_len);
|
|
|
|
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
fp = fopen (full_fname, "r");
|
|
|
|
if (fp == NULL)
|
1996-06-03 22:46:17 +00:00
|
|
|
{
|
|
|
|
FREE_BLOCKS (block_list);
|
|
|
|
return 0;
|
|
|
|
}
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
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 ();
|
|
|
|
|
1997-08-20 03:53:21 +00:00
|
|
|
#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
|
1995-09-28 18:42:29 +00:00
|
|
|
len = strlen (alias) + 1;
|
|
|
|
tp = (char *) malloc (len);
|
|
|
|
if (tp == NULL)
|
1996-06-03 22:46:17 +00:00
|
|
|
{
|
|
|
|
FREE_BLOCKS (block_list);
|
|
|
|
return added;
|
|
|
|
}
|
1995-09-28 18:42:29 +00:00
|
|
|
memcpy (tp, alias, len);
|
|
|
|
map[nmap].alias = tp;
|
|
|
|
|
|
|
|
len = strlen (value) + 1;
|
|
|
|
tp = (char *) malloc (len);
|
|
|
|
if (tp == NULL)
|
1996-06-03 22:46:17 +00:00
|
|
|
{
|
|
|
|
FREE_BLOCKS (block_list);
|
|
|
|
return added;
|
|
|
|
}
|
1995-09-28 18:42:29 +00:00
|
|
|
memcpy (tp, value, len);
|
|
|
|
map[nmap].value = tp;
|
1997-08-20 03:53:21 +00:00
|
|
|
#endif
|
1995-09-28 18:42:29 +00:00
|
|
|
|
|
|
|
++nmap;
|
|
|
|
++added;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1996-12-20 01:39:50 +00:00
|
|
|
/* Possibly not the whole line fits into the buffer. Ignore
|
1995-09-28 18:42:29 +00:00
|
|
|
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),
|
1996-02-19 20:54:38 +00:00
|
|
|
(int (*) PARAMS ((const void *, const void *))) alias_compare);
|
1995-09-28 18:42:29 +00:00
|
|
|
|
1996-06-03 22:46:17 +00:00
|
|
|
FREE_BLOCKS (block_list);
|
1995-09-28 18:42:29 +00:00
|
|
|
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. */
|
1995-11-10 20:38:31 +00:00
|
|
|
c1 = isupper (*p1) ? tolower (*p1) : *p1;
|
|
|
|
c2 = isupper (*p2) ? tolower (*p2) : *p2;
|
1995-09-28 18:42:29 +00:00
|
|
|
if (c1 == '\0')
|
|
|
|
break;
|
1996-02-19 20:54:38 +00:00
|
|
|
++p1;
|
|
|
|
++p2;
|
1995-09-28 18:42:29 +00:00
|
|
|
}
|
|
|
|
while (c1 == c2);
|
|
|
|
|
|
|
|
return c1 - c2;
|
|
|
|
#endif
|
|
|
|
}
|