mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
04ea3b0fbb
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
104 lines
2.9 KiB
C
104 lines
2.9 KiB
C
/* Copyright (C) 1991, 1996, 1997, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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 <stddef.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <confstr.h>
|
|
|
|
/* If BUF is not NULL and LEN > 0, fill in at most LEN - 1 bytes
|
|
of BUF with the value corresponding to NAME and zero-terminate BUF.
|
|
Return the number of bytes required to hold NAME's entire value. */
|
|
size_t
|
|
confstr (name, buf, len)
|
|
int name;
|
|
char *buf;
|
|
size_t len;
|
|
{
|
|
const char *string;
|
|
size_t string_len;
|
|
|
|
switch (name)
|
|
{
|
|
case _CS_PATH:
|
|
{
|
|
static const char cs_path[] = CS_PATH;
|
|
string = cs_path;
|
|
string_len = sizeof (cs_path);
|
|
}
|
|
break;
|
|
|
|
case _CS_XBS5_ILP32_OFFBIG_CFLAGS:
|
|
case _CS_LFS_CFLAGS:
|
|
#if defined _XBS5_ILP32_OFF32 && !defined _XBS5_ILP32_OFFBIG
|
|
/* Signal that we want the new ABI. */
|
|
{
|
|
static const char file_offset[] = "-D_FILE_OFFSET_BITS=64";
|
|
string = file_offset;
|
|
string_len = sizeof (file_offset);
|
|
}
|
|
break;
|
|
#endif
|
|
|
|
case _CS_LFS_LINTFLAGS:
|
|
case _CS_LFS_LDFLAGS:
|
|
case _CS_LFS_LIBS:
|
|
case _CS_LFS64_CFLAGS:
|
|
case _CS_LFS64_LINTFLAGS:
|
|
case _CS_LFS64_LDFLAGS:
|
|
case _CS_LFS64_LIBS:
|
|
|
|
case _CS_XBS5_ILP32_OFF32_CFLAGS:
|
|
case _CS_XBS5_ILP32_OFF32_LDFLAGS:
|
|
case _CS_XBS5_ILP32_OFF32_LIBS:
|
|
case _CS_XBS5_ILP32_OFF32_LINTFLAGS:
|
|
case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:
|
|
case _CS_XBS5_ILP32_OFFBIG_LIBS:
|
|
case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:
|
|
case _CS_XBS5_LP64_OFF64_CFLAGS:
|
|
case _CS_XBS5_LP64_OFF64_LDFLAGS:
|
|
case _CS_XBS5_LP64_OFF64_LIBS:
|
|
case _CS_XBS5_LP64_OFF64_LINTFLAGS:
|
|
case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:
|
|
case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:
|
|
case _CS_XBS5_LPBIG_OFFBIG_LIBS:
|
|
case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:
|
|
/* GNU libc does not require special actions to use LFS functions. */
|
|
string = "";
|
|
string_len = 1;
|
|
break;
|
|
|
|
default:
|
|
__set_errno (EINVAL);
|
|
return 0;
|
|
}
|
|
|
|
if (len > 0 && buf != NULL)
|
|
{
|
|
if (string_len <= len)
|
|
memcpy (buf, string, string_len);
|
|
else
|
|
{
|
|
memcpy (buf, string, len - 1);
|
|
buf[len - 1] = '\0';
|
|
}
|
|
}
|
|
return string_len;
|
|
}
|