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

Command argument parsers set result argument

Browse Source
This commit is contained in:
James Booth
2014-04-09 21:31:43 +01:00
parent 6275644de4
commit c3e3759256
5 changed files with 237 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/parser.c
View File

@@ -48,9 +48,10 @@
*
*/
gchar **
parse_args(const char * const inp, int min, int max)
parse_args(const char * const inp, int min, int max, gboolean *result)
{
if (inp == NULL) {
*result = FALSE;
return NULL;
}
@@ -122,6 +123,7 @@ parse_args(const char * const inp, int min, int max)
if ((num < min) || (num > max)) {
g_slist_free_full(tokens, free);
g_free(copy);
*result = FALSE;
return NULL;
// if min allowed is 0 and 0 found, return empty char* array
@@ -130,6 +132,7 @@ parse_args(const char * const inp, int min, int max)
gchar **args = malloc((num + 1) * sizeof(*args));
args[0] = NULL;
g_free(copy);
*result = TRUE;
return args;
// otherwise return args array
@@ -147,7 +150,7 @@ parse_args(const char * const inp, int min, int max)
args[arg_count] = NULL;
g_slist_free_full(tokens, free);
g_free(copy);
*result = TRUE;
return args;
}
}
@@ -179,9 +182,10 @@ parse_args(const char * const inp, int min, int max)
*
*/
gchar **
parse_args_with_freetext(const char * const inp, int min, int max)
parse_args_with_freetext(const char * const inp, int min, int max, gboolean *result)
{
if (inp == NULL) {
*result = FALSE;
return NULL;
}
@@ -267,12 +271,14 @@ parse_args_with_freetext(const char * const inp, int min, int max)
// 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) {
gchar **args = malloc((num + 1) * sizeof(*args));
args[0] = NULL;
*result = TRUE;
return args;
// otherwise return args array
@@ -289,7 +295,7 @@ parse_args_with_freetext(const char * const inp, int min, int max)
args[arg_count] = NULL;
g_slist_free_full(tokens, free);
*result = TRUE;
return args;
}
}

4
src/tools/parser.h
View File

@@ -25,8 +25,8 @@
#include <glib.h>
gchar** parse_args(const char * const inp, int min, int max);
gchar** parse_args_with_freetext(const char * const inp, int min, int max);
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);
int count_tokens(char *string);
char* get_start(char *string, int tokens);