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

Boolify r_core_yank_file_all() and fix shadow var bug ##api

Browse Source
This commit is contained in:
pancake 2022-09-19 02:08:58 +02:00
parent 4801bbc13d
commit 98f7b10439
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/core/yank.c
View File

@ -6,7 +6,7 @@
* perform_mapped_file_yank will map in a file and yank from offset the number of len bytes from
* filename. if the len is -1, the all the bytes are mapped into the yank buffer.
*/
static int perform_mapped_file_yank(RCore *core, ut64 offset, ut64 len, const char *filename);
static bool perform_mapped_file_yank(RCore *core, ut64 offset, ut64 len, const char *filename);
static ut32 find_next_char(const char *input, char b);
static ut32 consume_chars(const char *input, char b);
@ -30,13 +30,13 @@ static ut32 consume_chars(const char *input, char b) {
return i;
}
static int perform_mapped_file_yank(RCore *core, ut64 offset, ut64 len, const char *filename) {
static bool perform_mapped_file_yank(RCore *core, ut64 offset, ut64 len, const char *filename) {
// grab the current file descriptor, so we can reset core and io state
// after our io op is done
RIODesc *yankdesc = NULL;
ut64 fd = core->io->desc ? core->io->desc->fd: -1, yank_file_sz = 0,
loadaddr = 0, addr = offset;
int res = false;
bool res = false;
if (filename && *filename) {
ut64 load_align = r_config_get_i (core->config, "file.loadalign");
@ -71,18 +71,18 @@ static int perform_mapped_file_yank(RCore *core, ut64 offset, ut64 len, const ch
// this wont happen if the file failed to open or the file failed to
// map into the IO layer
if (yankdesc) {
ut64 res = r_io_seek (core->io, addr, R_IO_SEEK_SET);
ut64 nres = r_io_seek (core->io, addr, R_IO_SEEK_SET);
ut64 actual_len = len <= yank_file_sz? len: 0;
ut8 *buf = NULL;
if (actual_len > 0 && res == addr) {
if (actual_len > 0 && nres == addr) {
buf = malloc (actual_len);
if (!r_io_read_at (core->io, addr, buf, actual_len)) {
actual_len = 0;
}
r_core_yank_set (core, R_CORE_FOREIGN_ADDR, buf, len);
res = true;
} else if (res != addr) {
R_LOG_ERROR ("Unable to yank data from file: (loadaddr (0x%" PFMT64x ") (addr (0x%" PFMT64x ") > file_sz (0x%"PFMT64x ")", res, addr, yank_file_sz);
} else if (nres != addr) {
R_LOG_ERROR ("Unable to yank data from file: (loadaddr (0x%" PFMT64x ") (addr (0x%" PFMT64x ") > file_sz (0x%"PFMT64x ")", nres, addr, yank_file_sz);
} else if (actual_len == 0) {
R_LOG_ERROR ("Unable to yank from file: addr+len (0x%" PFMT64x ") > file_sz (0x%"PFMT64x ")", addr + len, yank_file_sz);
}
@ -442,8 +442,7 @@ R_API bool r_core_yank_file_ex(RCore *core, const char *input) {
return b;
}
// R2_580 R_API bool r_core_yank_file_all(RCore *core, const char *input) {
R_API int r_core_yank_file_all(RCore *core, const char *input) {
R_API bool r_core_yank_file_all(RCore *core, const char *input) {
r_return_val_if_fail (core && input, false);
ut64 adv = consume_chars (input, ' ');
return perform_mapped_file_yank (core, 0, -1, input + adv);

2
libr/include/r_core.h
View File

@ -594,7 +594,7 @@ R_API int r_core_yank_cat_string(RCore *core, ut64 pos);
R_API int r_core_yank_hud_file(RCore *core, const char *input);
R_API int r_core_yank_hud_path(RCore *core, const char *input, int dir);
R_API bool r_core_yank_file_ex(RCore *core, const char *input);
R_API int r_core_yank_file_all(RCore *core, const char *input);
R_API bool r_core_yank_file_all(RCore *core, const char *input);
#define R_CORE_LOADLIBS_ENV 1
#define R_CORE_LOADLIBS_HOME 2