dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch from Anton Kochkov fixing whitespaces 

Bump 0.9.1hg to 0.9.1git as reported by @schrotthaufen
This commit is contained in:
pancake 2012-07-17 10:00:23 +02:00
parent 0338c9f072
commit 1fe1417c39
15 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AUTHORS
View File

@ -1,5 +1,5 @@
Main developer (author) Main developer (author and maintainer)
======================= ======================================
- pancake <nopcode.org> - pancake <nopcode.org>
Secondary developers Secondary developers
@ -9,17 +9,19 @@ Secondary developers
Contributors: (sorted by length) Contributors: (sorted by length)
================================ ================================
- esteve <eslack.org>
- Anton Bolotinksy - Anton Bolotinksy
- Glyn Kennington - Glyn Kennington
- @schrotthaufen - @schrotthaufen
- elektranox - elektranox
- neuroflip - neuroflip
- rvalles - rvalles
- esteve
- capi_x - capi_x
- rudi_s - rudi_s
- vext01 - vext01
- xvilka
- l0gic - l0gic
- eddyb - eddyb
- graz - graz
- oxff
- pof - pof

8
configure vendored
View File

@ -105,12 +105,12 @@ done
: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
: ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_MAN:=${INSTALL} -m 444}
: ${INSTALL_LIB:=${INSTALL} -c} : ${INSTALL_LIB:=${INSTALL} -c}
PKGNAME='radare2' ; VERSION='0.9.1hg' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ; PKGNAME='radare2' ; VERSION='0.9.1git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
} }
show_usage() { show_usage() {
cat <<EOF2 cat <<EOF2
'configure' configures radare2-0.9.1hg to adapt to many kinds of systems. 'configure' configures radare2-0.9.1git to adapt to many kinds of systems.
Usage: ./configure [OPTION]... [VAR=VALUE]... Usage: ./configure [OPTION]... [VAR=VALUE]...
@ -188,7 +188,7 @@ take_environ() {
} }
show_version() { show_version() {
echo "radare2-0.9.1hg configuration script done with acr v0.9.1. echo "radare2-0.9.1git configuration script done with acr v0.9.1.
The 'Free Software Foundation' message is only for autodetection. The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <youterm.com>." Originally written by pancake <youterm.com>."
exit 0 exit 0
@ -212,7 +212,7 @@ case $flag in
show_version ; ;; show_version ; ;;
"-r"|"--r"|"--report") "-r"|"--r"|"--report")
echo "PKGNAME: radare2" echo "PKGNAME: radare2"
echo "VERSION: 0.9.1hg" echo "VERSION: 0.9.1git"
echo "LANGS: c" echo "LANGS: c"
echo "REQUIRED: libdl" echo "REQUIRED: libdl"
echo "OPTIONAL: libmagic" echo "OPTIONAL: libmagic"

2
configure.acr
View File

@ -1,5 +1,5 @@
PKGNAME radare2 PKGNAME radare2
VERSION 0.9.1hg VERSION 0.9.1git
CONTACT pancake ; pancake@nopcode.org CONTACT pancake ; pancake@nopcode.org
LANG_C! LANG_C!

2
libr/anal/README
View File

@ -293,7 +293,7 @@ type = [ op | reg | mem | imm ] ; 2 bits is enought
size = 1, 2, 4, 8 ; byte level size = 1, 2, 4, 8 ; byte level
ADD reg, reg ADD reg, reg
SUB reg, SUB reg, reg
JMP reg JMP reg
JMP imm JMP imm
JMP mem JMP mem

6
libr/anal/cc.c
View File

@ -185,7 +185,7 @@ typedef struct {
- type of value (int, ptr, flt) - type of value (int, ptr, flt)
- name of reg ("eax", ..) - name of reg ("eax", ..)
- index of arg (0, 1, 2) - index of arg (0, 1, 2)
- -
RTL = push 3; push 2; push 1; call foo == foo(1,2,3) RTL = push 3; push 2; push 1; call foo == foo(1,2,3)
LTR = push 1; push 2; push 3; call foo == foo(1,2,3) LTR = push 1; push 2; push 3; call foo == foo(1,2,3)
@ -209,7 +209,7 @@ Calling conventions:
x86: cdecl, fastcall, stdcall x86: cdecl, fastcall, stdcall
cdecl: push args in the stack (right-to-left order) cdecl: push args in the stack (right-to-left order)
- return value in eax - return value in eax
push eax push eax
push 123 push 123
push byte[ebp+30] push byte[ebp+30]
@ -287,7 +287,7 @@ arm:
r0 : return value r0 : return value
mips: mips:
first 4 arguments as registers $a0-$a3 first 4 arguments as registers $a0-$a3
next args in stack. next args in stack.
return value in $v0 and $v1 return value in $v0 and $v1

8
libr/anal/diff.c
View File

@ -79,7 +79,7 @@ R_API int r_anal_diff_fingerprint_fcn(RAnal *anal, RAnalFcn *fcn) {
RAnalBlock *bb; RAnalBlock *bb;
RListIter *iter; RListIter *iter;
int len = 0; int len = 0;
if (anal && anal->cur && anal->cur->fingerprint_fcn) if (anal && anal->cur && anal->cur->fingerprint_fcn)
return (anal->cur->fingerprint_fcn (anal, fcn)); return (anal->cur->fingerprint_fcn (anal, fcn));
@ -116,7 +116,7 @@ R_API int r_anal_diff_bb(RAnal *anal, RAnalFcn *fcn, RAnalFcn *fcn2) {
#if 0 #if 0
eprintf ("BB: %llx - %llx => %lli - %lli => %f\n", bb->addr, bb2->addr, eprintf ("BB: %llx - %llx => %lli - %lli => %f\n", bb->addr, bb2->addr,
bb->size, bb->size, t); bb->size, bb->size, t);
#endif #endif
if (t > anal->diff_thbb && t > ot) { if (t > anal->diff_thbb && t > ot) {
ot = t; ot = t;
mbb = bb; mbb = bb;
@ -165,7 +165,7 @@ R_API int r_anal_diff_fcn(RAnal *anal, RList *fcns, RList *fcns2) {
#if 0 #if 0
eprintf ("FCN NAME (NAME): %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name, eprintf ("FCN NAME (NAME): %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name,
fcn->size, fcn2->size, t); fcn->size, fcn2->size, t);
#endif #endif
/* Set flag in matched functions */ /* Set flag in matched functions */
fcn->diff->type = fcn2->diff->type = (t==1)? fcn->diff->type = fcn2->diff->type = (t==1)?
R_ANAL_DIFF_TYPE_MATCH: R_ANAL_DIFF_TYPE_UNMATCH; R_ANAL_DIFF_TYPE_MATCH: R_ANAL_DIFF_TYPE_UNMATCH;
@ -218,7 +218,7 @@ R_API int r_anal_diff_fcn(RAnal *anal, RList *fcns, RList *fcns2) {
eprintf ("\n"); eprintf ("\n");
eprintf ("FCN: %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name, eprintf ("FCN: %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name,
fcn->size, fcn2->size, t); fcn->size, fcn2->size, t);
#endif #endif
if (t > anal->diff_thfcn && t > ot) { if (t > anal->diff_thfcn && t > ot) {
ot = t; ot = t;
mfcn = fcn; mfcn = fcn;

2
libr/anal/fcn.c
View File

@ -234,7 +234,7 @@ R_API RAnalFcn *r_anal_fcn_find(RAnal *anal, ut64 addr, int type) {
r_list_foreach (anal->fcns, iter, fcn) { r_list_foreach (anal->fcns, iter, fcn) {
if (!type || (fcn->type & type)) { if (!type || (fcn->type & type)) {
if (addr == fcn->addr || (ret == NULL && (addr > fcn->addr && addr < fcn->addr+fcn->size))) if (addr == fcn->addr || (ret == NULL && (addr > fcn->addr && addr < fcn->addr+fcn->size)))
ret = fcn; ret = fcn;
} }
} }
return ret; return ret;

4
libr/anal/meta.c
View File

@ -162,7 +162,7 @@ R_API int r_meta_comment_check (RMeta *m, const char *s) {
if (d->type == R_META_TYPE_COMMENT && (!strcmp (s, d->str))) if (d->type == R_META_TYPE_COMMENT && (!strcmp (s, d->str)))
return R_TRUE; return R_TRUE;
} }
return R_FALSE; return R_FALSE;
} }
@ -285,7 +285,7 @@ static void printmetaitem(RMeta *m, RMetaItem *d, int rad) {
if (d->type=='s' && !*str) if (d->type=='s' && !*str)
return; return;
r_str_sanitize (str); r_str_sanitize (str);
if (rad) if (rad)
m->printf ("%s %d %s @ 0x%08"PFMT64x"\n", m->printf ("%s %d %s @ 0x%08"PFMT64x"\n",
r_meta_type_to_string (d->type), r_meta_type_to_string (d->type),
(int)(d->to-d->from), str, d->from); (int)(d->to-d->from), str, d->from);

10
libr/anal/op.c
View File

@ -74,14 +74,14 @@ R_API int r_anal_op_execute (RAnal *anal, RAnalOp *op) {
break; break;
case R_ANAL_OP_TYPE_ADD: case R_ANAL_OP_TYPE_ADD:
// dst = src[0] + src[1] + src[2] // dst = src[0] + src[1] + src[2]
r_anal_value_set_ut64 (anal, op->dst, r_anal_value_set_ut64 (anal, op->dst,
r_anal_value_to_ut64 (anal, op->src[0])+ r_anal_value_to_ut64 (anal, op->src[0])+
r_anal_value_to_ut64 (anal, op->src[1])+ r_anal_value_to_ut64 (anal, op->src[1])+
r_anal_value_to_ut64 (anal, op->src[2])); r_anal_value_to_ut64 (anal, op->src[2]));
break; break;
case R_ANAL_OP_TYPE_SUB: case R_ANAL_OP_TYPE_SUB:
// dst = src[0] + src[1] + src[2] // dst = src[0] + src[1] + src[2]
r_anal_value_set_ut64 (anal, op->dst, r_anal_value_set_ut64 (anal, op->dst,
r_anal_value_to_ut64 (anal, op->src[0])- r_anal_value_to_ut64 (anal, op->src[0])-
r_anal_value_to_ut64 (anal, op->src[1])- r_anal_value_to_ut64 (anal, op->src[1])-
r_anal_value_to_ut64 (anal, op->src[2])); r_anal_value_to_ut64 (anal, op->src[2]));
@ -92,18 +92,18 @@ R_API int r_anal_op_execute (RAnal *anal, RAnalOp *op) {
if (div == 0) { if (div == 0) {
eprintf ("r_anal_op_execute: division by zero\n"); eprintf ("r_anal_op_execute: division by zero\n");
eprintf ("TODO: throw RAnalException\n"); eprintf ("TODO: throw RAnalException\n");
} else r_anal_value_set_ut64 (anal, op->dst, } else r_anal_value_set_ut64 (anal, op->dst,
r_anal_value_to_ut64 (anal, op->src[0])/div); r_anal_value_to_ut64 (anal, op->src[0])/div);
} }
break; break;
case R_ANAL_OP_TYPE_MUL: case R_ANAL_OP_TYPE_MUL:
r_anal_value_set_ut64 (anal, op->dst, r_anal_value_set_ut64 (anal, op->dst,
r_anal_value_to_ut64 (anal, op->src[0])* r_anal_value_to_ut64 (anal, op->src[0])*
r_anal_value_to_ut64 (anal, op->src[1])); r_anal_value_to_ut64 (anal, op->src[1]));
break; break;
case R_ANAL_OP_TYPE_MOV: case R_ANAL_OP_TYPE_MOV:
// dst = src[0] // dst = src[0]
r_anal_value_set_ut64 (anal, op->dst, r_anal_value_set_ut64 (anal, op->dst,
r_anal_value_to_ut64 (anal, op->src[0])); r_anal_value_to_ut64 (anal, op->src[0]));
break; break;
case R_ANAL_OP_TYPE_NOP: case R_ANAL_OP_TYPE_NOP:

2
libr/anal/type.c
View File

@ -19,7 +19,7 @@ CFt exit void=int
CFv [arraysize] [type] [name] CFv [arraysize] [type] [name]
CFa [arraysize] [type] [name] CFa [arraysize] [type] [name]
CFf 320 @ fun -> framesize for function CFf 320 @ fun -> framesize for function
CF 20 CF 20
#endif #endif
// how to define a function pointer? // how to define a function pointer?

4
libr/anal/var.c
View File

@ -157,7 +157,7 @@ R_API RAnalVar *r_anal_var_get(RAnal *anal, RAnalFcn *fcn, int delta, int type)
return NULL; return NULL;
} }
// XXX: rename function type? i think this is 'scope' // XXX: rename function type? i think this is 'scope'
R_API const char *r_anal_var_type_to_str (RAnal *anal, int type) { R_API const char *r_anal_var_type_to_str (RAnal *anal, int type) {
if (type & R_ANAL_VAR_TYPE_GLOBAL) if (type & R_ANAL_VAR_TYPE_GLOBAL)
return "global"; return "global";
@ -231,7 +231,7 @@ R_API void r_anal_var_list_show(RAnal *anal, RAnalFcn *fcn, ut64 addr) {
/* TODO: detect pointer to strings and so on */ /* TODO: detect pointer to strings and so on */
//if (string_flag_offset(NULL, buf, value, 0)) //if (string_flag_offset(NULL, buf, value, 0))
// r_cons_printf(" ; %s\n", buf); // r_cons_printf(" ; %s\n", buf);
//else //else
eprintf ("\n"); //r_cons_newline(); eprintf ("\n"); //r_cons_newline();
} }
} }

10
libr/include/r_anal.h
View File

@ -15,7 +15,7 @@
// containing a dupped file in memory // containing a dupped file in memory
/* save memory: /* save memory:
bb_has_ops=1 -> 600M bb_has_ops=1 -> 600M
bb_has_ops=0 -> 350MB bb_has_ops=0 -> 350MB
*/ */
#define R_ANAL_BB_HAS_OPS 0 #define R_ANAL_BB_HAS_OPS 0
@ -94,8 +94,8 @@ enum {
R_ANAL_OP_TYPE_NOT = 0x8000000, R_ANAL_OP_TYPE_NOT = 0x8000000,
R_ANAL_OP_TYPE_STORE = 0x10000000, /* store from register to memory */ R_ANAL_OP_TYPE_STORE = 0x10000000, /* store from register to memory */
R_ANAL_OP_TYPE_LOAD = 0x20000000, /* load from memory to register */ R_ANAL_OP_TYPE_LOAD = 0x20000000, /* load from memory to register */
R_ANAL_OP_TYPE_LEA = 0x40000000, R_ANAL_OP_TYPE_LEA = 0x40000000,
R_ANAL_OP_TYPE_LEAVE = 0x80000000, R_ANAL_OP_TYPE_LEAVE = 0x80000000,
}; };
/* TODO: what to do with signed/unsigned conditionals? */ /* TODO: what to do with signed/unsigned conditionals? */
@ -287,7 +287,7 @@ typedef struct r_anal_cc_t {
typedef struct r_anal_cc_type_t { typedef struct r_anal_cc_type_t {
int rtl; // right-to-left? if false use left-to-right int rtl; // right-to-left? if false use left-to-right
int alignstack; int alignstack;
// //
//const char **reglist; // //const char **reglist; //
} RAnalCCType; } RAnalCCType;
@ -539,7 +539,7 @@ R_API int r_anal_cond_eval (RAnal *anal, RAnalCond *cond);
R_API RAnalCond *r_anal_cond_new_from_string(const char *str); R_API RAnalCond *r_anal_cond_new_from_string(const char *str);
/* reflines.c */ /* reflines.c */
R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal, R_API struct r_anal_refline_t *r_anal_reflines_get(RAnal *anal,
ut64 addr, ut8 *buf, ut64 len, int nlines, int linesout, int linescall); ut64 addr, ut8 *buf, ut64 len, int nlines, int linesout, int linescall);
R_API char* r_anal_reflines_str(struct r_anal_t *anal, struct r_anal_refline_t *list, R_API char* r_anal_reflines_str(struct r_anal_t *anal, struct r_anal_refline_t *list,
ut64 addr, int opts); ut64 addr, int opts);

2
libr/include/r_util.h
View File

@ -224,7 +224,7 @@ R_API boolt r_file_is_directory(const char *str);
R_API RMmap *r_file_mmap (const char *file, boolt rw); R_API RMmap *r_file_mmap (const char *file, boolt rw);
R_API void r_file_mmap_free (RMmap *m); R_API void r_file_mmap_free (RMmap *m);
// TODO: find better names and write vapis // TODO: find better names and write vapis
#define ut8p_b(x) ((x)[0]) #define ut8p_b(x) ((x)[0])
#define ut8p_bw(x) ((x)[0]|((x)[1]<<8)) #define ut8p_bw(x) ((x)[0]|((x)[1]<<8))
#define ut8p_bd(x) ((x)[0]|((x)[1]<<8)|((x)[2]<<16)|((x)[3]<<24)) #define ut8p_bd(x) ((x)[0]|((x)[1]<<8)|((x)[2]<<16)|((x)[3]<<24))

8
r2-bindings/configure vendored
View File

@ -97,12 +97,12 @@ done
: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
: ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_MAN:=${INSTALL} -m 444}
: ${INSTALL_LIB:=${INSTALL} -c} : ${INSTALL_LIB:=${INSTALL} -c}
PKGNAME='radare2-bindings' ; VERSION='0.9.1hg' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ; PKGNAME='radare2-bindings' ; VERSION='0.9.1git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
} }
show_usage() { show_usage() {
cat <<EOF2 cat <<EOF2
'configure' configures radare2-bindings-0.9.1hg to adapt to many kinds of systems. 'configure' configures radare2-bindings-0.9.1git to adapt to many kinds of systems.
Usage: ./configure [OPTION]... [VAR=VALUE]... Usage: ./configure [OPTION]... [VAR=VALUE]...
@ -171,7 +171,7 @@ take_environ() {
} }
show_version() { show_version() {
echo "radare2-bindings-0.9.1hg configuration script done with acr v0.9.1. echo "radare2-bindings-0.9.1git configuration script done with acr v0.9.1.
The 'Free Software Foundation' message is only for autodetection. The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <youterm.com>." Originally written by pancake <youterm.com>."
exit 0 exit 0
@ -195,7 +195,7 @@ case $flag in
show_version ; ;; show_version ; ;;
"-r"|"--r"|"--report") "-r"|"--r"|"--report")
echo "PKGNAME: radare2-bindings" echo "PKGNAME: radare2-bindings"
echo "VERSION: 0.9.1hg" echo "VERSION: 0.9.1git"
echo "LANGS: c c++" echo "LANGS: c c++"
echo "PKG-CONFIG: r_core" echo "PKG-CONFIG: r_core"
echo "FLAGS: --enable-devel --with-cc=gcc --with-cxx=g++ --with-ostype=auto" echo "FLAGS: --enable-devel --with-cc=gcc --with-cxx=g++ --with-ostype=auto"

2
r2-bindings/configure.acr
View File

@ -1,5 +1,5 @@
PKGNAME radare2-bindings PKGNAME radare2-bindings
VERSION 0.9.1hg VERSION 0.9.1git
CONTACT pancake ; pancake@nopcode.org CONTACT pancake ; pancake@nopcode.org
LANG_C! LANG_C!