* Commited 'rapatch' from lacon-2010 talk

binr/rapatch2/Makefile

@@ -0,0 +1,10 @@
+all:
+	gcc rapatch.c `pkg-config --cflags --libs r_core`
+
+a: all
+	cp /bin/ls ls
+	./a.out ls patch.txt
+	./ls
+
+clean:
+	rm -f a.out RaPatcher RaPatcher.c out.* ls

binr/rapatch2/patch.txt

@@ -0,0 +1,21 @@
+# This is an example file for rapatch
+
+#0x8048000  : mov eax, 33
+#0x8048005  # This is fucking awesome
+!echo ++ Patching binary
+. import.rdb
+
+0x8048000  "Hello World"
+0x8048200  223399
+entry0 {
+ 	printf@alias(${imp.printf});
+
+	main@global(128,128) {
+		printf("%d\n", 33);
+		printf("1234567890\n");
+		printf("hello world\n");
+		: mov eax,1
+		: int 0x80
+	}
+}
+#entry0+4 : nop;nop;nop

binr/rapatch2/rapatch.c

@@ -0,0 +1,90 @@
+/* radare - Copyright 2010 - pancake<nopcode.org> */
+#include <stdio.h>
+#include <r_core.h>
+
+int main(int argc, char **argv) {
+	char *p, *p2, *q, str[200], str2[200];
+	char *file = argv[1];
+	char *patch = argv[2];
+	ut64 noff;
+	RCore *core;
+	FILE *fd;
+	if (argc<3) {
+		eprintf ("Usage: rapatch [target] [patchfile ...]\n");
+		return 1;
+	}
+	fd = fopen(patch, "r");
+	if (fd==NULL) {
+		eprintf ("Cannot open patch file\n");
+		return 1;
+	}
+
+	core = r_core_new ();
+	r_core_file_open (core, file, 2);
+	r_core_cmdf (core, ".!rabin2 -revSIsi %s", file);
+	r_cons_flush ();
+
+	while (!feof(fd)) {
+		fgets(str, sizeof(str), fd);
+		if (*str=='#' || *str=='\n' || *str=='\r')
+			continue;
+		if (*str=='.' || *str=='!') {
+			r_core_cmd0(core, str);
+			continue;
+		}
+		p = strchr (str+1, ' ');
+		if (p) {
+			*p=0;
+			for(++p;*p==' ';p++);
+			switch(*p) {
+			case '{': {
+				FILE *fw = fopen("out.rarc", "w");
+				char *off = strdup(str);
+				while(!feof(fd)) {
+					fgets(str, sizeof(str), fd);
+// TODO: replace ${..}
+					if (*str=='}')
+						break;
+					if ((q=strstr(str, "${"))) {
+						char *end = strchr(q+2,'}');
+						if (end) {
+							*q = *end = 0;
+							noff = r_num_math(core->num, q+2);
+							fwrite (str, strlen (str), 1, fw);
+							fprintf(fw, "0x%08llx", noff);
+							fwrite (end+1, strlen (end+1), 1, fw);
+						}
+					} else fwrite (str, strlen (str), 1, fw);
+				}
+				fclose (fw);
+				r_sys_cmd ("rarc2 < out.rarc > out.rasm");
+				
+				noff = r_num_math(core->num, off);
+				r_sys_cmdf( "rasm2 -o 0x%llx -a x86.olly "
+					"-f out.rasm | tee out.hex", noff);
+				r_core_cmdf(core, "s %s", off);
+				r_core_cmd0(core, "wF out.hex");
+				free(off);
+				}
+				break;
+			case '"':
+				p2=strchr(p+1,'"');
+				if (p2)
+					*p2=0;
+				r_core_cmdf(core, "s %s", str);
+				r_core_cmdf(core, "\" %s\"", p+1);
+				break;
+			case ':':
+				r_core_cmdf(core, "s %s", str);
+				r_core_cmdf(core, "wa %s", p);
+				break;
+			default:
+				r_core_cmdf(core, "s %s", str);
+				r_core_cmdf(core, "wx %s", p);
+				break;
+			}
+		}
+	}
+	fclose(fd);
+	return 0;
+}