Initial import of the rapatch2 tool ##shell

binr/Makefile

@@ -6,7 +6,7 @@ BTOP=$(shell pwd)
 
 .PHONY: all clean install install-symlink deinstall uninstall mrproper preload
 
-BINS=r2r r2pm ravc2 rax2 rasm2 rabin2 rahash2 radiff2 radare2 rafind2 rarun2 ragg2 r2agent rasign2
+BINS=r2r r2pm ravc2 rax2 rasm2 rabin2 rahash2 radiff2 rapatch2 radare2 rafind2 rarun2 ragg2 r2agent rasign2
 
 LIBR2=$(call libname-version,libr2.$(EXT_SO),${LIBVERSION})
 

binr/meson.build

@@ -17,6 +17,7 @@ if cli_enabled
     subdir('ragg2')
     subdir('r2agent')
     subdir('radiff2')
+    subdir('rapatch2')
     subdir('rafind2')
     subdir('rasign2')
     subdir('ravc2')

binr/rapatch2/Makefile

@@ -0,0 +1,22 @@
+BIN=rapatch2
+
+BINDEPS=r_core r_search r_cons r_config
+BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io r_fs
+BINDEPS+=r_lang r_asm r_syscall r_main r_util r_esil
+BINDEPS+=r_magic r_socket r_flag r_egg r_crypto
+
+include ../rules.mk
+
+ifeq ($(OSTYPE),android)
+LDFLAGS+=${DL_LIBS} -lm
+endif
+
+include ../../libr/socket/deps.mk
+include ../../libr/main/deps.mk
+include ../../shlr/zip/deps.mk
+include ../../shlr/gdb/deps.mk
+include ../../shlr/bochs/deps.mk
+include ../../shlr/qnx/deps.mk
+include ../../shlr/ar/deps.mk
+
+LDFLAGS+=$(LINK)

binr/rapatch2/meson.build

@@ -0,0 +1,19 @@
+executable('rapatch2', 'rapatch2.c',
+  include_directories: [platform_inc],
+  dependencies: [
+    r_util_dep,
+    r_main_dep,
+    r_io_dep,
+    r_search_dep,
+    r_cons_dep,
+    r_core_dep,
+    r_bin_dep,
+    r_anal_dep,
+    r_asm_dep,
+    r_crypto_dep,
+    r_config_dep
+  ],
+  install: true,
+  install_rpath: rpath_exe,
+  implicit_include_directories: false
+)

binr/rapatch2/rapatch2.c

@@ -0,0 +1,7 @@
+/* radare - LGPL - Copyright 2024 - pancake */
+
+#include <r_main.h>
+
+int main (int argc, const char *argv[]) {
+	return r_main_rapatch2 (argc, argv);
+}

libr/core/cmd.c

@@ -2721,6 +2721,9 @@ static bool cmd_r2cmd(RCore *core, const char *_input) {
 	int rc = 0;
 	if (r_str_startswith (input, "rax2")) {
 		rc = __runMain (core->r_main_rax2, input);
+	} else if (r_str_startswith (input, "rapatch2")) {
+		r_sys_cmdf ("%s", input);
+		// rc = __runMain (r_main_rapatch2, input);
 	} else if (r_str_startswith (input, "radare2")) {
 		r_sys_cmdf ("%s", input);
 		// rc = __runMain (core->r_main_radare2, input);

libr/include/r_main.h

@@ -39,6 +39,7 @@ R_API int r_main_radiff2(int argc, const char **argv);
 R_API int r_main_ragg2(int argc, const char **argv);
 R_API int r_main_rasign2(int argc, const char **argv);
 R_API int r_main_r2pm(int argc, const char **argv);
+R_API int r_main_rapatch2(int argc, const char **argv);
 
 #ifdef __cplusplus
 }

libr/main/Makefile

@@ -16,6 +16,7 @@ OBJS+=rasign2.o
 OBJS+=rafind2.o
 OBJS+=r2agent.o
 OBJS+=radiff2.o
+OBJS+=rapatch2.o
 OBJS+=radare2.o
 OBJS+=rahash2.o
 

libr/main/main.c

@@ -13,6 +13,7 @@ static RMain foo[] = {
 	{ "rarun2", r_main_rarun2 },
 	{ "rasm2", r_main_rasm2 },
 	{ "ragg2", r_main_ragg2 },
+	{ "rapatch2", r_main_rapatch2 },
 	{ "rabin2", r_main_rabin2 },
 	{ "radare2", r_main_radare2 },
 	{ "r2", r_main_radare2 },

libr/main/meson.build

@@ -8,6 +8,7 @@ r_main_sources = [
   'rafind2.c',
   'ragg2.c',
   'rahash2.c',
+  'rapatch2.c',
   'rarun2.c',
   'rasign2.c',
   'rasm2.c',

libr/main/rapatch2.c

@@ -0,0 +1,79 @@
+/* radare - LGPL - Copyright 2024 - pancake */
+
+#define R_LOG_ORIGIN "rapatch2"
+
+#include <r_core.h>
+#include <r_main.h>
+
+static int show_help(int v) {
+	printf ("Usage: rapatch2 [-p N] [-sv] [-R] [origfile] ([patchfile])\n");
+	if (v) {
+		printf (
+			"  -p N       patch level, skip N directories\n"
+			"  -R         reverse patch\n"
+			"  -s         be silent\n"
+			"  -v         show version\n"
+		       );
+	}
+	return 1;
+}
+
+R_API int r_main_rapatch2(int argc, const char **argv) {
+	RGetopt opt;
+	int o;
+
+	bool reverse = false;
+	bool silent = false;
+	int patchlevel = 0;
+
+	r_getopt_init (&opt, argc, argv, "hRvsp:");
+	while ((o = r_getopt_next (&opt)) != -1) {
+		switch (o) {
+		case 'h':
+			return show_help (1);
+		case 's':
+			silent = true;
+			break;
+		case 'p':
+			patchlevel = atoi (opt.arg);
+			break;
+		case 'R':
+			reverse = true;
+			break;
+		case 'v':
+			return r_main_version_print ("rapatch2", 0);
+		default:
+			return show_help (0);
+		}
+	}
+
+	if (argc < 3 || opt.ind + 2 > argc) {
+		return show_help (0);
+	}
+	const char *file = (opt.ind < argc)? argv[opt.ind]: NULL;
+	const char *patchfile = (opt.ind + 1 < argc)? argv[opt.ind + 1]: NULL;
+
+	if (R_STR_ISEMPTY (file) || R_STR_ISEMPTY (patchfile)) {
+		R_LOG_ERROR ("Cannot open empty path");
+		return 1;
+	}
+	if (reverse) {
+		R_LOG_TODO ("reverse patch not yet supported");
+	}
+	if (silent) {
+		R_LOG_TODO ("silent not yet supported");
+	}
+	if (patchlevel) {
+		R_LOG_TODO ("patchlevel not yet supported");
+	}
+	const char *r2argv[5] = {
+		"radare2",
+		"-qwP",
+		patchfile,
+		file,
+		NULL
+	};
+	r_main_radare2 (5, r2argv);
+
+	return 0;
+}

man/rapatch2.1

@@ -0,0 +1,72 @@
+.TH RAPATCH2 1 "rapatch2 tool" "Sep 27, 2024"
+.SH NAME
+rapatch2 - binary patching utility
+.SH SYNOPSIS
+.B rapatch2
+[-p #] [-R] file patch
+
+.SH DESCRIPTION
+rapatch2 is a tool from the radare2 suite designed for binary patching code and data.
+.PP
+Human friendly text format to apply patches to binary files.
+.Pp
+It supports a wide range of formats and features, including architecture and
+bits specification, delta patching, graph patching, and more.
+.Pp
+Those patches must be written in files and the syntax looks like the following:
+
+.RS
+.nf
+^# -> comments
+. -> execute command
+! -> execute command
+OFFSET { code block }
+OFFSET "string"
+OFFSET 01020304
+OFFSET : assembly
++ {code}|"str"|0210|: asm
+.fi
+.RE
+
+.SH OPTIONS
+.TP
+.B -h
+Show this help message
+.TP
+.B -R
+Reverse patch
+.TP
+.B -p [num]
+Skip num directories from patch file
+
+.TP
+.B -s
+Be silent
+
+.TP
+.B -v
+Show version string
+
+.SH USAGE EXAMPLES
+.TP
+.B "Comparing two binaries"
+radiff2 -u bin1 bin2 > patch
+
+rapatch2 -p 1 < patch
+
+.TP
+.B "Patch only one file"
+rapatch2 bin1 patch
+
+.SH COMMAND IN R2
+
+See the -p flag and command.
+
+.SH SEE ALSO
+radare2(1)
+
+.Sh WWW
+.Pp
+https://www.radare.org/
+.SH AUTHOR
+pancake <[email protected]>