PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-05-20 15:32:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

(SKIP_SOMETHING, find_occurs_in_text):

Browse Source 
Store match length in regoff_t,
not int.  Assume that negative return values less than -2
represent regoff_t overflow.
(matcher_error): New function.
(SKIP_SOMETHING, find_occurs_in_text): Use it to report matcher errors.
(alloc_and_compile_regex): No longer any need to worry about
int versus size_t mismatch.
This commit is contained in:
Paul Eggert
2005-09-09 21:11:07 +00:00
parent 0d11284c9e
commit fe041980c8
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ptx.c
+34 -18
View File
@@ -190,9 +190,11 @@ static BLOCK text_buffer; /* file to study */
#define SKIP_SOMETHING(cursor, limit) \
if (word_regex_string) \
{ \
int count; \
regoff_t count; \
count = re_match (word_regex, cursor, limit - cursor, 0, NULL); \
cursor += count <= 0 ? 1 : count; \
if (count == -2) \
matcher_error (); \
cursor += count == -1 ? 1 : count; \
} \
else if (word_fastmap[to_uchar (*cursor)]) \
while (cursor < limit && word_fastmap[to_uchar (*cursor)]) \
@@ -278,6 +280,15 @@ static BLOCK reference; /* reference field for input reference mode */
/* Miscellaneous routines. */
/* Diagnose an error in the regular expression matcher. Then exit. */
static void ATTRIBUTE_NORETURN
matcher_error (void)
{
error (0, errno, _("error in regular expression matcher"));
exit (EXIT_FAILURE);
}
/*------------------------------------------------------.
| Duplicate string STRING, while evaluating \-escapes. |
`------------------------------------------------------*/
@@ -417,12 +428,8 @@ alloc_and_compile_regex (const char *string)
/* Do not waste extra allocated space. */
if (pattern->allocated > pattern->used)
{
pattern->buffer
= xrealloc (pattern->buffer, (size_t) pattern->used);
pattern->allocated = pattern->used;
}
pattern->buffer = xrealloc (pattern->buffer, pattern->used);
pattern->allocated = pattern->used;
return pattern;
}
@@ -872,14 +879,21 @@ find_occurs_in_text (void)
This test also accounts for the case of an incomplete line or
sentence at the end of the buffer. */
if (context_regex_string
&& (re_search (context_regex, cursor, text_buffer.end - cursor,
0, text_buffer.end - cursor, &context_regs)
>= 0))
next_context_start = cursor + context_regs.end[0];
next_context_start = text_buffer.end;
if (context_regex_string)
switch (re_search (context_regex, cursor, text_buffer.end - cursor,
0, text_buffer.end - cursor, &context_regs))
{
case -2:
matcher_error ();
else
next_context_start = text_buffer.end;
case -1:
break;
default:
next_context_start = cursor + context_regs.end[0];
break;
}
/* Include the separator into the right context, but not any suffix
white space in this separator; this insures it will be seen in
@@ -900,9 +914,11 @@ find_occurs_in_text (void)
the loop. */
{
if (re_search (word_regex, cursor, context_end - cursor,
0, context_end - cursor, &word_regs)
< 0)
regoff_t r = re_search (word_regex, cursor, context_end - cursor,
0, context_end - cursor, &word_regs);
if (r == -2)
matcher_error ();
if (r == -1)
break;
word_start = cursor + word_regs.start[0];
word_end = cursor + word_regs.end[0];