portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* rabin2

Browse source 
- Flags '-x' and '-w' unified into '-o'
  - '-w' is used to open file in rw mode
  - More refactoring
* r_bin
  - Added bin_dummy plugin
  - get_strings works now with unknown formats
This commit is contained in:
Nibble 2009-05-17 12:01:02 +02:00
parent 5cc6b4769c
commit df9e68bf53
8 changed files with 120 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libr/bin/bin.c
View file

@ -51,6 +51,7 @@ static struct r_bin_string_t *get_strings(struct r_bin_t *bin, int min)
str[matches] = '\0';
ret[ctr].rva = ret[ctr].offset = i-matches;
ret[ctr].size = matches;
ret[ctr].ordinal = ctr;
memcpy(ret[ctr].string, str, R_BIN_SIZEOF_NAMES);
ret[ctr].string[R_BIN_SIZEOF_NAMES-1] = '\0';
ret[ctr].last = 0;
@ -125,7 +126,7 @@ int r_bin_list(struct r_bin_t *bin)
int r_bin_open(struct r_bin_t *bin, const char *file, int rw, char *plugin_name)
{
if (file != NULL)
bin->file = strdup(file);
bin->file = file;
else return R_FALSE;
bin->rw = rw;
@ -139,8 +140,9 @@ int r_bin_open(struct r_bin_t *bin, const char *file, int rw, char *plugin_name)
if (bin->cur && bin->cur->open)
return bin->cur->open(bin);
return R_FALSE;
if (plugin_name && !strcmp(plugin_name, "bin_dummy"))
return R_FALSE;
return r_bin_open(bin, file, rw, "bin_dummy");
}
int r_bin_close(struct r_bin_t *bin)

2
libr/bin/p/Makefile
View file

@ -5,7 +5,7 @@ CFLAGS+=-DLIL_ENDIAN=1 -D__UNIX__ -g -DR_DEBUG=0
foo: all
ALL_TARGETS=
FORMATS=elf.mk elf64.mk pe.mk pe64.mk java.mk
FORMATS=elf.mk elf64.mk pe.mk pe64.mk java.mk dummy.mk
include $(FORMATS)
all: ${ALL_TARGETS}

45
libr/bin/p/bin_dummy.c Normal file
View file

@ -0,0 +1,45 @@
/* radare - GPL3 - Copyright 2009 nibble<.ds@gmail.com> */
#include <r_types.h>
#include <r_lib.h>
#include <r_bin.h>
#include "java/java.h"
static int bopen(struct r_bin_t *bin)
{
if ((bin->fd = open(bin->file, 0)) == -1) {
fprintf(stderr, "Cannot open file\n");
return R_FALSE;
} else return bin->fd;
}
static int bclose(struct r_bin_t *bin)
{
return close(bin->fd);
}
struct r_bin_handle_t r_bin_plugin_dummy = {
.name = "bin_dummy",
.desc = "dummy bin plugin",
.init = NULL,
.fini = NULL,
.open = &bopen,
.close = &bclose,
.check = NULL,
.baddr = NULL,
.entry = NULL,
.sections = NULL,
.symbols = NULL,
.imports = NULL,
.strings = NULL,
.info = NULL,
.fields = NULL,
.resize_section = NULL,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_BIN,
.data = &r_bin_plugin_dummy
};
#endif

10
libr/bin/p/dummy.mk Normal file
View file

@ -0,0 +1,10 @@
OBJ_DUMMY=bin_dummy.o
STATIC_OBJ+=${OBJ_DUMMY}
TARGET_DUMMY=bin_dummy.so
ALL_TARGETS+=${TARGET_DUMMY}
${TARGET_DUMMY}: ${OBJ_DUMMY}
${CC} ${CFLAGS} -o ${TARGET_DUMMY} ${OBJ_DUMMY}
@#strip -s ${TARGET_DUMMY}

114
libr/bin/t/rabin2.c
View file

@ -22,11 +22,10 @@
#define ACTION_SYMBOLS 0x0004
#define ACTION_SECTIONS 0x0008
#define ACTION_INFO 0x0010
#define ACTION_WRITE 0x0020
#define ACTION_EXTRACT 0x0040
#define ACTION_HELP 0x0080
#define ACTION_STRINGS 0x0100
#define ACTION_FIELDS 0x0200
#define ACTION_OPERATION 0x0020
#define ACTION_HELP 0x0040
#define ACTION_STRINGS 0x0080
#define ACTION_FIELDS 0x0100
static struct r_lib_t l;
static struct r_bin_t bin;
@ -43,10 +42,10 @@ static int rabin_show_help()
" -z Strings\n"
" -I Binary info\n"
" -H Header fields\n"
" -w [str] Write operation (str=help for help)\n"
" -x [str] Extract operation (str=help for help)\n"
" -o [str] Write/Extract operations (str=help for help)\n"
" -f [format] Override file format autodetection\n"
" -r Radare output\n"
" -w Open file in rw mode\n"
" -L List supported bin plugins\n"
" -h This help\n");
@ -393,60 +392,63 @@ static int rabin_dump_sections(char *name)
return R_TRUE;
}
static int rabin_do_operation(const char *op, int write)
static int rabin_do_operation(const char *op)
{
char *arg, *ptr, *ptr2;
char *arg = NULL, *ptr = NULL, *ptr2 = NULL;
if (!strcmp(op, "help")) {
if (write)
printf( "Operation string:\n"
" Resize section: r/.data/1024 (ONLY ELF)\n");
else
printf( "Operation string:\n"
" Dump symbols: d/s/1024\n"
" Dump section: d/S/.text\n");
printf( "Operation string:\n"
" Dump symbols: d/s/1024\n"
" Dump section: d/S/.text\n"
" Resize section: r/.data/1024\n");
return R_FALSE;
}
arg = alloca(strlen(op)+1);
strcpy(arg, op);
ptr = strchr(op, '/');
if (!ptr) {
printf("Unknown operation. use -%c help\n", write?'w':'x');
return R_FALSE;
if ((ptr = strchr(arg, '/'))) {
ptr[0] = '\0';
ptr = ptr + 1;
if ((ptr2 = strchr(ptr, '/'))) {
ptr2[0] = '\0';
ptr2 = ptr2 + 1;
}
}
ptr = ptr+1;
if (write) {
switch(arg[0]) {
case 'r':
ptr2 = strchr(ptr, '/');
if (ptr2) {
ptr2[0]='\0';
if (r_bin_resize_section(&bin, ptr, r_num_math(NULL,ptr2+1)) == 0) {
fprintf(stderr, "Delta = 0\n");
return R_FALSE;
}
} else return R_FALSE;
break;
switch(arg[0]) {
case 'r':
if (!rw) {
printf("File must be opened in rw mode\n");
return R_FALSE;
}
} else {
switch(arg[0]) {
case 'd':
ptr2 = strchr(ptr, '/');
if (!ptr || !ptr2)
goto _rabin_do_operation_error;
if (r_bin_resize_section(&bin, ptr, r_num_math(NULL,ptr2)) == 0) {
fprintf(stderr, "Delta = 0\n");
return R_FALSE;
}
break;
case 'd':
if (!ptr)
goto _rabin_do_operation_error;
if (ptr[0]=='s') {
if (ptr2) {
ptr2[0]='\0';
if (ptr[0]=='s')
if (!rabin_dump_symbols(r_num_math(NULL, ptr2+1)))
return R_FALSE;
if (ptr[0]=='S')
if (!rabin_dump_sections(ptr2+1))
return R_FALSE;
} else if (ptr[0]=='s') {
if (!rabin_dump_symbols(r_num_math(NULL, ptr2)))
return R_FALSE;
} else
if (!rabin_dump_symbols(0))
return R_FALSE;
} else return R_FALSE;
}
} else if (ptr[0]=='S') {
if (!ptr2)
goto _rabin_do_operation_error;
if (!rabin_dump_sections(ptr2))
return R_FALSE;
} else goto _rabin_do_operation_error;
break;
default:
_rabin_do_operation_error:
printf("Unknown operation. use -o help\n");
return R_FALSE;
}
return R_TRUE;
@ -466,7 +468,7 @@ int main(int argc, char **argv)
{
int c;
int action = ACTION_UNK;
const char *format = NULL, *write_op = NULL, *extract_op = NULL;
const char *format = NULL, *op = NULL;
char *plugin_name = NULL;
r_bin_init(&bin);
@ -481,7 +483,7 @@ int main(int argc, char **argv)
r_lib_opendir(&l, LIBDIR"/radare2/");
}
while ((c = getopt(argc, argv, "isSzIHew:x:f:rvLh")) != -1)
while ((c = getopt(argc, argv, "isSzIHewo:f:rvLh")) != -1)
{
switch( c ) {
case 'i':
@ -506,13 +508,11 @@ int main(int argc, char **argv)
action |= ACTION_ENTRY;
break;
case 'w':
write_op = optarg;
action |= ACTION_WRITE;
rw = 1;
break;
case 'x':
extract_op = optarg;
action |= ACTION_EXTRACT;
case 'o':
op = optarg;
action |= ACTION_OPERATION;
break;
case 'f':
format = optarg;
@ -563,10 +563,8 @@ int main(int argc, char **argv)
rabin_show_info();
if (action&ACTION_FIELDS)
rabin_show_fields();
if (write_op != NULL && action&ACTION_WRITE)
rabin_do_operation(write_op, 1);
if (extract_op != NULL && action&ACTION_EXTRACT)
rabin_do_operation(extract_op, 0);
if (op != NULL && action&ACTION_OPERATION)
rabin_do_operation(op);
r_bin_close(&bin);

1
libr/config.h
View file

@ -22,6 +22,7 @@
&r_bin_plugin_pe , \
&r_bin_plugin_pe64 , \
&r_bin_plugin_java , \
&r_bin_plugin_dummy , \
0
#define R_BININFO_STATIC_PLUGINS \

2
libr/config.mk
View file

@ -10,7 +10,7 @@ USE_RIO=1
STATIC_DEBUG=0
RUNTIME_DEBUG=1
STATIC_ASM_PLUGINS=p/x86olly.mk p/x86nasm.mk p/mips.mk p/java.mk
STATIC_BIN_PLUGINS=p/elf.mk p/elf64.mk p/pe.mk p/pe64.mk p/java.mk
STATIC_BIN_PLUGINS=p/elf.mk p/elf64.mk p/pe.mk p/pe64.mk p/java.mk p/dummy.mk
STATIC_BP_PLUGINS=p/x86.mk
STATIC_BININFO_PLUGINS=p/addr2line.mk

1
libr/include/r_bin.h
View file

@ -144,5 +144,6 @@ extern struct r_bin_handle_t r_bin_plugin_elf64;
extern struct r_bin_handle_t r_bin_plugin_pe;
extern struct r_bin_handle_t r_bin_plugin_pe64;
extern struct r_bin_handle_t r_bin_plugin_java;
extern struct r_bin_handle_t r_bin_plugin_dummy;
#endif