Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-03 20:22:38 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make SPP less dependent on system(3) and popen(3)

Browse Source
This commit is contained in:
iamahuman 2018-12-15 23:53:48 +09:00 committed by radare
parent 4462e73306
commit 7f380ae78d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shlr/spp/config.def.h
View File

@ -1,4 +1,4 @@
#ifdef HAVE_FORK
#ifndef HAVE_FORK
#define HAVE_FORK 1
#endif

22
shlr/spp/p/spp.h
View File

@ -10,6 +10,7 @@ static int spp_var_set(const char *var, const char *val) {
return r_sys_setenv(var, val);
}
#if HAVE_SYSTEM
/* Should be dynamic buffer */
static char *cmd_to_str(const char *cmd) {
char *out = (char *)calloc (4096, 1);
@ -40,6 +41,7 @@ static char *cmd_to_str(const char *cmd) {
out[len] = '\0';
return out;
}
#endif
static TAG_CALLBACK(spp_set) {
char *eq, *val = "";
@ -133,15 +135,10 @@ static TAG_CALLBACK(spp_sub) {
return ret;
}
// XXX This method needs some love
static TAG_CALLBACK(spp_trace) {
#if HAVE_SYSTEM
char b[1024];
if (state->echo[state->ifl]) {
snprintf (b, 1023, "echo '%s' >&2 ", buf);
system (b);
fprintf (stderr, "%.1000s\n", buf);
}
#endif
return 0;
}
@ -174,9 +171,11 @@ static TAG_CALLBACK(spp_system) {
if (!state->echo[state->ifl]) {
return 0;
}
#if HAVE_SYSTEM
char *str = cmd_to_str (buf);
do_printf (out, "%s", str);
free(str);
#endif
return 0;
}
@ -315,10 +314,14 @@ static TAG_CALLBACK(spp_default) {
return 0;
}
#if HAVE_SYSTEM
static FILE *spp_pipe_fd = NULL;
#endif
static TAG_CALLBACK(spp_pipe) {
#if HAVE_SYSTEM
spp_pipe_fd = popen (buf, "w");
#endif
return 0;
}
@ -346,6 +349,7 @@ static TAG_CALLBACK(spp_endswitch) {
}
static TAG_CALLBACK(spp_endpipe) {
#if HAVE_SYSTEM
/* TODO: Get output here */
int ret = 0, len = 0;
int outlen = 4096;
@ -371,13 +375,17 @@ static TAG_CALLBACK(spp_endpipe) {
}
spp_pipe_fd = NULL;
free (str);
#endif
return 0;
}
static PUT_CALLBACK(spp_fputs) {
#if HAVE_SYSTEM
if (spp_pipe_fd) {
fprintf (spp_pipe_fd, "%s", buf);
} else {
} else
#endif
{
do_printf (out, "%s", buf);
}
return 0;