macos install and more build fixes

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ jobs:
       uses: actions/checkout@v3
     - name: Configure, build and install
       run: |
-          pwd ; ls -l
           ./configure --prefix=/usr
           make -j
           sudo make install
@@ -56,8 +55,7 @@ jobs:
       uses: actions/checkout@v3
     - name: Configure, build and install
       run: |
-          pwd ; ls -l
-          ./configure --prefix=/usr
+          ./configure
           make -j
           sudo make install
     - name: Test

README

@@ -1,4 +1,10 @@
-**Note**: this version is deprecated in favor of radare2: https://github.com/radareorg/radare2
+[![ci](https://github.com/radareorg/radare/actions/workflows/ci.yml/badge.svg)](https://github.com/radareorg/radare/actions/workflows/ci.yml)
+
+# WARNING
+
+This version is the original code being refactored into [radare2](https://github.com/radareorg/radare2)
+
+```
 
                   __--~.
                .-'_ ,' |
@@ -9,13 +15,14 @@
          \/   -| '. ' | | |_/ | | | \ \_
 
                             pwn them all
+```
 
-SHORT
+## SHORT
 
   radare is a commandline hexadecimal editor.
 
 
-DESCRIPTION
+## DESCRIPTION
 
   Radare is a toolkit framework for working with binary files having the
   unix philosphy in mind.

src/analyze.c

@@ -32,7 +32,7 @@
 #define MAX_FUN_SIZE 1023
 
 /* code analyzer */
-int (*arch_aop)(ut64 addr, const u8 *bytes, struct aop_t *aop);
+// int (*arch_aop)(ut64 addr, const u8 *bytes, struct aop_t *aop);
 
 int section_is_x (ut64 addr)
 {

src/arch/csr/code.c

@@ -205,9 +205,10 @@ int arch_csr_aop(ut64 addr, const unsigned char *bytes, struct aop_t *aop)
 			aop->type = AOP_TYPE_XOR;
 			break;
 		case 0xe:
-			if (in->in_mode == ADDR_MODE_RELATIVE)
+			if (in->in_mode == ADDR_MODE_RELATIVE) {
 				rel = 1;
-			switch(in->in_reg) {
+			}
+			switch (in->in_reg) {
 			case 0: // BRA
 				aop->type = AOP_TYPE_JMP;
 				aop->jump = label_off(&d)+4;
@@ -249,7 +250,7 @@ int arch_csr_aop(ut64 addr, const unsigned char *bytes, struct aop_t *aop)
 				aop->type = AOP_TYPE_CJMP;
 				rel = 0;
 				aop->jump = label_off(&d);
-if (aop->jump&1)aop->jump+=3;
+				if (aop->jump&1) aop->jump+=3;
 				aop->fail = addr+2;
 				break;
 			}

src/arch/ppc/ppc_disasm.c

@@ -474,7 +474,7 @@ static void trap(struct DisasmPara_PPC *dp,ppc_word in,unsigned char dmode)
   char *cnd;
   int to = (int)PPCGETD(in);
 
-  if (cnd = trap_condition[to]) {
+  if ((cnd = trap_condition[to])) {
     dp->flags |= dmode;
     sprintf(dp->opcode,"t%c%s",dmode?'d':'w',cnd);
     ra_rb(dp->operands,in);

src/bytepat.c

@@ -86,7 +86,7 @@ int do_byte_pat(int patlen)
 	int pcnt, cnt=0, k=0;
 	ut64 intaddr;
 	/* end addr */
-	ut64 bytes;
+	ut64 bytes = 0;
  	/* start addr */
 	ut64 bact = config.seek;
 

src/cmds.c

@@ -2924,7 +2924,7 @@ CMD_DECL(help)
 			} else {
 				char buf[1024];
 				int len;
-				len = hexstr2binstr(input+1, buf);
+				len = hexstr2binstr(input+1, (u8*)buf);
 				if (len>0)
 					print_data(0, "", (u8*)buf, len, FMT_ASC);
 			}

src/cmds.h

@@ -34,7 +34,7 @@ typedef struct command {
 #define COMMAND(sn,opt,help,hook) {sn, (char*)opt, help, cmd_ ## hook}
 
 int commands_parse(const char *cmdline);
-void show_help_message();
+void show_help_message(void);
 
 CMD_DECL(gotoxy);
 CMD_DECL(menu);

src/code.h

@@ -134,7 +134,7 @@ int gnu_disparc_str(char *str, const u8 *inst, ut64 offset);
 int z80_udis (char *str, ut8 *bytes, int len, ut64 seek);
 
 struct aop_t *pas_aop(int arch, ut64 seek, const u8 *bytes, int len, struct aop_t *aop, char *newstr, int pseudo);
-struct reflines_t *code_lines_init();
+struct reflines_t *code_lines_init(int );
 void code_lines_free(struct list_head *list);
 void code_lines_print(struct reflines_t *list, ut64 addr, int expand);
 void metadata_comment_add(ut64 offset, const char *str);

src/cons.c

@@ -97,7 +97,7 @@ char cons_palette[CONS_PALETTE_SIZE][8] = {
 	/* FF */
 };
 
-const char *cons_color_names[CONS_COLORS_SIZE+1] = {
+static const char *cons_color_names[CONS_COLORS_SIZE+1] = {
 	"black",
 	"gray",
 	"white",
@@ -128,7 +128,7 @@ void cons_invert(int set)
 	else cons_strcat("\x1b[0m");
 }
 
-const char *cons_colors[CONS_COLORS_SIZE+1] = {
+static const char *cons_colors[CONS_COLORS_SIZE+1] = {
 	C_BLACK,      // 0
 	C_GRAY,       // 1
 	C_WHITE,      // 2

src/cons.h

@@ -62,7 +62,7 @@ enum {
 };
 
 extern const char *cons_palette_default;
-const char *cons_colors[CONS_COLORS_SIZE+1];
+// const char *cons_colors[CONS_COLORS_SIZE+1];
 extern char cons_palette[CONS_PALETTE_SIZE][8];
 const char *cons_get_buffer();
 extern int cons_floodprot;

src/data.c

@@ -827,7 +827,6 @@ int data_var_type_add(const char *typename, int size, const char *fmt)
 int data_var_type_del(const char *typename)
 {
 	struct list_head *pos;
-	ut64 ret = 0;
 
 	if (*typename==' ')typename=typename+1;
 
@@ -861,8 +860,6 @@ int data_var_type_list(const char *mask)
 struct var_type_t *data_var_type_get(const char *datatype)
 {
 	struct list_head *pos;
-	ut64 ret = 0;
-
 	list_for_each(pos, &vartypes) {
 		struct var_type_t *d = (struct var_type_t *)list_entry(pos, struct var_type_t, list);
 		//eprintf("---(%s)(%s)\n", d->name, datatype);

src/dbg/arch/cpu.h

@@ -1,7 +1,7 @@
 #ifndef _INCLUDE_CPU_H_
 #define _INCLUDE_CPU_H_
 
-struct {
+typedef struct {
 	char *name;
 } cpu_struct;
 

src/dbg/bp.h

@@ -9,7 +9,7 @@ struct arch_bp_t {
 	int length;
 };
 
-struct arch_bp_t **arch_bps;
+extern struct arch_bp_t **arch_bps;
 
 int arch_bp_rm_soft(struct bp_t *bp);
 void debug_bp_reload_all();

src/javasm/Makefile

@@ -1,7 +1,8 @@
 include ../../config.mk
 
-OBJ=../rabin/javasm.o main.o
+OBJ=main.o
 BIN=javasm${BINSFX}
+CFLAGS+=-DHAVE_MAIN=1
 
 all: ${BIN}
 

src/javasm/main.c

@@ -32,7 +32,8 @@
 
 //int radare_output = 0;
 extern int radare_output;
-int java_assemble(unsigned char *bytes, char *string);
+// int java_assemble(unsigned char *bytes, char *string);
+#include "../rabin/javasm.c"
 
 void eprintf(const char *format, ...)
 {

src/rabin/aux.c

@@ -137,9 +137,10 @@ ut64 get_offset(const char *orig)
 	if (arg[0]=='\'' && arg[0+2]=='\'')
 		return arg[0+1];
 
-	for(;*arg==' ';arg=arg+1);
-	for(i=0;arg[i]==' ';i++);
-	for(;arg[i]=='\\';i++); i++;
+	for(;*arg==' ';arg=arg+1) {}
+	for(i=0;arg[i]==' ';i++) {}
+	for(;arg[i]=='\\';i++) {}
+	i++;
 
 	if (arg[i] == 'x' && i>0 && arg[i-1]=='0') {
 		sscanf(arg, "0x"OFF_FMTx, &ret);

src/rabin/javasm.c

@@ -780,7 +780,7 @@ int hexstr2binstr(const char *in, unsigned char *out) // 0A 3B 4E A0
 
 	return (int)len;
 }
-
+#if HAVE_MAIN
 static int show_help()
 {
 	printf("Usage: javasm [-hV] [-a 'opcode'] [-d 'hexpairstring'] [-r][-c 'classfile']\n");
@@ -831,3 +831,5 @@ int main(int argc, char **argv)
 	return 0;
 }
 #endif
+
+#endif

src/radiff/main.c

@@ -139,10 +139,10 @@ int radiff_hexdump(const char *a, const char *b)
 	snprintf(cmd, 1023, "cat '%s' | ired - > b.hex", b);
 	system(cmd);
 	snprintf(cmd, 1023, "diff -u a.hex b.hex");
-	system(cmd);
+	int rc = system(cmd);
 	unlink("a.hex");
 	unlink("b.hex");
-
+	return rc;
 }
 
 int main(int argc, char **argv)

src/radiff/rdbdiff_main.c

@@ -25,7 +25,7 @@
 
 int udis86_color = 1;
 
-void show_help_message(int v)
+static void helpmsg(int v)
 {
 	printf("Usage: rdbdiff [-hV] [-i fmt] [-o fmt] [file_0] [file_1]\n");
 	if (v) {
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 	{
 		switch( c ) {
 		case 'h':
-			show_help_message(1);
+			helpmsg(1);
 		case 'V':
 			show_version();
 			break;
@@ -98,12 +98,12 @@ int main(int argc, char **argv)
 		case 'o':
 			break;
 		default:
-			show_help_message(0);
+			helpmsg(0);
 		}
 	}
 
 	if ((argc-optind) != 2)
-		show_help_message(0);
+		helpmsg(0);
 
 	return main_rdb_diff(argv[optind], argv[optind+1]);
 }

src/rahash/sha2.c

@@ -625,7 +625,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(&context, sizeof(context));
 	usedspace = 0;
 }
 
@@ -646,7 +646,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(&context, sizeof(context));
 	}
 	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
 	return buffer;
@@ -667,7 +667,7 @@ void SHA512_Init(SHA512_CTX* context) {
 		return;
 	}
 	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
+	MEMSET_BZERO(&context->buffer, SHA512_BLOCK_LENGTH);
 	context->bitcount[0] = context->bitcount[1] =  0;
 }
 
@@ -955,7 +955,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(&context, sizeof(context));
 }
 
 char *SHA512_End(SHA512_CTX* context, char buffer[]) {
@@ -975,7 +975,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(&context, sizeof(context));
 	}
 	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
 	return buffer;
@@ -996,7 +996,7 @@ void SHA384_Init(SHA384_CTX* context) {
 		return;
 	}
 	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
+	MEMSET_BZERO(&context->buffer, SHA384_BLOCK_LENGTH);
 	context->bitcount[0] = context->bitcount[1] = 0;
 }
 
@@ -1030,7 +1030,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(&context, sizeof(context));
 }
 
 char *SHA384_End(SHA384_CTX* context, char buffer[]) {
@@ -1050,9 +1050,9 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(&context, sizeof(context));
 	}
-	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
+	MEMSET_BZERO(&digest, SHA384_DIGEST_LENGTH);
 	return buffer;
 }
 

src/rdb.c

@@ -383,7 +383,7 @@ int program_serialize(struct program_t *program, char *file)
 int program_free(struct program_t *prg)
 {
 	//printf("program_free: MEMORY LEAK!\n");
-#warning program_free: must be implemented
+// #warning program_free: not implemented
 	return 0;
 }
 

src/utils.c

@@ -364,9 +364,10 @@ ut64 get_offset(const char *orig)
 	if (arg[0]=='\'' && arg[0+2]=='\'')
 		return arg[0+1];
 
-	for(;*arg==' ';arg=arg+1);
-	for(i=0;arg[i]==' ';i++);
-	for(;arg[i]=='\\';i++); i++;
+	for (;*arg==' ';arg=arg+1) {}
+	for (i=0;arg[i]==' ';i++) {}
+	for (;arg[i]=='\\';i++) {}
+	i++;
 
 #if RADARE_CORE
 #if 0
@@ -584,14 +585,14 @@ ut64 get_math(const char* text)
 	/* remove whitespaces and dupped '=' */
 	for(tmp = txt = strdup(text); txt && txt[0] && txt[1]; txt = txt+1) {
 #if 1
-		if ((txt[0]=='!' && txt[1]=='='))
+		if (txt[0] == '!' && txt[1]=='=')
 			str_cpy(txt+1, txt+2);
 		else
 #endif
-		if ((txt[0]=='=' && txt[1]=='='))
+		if (txt[0] == '=' && txt[1]=='=')
 			txt[0]=' ';
 		else
-		if ((txt[0]==' '))
+		if (txt[0] == ' ')
 			str_cpy(txt, txt+1);
 	}
 	txt = tmp;