Honor R_SYS_OS in asm.os eval var

This commit is contained in:
pancake 2015-09-01 03:13:16 +02:00
parent d381055304
commit a2b21a51ef
2 changed files with 10 additions and 2 deletions

View File

@ -359,10 +359,14 @@ static int cb_asmos(void *user, void *data) {
int asmbits = r_config_get_i (core->config, "asm.bits");
RConfigNode *asmarch, *node = (RConfigNode*) data;
if (*node->value=='?') {
if (*node->value == '?') {
r_cons_printf ("dos\ndarwin\nlinux\nfreebsd\nopenbsd\nnetbsd\nwindows\n");
return 0;
}
if (!node->value[0]) {
free (node->value);
node->value = strdup (R_SYS_OS);
}
asmarch = r_config_node_get (core->config, "asm.arch");
if (asmarch) {
r_syscall_setup (core->anal->syscall, asmarch->value,
@ -1155,7 +1159,11 @@ R_API int r_core_config_init(RCore *core) {
SETCB("asm.syntax", "intel", &cb_asmsyntax, "Select assembly syntax");
SETI("asm.nbytes", 6, "Number of bytes for each opcode at disassembly");
SETPREF("asm.bytespace", "false", "Separate hexadecimal bytes with a whitespace");
#if R_SYS_BITS == R_SYS_BITS_64
SETICB("asm.bits", 64, &cb_asmbits, "Word size in bits at assembler");
#else
SETICB("asm.bits", 32, &cb_asmbits, "Word size in bits at assembler");
#endif
SETPREF("asm.functions", "true", "Show functions in disassembly");
SETPREF("asm.fcncalls", "true", "Show functions calls");
SETPREF("asm.xrefs", "true", "Show xrefs in disassembly");

View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2010-2013 - pancake */
/* radare - LGPL - Copyright 2010-2015 - pancake */
#include <r_egg.h>