mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2952: search: fix zero-length substitution.

Browse Source 
Problem:
Suppose you want to replace a substring in some file names with another,
so you do a File Rename operation with source pattern:

*OLDSTRING*

and target pattern:

\1NEWSTRING\2

If OLDSTRING occurs inside a filename, it is replaced correctly, but if
at the beginning or end of the filename, the corresponding zero-length
wildcard match is replaced by literal \1 or \2, respectively.

Expected
Wildcards that match a zero-length substring should be substituted with
an empty string.

Thanks boris<> for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2014-12-30 16:21:55 +03:00
parent 774762a8e9
commit 5ecf12483a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/search/regex.c
View File

@ -8,7 +8,7 @@
Written by: Written by:
Slava Zanko <slavazanko@gmail.com>, 2009, 2010, 2011, 2013 Slava Zanko <slavazanko@gmail.com>, 2009, 2010, 2011, 2013
Vitaliy Filippov <vitalif@yourcmc.ru>, 2011 Vitaliy Filippov <vitalif@yourcmc.ru>, 2011
Andrew Borodin <aborodin@vmail.ru>, 2013 Andrew Borodin <aborodin@vmail.ru>, 2013, 2014
This file is part of the Midnight Commander. This file is part of the Midnight Commander.
@ -368,8 +368,8 @@ mc_search_regex__get_token_by_num (const mc_search_t * lc_mc_search, gsize lc_in
fnd_end = lc_mc_search->iovector[lc_index * 2 + 1]; fnd_end = lc_mc_search->iovector[lc_index * 2 + 1];
#endif /* SEARCH_TYPE_GLIB */ #endif /* SEARCH_TYPE_GLIB */
if (fnd_end - fnd_start == 0) if (fnd_end == fnd_start)
return NULL; return g_strdup ("");
return g_strndup (lc_mc_search->regex_buffer->str + fnd_start, fnd_end - fnd_start); return g_strndup (lc_mc_search->regex_buffer->str + fnd_start, fnd_end - fnd_start);
@ -913,7 +913,6 @@ GString *
mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str) mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * replace_str)
{ {
GString *ret; GString *ret;
gchar *tmp_str;
int num_replace_tokens; int num_replace_tokens;
gsize loop; gsize loop;
@ -941,6 +940,7 @@ mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * repla
for (loop = 0; loop < replace_str->len - 1; loop++) for (loop = 0; loop < replace_str->len - 1; loop++)
{ {
int lc_index; int lc_index;
gchar *tmp_str;
lc_index = mc_search_regex__process_replace_str (replace_str, loop, &len, &replace_flags); lc_index = mc_search_regex__process_replace_str (replace_str, loop, &len, &replace_flags);
@ -994,8 +994,6 @@ mc_search_regex_prepare_replace_str (mc_search_t * lc_mc_search, GString * repla
} }
tmp_str = mc_search_regex__get_token_by_num (lc_mc_search, lc_index); tmp_str = mc_search_regex__get_token_by_num (lc_mc_search, lc_index);
if (tmp_str == NULL)
continue;
if (loop) if (loop)
mc_search_regex__process_append_str (ret, prev_str, replace_str->str - prev_str + loop, mc_search_regex__process_append_str (ret, prev_str, replace_str->str - prev_str + loop,