devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

parser.c: Use helper function to reduce duplicate code

Browse Source 
`parse_args()` and `parse_args_with_freetext()` shared a lot of common
code.
Let's have a helper function `_parse_args_helper()` for that. The
`with_freetext` parameter will make it behave like
`parse_args_with_freetext()`.

In preparation for https://github.com/profanity-im/profanity/issues/1404
This commit is contained in:
Michael Vetter
2020-07-21 10:43:14 +02:00
parent 0077d02c86
commit 5a9f76c16a
1 changed files with 67 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
src/tools/parser.c
View File

@@ -40,163 +40,8 @@
#include "common.h" #include "common.h"
/* static gchar**
* Take a full line of input and return an array of strings representing _parse_args_helper(const char* const inp, int min, int max, gboolean* result, gboolean with_freetext)
* the arguments of a command.
* If the number of arguments found is less than min, or more than max
* NULL is returned.
*
* inp - The line of input
* min - The minimum allowed number of arguments
* max - The maximum allowed number of arguments
*
* Returns - An NULL terminated array of strings representing the arguments
* of the command, or NULL if the validation fails.
*
* E.g. the following input line:
*
* /cmd arg1 arg2
*
* Will return a pointer to the following array:
*
* { "arg1", "arg2", NULL }
*
*/
gchar**
parse_args(const char* const inp, int min, int max, gboolean* result)
{
if (inp == NULL) {
*result = FALSE;
return NULL;
}
// copy and strip input of leading/trailing whitespace
char* copy = strdup(inp);
g_strstrip(copy);
int inp_size = g_utf8_strlen(copy, -1);
gboolean in_token = FALSE;
gboolean in_quotes = FALSE;
char* token_start = &copy[0];
int token_size = 0;
GSList* tokens = NULL;
// add tokens to GSList
int i;
for (i = 0; i < inp_size; i++) {
gchar* curr_ch = g_utf8_offset_to_pointer(copy, i);
gunichar curr_uni = g_utf8_get_char(curr_ch);
if (!in_token) {
if (curr_uni == ' ') {
continue;
} else {
in_token = TRUE;
if (curr_uni == '"') {
in_quotes = TRUE;
i++;
gchar* next_ch = g_utf8_next_char(curr_ch);
gunichar next_uni = g_utf8_get_char(next_ch);
token_start = next_ch;
token_size += g_unichar_to_utf8(next_uni, NULL);
} else {
token_start = curr_ch;
token_size += g_unichar_to_utf8(curr_uni, NULL);
}
}
} else {
if (in_quotes) {
if (curr_uni == '"') {
tokens = g_slist_append(tokens, g_strndup(token_start,
token_size));
token_size = 0;
in_token = FALSE;
in_quotes = FALSE;
} else {
token_size += g_unichar_to_utf8(curr_uni, NULL);
}
} else {
if (curr_uni == ' ') {
tokens = g_slist_append(tokens, g_strndup(token_start,
token_size));
token_size = 0;
in_token = FALSE;
} else {
token_size += g_unichar_to_utf8(curr_uni, NULL);
}
}
}
}
if (in_token) {
tokens = g_slist_append(tokens, g_strndup(token_start, token_size));
}
free(copy);
int num = g_slist_length(tokens) - 1;
// if num args not valid return NULL
if ((num < min) || (num > max)) {
g_slist_free_full(tokens, free);
*result = FALSE;
return NULL;
// if min allowed is 0 and 0 found, return empty char* array
} else if (min == 0 && num == 0) {
g_slist_free_full(tokens, free);
gchar** args = malloc((num + 1) * sizeof(*args));
args[0] = NULL;
*result = TRUE;
return args;
// otherwise return args array
} else {
gchar** args = malloc((num + 1) * sizeof(*args));
GSList* token = tokens;
token = g_slist_next(token);
int arg_count = 0;
while (token) {
args[arg_count++] = strdup(token->data);
token = g_slist_next(token);
}
args[arg_count] = NULL;
g_slist_free_full(tokens, free);
*result = TRUE;
return args;
}
}
/*
* Take a full line of input and return an array of strings representing
* the arguments of a command. This function handles when the last parameter
* to the command is free text e.g.
*
* /msg user@host here is a message
*
* If the number of arguments found is less than min, or more than max
* NULL is returned.
*
* inp - The line of input
* min - The minimum allowed number of arguments
* max - The maximum allowed number of arguments
*
* Returns - An NULL terminated array of strings representing the arguments
* of the command, or NULL if the validation fails.
*
* E.g. the following input line:
*
* /cmd arg1 arg2 some free text
*
* Will return a pointer to the following array:
*
* { "arg1", "arg2", "some free text", NULL }
*
*/
gchar**
parse_args_with_freetext(const char* const inp, int min, int max, gboolean* result)
{ {
if (inp == NULL) { if (inp == NULL) {
*result = FALSE; *result = FALSE;
@@ -227,8 +72,10 @@ parse_args_with_freetext(const char* const inp, int min, int max, gboolean* resu
continue; continue;
} else { } else {
in_token = TRUE; in_token = TRUE;
num_tokens++; if (with_freetext) {
if ((num_tokens == max + 1) && (curr_uni != '"')) { num_tokens++;
}
if (with_freetext && (num_tokens == max + 1) && (curr_uni != '"')) {
in_freetext = TRUE; in_freetext = TRUE;
} else if (curr_uni == '"') { } else if (curr_uni == '"') {
in_quotes = TRUE; in_quotes = TRUE;
@@ -260,7 +107,7 @@ parse_args_with_freetext(const char* const inp, int min, int max, gboolean* resu
} }
} }
} else { } else {
if (in_freetext) { if (with_freetext && in_freetext) {
token_size += g_unichar_to_utf8(curr_uni, NULL); token_size += g_unichar_to_utf8(curr_uni, NULL);
} else if (curr_uni == ' ') { } else if (curr_uni == ' ') {
tokens = g_slist_append(tokens, g_strndup(token_start, tokens = g_slist_append(tokens, g_strndup(token_start,
@@ -315,6 +162,66 @@ parse_args_with_freetext(const char* const inp, int min, int max, gboolean* resu
} }
} }
/*
* Take a full line of input and return an array of strings representing
* the arguments of a command.
* If the number of arguments found is less than min, or more than max
* NULL is returned.
*
* inp - The line of input
* min - The minimum allowed number of arguments
* max - The maximum allowed number of arguments
*
* Returns - An NULL terminated array of strings representing the arguments
* of the command, or NULL if the validation fails.
*
* E.g. the following input line:
*
* /cmd arg1 arg2
*
* Will return a pointer to the following array:
*
* { "arg1", "arg2", NULL }
*
*/
gchar**
parse_args(const char* const inp, int min, int max, gboolean* result)
{
return _parse_args_helper(inp, min, max, result, FALSE);
}
/*
* Take a full line of input and return an array of strings representing
* the arguments of a command. This function handles when the last parameter
* to the command is free text e.g.
*
* /msg user@host here is a message
*
* If the number of arguments found is less than min, or more than max
* NULL is returned.
*
* inp - The line of input
* min - The minimum allowed number of arguments
* max - The maximum allowed number of arguments
*
* Returns - An NULL terminated array of strings representing the arguments
* of the command, or NULL if the validation fails.
*
* E.g. the following input line:
*
* /cmd arg1 arg2 some free text
*
* Will return a pointer to the following array:
*
* { "arg1", "arg2", "some free text", NULL }
*
*/
gchar**
parse_args_with_freetext(const char* const inp, int min, int max, gboolean* result)
{
return _parse_args_helper(inp, min, max, result, TRUE);
}
int int
count_tokens(const char* const string) count_tokens(const char* const string)
{ {