Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-19 05:38:43 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #16394 - Make pm [file] work again ##print (#16428)

Browse Source 
* Fix #16394 - Make pm [file] work again ##print
* Add test for pm [file]
This commit is contained in:
pancake 2020-04-06 04:02:50 -04:00 committed by GitHub
parent 5d6406adec
commit a12d55c6c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/cmd.c
View File

@ -2884,7 +2884,7 @@ static int r_core_cmd_subst_i(RCore *core, char *cmd, char *colon, bool *tmpseek
line = strdup (cmd);
line = r_str_replace (line, "\\\"", "\"", true);
if (p && *p && p[1] == '|') {
str = r_str_trim_head_ro (p + 2);
str = (char *)r_str_trim_head_ro (p + 2);
r_core_cmd_pipe (core, cmd, str);
} else {
r_cmd_call (core->rcmd, line);

10
libr/core/cmd_print.c
View File

@ -5872,14 +5872,12 @@ l = use_blocksize;
"| /m # search for magic signatures\n"
);
} else if (input[1] == 'j') { // "pmj"
if (l > 0) {
r_core_magic (core, input + 2, true, true);
}
const char *filename = r_str_trim_head_ro (input + 2);
r_core_magic (core, filename, true, true);
} else {
// XXX: need cmd_magic header for r_core_magic
if (l > 0) {
r_core_magic (core, input + 1, true, false);
}
const char *filename = r_str_trim_head_ro (input + 1);
r_core_magic (core, filename, true, false);
}
break;
case 'u': // "pu"

11
test/new/db/cmd/cmd_search
View File

@ -1,3 +1,14 @@
NAME=pm olf
FILE=../bins/elf/ioli/crackme0x00
ARGS=-n
CMDS=<<EOF
pm ../bins/src/olf.magic
EOF
EXPECT=<<EOF
0x00000000 1 OLF 32-bit
EOF
RUN
NAME=/m lzma
FILE=../bins/other/hello-world.lzma
CMDS=<<EOF