mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 21:40:33 +02:00
Code Activity

(scm_regexp_exec): Convert string to zero-temrinated locale string

Browse source 
before matching against it.
This commit is contained in:
Marius Vollmer 2004-09-22 14:21:52 +00:00
parent ec82b7c251
commit 1eff9c2f70
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/regex-posix.c
View file

@ -218,6 +218,7 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0,
{ {
int status, nmatches, offset; int status, nmatches, offset;
regmatch_t *matches; regmatch_t *matches;
char *c_str;
SCM mvec = SCM_BOOL_F; SCM mvec = SCM_BOOL_F;
SCM_VALIDATE_RGXP (1, rx); SCM_VALIDATE_RGXP (1, rx);
@ -226,7 +227,10 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0,
if (SCM_UNBNDP (start)) if (SCM_UNBNDP (start))
offset = 0; offset = 0;
else else
offset = scm_to_signed_integer (start, 0, scm_i_string_length (str)); {
str = scm_substring (str, start, SCM_UNDEFINED);
offset = scm_to_int (start);
}
if (SCM_UNBNDP (flags)) if (SCM_UNBNDP (flags))
flags = SCM_INUM0; flags = SCM_INUM0;
@ -237,9 +241,11 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0,
nmatches = SCM_RGX(rx)->re_nsub + 1; nmatches = SCM_RGX(rx)->re_nsub + 1;
SCM_DEFER_INTS; SCM_DEFER_INTS;
matches = scm_malloc (sizeof (regmatch_t) * nmatches); matches = scm_malloc (sizeof (regmatch_t) * nmatches);
status = regexec (SCM_RGX (rx), scm_i_string_chars (str) + offset, c_str = scm_to_locale_string (str);
nmatches, matches, status = regexec (SCM_RGX (rx), c_str, nmatches, matches,
scm_to_int (flags)); scm_to_int (flags));
free (c_str);
if (!status) if (!status)
{ {
int i; int i;