Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #5742 - Honor -n in -d

Browse Source
This commit is contained in:
pancake 2016-09-12 23:04:44 +02:00
parent 4486553e4f
commit d01f3832ad
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
binr/radare2/radare2.c
View File

@ -709,10 +709,12 @@ int main(int argc, char **argv, char **envp) {
eprintf ("bin.baddr 0x%08"PFMT64x"\n", baddr);
va = 2;
}
if (r_core_bin_load (&r, diskfile, baddr)) {
RBinObject *obj = r_bin_get_object (r.bin);
if (obj && obj->info)
eprintf ("asm.bits %d\n", obj->info->bits);
if (run_anal > 0) {
if (r_core_bin_load (&r, diskfile, baddr)) {
RBinObject *obj = r_bin_get_object (r.bin);
if (obj && obj->info)
eprintf ("asm.bits %d\n", obj->info->bits);
}
}
r_core_cmd0 (&r, ".dm*");
// Set Thumb Mode if necessary
@ -775,18 +777,25 @@ int main(int argc, char **argv, char **envp) {
}
}
}
if (!pfile) pfile = file;
if (fh == NULL) {
if (!pfile) {
pfile = file;
}
if (!fh) {
if (pfile && *pfile) {
r_cons_flush ();
if (perms & R_IO_WRITE)
if (perms & R_IO_WRITE) {
eprintf ("Cannot open '%s' for writing.\n", pfile);
else eprintf ("Cannot open '%s'\n", pfile);
} else eprintf ("Missing file to open\n");
} else {
eprintf ("Cannot open '%s'\n", pfile);
}
} else {
eprintf ("Missing file to open\n");
}
return 1;
}
if (r.file == NULL) // no given file
if (!r.file) { // no given file
return 1;
}
#if USE_THREADS
if (run_anal > 0 && threaded) {
// XXX: if no rabin2 in path that may fail
@ -806,7 +815,6 @@ int main(int argc, char **argv, char **envp) {
r_config_eval (r.config, cmdn);
r_cons_flush ();
}
#if 0
// Do not autodetect utf8 terminals to avoid problems on initial
// stdin buffer and some terminals that just hang (android/ios)
@ -823,20 +831,25 @@ int main(int argc, char **argv, char **envp) {
debug = r.file && r.file->desc && r.file->desc->plugin && \
r.file->desc->plugin->isdbg;
if (debug) {
if (baddr != UT64_MAX)
if (baddr != UT64_MAX) {
//setup without attach again because there is dpa call
//producing two attach and it's annoying
r_core_setup_debugger (&r, debugbackend, false);
else
} else {
r_core_setup_debugger (&r, debugbackend, true);
}
}
if (!debug && r_flag_get (r.flags, "entry0"))
if (!debug && r_flag_get (r.flags, "entry0")) {
r_core_cmd0 (&r, "s entry0");
if (seek != UT64_MAX)
}
if (seek != UT64_MAX) {
r_core_seek (&r, seek, 1);
}
if (fullfile) r_core_block_size (&r, r_io_desc_size (r.io, r.file->desc));
if (fullfile) {
r_core_block_size (&r, r_io_desc_size (r.io, r.file->desc));
}
r_core_seek (&r, r.offset, 1); // read current block

15
libr/core/cio.c
View File

@ -1,4 +1,4 @@
/* radare2 - LGPL - Copyright 2009-2015 - pancake */
/* radare2 - LGPL - Copyright 2009-2016 - pancake */
#include "r_core.h"
@ -17,14 +17,16 @@ R_API int r_core_setup_debugger (RCore *r, const char *debugbackend, bool attach
pid = *p; // 1st element in debugger's struct must be int
r_config_set (r->config, "io.ff", "true");
if (is_gdb)
if (is_gdb) {
r_core_cmd (r, "dh gdb", 0);
else
} else {
r_core_cmdf (r, "dh %s", debugbackend);
}
//this makes to attach twice showing warnings in the output
//we get "resource busy" so it seems isn't an issue
if (attach)
if (attach) {
r_core_cmdf (r, "dpa %d", pid);
}
r_core_cmdf (r, "dp=%d", pid);
r_core_cmd (r, ".dr*", 0);
/* honor dbg.bep */
@ -45,10 +47,11 @@ R_API int r_core_setup_debugger (RCore *r, const char *debugbackend, bool attach
/* set the prompt if it's not been set already by the callbacks */
prompt = r_config_get (r->config, "cmd.prompt");
if (prompt && !strcmp (prompt, "")) {
if (r_config_get_i (r->config, "dbg.status"))
if (r_config_get_i (r->config, "dbg.status")) {
r_config_set (r->config, "cmd.prompt", ".dr*;drd;sr PC;pi 1;s-");
else
} else {
r_config_set (r->config, "cmd.prompt", ".dr*");
}
}
r_config_set (r->config, "cmd.vprompt", ".dr*");
return true;