tailix
/
libkernaux
mirror of https://github.com/tailix/libkernaux.git
1
0
Fork 0
Code Releases Activity

Rewrite command line parser

This commit is contained in:
Alex Kotov 2020-12-06 02:47:19 +05:00
parent d6202e2ce5
commit 878ce4b4a9
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/cmdline.c
View File

@ -44,7 +44,7 @@ kernaux_bool kernaux_cmdline_parse(
enum State state = INITIAL;
unsigned int start = 0;
unsigned int buffer_size = 0;
for (unsigned int index = 0; ; ++index) {
const char cur = cmdline[index];
@ -60,8 +60,20 @@ kernaux_bool kernaux_cmdline_parse(
state = WHITESPACE;
}
else {
if (*argc >= argv_count_max) {
kernaux_strncpy(error_msg, "too many args", 13);
goto fail;
}
if (buffer_size >= arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
state = TOKEN;
start = index;
argv[(*argc)++] = buffer;
*(buffer++) = cur;
++buffer_size;
}
break;
case WHITESPACE:
@ -71,20 +83,51 @@ kernaux_bool kernaux_cmdline_parse(
else if (cur == ' ') {
}
else {
if (*argc >= argv_count_max) {
kernaux_strncpy(error_msg, "too many args", 13);
goto fail;
}
if (buffer_size >= arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
state = TOKEN;
start = index;
argv[(*argc)++] = buffer;
*(buffer++) = cur;
++buffer_size;
}
break;
case TOKEN:
if (cur == '\0') {
if (buffer_size >= arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
state = FINAL;
goto create_token;
*(buffer++) = '\0';
buffer_size = 0;
}
else if (cur == ' ') {
if (buffer_size >= arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
state = WHITESPACE;
goto create_token;
*(buffer++) = '\0';
buffer_size = 0;
}
else {
if (buffer_size >= arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
*(buffer++) = cur;
++buffer_size;
}
break;
}
@ -92,31 +135,6 @@ kernaux_bool kernaux_cmdline_parse(
if (state == FINAL) {
break;
}
continue;
create_token:
{
const unsigned size = index - start + 1;
if (*argc >= argv_count_max) {
kernaux_strncpy(error_msg, "too many args", 13);
goto fail;
}
if (size > arg_size_max) {
kernaux_strncpy(error_msg, "arg too long", 12);
goto fail;
}
argv[(*argc)++] = buffer;
kernaux_strncpy(buffer, &cmdline[start], size - 1);
buffer += size;
}
if (state == FINAL) {
break;
}
}
return KERNAUX_TRUE;