formatting fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2727 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
25799f6862
Коммит
0227ccca7c
12
src/utils.c
12
src/utils.c
@ -260,15 +260,15 @@ const char *strstrwrapper(const char *haystack, const char *needle,
|
|||||||
if (ISSET(USE_REGEXP)) {
|
if (ISSET(USE_REGEXP)) {
|
||||||
#ifndef NANO_SMALL
|
#ifndef NANO_SMALL
|
||||||
if (ISSET(BACKWARDS_SEARCH)) {
|
if (ISSET(BACKWARDS_SEARCH)) {
|
||||||
if (regexec(&search_regexp, haystack, 1, regmatches, 0) == 0
|
if (regexec(&search_regexp, haystack, 1, regmatches,
|
||||||
&& haystack + regmatches[0].rm_so <= start) {
|
0) == 0 && haystack + regmatches[0].rm_so <= start) {
|
||||||
const char *retval = haystack + regmatches[0].rm_so;
|
const char *retval = haystack + regmatches[0].rm_so;
|
||||||
|
|
||||||
/* Search forward until there are no more matches. */
|
/* Search forward until there are no more matches. */
|
||||||
while (regexec(&search_regexp, retval + 1, 1, regmatches,
|
while (regexec(&search_regexp, retval + 1, 1,
|
||||||
REG_NOTBOL) == 0 && retval + 1 +
|
regmatches, REG_NOTBOL) == 0 &&
|
||||||
regmatches[0].rm_so <= start)
|
retval + regmatches[0].rm_so + 1 <= start)
|
||||||
retval += 1 + regmatches[0].rm_so;
|
retval += regmatches[0].rm_so + 1;
|
||||||
/* Finally, put the subexpression matches in global
|
/* Finally, put the subexpression matches in global
|
||||||
* variable regmatches. The REG_NOTBOL flag doesn't
|
* variable regmatches. The REG_NOTBOL flag doesn't
|
||||||
* matter now. */
|
* matter now. */
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user