Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-25 06:09:50 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add clearenv in rarun2 and update documentation

Browse Source 
fix unsetenv wrong description
add some example for environment variable
fix r2 use of rarun2 example

Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
This commit is contained in:
Kevin Grandemange 2015-08-29 00:15:41 +02:00 committed by Riccardo Schirone
parent 4261075d60
commit 71c4245df7
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/include/r_util.h
View File

@ -624,6 +624,7 @@ R_API int r_sys_sleep(int secs);
R_API int r_sys_usleep(int usecs);
R_API char *r_sys_getenv(const char *key);
R_API int r_sys_setenv(const char *key, const char *value);
R_API int r_sys_clearenv(void);
R_API char *r_sys_whoami (char *buf);
R_API char *r_sys_getdir(void);
R_API int r_sys_chdir(const char *s);

3
libr/socket/run.c
View File

@ -284,6 +284,8 @@ R_API int r_run_parseline (RRunProfile *p, char *b) {
*v++ = 0;
r_sys_setenv (e, v);
}
} else if (!strcmp(b, "clearenv")) {
r_sys_clearenv ();
}
if (must_free == R_TRUE)
free (e);
@ -304,6 +306,7 @@ R_API const char *r_run_help() {
"# aslr=no\n"
"setenv=FOO=BAR\n"
"# unsetenv=FOO\n"
"# clearenv=true\n"
"# envfile=environ.txt\n"
"timeout=3\n"
"# connect=localhost:8080\n"

18
libr/util/sys.c
View File

@ -31,6 +31,9 @@ int proc_pidpath(int pid, void * buffer, ut32 buffersize);
# include <sys/stat.h>
# include <errno.h>
# include <signal.h>
# include <unistd.h>
extern char **environ;
#ifdef __HAIKU__
# define Sleep sleep
#endif
@ -187,6 +190,21 @@ R_API int r_sys_usleep(int usecs) {
#endif
}
R_API int r_sys_clearenv(void) {
#if __UNIX__ || __CYGWIN__ && !defined(MINGW32)
if (environ == NULL) {
return 0;
}
while (*environ != NULL) {
*environ++ = NULL;
}
return 0;
#else
#warning r_sys_clearenv : unimplemented for this platform
return 0;
#endif
}
R_API int r_sys_setenv(const char *key, const char *value) {
#if __UNIX__ || __CYGWIN__ && !defined(MINGW32)
if (!key) return 0;

17
man/rarun2.1
View File

@ -26,8 +26,10 @@ set 32 or 64 bit (if the architecture supports it)
change directory before executing the program
.It Ar chroot
run the program in chroot. requires some previous setup
.It Ar clearenv
unset the whole environment
.It Ar core
set no limit the core file size
set no limit the core file size
.It Ar connect
connect stdin/stdout/stderr to a socket
.It Ar envfile
@ -75,7 +77,7 @@ execute the given command
.It Ar timeout
set a timeout
.It Ar unsetenv
unset the whole environnement
unset one environment variable
.El
.Sh EXAMPLES
Sample rarun2 script
@ -86,6 +88,11 @@ Sample rarun2 script
arg0=10
stdin=foo.txt
chdir=/tmp
clearenv=true
setenv=EGG=eggsy
setenv=NOFUN=nogames
unsetenv=NOFUN
# EGG will be the only env variable
#chroot=.
./foo.rr2
.Pp
@ -100,7 +107,11 @@ Debugging a program redirecting io to another terminal
$ tty ; clear ; sleep 999999
/dev/ttyS010
## in another terminal run r2
$ r2 \-d rarun2 program=/bin/ls stdio=/dev/ttys010
$ r2 \-d /bin/ls -e dbg.profile=foo.rr2
$ cat foo.rr2
#!/usr/bin/rarun2
stdio=/dev/ttys010
.Sh SEE ALSO
.Pp
.Xr radare2(1) ,