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

Delete r_core_file_get_next_map & file.loadmethod, relic of pre-siol old days (#8426)

Browse Source
This commit is contained in:
Fangrui Song 2017-09-12 03:27:10 -07:00 committed by radare
parent bc6024f3a4
commit b75f800e59
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libr/core/cconfig.c
View File

@ -1860,15 +1860,6 @@ static int cb_searchin(void *user, void *data) {
return true;
}
static int cb_fileloadmethod(void *user, void *data) {
RConfigNode *node = (RConfigNode*) data;
if (*node->value == '?') {
print_node_options (node);
return false;
}
return true;
}
static int __dbg_swstep_getter(void *user, RConfigNode *node) {
RCore *core = (RCore*)user;
node->i_value = core->dbg->swstep;
@ -2678,9 +2669,6 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("file.lastpath", "", "Path of current file");
SETPREF ("file.sha1", "", "SHA1 hash of current file");
SETPREF ("file.type", "", "Type of current file");
n = NODECB ("file.loadmethod", "fail", &cb_fileloadmethod);
SETDESC (n, "What to do when load addresses overlap");
SETOPTIONS (n, "fail", "overwrite", "append", NULL);
SETI ("file.loadalign", 1024, "Alignment of load addresses");
SETI ("file.openmany", 1, "Maximum number of files opened at once");
SETPREF ("file.nowarn", "true", "Suppress file loading warning messages");

58
libr/core/file.c
View File

@ -636,47 +636,13 @@ R_API bool r_core_bin_load(RCore *r, const char *filenameuri, ut64 baddr) {
return true;
}
R_API RIOMap *r_core_file_get_next_map(RCore *core, RCoreFile *fh, int mode, ut64 loadaddr) {
const char *loadmethod = r_config_get (core->config, "file.loadmethod");
bool suppress_warning = r_config_get_i (core->config, "file.nowarn");
ut64 load_align = r_config_get_i (core->config, "file.loadalign");
if (!loadmethod) {
return NULL;
}
RIOMap *map = NULL;
if (!strcmp (loadmethod, "overwrite")) {
map = r_io_map_new (core->io, fh->fd, mode, 0, loadaddr, r_io_fd_size (core->io, fh->fd), true);
}
if (!strcmp (loadmethod, "fail")) {
map = r_io_map_add (core->io, fh->fd, mode, 0, loadaddr, r_io_fd_size (core->io, fh->fd), true);
}
if (!strcmp (loadmethod, "append") && load_align) {
map = r_io_map_add_next_available (core->io, fh->fd, mode, 0, loadaddr, r_io_fd_size (core->io, fh->fd), load_align);
}
if (!suppress_warning) {
if (!map) {
eprintf ("r_core_file_get_next_map: Unable to load specified file to 0x%08"PFMT64x "\n", loadaddr);
} else {
if (map->from != loadaddr) {
eprintf ("r_core_file_get_next_map: Unable to load specified file to 0x%08"PFMT64x ",\n"
"but loaded to 0x%08"PFMT64x "\n", loadaddr, map->from);
}
}
}
// r_io_sort_maps (core->io); //necessary ??? //condret says no
return map;
}
R_API RCoreFile *r_core_file_open_many(RCore *r, const char *file, int flags, ut64 loadaddr) {
bool openmany = r_config_get_i (r->config, "file.openmany");
int opened_count = 0;
// ut64 current_loadaddr = loadaddr;
RCoreFile *fh; //, *top_file = NULL;
RListIter *fd_iter, *iter2;
char *loadmethod = NULL;
RList *list_fds = NULL;
const char *cp = NULL;
RIODesc *fd;
list_fds = r_io_open_many (r->io, file, flags, 0644);
@ -686,12 +652,6 @@ R_API RCoreFile *r_core_file_open_many(RCore *r, const char *file, int flags, ut
return NULL;
}
cp = r_config_get (r->config, "file.loadmethod");
if (cp) {
loadmethod = strdup (cp);
}
r_config_set (r->config, "file.loadmethod", "append");
r_list_foreach_safe (list_fds, fd_iter, iter2, fd) {
opened_count++;
if (opened_count > openmany) {
@ -718,24 +678,6 @@ R_API RCoreFile *r_core_file_open_many(RCore *r, const char *file, int flags, ut
r_core_bin_load (r, fd->name, 0LL);
}
return NULL;
#if DEAD_CODE
if (!top_file) {
free (loadmethod);
return top_file;
}
cp = r_config_get (r->config, "cmd.open");
if (cp && *cp) {
r_core_cmd (r, cp, 0);
}
r_config_set (r->config, "file.path", r_file_abspath (r_io_desc_get (r->io, top_file->fd)->name));
if (loadmethod) {
r_config_set (r->config, "file.loadmethod", loadmethod);
}
free (loadmethod);
return top_file;
#endif
}
/* loadaddr is r2 -m (mapaddr) */