Fix android build and bin/d installation issue

binr/blob/Makefile

@@ -4,6 +4,7 @@ DESTDIR?=/
 BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2 radiff2
 BINS2=radare2 ${BINS}
 
+SHLR=../../shlr
 include ../../config-user.mk
 include ../../shlr/zip/deps.mk
 
@@ -79,6 +80,7 @@ LDFLAGS+=-L../../libr/debug -lr_debug
 LDFLAGS+=-L../../libr/search -lr_search
 LDFLAGS+=-L../../libr/config -lr_config
 endif
+LDFLAGS+=${LINK}
 
 all: symlinks
 

libr/bin/d/Makefile

@@ -18,9 +18,10 @@ clean:
 .PHONY: all clean install install-symlink symstall
 
 install: ${F_SDB}
+	@echo "[i] Installing bin format files"
 	rm -rf "$P"
 	mkdir -p "$P"
-	cp -f * "$P"
+	-cp -f * "$P"
 	mkdir -p "$P/dll"
 	cp -f dll/*.sdb "$P"
 

libr/util/p_format.c

@@ -1249,6 +1249,8 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
 				if (size >= ARRAYINDEX_COEF) {
 					elem = size/ARRAYINDEX_COEF-1;
 					size %= ARRAYINDEX_COEF;
+				} else {
+					elem = 0;
 				}
 				if (!(mode & R_PRINT_ISFIELD)) nxtfield = MINUSONE;
 				else if (field) nxtfield = strchr (ofield, '.');

libr/util/print.c

@@ -245,7 +245,7 @@ R_API char *r_print_hexpair(RPrint *p, const char *str, int n) {
 	const char *s, *lastcol = Color_WHITE;
 	char *d, *dst = (char *)malloc ((strlen (str)+2)*32);
 	int colors = p->flags & R_PRINT_FLAGS_COLOR;
-	const char *color_0x00, *color_0x7f, *color_0xff, *color_text, *color_other;
+	const char *color_0x00 = "", *color_0x7f = "", *color_0xff = "", *color_text = "", *color_other = "";
 	int bs = p->bytespace;
 	/* XXX That's hacky as shit.. but partially works O:) */
 	/* TODO: Use r_print_set_cursor for win support */

shlr/zip/deps.mk

@@ -1,6 +1,10 @@
+#ifeq ($(SHLR),)
+#SHLR=../../shlr
+#endif
+
 ifeq ($(USE_LIB_ZIP),1)
 LINK+=$(LIBZIP)
 else
-LINK+=$(STOP)/zip/librz.a
+LINK+=$(SHLR)/zip/librz.a
 CFLAGS+=-I$(SHLR)/zip/include
 endif