HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Find in files: split extra options like a shell would do

Browse Source 
Don't simply split the the extra options string on spaces to build the
grep argument list but rather split it in a shell-style fashion.

This is probably more intuitive for most users, is more consistent with
e.g. custom commands, and allows for spaces in an option or its
argument.

Closes #3516263.
This commit is contained in:
Colomban Wendling 2012-04-10 04:07:16 +02:00
parent 728eeb854b
commit 78432b5806
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -3,6 +3,10 @@ Geany 1.22 (unreleased)
Editor
* Update Scintilla to version 2.29.
Search
* Extra options passed to grep through Find in Files now follows a
real shell-style syntax (#3516263).
Geany 0.21 (October 2, 2011)

13
src/search.c
View File

@ -1551,7 +1551,7 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gcha
gchar **argv_prefix, **argv, **opts_argv;
gchar *command_grep;
gchar *search_text = NULL;
guint opts_argv_len, i;
gint opts_argv_len, i;
GPid child_pid;
gint stdout_fd;
gint stderr_fd;
@ -1569,6 +1569,14 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gcha
return FALSE;
}
if (! g_shell_parse_argv(opts, &opts_argv_len, &opts_argv, &error))
{
ui_set_statusbar(TRUE, _("Cannot parse extra options: %s"), error->message);
g_error_free(error);
g_free(command_grep);
return FALSE;
}
/* convert the search text in the preferred encoding (if the text is not valid UTF-8. assume
* it is already in the preferred encoding) */
utf8_text_len = strlen(utf8_search_text);
@ -1579,9 +1587,6 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gcha
if (search_text == NULL)
search_text = g_strdup(utf8_search_text);
opts_argv = g_strsplit(opts, " ", -1);
opts_argv_len = g_strv_length(opts_argv);
/* set grep command and options */
argv_prefix = g_new0(gchar*, 1 + opts_argv_len + 3 + 1); /* last +1 for recursive arg */