mirrors/TegraExplorer
1
0
Fork 0
mirror of https://github.com/suchmememanyskill/TegraExplorer.git synced 2024-11-26 13:52:06 +00:00
Code Issues Releases Activity

Fix a few bugs in the arg parser

Browse source
This commit is contained in:
Such Meme, Many Skill 2020-05-29 00:07:19 +02:00
parent 34abed91a9
commit 81cf8c201c
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/tegraexplorer/script/parser.c
View file

@ -18,7 +18,7 @@
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../../hid/hid.h" #include "../../hid/hid.h"
u32 countchars(const char* in, char target) { int countchars(const char* in, char target) {
u32 len = strlen(in); u32 len = strlen(in);
u32 count = 0; u32 count = 0;
@ -42,15 +42,18 @@ u32 splitargs(const char* in) {
// arg like '5, "6", @arg7' // arg like '5, "6", @arg7'
u32 i = 0, count = 1, len = strlen(in), curcount = 0, begin, end; u32 i = 0, count = 1, len = strlen(in), curcount = 0, begin, end;
if ((count += countchars(in, ',')) < 0){ count += countchars(in, ',');
if (!count)
return 0; return 0;
}
argv = calloc(count + 1, sizeof(char*)); argv = calloc(count + 1, sizeof(char*));
while (i < len && curcount < count) { while (i < len && curcount < count) {
while (in[i] == ' ' || in[i] == ',') if (in[i] == ' ' || in[i] == ','){
i++; i++;
continue;
}
begin = i; begin = i;
@ -62,6 +65,10 @@ u32 splitargs(const char* in) {
return 0; return 0;
} }
} }
if (in[i] == '\0')
return 0;
i++; i++;
} }
@ -73,7 +80,7 @@ u32 splitargs(const char* in) {
argv[curcount++] = utils_copyStringSize(in + begin, (u32)(end - begin)); argv[curcount++] = utils_copyStringSize(in + begin, (u32)(end - begin));
} }
return count; return curcount;
} }
FIL scriptin; FIL scriptin;