diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-01-14 09:06:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-14 09:06:25 +0000 |
| commit | ea161661142ab98568ea811ce791da538da981d1 (patch) | |
| tree | 79da250397aa476ac4eec1bbe2108b01e039014e /posix/regcomp.c | |
| parent | 3e539cb47e9fabfdda295926b4270b0f3cc7fa65 (diff) | |
| download | glibc-ea161661142ab98568ea811ce791da538da981d1.zip glibc-ea161661142ab98568ea811ce791da538da981d1.tar.gz glibc-ea161661142ab98568ea811ce791da538da981d1.tar.bz2 | |
Update.
2005-01-14 Ulrich Drepper <drepper@redhat.com>
* posix/regcomp.c [!_LIBC] (init_dfa): Fix determining of relevant
LC_* variable. Patch by Aharon Robbins <arnold@skeeve.com>.
* stdlib/fmtmsg.c (internal_addseverity): Remove incorrect free call.
* stdlib/tst-fmtmsg.c (main): Add another addseverity test.
Diffstat (limited to 'posix/regcomp.c')
| -rw-r--r-- | posix/regcomp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c index 5de5bf7..a8c1f74 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -894,9 +894,9 @@ init_dfa (dfa, pat_len) codeset_name = nl_langinfo (CODESET); # else codeset_name = getenv ("LC_ALL"); - if (codeset_name == NULL || codeset[0] == '\0') + if (codeset_name == NULL || codeset_name[0] == '\0') codeset_name = getenv ("LC_CTYPE"); - if (codeset_name == NULL || codeset[0] == '\0') + if (codeset_name == NULL || codeset_name[0] == '\0') codeset_name = getenv ("LANG"); if (codeset_name == NULL) codeset_name = ""; @@ -1164,7 +1164,7 @@ optimize_subexps (so, node, sidx, depth) && so->nodes[node->left->node_idx].type == OP_OPEN_SUBEXP ? depth + 1 : 0; node->right = optimize_subexps (so, node->right, sidx, new_depth); - + if (node->type != CONCAT) return node; if ((depth & 1) == 0 |