diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2005-01-25 18:08:14 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2008-01-09 16:11:42 +0100 |
| commit | b48e80e8ad4f29b6447d2726f72992c0a44649d2 (patch) | |
| tree | 7de00b7e7363aec3760eacc732d2e3174bc3c0f7 /lib | |
| parent | 32cf31f2ba6fbeb61740e3ad40005e5052317ad5 (diff) | |
| download | sed-b48e80e8ad4f29b6447d2726f72992c0a44649d2.tar.gz | |
prepare for 4.1.4 release
2005-01-25 Paolo Bonzini <bonzini@gnu.org>
* sed/regexp.c: Fix building on GCC 2.95 and earlier.
git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-35
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/regcomp.c | 13 | ||||
| -rw-r--r-- | lib/regex.c | 2 | ||||
| -rw-r--r-- | lib/regex_internal.c | 2 | ||||
| -rw-r--r-- | lib/regex_internal.h | 2 | ||||
| -rw-r--r-- | lib/regexec.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/lib/regcomp.c b/lib/regcomp.c index 7f4f63b..586ebc7 100644 --- a/lib/regcomp.c +++ b/lib/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>. @@ -875,9 +875,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 = ""; @@ -3314,17 +3314,18 @@ parse_bracket_exp (regexp, dfa, token, syntax, err) } } else +#endif /* not RE_ENABLE_I18N */ { +#ifdef RE_ENABLE_I18N + free_charset (mbcset); +#endif /* Build a tree for simple bracket. */ br_token.type = SIMPLE_BRACKET; br_token.opr.sbcset = sbcset; work_tree = create_token_tree (dfa, NULL, NULL, &br_token); if (BE (work_tree == NULL, 0)) goto parse_bracket_exp_espace; - - free_charset (mbcset); } -#endif /* not RE_ENABLE_I18N */ return work_tree; parse_bracket_exp_espace: diff --git a/lib/regex.c b/lib/regex.c index 7a4f304..1e24fcf 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.c b/lib/regex_internal.c index c3295a8..7284ed3 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.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>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index e5a1a8d..ae77aeb 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -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>. diff --git a/lib/regexec.c b/lib/regexec.c index cd5a76b..3089983 100644 --- a/lib/regexec.c +++ b/lib/regexec.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>. |