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

fix rizin egg SFLIBPATH detection

Browse source 
previously rz_sys_cmd_strf("rizin -hh | grep INCDIR | awk '{print $2}'")
was used to detect SFLIBPATH
however, in a recent commit (4707df437d)
the rz_sys_cmd_strf function no longer runs commands in shell mode
but rather in subprocess mode, which does not support pipes etc.
since rizin uses rz_path_incdir() for printing RZ_INCDIR, this logic can
be replaced with a simple call to rz_path_incdir().
This commit is contained in:
Gilad Reti 2023-04-22 15:41:18 +03:00 committed by Anton Kochkov
parent beedbfc5a1
commit 084533b04e
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
librz/egg/egg_Cfile.c
View file

@ -67,7 +67,7 @@ static struct cEnv_t *rz_egg_Cfile_set_cEnv(const char *arch, const char *os, in
struct cEnv_t *cEnv = calloc(1, sizeof(struct cEnv_t));
bool use_clang;
char *buffer = NULL;
char *output = NULL;
char *incdir = NULL;
if (!cEnv) {
return NULL;
@ -79,15 +79,9 @@ static struct cEnv_t *rz_egg_Cfile_set_cEnv(const char *arch, const char *os, in
cEnv->SFLIBPATH = rz_sys_getenv("SFLIBPATH");
if (!cEnv->SFLIBPATH) {
output = rz_sys_cmd_strf("rizin -hh | grep INCDIR | awk '{print $2}'");
if (!output || (output[0] == '\0')) {
eprintf("Cannot find SFLIBPATH env var.\n"
"Please define it, or fix rizin installation.\n");
goto fail;
}
incdir = rz_path_incdir();
output[strlen(output) - 1] = '\0'; // strip the ending '\n'
if (!(cEnv->SFLIBPATH = rz_str_newf("%s/sflib", output))) {
if (!(cEnv->SFLIBPATH = rz_str_newf("%s/sflib", incdir))) {
goto fail;
}
}
@ -199,12 +193,12 @@ static struct cEnv_t *rz_egg_Cfile_set_cEnv(const char *arch, const char *os, in
}
free(buffer);
free(output);
free(incdir);
return cEnv;
fail:
free(buffer);
free(output);
free(incdir);
rz_egg_Cfile_free_cEnv(cEnv);
return NULL;
}