dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump sdb from git with some new features

This commit is contained in:
pancake 2014-07-11 00:49:35 +02:00
parent 66a2a5b8a9
commit 34a9db2d45
6 changed files with 134 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/include/sdb/sdb.h
View File

@ -141,6 +141,7 @@ ut64 sdb_unow (void);
ut32 sdb_hash (const char *key);
/* json api */
int sdb_isjson (const char *k);
char *sdb_json_get (Sdb* s, const char *key, const char *p, ut32 *cas);
int sdb_json_set (Sdb* s, const char *k, const char *p, const char *v, ut32 cas);
int sdb_json_num_get (Sdb* s, const char *k, const char *p, ut32 *cas);
@ -213,6 +214,7 @@ int sdb_check_value (const char *s);
int sdb_check_key (const char *s);
int sdb_isnum (const char *s);
const char *sdb_type(const char *k);
int sdb_match (const char *str, const char *glob);
int sdb_bool_set(Sdb *db, const char *str, int v, ut32 cas);
int sdb_bool_get(Sdb *db, const char *str, ut32 *cas);

2
shlr/sdb/Makefile
View File

@ -30,7 +30,7 @@ EMCCFLAGS=-O2 -s EXPORTED_FUNCTIONS="['_sdb_querys','_sdb_new0']"
sdb.js: src/sdb-version.h
cd src ; emcc ${EMCCFLAGS} -I. -o ../sdb.js ${CFILES}
#json/api.c json/js0n.c json/json.c json/rangstr.c
#json/api.c json/js0n.c json/json.c json/rangstr.c
clean:
rm -f src/sdb-version.h

32
shlr/sdb/config.mk
View File

@ -39,16 +39,23 @@ HAVE_VALA=#$(shell valac --version 2> /dev/null)
HOST_CC?=gcc
RANLIB?=ranlib
OS?=$(shell uname)
OSTYPE?=$(shell uname -s)
ARCH?=$(shell uname -m)
ifeq (${OS},w32)
WCP?=i386-mingw32
CC=${WCP}-gcc
AR?=${WCP}-ar
ifeq (,$(findstring MINGW32,${OSTYPE}))
CFLAGS_SHARED?=-fPIC
endif
EXEXT=.exe
else
ifeq (,$(findstring CYGWIN,${OSTYPE}))
ifeq (,$(findstring MINGW32,${OSTYPE}))
CFLAGS_SHARED?=-fPIC
endif
endif
# -fvisibility=hidden
AR?=ar
CC?=gcc
@ -63,15 +70,32 @@ SOEXT=dylib
SOVER=dylib
LDFLAGS+=-dynamic
LDFLAGS_SHARED?=-fPIC -shared
ifeq (${ARCH},i386)
#CC+=-arch i386
CC+=-arch x86_64
endif
ifeq (${ARCH},i386)
#CC+=-arch i386
CC+=-arch x86_64
endif
else
ifneq (,$(findstring CYGWIN,${OSTYPE}))
CFLAGS+=-D__CYGWIN__=1
SOEXT=dll
SOVER=${SOEXT}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
ifneq (,$(findstring MINGW32,${OSTYPE}))
CFLAGS+=-DMINGW32=1
SOEXT=dll
SOVER=${SOEXT}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
CFLAGS+=-fPIC
SOVERSION=0
SOEXT=so
SOVER=${SOEXT}.${SDBVER}
LDFLAGS_SHARED?=-fPIC -shared
endif
endif
LDFLAGS_SHARED+=-Wl,-soname,libsdb.so.$(SOVERSION)
endif

79
shlr/sdb/src/query.c
View File

@ -18,7 +18,7 @@ static StrBuf* strbuf_new() {
return calloc (sizeof(StrBuf),1);
}
static StrBuf* strbuf_append(StrBuf *sb, const char *str) {
static StrBuf* strbuf_append(StrBuf *sb, const char *str, const int nl) {
int len = strlen (str);
if ((sb->len + len+2)>=sb->size) {
int newsize = sb->size+len+256;
@ -29,8 +29,14 @@ static StrBuf* strbuf_append(StrBuf *sb, const char *str) {
sb->size = newsize;
}
memcpy (sb->buf+sb->len, str, len);
memcpy (sb->buf+sb->len+len, "\n", 2);
sb->len += len+1;
/*nl != 0 -> newline at the end*/
if(nl!=0)
{
memcpy (sb->buf+sb->len+len, "\n", 2);
len+=1;
}
sb->len += len;
return sb;
}
@ -40,8 +46,6 @@ static StrBuf *strbuf_free(StrBuf *sb) {
return NULL;
}
/*******/
SDB_API int sdb_queryf (Sdb *s, const char *fmt, ...) {
char string[4096];
int ret;
@ -66,18 +70,19 @@ SDB_API char *sdb_querysf (Sdb *s, char *buf, size_t buflen, const char *fmt, ..
// TODO: Reimplement as a function with optimized concat
#define out_concat(x) if (x&&*x) { \
strbuf_append (out, x); \
strbuf_append (out, x, 1); \
}
typedef struct {
StrBuf *out;
int encode;
char *root;
} ForeachListUser;
static int foreach_list_cb(void *user, const char *k, const char *v) {
ForeachListUser *rlu = user;
char *line;
int klen, vlen;
char *line, *root = rlu->root;
int rlen, klen, vlen;
ut8 *v2 = NULL;
if (!rlu) return 0;
klen = strlen (k);
@ -86,11 +91,21 @@ static int foreach_list_cb(void *user, const char *k, const char *v) {
if (v2) v = (const char *)v2;
}
vlen = strlen (v);
line = malloc (klen + vlen + 2);
memcpy (line, k, klen);
line[klen] = '=';
memcpy (line+klen+1, v, vlen+1);
strbuf_append (rlu->out, line);
if (root) {
rlen = strlen (root);
line = malloc (klen + vlen + rlen + 2);
memcpy (line, root, rlen);
line[rlen]='/'; /*append the '/' at the end of the namespace */
memcpy (line+rlen+1, k, klen);
line[rlen+klen+1] = '=';
memcpy (line+rlen+klen+2, v, vlen+1);
} else {
line = malloc (klen + vlen +2);
memcpy (line, k, klen);
line[klen] = '=';
memcpy (line+klen+1,v,vlen+1);
}
strbuf_append (rlu->out, line, 1);
free (v2);
free (line);
return 1;
@ -101,7 +116,7 @@ static void walk_namespace (StrBuf *sb, char *root, int left, char *p, SdbNs *ns
SdbListIter *it;
char *_out, *out = sb->buf;
SdbNs *n;
ForeachListUser user = { sb, encode };
ForeachListUser user = { sb, encode, root };
char *roote = root + strlen (root);
if (!ns->sdb)
return;
@ -117,8 +132,7 @@ static void walk_namespace (StrBuf *sb, char *root, int left, char *p, SdbNs *ns
memcpy (p+1, n->name, len+1);
left -= len+2;
}
strbuf_append (sb, "");/*Print a new line after the "whole" ns*/
strbuf_append (sb, root);
_out = out;
walk_namespace (sb, root, left,
roote+len+1, n, encode);
@ -221,6 +235,11 @@ next_quote:
if (arroba)
goto next_arroba;
}
if (*cmd=='?') {
const char *val = sdb_const_get (s, cmd+1, 0);
const char *type = sdb_type (val);
out_concat (type);
} else
if (*cmd=='*') {
char *res;
if (!strcmp (cmd, "***")) {
@ -231,7 +250,6 @@ next_quote:
int len = strlen (ns->name);
if (len<sizeof (root)) {
memcpy (root, ns->name, len+1);
out_concat (root);
walk_namespace (out, root,
sizeof (root)-len,
root+len, ns, encode);
@ -555,21 +573,28 @@ next_quote:
val = NULL;
}
} else {
// 0 1 kvpath?jspath
// 0 1 kvpath:jspath
// 0 0 kvpath
if (json) {
*json++ = 0;
// TODO: not optimized to reuse 'buf'
if ((tmp = sdb_json_get (s, cmd, json, 0))) {
if (encode) {
char *newtmp = (void*)sdb_decode (tmp, NULL);
if (!newtmp)
goto fail;
if (*json) {
// TODO: not optimized to reuse 'buf'
if ((tmp = sdb_json_get (s, cmd, json, 0))) {
if (encode) {
char *newtmp = (void*)sdb_decode (tmp, NULL);
if (!newtmp)
goto fail;
free (tmp);
tmp = newtmp;
}
out_concat (tmp);
free (tmp);
tmp = newtmp;
}
out_concat (tmp);
free (tmp);
} else {
// kvpath: -> show indented json
char *o = sdb_json_indent (sdb_const_get (s, cmd, 0));
out_concat (o);
free (o);
}
} else {
// sdbget

2
shlr/sdb/src/sdb.h
View File

@ -141,6 +141,7 @@ ut64 sdb_unow (void);
ut32 sdb_hash (const char *key);
/* json api */
int sdb_isjson (const char *k);
char *sdb_json_get (Sdb* s, const char *key, const char *p, ut32 *cas);
int sdb_json_set (Sdb* s, const char *k, const char *p, const char *v, ut32 cas);
int sdb_json_num_get (Sdb* s, const char *k, const char *p, ut32 *cas);
@ -213,6 +214,7 @@ int sdb_check_value (const char *s);
int sdb_check_key (const char *s);
int sdb_isnum (const char *s);
const char *sdb_type(const char *k);
int sdb_match (const char *str, const char *glob);
int sdb_bool_set(Sdb *db, const char *str, int v, ut32 cas);
int sdb_bool_get(Sdb *db, const char *str, ut32 *cas);

49
shlr/sdb/src/util.c
View File

@ -200,3 +200,52 @@ SDB_API int sdb_match (const char *str, const char *glob) {
return 1;
return 0;
}
SDB_API const char *sdb_type(const char *k) {
if (!k || !*k)
return "undefined";
if (sdb_isnum (k))
return "number";
if (sdb_isjson (k))
return "json";
if (strchr (k, ','))
return "array";
if (!strcmp (k, "true") || !strcmp (k, "false"))
return "boolean";
return "string";
}
// TODO: check if open and closed bracket/parenthesis matches
// TODO: check all the values
SDB_API int sdb_isjson (const char *k) {
int level = 0;
int quotes = 0;
if (*k!='{' && *k != '[')
return 0;
if (k)
for (; *k; k++) {
if (quotes) {
if (*k == '"')
quotes = 0;
continue;
}
switch (*k) {
case '"':
if (quotes) quotes = 0;
else quotes = 1;
break;
case '[':
case '{':
level++;
break;
case ']':
case '}':
level--;
break;
}
}
if (quotes || level)
return 0;
return 1;
}