mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 17:30:07 +00:00
fa0bc87c32
* stdlib/canonicalize.c: New file. * stdlib/stdlib.h: Declare canonicalize_file_name, realpath. * stdlib/Makefile (routines): Add canonicalize. * posix/unistd.h: Declare __canonicalize_directory_name_internal. Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_seq.c: Prevent `sccsid' definition by using the same #if condition as in the other db files. * intl/Makefile: Add -Wno-unused CFLAGS for compilation of bindtextdom.c, finddomain.c, and localealias.c. * intl/dcgettext.c: Don't define prototype for getcwd() when compiling in glibc. * libio/cleanup.c: Add prototype for _IO_register_cleanup. * libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't define _POSIX_SOURCE unconditionally. * libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if compiling in glibc. * libio/fileops.c (_IO_file_close_it): Don't sync file, call flush instead. This relaxes the rules from POSIX.1 about changing the active handle a bit. * libio/iofopncook.c (struct _IO_cookie_file): Move definition into <libio.h>. Add prototypes for local functions to prevent warnings. * libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and _IO_DUP2 to contain complete parameter list. * libio/libio.h: Add definition of struct _IO_cookie_file. * libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf, and _IO_vsnprintf. * libio/memstream.c: Include <stdio.h>. * libio/stdio.h: Add prototypes for fopencookie, __stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf. * libio/strops.c: Avoid useless expression in `for' initializer. * locale/findlocale.c: Add some casts to prevent warnings. * locale/programs/locfile.c (write_locale_data): Don't use double `/' in locale binary file. * posix/unistd.h: Remove prototype for `reboot'. Update from bind-4.9.4-T1A. * resolv/Makefile (routines): Add inet_ntop and inet_pton. * resolv/arpa/nameser.h: Add definition of IN6ADDRSZ. * resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c, resolv/res_debug.c, resolv/res_init.c * resolv/inet_ntop.c, resolv/inet_pton.c: New files. * resolv/resolv.h: Add RES_USE_INET6 flag. (__dn_isvalid): Renamed to __res_dnok. Add prototypes for __res_ownok and __res_mailok. * stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c. * stdio-common/getline.c, stdio-common/vfscanf.c, sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore. * sysdeps/unix/sysv/linux/Makefile [$subdir == misc] (sysdep_routines): Add s_reboot. (install-others): Add $(includedir)/sys/syscall.h. New rule for $(includedir)/sys/syscall.h to produce from <asm/unistd.h>. * sysdeps/unix/sysv/linux/reboot.c: New file. Make single argument function call 3 argument system call. * sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific definition for reboot function. * sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete comment. * sysdeps/unix/sysv/linux/syscalls.list: Rename function for reboot syscall to __syscall_reboot. * wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by __USE_GNU, not USE_GNU. Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com> * locale/programs/charset.c, locale/programs/ld-collate.c: Add casts to prevent warnings on 64-bit machines. * locale/programs/ld-monetary.c: Don't do unnecessary tests for int_frac_digits and frac_digits which only produce warnings. Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com> * inet/arpa/inet.h: Backup return type of inet_addr to u_long. * resolv/inet_addr.c: Likewise. * resolv/Makefile (distribute): Add res_hconf.h (routines): Add res_hconf. * resolv/gethnamaddr.c: Add support for /etc/host.conf. * resolv/res_init.c: Initialize /etc/host.conf reader. * resolv/res_hconf.c, resolv/res_hconf.h: New files. Implementation of reading /etc/host.conf. Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * Rules (%.out rules): Prepend $($*-ENV) to the command. * sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak alias for __curbrk. Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu> * hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK. * hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK. Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. (__canonicalize_directory_name_internal): New function using it. * sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu> * string/argz-create.c (__argz_create): Correctly calculate length. * string/argz-extract.c (__argz_extract): Add terminating 0 entry. * hurd/hurdstartup.c (_hurd_startup): ... and don't so here. [HAVE_VMSDIR_H]: Include "vmsdir.h". (glob) [VMS]: Don't grok ~.
193 lines
6.0 KiB
C
193 lines
6.0 KiB
C
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
|
|
|
|
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. */
|
|
|
|
#include <locale.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "localeinfo.h"
|
|
|
|
|
|
/* Constant data defined in setlocale.c. */
|
|
extern const struct locale_data *const _nl_C[];
|
|
|
|
|
|
static inline char *
|
|
copy (const char *string)
|
|
{
|
|
size_t len;
|
|
char *new;
|
|
len = strlen (string) + 1;
|
|
new = (char *) malloc (len);
|
|
return new != NULL ? memcpy (new, string, len) : NULL;
|
|
}
|
|
|
|
|
|
/* For each category we keep a list of records for the locale files
|
|
which are somehow addressed. */
|
|
static struct loaded_l10nfile *locale_file_list[LC_ALL];
|
|
|
|
|
|
const struct locale_data *
|
|
_nl_find_locale (const char *locale_path, size_t locale_path_len,
|
|
int category, char **name)
|
|
{
|
|
int mask;
|
|
/* Name of the locale for this category. */
|
|
char *loc_name;
|
|
const char *language;
|
|
const char *modifier;
|
|
const char *territory;
|
|
const char *codeset;
|
|
const char *normalized_codeset;
|
|
const char *special;
|
|
const char *sponsor;
|
|
const char *revision;
|
|
struct loaded_l10nfile *locale_file;
|
|
|
|
if ((*name)[0] == '\0')
|
|
{
|
|
/* The user decides which locale to use by setting environment
|
|
variables. */
|
|
*name = getenv ("LC_ALL");
|
|
if (*name == NULL || (*name)[0] == '\0')
|
|
*name = getenv (_nl_category_names[category]);
|
|
if (*name == NULL || (*name)[0] == '\0')
|
|
*name = getenv ("LANG");
|
|
if (*name == NULL || (*name)[0] == '\0')
|
|
*name = (char *) _nl_C_name;
|
|
}
|
|
|
|
if (strcmp (*name, _nl_C_name) == 0 || strcmp (*name, "POSIX") == 0)
|
|
{
|
|
/* We need not load anything. The needed data is contained in
|
|
the library itself. */
|
|
*name = (char *) _nl_C_name;
|
|
return _nl_C[category];
|
|
}
|
|
|
|
/* We really have to load some data. First see whether the name is
|
|
an alias. Please note that this makes it impossible to have "C"
|
|
or "POSIX" as aliases. */
|
|
loc_name = (char *) _nl_expand_alias (*name);
|
|
if (loc_name == NULL)
|
|
/* It is no alias. */
|
|
loc_name = *name;
|
|
|
|
/* Make a writable copy of the locale name. */
|
|
loc_name = copy (loc_name);
|
|
|
|
/* LOCALE can consist of up to four recognized parts for the XPG syntax:
|
|
|
|
language[_territory[.codeset]][@modifier]
|
|
|
|
and six parts for the CEN syntax:
|
|
|
|
language[_territory][+audience][+special][,sponsor][_revision]
|
|
|
|
Beside the first all of them are allowed to be missing. If the
|
|
full specified locale is not found, the less specific one are
|
|
looked for. The various part will be stripped of according to
|
|
the following order:
|
|
(1) revision
|
|
(2) sponsor
|
|
(3) special
|
|
(4) codeset
|
|
(5) normalized codeset
|
|
(6) territory
|
|
(7) audience/modifier
|
|
*/
|
|
mask = _nl_explode_name (loc_name, &language, &modifier, &territory,
|
|
&codeset, &normalized_codeset, &special,
|
|
&sponsor, &revision);
|
|
|
|
/* If exactly this locale was already asked for we have an entry with
|
|
the complete name. */
|
|
locale_file = _nl_make_l10nflist (&locale_file_list[category],
|
|
locale_path, locale_path_len, mask,
|
|
language, territory, codeset,
|
|
normalized_codeset, modifier, special,
|
|
sponsor, revision,
|
|
_nl_category_names[category], 0);
|
|
|
|
if (locale_file == NULL)
|
|
{
|
|
/* Find status record for addressed locale file. We have to search
|
|
through all directories in the locale path. */
|
|
locale_file = _nl_make_l10nflist (&locale_file_list[category],
|
|
locale_path, locale_path_len, mask,
|
|
language, territory, codeset,
|
|
normalized_codeset, modifier, special,
|
|
sponsor, revision,
|
|
_nl_category_names[category], 1);
|
|
if (locale_file == NULL)
|
|
/* This means we are out of core. */
|
|
return NULL;
|
|
}
|
|
else
|
|
/* If the addressed locale is already available it should be freed.
|
|
If we would not do this switching back and force between two
|
|
locales would slowly eat up all memory.*/
|
|
free ((void *) loc_name);
|
|
|
|
if (locale_file->decided == 0)
|
|
_nl_load_locale (locale_file, category);
|
|
|
|
if (locale_file->data == NULL)
|
|
{
|
|
int cnt;
|
|
for (cnt = 0; locale_file->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (locale_file->successor[cnt]->decided == 0)
|
|
_nl_load_locale (locale_file->successor[cnt], category);
|
|
if (locale_file->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
/* Move the entry we found (or NULL) to the first place of
|
|
successors. */
|
|
locale_file->successor[0] = locale_file->successor[cnt];
|
|
locale_file = locale_file->successor[cnt];
|
|
}
|
|
|
|
if (locale_file == NULL)
|
|
return NULL;
|
|
|
|
/* Determine the locale name for which loading succeeded. This
|
|
information comes from the file name. The form is
|
|
<path>/<locale>/LC_foo. We must extract this <locale> part. */
|
|
if (((struct locale_data *) locale_file->data)->name == NULL)
|
|
{
|
|
char *newp, *cp, *endp;
|
|
|
|
endp = strrchr (locale_file->filename, '/');
|
|
cp = endp - 1;
|
|
while (cp[-1] != '/')
|
|
--cp;
|
|
newp = (char *) malloc (endp - cp + 1);
|
|
if (newp == NULL)
|
|
return NULL;
|
|
memcpy (newp, cp, endp - cp);
|
|
newp[endp - cp] = '\0';
|
|
((struct locale_data *) locale_file->data)->name = newp;
|
|
}
|
|
*name = (char *) ((struct locale_data *) locale_file->data)->name;
|
|
|
|
return (struct locale_data *) locale_file->data;
|
|
}
|