diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/confstr.c | 20 | ||||
| -rw-r--r-- | posix/fnmatch.c | 1 | ||||
| -rw-r--r-- | posix/fnmatch_loop.c | 109 |
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 |