* Bugfix for binr/blob

This commit is contained in:
pancake 2012-04-01 02:16:20 +02:00
parent cafc5c920a
commit 1d9668cb8e
2 changed files with 15 additions and 4 deletions

View File

@ -1,7 +1,7 @@
PREFIX?=/usr
DESTDIR?=/
BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2
BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2 radiff2
BINS2=radare2 ${BINS}
include ../../config-user.mk
@ -55,6 +55,7 @@ LDFLAGS+=-L../../libr/lib -lr_lib
LDFLAGS+=-L../../libr/egg -lr_egg
LDFLAGS+=-L../../libr/core -lr_core
LDFLAGS+=-L../../libr/anal -lr_anal
LDFLAGS+=-L../../libr/diff -lr_diff
LDFLAGS+=-L../../libr/util -lr_util
LDFLAGS+=-L../../libr/cons -lr_cons
LDFLAGS+=-L../../libr/hash -lr_hash
@ -67,10 +68,16 @@ endif
all: symlinks
symlinks: build
for a in ${BINS} ; do \
for a in r2 ${BINS} ; do \
ln -fs radare2 $$a ; \
done
clean:
mv main.c main.k
rm -f *.[ch]
mv main.k main.c
rm -f ${BINS2} r2
build:
mv main.c main.k
rm -f *.[ch]
@ -90,7 +97,7 @@ build:
install:
mkdir -p ${DESTDIR}/${PREFIX}/bin
for a in ${BINS2} ; do \
for a in r2 ${BINS2} ; do \
rm -f ${DESTDIR}/${PREFIX}/bin/$$a ; \
cp -af $$a ${DESTDIR}/${PREFIX}/bin/$$a ; \
done

View File

@ -7,6 +7,7 @@ int ragg2_main(int argc, char **argv);
int rabin2_main(int argc, char **argv);
int rarun2_main(int argc, char **argv);
int rafind2_main(int argc, char **argv);
int radiff2_main(int argc, char **argv);
int rax2_main(int argc, char **argv);
typedef struct {
@ -17,6 +18,7 @@ typedef struct {
Main foo[] = {
{ "r2", radare2_main },
{ "rax", rax2_main },
{ "radiff", radiff2_main },
{ "rafind", rafind2_main },
{ "rarun", rarun2_main },
{ "rasm", rasm2_main },
@ -29,8 +31,10 @@ Main foo[] = {
int main(int argc, char **argv) {
int i=0;
while (foo[i].name) {
if (strstr (argv[0], foo[i].name))
if (strstr (argv[0], foo[i].name)) {
printf ("Using (%s)\n", foo[i].name);
return foo[i].main (argc, argv);
}
i++;
}
for (i=0; foo[i].name; i++)