libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

(libretro-db) Add support for binary string input

Browse Source 
Binary strings are hexadecimal strings prefixed with 'b', e.g.
b"D34DB33F". Binary strings result in RDT_BINARY values instead of a
RDT_STRING ones.
This commit is contained in:
Higor Eurípedes 2015-06-10 14:08:45 -03:00
parent 43d7124c75
commit dc3d096a46
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libretro-db/query.c
View File

@ -483,6 +483,7 @@ static struct buffer parse_string(struct buffer buff,
const char * str_start; const char * str_start;
char terminator = '\0'; char terminator = '\0';
char c = '\0'; char c = '\0';
int is_binstr = 0;
(void)c; (void)c;
@ -491,6 +492,12 @@ static struct buffer parse_string(struct buffer buff,
if (*error) if (*error)
return buff; return buff;
if (terminator == 'b')
{
is_binstr = 1;
buff = get_char(buff, &terminator, error);
}
if (terminator != '"' && terminator != '\'') if (terminator != '"' && terminator != '\'')
{ {
buff.offset--; buff.offset--;
@ -509,18 +516,42 @@ static struct buffer parse_string(struct buffer buff,
if (!*error) if (!*error)
{ {
value->type = RDT_STRING; size_t nmemb = is_binstr ? (value->string.len + 1) / 2 : (value->string.len + 1);
value->type = is_binstr ? RDT_BINARY : RDT_STRING;
value->string.len = (buff.data + buff.offset) - str_start - 1; value->string.len = (buff.data + buff.offset) - str_start - 1;
value->string.buff = (char*)calloc(value->string.len + 1, sizeof(char)); value->string.buff = (char*)calloc(nmemb, sizeof(char));
if (!value->string.buff) if (!value->string.buff)
raise_enomem(error); raise_enomem(error);
else if (is_binstr)
{
unsigned i, j;
const char *tok = str_start;
j = 0;
for (i = 0; i < value->string.len; i += 2)
{
uint8_t hi, lo;
char hic = tok[i];
char loc = tok[i + 1];
if (hic <= '9')
hi = hic - '0';
else
hi = (hic - 'A') + 10;
if (loc <= '9')
lo = loc - '0';
else
lo = (loc - 'A') + 10;
value->string.buff[j++] = hi * 16 + lo;
}
value->string.len = j;
}
else else
memcpy( memcpy(value->string.buff, str_start, value->string.len);
value->string.buff,
str_start,
value->string.len
);
} }
return buff; return buff;
} }
@ -568,7 +599,7 @@ static struct buffer parse_value(struct buffer buff,
value->type = RDT_BOOL; value->type = RDT_BOOL;
value->bool_ = 0; value->bool_ = 0;
} }
else if (peek(buff, "\"") || peek(buff, "'")) else if (peek(buff, "b") || peek(buff, "\"") || peek(buff, "'"))
buff = parse_string(buff, value, error); buff = parse_string(buff, value, error);
else if (isdigit(buff.data[buff.offset])) else if (isdigit(buff.data[buff.offset]))
buff = parse_integer(buff, value, error); buff = parse_integer(buff, value, error);
@ -824,6 +855,7 @@ static struct buffer parse_argument(struct buffer buff,
peek(buff, "nil") peek(buff, "nil")
|| peek(buff, "true") || peek(buff, "true")
|| peek(buff, "false") || peek(buff, "false")
|| peek(buff, "b\"") || peek(buff, "b'") /* bin string prefix*/
) )
) )
{ {