Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 13:19:54 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Show bools as bools and ints as ints in ej json output ##shell

Browse Source
This commit is contained in:
pancake 2023-09-26 23:15:09 +02:00 committed by pancake
parent 3d7845f0fd
commit 5ab7298133
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libr/config/config.c
View File

@ -70,7 +70,7 @@ static void config_print_value_json(RConfig *cfg, PJ *pj, RConfigNode *node) {
}
char *sval = r_str_escape (val);
if (r_config_node_is_bool (node) || r_config_node_is_int (node)) {
if (!strncmp (val, "0x", 2)) {
if (r_str_startswith (val, "0x")) {
ut64 n = r_num_get (NULL, val);
if (pj) {
pj_n (pj, n);
@ -79,7 +79,14 @@ static void config_print_value_json(RConfig *cfg, PJ *pj, RConfigNode *node) {
}
} else if (r_str_isnumber (val) || (*val /* HACK */ && r_str_is_bool (val))) {
if (pj) {
pj_s (pj, val);
if (r_str_is_bool (val)) {
pj_b (pj, val);
} else if (r_str_isnumber (val)) {
ut64 n = r_num_get (NULL, val);
pj_n (pj, n);
} else {
pj_s (pj, val);
}
} else {
cfg->cb_printf ("%s", val); // TODO: always use true/false for bool json str
}

16
libr/util/str.c
View File

@ -3519,8 +3519,8 @@ R_API bool r_str_isnumber(const char *str) {
if (!str || (!IS_DIGIT (*str) && *str != '-')) {
return false;
}
for (str++; *str; str++) {
// consider '.' part of the number?
if (!IS_DIGIT (*str)) {
return false;
}
@ -3800,17 +3800,15 @@ R_API int r_snprintf(char *string, int len, const char *fmt, ...) {
// Strips all the lines in str that contain key
R_API void r_str_stripLine(char *str, const char *key) {
size_t i, j, klen, slen, off;
const char *ptr;
if (!str || !key) {
return;
}
klen = strlen (key);
slen = strlen (str);
size_t i, j;
size_t klen = strlen (key);
size_t slen = strlen (str);
for (i = 0; i < slen; ) {
ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) "\n", 1);
const char *ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) "\n", 1);
if (!ptr) {
ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) key, klen);
if (ptr) {
@ -3820,7 +3818,7 @@ R_API void r_str_stripLine(char *str, const char *key) {
break;
}
off = (size_t) (ptr - (str + i)) + 1;
size_t off = (size_t) (ptr - (str + i)) + 1;
ptr = (char*) r_mem_mem ((ut8*) str + i, off, (ut8*) key, klen);
if (ptr) {
@ -3850,11 +3848,9 @@ R_API char *r_str_list_join(RList *str, const char *sep) {
R_API char *r_str_array_join(const char **a, size_t n, const char *sep) {
RStrBuf *sb = r_strbuf_new ("");
size_t i;
if (n > 0) {
r_strbuf_append (sb, a[0]);
}
for (i = 1; i < n; i++) {
r_strbuf_append (sb, sep);
r_strbuf_append (sb, a[i]);