Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-19 12:22:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix rarun2 stdout and stderr pipes

Browse Source 
dcu requires argument to work
Enhace rarun2 manpage
Fix rax2 -B for negative values
This commit is contained in:
pancake 2013-05-05 19:39:01 +02:00
parent 735bcc2fb9
commit 3c62d1905a
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binr/rarun2/rarun2.c
View File

@ -41,7 +41,10 @@ static void parseline (char *b) {
else if (!strcmp (b, "connect")) _connect = strdup (e);
else if (!strcmp (b, "listen")) _listen = strdup (e);
else if (!strcmp (b, "stdout")) _stdout = strdup (e);
else if (!strcmp (b, "stdin")) _stdin = strdup (e);
else if (!strcmp (b, "stdio")) {
_stdout = _stderr = _stdin = strdup (e);
} else if (!strcmp (b, "stdin")) _stdin = strdup (e);
else if (!strcmp (b, "stderr")) _stderr = strdup (e);
else if (!strcmp (b, "input")) _input = strdup (e);
else if (!strcmp (b, "chdir")) _chgdir = strdup (e);
else if (!strcmp (b, "chroot")) _chroot = strdup (e);
@ -89,12 +92,12 @@ static int runfile () {
dup2 (f, 0);
}
if (_stdout) {
int f = open (_stdout, O_RDONLY);
int f = open (_stdout, O_WRONLY);
close (1);
dup2 (f, 1);
}
if (_stderr) {
int f = open (_stderr, O_RDONLY);
int f = open (_stderr, O_WRONLY);
close (2);
dup2 (f, 2);
}
@ -171,7 +174,7 @@ static int runfile () {
if (!fork ()) {
sleep (_timeout);
if (!kill (mypid, 0))
fprintf (stderr, "\nrarun2: Interrupted by timeout\n");
eprintf ("\nrarun2: Interrupted by timeout\n");
kill (mypid, SIGKILL);
exit (0);
}
@ -191,7 +194,7 @@ int main(int argc, char **argv) {
FILE *fd;
char *file, buf[4096];
if (argc==1 || !strcmp (argv[1], "-h")) {
fprintf (stderr, "Usage: rarun2 [-v] [script.rr2] [directive ..]\n");
eprintf ("Usage: rarun2 [-v] [script.rr2] [directive ..]\n");
printf (
"program=/bin/ls\n"
"arg1=/bin\n"
@ -200,6 +203,8 @@ int main(int argc, char **argv) {
"timeout=3\n"
"# connect=localhost:8080\n"
"# listen=8080\n"
"# #stdio=blah.txt\n"
"# #stderr=foo.txt\n"
"# stdout=foo.txt\n"
"# stdin=input.txt\n"
"# input=input.txt\n"
@ -220,7 +225,7 @@ int main(int argc, char **argv) {
if (*file && !strchr (file, '=')) {
fd = fopen (file, "r");
if (!fd) {
fprintf (stderr, "Cannot open %s\n", file);
eprintf ("Cannot open %s\n", file);
return 1;
}
for (;;) {

1
binr/rax2/rax2.c
View File

@ -98,6 +98,7 @@ static int rax (char *str, int len, int last) {
case 'v': blob_version ("rax2"); break;
case '\0': return !use_stdin ();
default:
out_mode = (flags^32)? '0': 'I';
if (str[1]>='0' && str[1]<='9')
return format_output (out_mode, str);
printf ("Usage: rax2 [options] [expr ...]\n");

4
libr/core/cmd_debug.c
View File

@ -943,6 +943,10 @@ static int cmd_debug(void *data, const char *input) {
return 1;
}
case 'u':
if (input[2] != ' ') {
eprintf ("Usage: dcu [address]\n");
return 1;
}
ptr = strchr (input+3, ' ');
// TODO : handle ^C here
if (ptr) { // TODO: put '\0' in *ptr to avoid

7
man/rarun2.1
View File

@ -60,6 +60,13 @@ Connecting a program to a socket
$ nc -l 9999
$ rarun2 program=/bin/ls connect=localhost:9999
.Pp
Debugging a program redirecting io to another terminal
.Pp
## open a new terminal and type 'tty' to get
$ tty ; clear ; sleep 999999
/dev/ttyS010
## in another terminal run r2
$ r2 -d rarun2 program=/bin/ls stdio=/dev/ttys010
.Sh SEE ALSO
.Pp
.Xr radare2(1) ,