Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-04 12:27:40 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Support == in conditionals, Add r2 -C to connect

Browse Source
This commit is contained in:
pancake 2013-03-03 06:00:57 +01:00
parent b45f07a39a
commit 5d67033220
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binr/radare2/radare2.c
View File

@ -24,6 +24,7 @@ static int main_help(int line) {
" -b [bits] set asm.bits\n"
" -B [size] initial block size\n"
" -c 'cmd..' execute radare command\n"
" -C file is host:port (alias for -c+=http://%%s/cmd/)\n"
" -d use 'file' as a program to debug\n"
" -D [backend] enable debug mode (e cfg.debug=true)\n"
" -e k=v evaluate config var\n"
@ -117,6 +118,7 @@ int main(int argc, char **argv) {
//int threaded = R_FALSE;
int has_project = R_FALSE;
int ret, i, c, perms = R_IO_READ;
int do_connect = 0;
int run_anal = 1;
int run_rc = 1;
int help = 0;
@ -143,12 +145,15 @@ int main(int argc, char **argv) {
return main_help (1);
r_core_init (&r);
while ((c = getopt (argc, argv, "wfhm:e:nNdqvs:p:b:B:a:Lui:l:P:c:D:"
while ((c = getopt (argc, argv, "Cwfhm:e:nNdqvs:p:b:B:a:Lui:l:P:c:D:"
#if USE_THREADS
"t"
#endif
))!=-1) {
switch (c) {
case 'C':
do_connect = R_TRUE;
break;
#if USE_THREADS
case 't':
threaded = R_TRUE;
@ -194,6 +199,11 @@ int main(int argc, char **argv) {
if (help>1) return main_help (2);
else if (help) return main_help (0);
if (do_connect) {
r_core_cmdf (&r, "=+http://%s/cmd/", argv[optind]);
return 0;
}
// DUP
if (asmarch) r_config_set (r.config, "asm.arch", asmarch);
if (asmbits) r_config_set (r.config, "asm.bits", asmbits);

4
libr/util/num.c
View File

@ -313,7 +313,9 @@ R_API int r_num_conditional(RNum *num, const char *str) {
if (!n) goto fail;
}
}
r_str_replace_char (s, '=', '-');
lgt = strstr (p, "==");
if (lgt) *lgt = ' ';
r_str_replace_char (p, '=', '-');
n = r_num_math (num, p);
if (n) goto fail;
}