devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-31 23:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix /correct quotation marks usage

Browse Source 
Add new `parse_args_as_one()` function to just use everything after the
command as the argument.

Fix https://github.com/profanity-im/profanity/issues/1404
This commit is contained in:
Michael Vetter
2020-07-23 09:40:22 +02:00
parent a5ca65453e
commit 8c0c5cb28c
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/cmd_ac.c
View File

@@ -4189,7 +4189,6 @@ _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean pr
if (result) { if (result) {
return result; return result;
} }
} }
return NULL; return NULL;

2
src/command/cmd_defs.c
View File

@@ -2443,7 +2443,7 @@ static struct cmd_t command_defs[] = {
}, },
{ "/correct", { "/correct",
parse_args_with_freetext, 1, 1, NULL, parse_args_as_one, 1, 1, NULL,
CMD_NOSUBFUNCS CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_correct) CMD_MAINFUNC(cmd_correct)
CMD_TAGS( CMD_TAGS(

27
src/tools/parser.c
View File

@@ -222,6 +222,33 @@ parse_args_with_freetext(const char* const inp, int min, int max, gboolean* resu
return _parse_args_helper(inp, min, max, result, TRUE); return _parse_args_helper(inp, min, max, result, TRUE);
} }
/*
* Will just take everything after the first space as the argument.
* Used for `/correct` so that we also include quotation marks.
*/
gchar**
parse_args_as_one(const char* const inp, int min, int max, gboolean* result)
{
gchar** args = g_malloc0(2 * sizeof(*args));
int length = g_utf8_strlen(inp, -1);
gchar* space = g_utf8_strchr(inp, length, ' ');
if (space) {
int sub_length = g_utf8_strlen(space, -1);
if (sub_length > 1) {
args[0] = g_strdup(space + 1);
*result = TRUE;
return args;
} else {
g_free(args);
}
} else {
g_free(args);
}
*result = FALSE;
return NULL;
}
int int
count_tokens(const char* const string) count_tokens(const char* const string)
{ {

1
src/tools/parser.h
View File

@@ -40,6 +40,7 @@
gchar** parse_args(const char* const inp, int min, int max, gboolean* result); gchar** parse_args(const char* const inp, int min, int max, gboolean* result);
gchar** parse_args_with_freetext(const char* const inp, int min, int max, gboolean* result); gchar** parse_args_with_freetext(const char* const inp, int min, int max, gboolean* result);
gchar** parse_args_as_one(const char* const inp, int min, int max, gboolean* result);
int count_tokens(const char* const string); int count_tokens(const char* const string);
char* get_start(const char* const string, int tokens); char* get_start(const char* const string, int tokens);
GHashTable* parse_options(gchar** args, gchar** keys, gboolean* res); GHashTable* parse_options(gchar** args, gchar** keys, gboolean* res);