mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* syntax.c (compare_word_to_right): Fix recent breakage - rules 

ending with wildcard (e.g. "$+") won't match.
This commit is contained in:
Pavel Roskin 2003-10-16 20:16:38 +00:00
parent 6bb01bfe85
commit 7f8dfa977d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
edit/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-16 Pavel Roskin <proski@gnu.org>
* syntax.c (compare_word_to_right): Fix recent breakage - rules
ending with wildcard (e.g. "$+") won't match.
2003-10-14 Pavel Roskin <proski@gnu.org>
* edit.h: Make static all functions and variables that don't

14
edit/syntax.c
View File

@ -161,7 +161,7 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
for (p = (unsigned char *) text, q = p + strlen ((char *) p); p < q; p++, i++) {
switch (*p) {
case SYNTAX_TOKEN_STAR:
if (++p >= q)
if (++p > q)
return -1;
for (;;) {
c = edit_get_byte (edit, i);
@ -177,7 +177,7 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
}
break;
case SYNTAX_TOKEN_PLUS:
if (++p >= q)
if (++p > q)
return -1;
j = 0;
for (;;) {
@ -214,7 +214,7 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
}
break;
case SYNTAX_TOKEN_BRACKET:
if (++p >= q)
if (++p > q)
return -1;
c = -1;
for (;; i++) {
@ -228,15 +228,15 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
j = c; /* dummy command */
}
i--;
while (*p != SYNTAX_TOKEN_BRACKET && p < q)
while (*p != SYNTAX_TOKEN_BRACKET && p <= q)
p++;
if (p >= q)
if (p > q)
return -1;
if (p[1] == d)
i--;
break;
case SYNTAX_TOKEN_BRACE:
if (++p >= q)
if (++p > q)
return -1;
c = edit_get_byte (edit, i);
for (; *p != SYNTAX_TOKEN_BRACE; p++)
@ -244,7 +244,7 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
goto found_char3;
return -1;
found_char3:
for (; *p != SYNTAX_TOKEN_BRACE && p < q; p++);
for (; *p != SYNTAX_TOKEN_BRACE && p <= q; p++);
break;
default:
if (*p != edit_get_byte (edit, i))