aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-29 01:20:23 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-29 01:20:23 +0000
commit04ea3b0fbb9ca56a04b437c57c2878842d331c77 (patch)
tree3f03f09731b5185c8a25609af1507866ca5783e9 /posix
parent50fd913bece94eba2aa8394b1b6958708e4dcd4d (diff)
downloadglibc-04ea3b0fbb9ca56a04b437c57c2878842d331c77.tar
glibc-04ea3b0fbb9ca56a04b437c57c2878842d331c77.tar.gz
glibc-04ea3b0fbb9ca56a04b437c57c2878842d331c77.tar.bz2
glibc-04ea3b0fbb9ca56a04b437c57c2878842d331c77.zip
Update.
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.
Diffstat (limited to 'posix')
-rw-r--r--posix/confstr.c20
-rw-r--r--posix/fnmatch.c1
-rw-r--r--posix/fnmatch_loop.c109
3 files changed, 95 insertions, 35 deletions
diff --git a/posix/confstr.c b/posix/confstr.c
index c2b12dfd33..6ab76e8bed 100644
--- a/posix/confstr.c
+++ b/posix/confstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
+/* 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
@@ -22,9 +22,9 @@
#include <string.h>
#include <confstr.h>
-/* If BUF is not NULL, fill in at most LEN characters of BUF
- with the value corresponding to NAME. Return the number
- of characters required to hold NAME's entire value. */
+/* 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;
@@ -89,7 +89,15 @@ confstr (name, buf, len)
return 0;
}
- if (buf != NULL)
- (void) strncpy (buf, string, len);
+ 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;
}
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index 1db39d9e0d..d1777d179e 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -54,6 +54,7 @@
#ifdef _LIBC
# include "../locale/localeinfo.h"
# include "../locale/elem-hash.h"
+# include "../locale/coll-lookup.h"
# define CONCAT(a,b) __CONCAT(a,b)
# define mbsinit __mbsinit
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
index 86526a15ff..c933346877 100644
--- a/posix/fnmatch_loop.c
+++ b/posix/fnmatch_loop.c
@@ -618,44 +618,70 @@ FCT (pattern, string, no_leading_period, flags)
uint32_t fcollseq;
uint32_t lcollseq;
UCHAR cend = *p++;
-# ifdef WIDE_CHAR_VERSION
- int idx;
- size_t cnt;
-# endif
# ifdef WIDE_CHAR_VERSION
/* Search in the `names' array for the characters. */
- idx = fn % size;
- cnt = 0;
- while (names[idx] != fn)
+ if (size != 0)
{
- if (++cnt == layers)
+ /* Old locale format. */
+ int idx;
+ size_t cnt;
+
+ idx = fn % size;
+ cnt = 0;
+ while (names[idx] != fn)
+ {
+ if (++cnt == layers)
+ /* XXX We don't know anything about
+ the character we are supposed to
+ match. This means we are failing. */
+ goto range_not_matched;
+
+ idx += size;
+ }
+ fcollseq = collseq[idx];
+ }
+ else
+ {
+ /* New locale format. */
+ fcollseq =
+ collseq_table_lookup ((const char *) collseq, fn);
+ if (fcollseq == ~((uint32_t) 0))
/* XXX We don't know anything about
the character we are supposed to
match. This means we are failing. */
goto range_not_matched;
-
- idx += size;
}
- fcollseq = collseq[idx];
if (is_seqval)
lcollseq = cold;
else
{
- idx = cold % size;
- cnt = 0;
- while (names[idx] != cold)
+ if (size != 0)
{
- if (++cnt == layers)
+ /* Old locale format. */
+ int idx;
+ size_t cnt;
+
+ idx = cold % size;
+ cnt = 0;
+ while (names[idx] != cold)
{
- idx = -1;
- break;
+ if (++cnt == layers)
+ {
+ idx = -1;
+ break;
+ }
+ idx += size;
}
- idx += size;
- }
- lcollseq = idx == -1 ? 0xffffffff : collseq[idx];
+ lcollseq =
+ idx == -1 ? 0xffffffff : collseq[idx];
+ }
+ else
+ /* New locale format. */
+ lcollseq =
+ collseq_table_lookup ((const char *) collseq, cold);
}
# else
fcollseq = collseq[fn];
@@ -817,22 +843,47 @@ FCT (pattern, string, no_leading_period, flags)
else
{
# ifdef WIDE_CHAR_VERSION
- idx = cend % size;
- cnt = 0;
- while (names[idx] != cend)
+ if (size != 0)
{
- if (++cnt == layers)
+ /* Old locale format. */
+ int idx;
+ size_t cnt;
+
+ idx = cend % size;
+ cnt = 0;
+ while (names[idx] != cend)
+ {
+ if (++cnt == layers)
+ {
+ /* Hum, no information about the
+ upper bound. The matching
+ succeeds if the lower bound is
+ matched exactly. */
+ if (lcollseq != fcollseq)
+ goto range_not_matched;
+
+ goto matched;
+ }
+ }
+ hcollseq = collseq[idx];
+ }
+ else
+ {
+ /* New locale format. */
+ hcollseq =
+ collseq_table_lookup ((const char *) collseq, cend);
+ if (hcollseq == ~((uint32_t) 0))
{
- /* Hum, no information about the upper
- bound. The matching succeeds if the
- lower bound is matched exactly. */
- if (idx == -1 && lcollseq != fcollseq)
+ /* Hum, no information about the
+ upper bound. The matching succeeds
+ if the lower bound is matched
+ exactly. */
+ if (lcollseq != fcollseq)
goto range_not_matched;
goto matched;
}
}
- hcollseq = collseq[idx];
# else
hcollseq = collseq[cend];
# endif