portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Exclusions to RzConfig Loading (#223)

Browse source
This commit is contained in:
Florian Märkl 2020-12-21 14:26:31 +01:00 committed by GitHub
parent 5d07857260
commit da4703d757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
librz/config/serialize_config.c
View file

@ -23,17 +23,40 @@ RZ_API void rz_serialize_config_save(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *co
}
}
typedef struct load_config_ctx_t {
RzConfig *config;
HtPP *exclude;
} LoadConfigCtx;
static bool load_config_cb(void *user, const char *k, const char *v) {
RzConfig *config = user;
RzConfigNode *node = rz_config_node_get (config, k);
LoadConfigCtx *ctx = user;
if (ctx->exclude && ht_pp_find_kv (ctx->exclude, k, NULL)) {
return true;
}
RzConfigNode *node = rz_config_node_get (ctx->config, k);
if (!node) {
return 1;
}
rz_config_set (config, k, v);
rz_config_set (ctx->config, k, v);
return 1;
}
RZ_API bool rz_serialize_config_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *config, RZ_NULLABLE RzSerializeResultInfo *res) {
sdb_foreach (db, load_config_cb, config);
/**
* @param exclude NULL-terminated array of keys to not load from the sdb.
*/
RZ_API bool rz_serialize_config_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *config,
RZ_NULLABLE const char * const *exclude, RZ_NULLABLE RzSerializeResultInfo *res) {
LoadConfigCtx ctx = { config, NULL };
if (exclude) {
ctx.exclude = ht_pp_new (NULL, NULL, NULL);
if (!ctx.exclude) {
return false;
}
for (; *exclude; exclude++) {
ht_pp_insert (ctx.exclude, *exclude, NULL);
}
}
sdb_foreach (db, load_config_cb, &ctx);
ht_pp_free (ctx.exclude);
return true;
}

8
librz/core/serialize_core.c
View file

@ -39,6 +39,12 @@ RZ_API void rz_serialize_core_save(RZ_NONNULL Sdb *db, RZ_NONNULL RzCore *core,
sdb_set (db, "blocksize", buf, 0);
}
static const char * const config_exclude[] = {
"scr.interactive", // especially relevant for Cutter since it needs this to be false
"scr.color",
NULL
};
RZ_API bool rz_serialize_core_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzCore *core, bool load_bin_io,
RZ_NULLABLE const char *prj_file, RZ_NULLABLE RzSerializeResultInfo *res) {
Sdb *subdb;
@ -48,7 +54,7 @@ RZ_API bool rz_serialize_core_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzCore *core,
if (load_bin_io) {
SUB ("file", file_load (subdb, core, prj_file, res));
}
SUB ("config", rz_serialize_config_load (subdb, core->config, res));
SUB ("config", rz_serialize_config_load (subdb, core->config, config_exclude, res));
SUB ("flags", rz_serialize_flag_load (subdb, core->flags, res));
SUB ("analysis", rz_serialize_analysis_load (subdb, core->analysis, res));

3
librz/include/rz_config.h
View file

@ -118,7 +118,8 @@ static inline bool rz_config_node_is_str(RzConfigNode *node) {
/* serialize */
RZ_API void rz_serialize_config_save(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *config);
RZ_API bool rz_serialize_config_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *config, RZ_NULLABLE RzSerializeResultInfo *res);
RZ_API bool rz_serialize_config_load(RZ_NONNULL Sdb *db, RZ_NONNULL RzConfig *config,
RZ_NULLABLE const char * const *exclude, RZ_NULLABLE RzSerializeResultInfo *res);
#endif
#ifdef __cplusplus

28
test/unit/test_serialize_config.c
View file

@ -38,7 +38,7 @@ bool test_config_load() {
Sdb *db = ref_db ();
sdb_set (db, "sneaky", "not part of config", 0);
bool loaded = rz_serialize_config_load (db, config, NULL);
bool loaded = rz_serialize_config_load (db, config, NULL, NULL);
sdb_free (db);
mu_assert ("load success", loaded);
@ -50,9 +50,35 @@ bool test_config_load() {
mu_end;
}
bool test_config_load_exclude() {
static const char * const exclude[] = {
"somestring",
"someint",
NULL
};
RzConfig *config = rz_config_new (NULL);
rz_config_set (config, "somestring", "someoldvalue");
rz_config_set_i (config, "someint", 123);
rz_config_set_i (config, "somebiggerint", 0);
rz_config_lock (config, true);
Sdb *db = ref_db ();
bool loaded = rz_serialize_config_load (db, config, exclude, NULL);
sdb_free (db);
mu_assert ("load success", loaded);
mu_assert_eq (rz_list_length (config->nodes), 3, "count after load");
mu_assert_streq (rz_config_get (config, "somestring"), "someoldvalue", "excluded config string");
mu_assert_eq_fmt (rz_config_get_i (config, "someint"), (ut64)123, "excluded config int", "%"PFMT64u);
mu_assert_eq_fmt (rz_config_get_i (config, "somebiggerint"), (ut64)0x1337, "loaded config bigger int", "0x%"PFMT64x);
rz_config_free (config);
mu_end;
}
int all_tests() {
mu_run_test (test_config_save);
mu_run_test (test_config_load);
mu_run_test (test_config_load_exclude);
return tests_passed != tests_run;
}