X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/9897bfc3aab309cb3867af8f154b601118d366c9..9eb4b3c68c23622076943399ae2c8d298eb32799:/rsb-lz.c

diff --git a/rsb-lz.c b/rsb-lz.c
index ed0c813..b624265 100644
--- a/rsb-lz.c
+++ b/rsb-lz.c
@@ -1,8 +1,14 @@
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <limits.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
+#include <libgen.h>
 #include "rsb-crc.h"
 #include "rsb-lz.h"
 
@@ -426,35 +432,105 @@
  * 59b80:	46335053 	undefined
  */
 
-void fn_59560(unsigned int arg1)
+void fn_59788(const char *fname)
 {
-}
-
-void fn_59578(unsigned int arg1, unsigned int arg2, unsigned int arg3, unsigned int arg4)
-{
-}
-
-void fn_59788()
-{
-	fprintf(stderr,"error extracting...\n");
+	fprintf(stderr,"%s: error extracting...\n", fname);
 	exit(1);
 }
 
 struct s_59b78 {
-	unsigned char *start;
-	unsigned char *stop;
+	unsigned char *start; /* 0 */
+	unsigned char *stop; /* 4 */
 	unsigned char y; /* 8 */
 	unsigned char x; /* 9 */
 };
 
-unsigned int fn_59848(struct s_59b78 *data)
+unsigned char fn_597c8(struct s_59b78 *r6_data)
+{
+	unsigned char *r0;
+	unsigned char *r1;
+	unsigned char r5;
+
+	r5 = 0;
+
+	r0 = r6_data->start;
+	r1 = r6_data->stop;
+
+	if (r1 < r0)
+		fn_59788(__func__);
+
+	r5 = *r0;
+	r0++;
+	r6_data->start = r0;
+
+	return r5;
+}
+
+unsigned int fn_59848(struct s_59b78 *r6_data)
 {
-	return 0;
+	unsigned char r1;
+	unsigned char r2;
+	unsigned int r5;
+
+	r1 = r6_data->y;
+	if (r1 == 0x80) {
+		r6_data->x = fn_597c8(r6_data);
+	}
+	r1 = r6_data->y;
+	r2 = r6_data->x;
+	r1 = r1 & r2;
+	r5 = r1 & 0xff;
+
+	r1 = r6_data->y;
+	r1 = r1 >> 1;
+	r6_data->y = r1;
+	if (r1 == 0) {
+		r1 = 0x80;
+		r6_data->y = r1;
+	}
+
+	if (r5 == 0)
+		return 0;
+
+	return 1;
 }
 
-unsigned int fn_598b4(struct s_59b78 *data, unsigned int arg2)
+unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2)
 {
-	return 0;
+	unsigned int r1;
+	unsigned int r2;
+	unsigned int r6;
+	unsigned int r7;
+
+	r1 = r10_arg2 - 1;
+	r6 = 1 << r1;
+
+	r7 = 0;
+	while (r6 != 0) {
+		r1 = r11_data->y;
+		if (r1 == 0x80) {
+			r1 = fn_597c8(r11_data);
+			r11_data->x = r1;
+		}
+		r1 = r11_data->y;
+		r2 = r11_data->x;
+		r1 = r1 & r2;
+		if (r1 != 0)
+			r7 = r7 | r6;
+
+		r6 = r6 >> 1;
+
+		r2 = r11_data->y;
+		r2 = r2 >> 1;
+		r11_data->y = r2;
+
+		r1 = r11_data->y;
+		if(r1 == 0) {
+			r11_data->y = 0x80;
+		}
+	}
+
+	return r7;
 }
 
 void fn_5980c(unsigned int arg1, unsigned int mem[])
@@ -465,8 +541,10 @@ void fn_5980c(unsigned int arg1, unsigned int mem[])
 	r1 = (unsigned char*)mem[0];
 	r2 = (unsigned char*)mem[1];
 
-	if (r1 >= r2)
-		fn_59788();
+	if (r1 > r2) {
+		printf("r1: 0x%08x, r2: 0x%08x\n", (unsigned int)r1, (unsigned int)r2);
+		fn_59788(__func__);
+	}
 
 	*r1 = arg1 & 0xff;
 
@@ -474,56 +552,56 @@ void fn_5980c(unsigned int arg1, unsigned int mem[])
 	mem[0] = (unsigned int)r1;
 }
 
-void fn_5993c(struct s_59b78 *data, unsigned int mem[])
+void fn_5993c(struct s_59b78 *r10_data, unsigned int r13_mem[])
 {
 	unsigned int r5;
 	unsigned int r2;
-	unsigned int r4;
+	unsigned char r4;
 	unsigned int r6;
 	unsigned int r7;
 	unsigned int r11;
-	unsigned char arr_59b64[1024];
+	unsigned char arr_59b64[2048];
 
 	r5 = 1;
 
-	do {
-		do {
-			r2 = fn_59848(data);
+	while (1) {
+		while (1) {
+			r2 = fn_59848(r10_data);
 			if (r2 == 0)
 				break;
 
-			r2 = fn_598b4(data, 8) & 0xff;
+			r2 = fn_598b4(r10_data, 8) & 0xff;
 			r4 = r2;
 
-			fn_5980c(r4, mem);
+			fn_5980c(r4, r13_mem);
 			arr_59b64[r5] = r4 & 0xff;
 			r2 = r5 + 1;
 			r2 = r2 << 22;
 			r2 = r2 >> 22;
 			r5 = r2;
-		} while(1);
+		}
 
-		r11 = fn_598b4(data, 0x0a);
+		r11 = fn_598b4(r10_data, 0x0a);
 		if(r11 == 0)
 			return;
 
-		r2 = fn_598b4(data, 0x04);
+		r2 = fn_598b4(r10_data, 0x04);
 		r7 = r2 + 1;
 		r6 = 0;
-		do {
+		while (r6 <= r7) {
 			r2 = r6 + r11;
 			r2 = r2 << 22;
 			r2 = r2 >> 22;
 			r4 = arr_59b64[r2];
-			fn_5980c(r4, mem);
-			arr_59b64[r5] = r4 & 0xff;
+			fn_5980c(r4, r13_mem);
+			arr_59b64[r5] = r4;
 			r2 = r5 + 1;
 			r2 = r2 << 22;
 			r2 = r2 >> 22;
 			r5 = r2;
 			r6++;
-		} while(r6 <= r7);
-	} while(1);
+		}
+	}
 }
 
 unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned int magic)
@@ -537,9 +615,11 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in
 		return 1;
 #endif
 
+	/* ??? */
 	r4 = *((unsigned int*)arg1 + 0x20);
 	r5 = *((unsigned int*)arg1 + 0x24);
 
+	printf("magic: 0x%08x <-> 0x%08x\n", r5, magic);
 	if (r5 != magic)
 		return 2;
 	
@@ -558,8 +638,70 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in
 	return 4;
 }
 
-void fn_59508()
+void mkdir_p(char *dir)
 {
+	char *copy, *parent;
+
+	if ((dir == NULL) || (!strcmp(dir, ".")))
+		return;
+
+	if ((copy = strdup(dir)) == NULL) {
+		perror("strdup");
+		exit(1);
+	}
+	parent = dirname(copy);
+	mkdir_p(parent);
+
+	errno = 0;
+	if (mkdir(dir, 0755) == -1) {
+		if (errno != EEXIST) {
+			fprintf(stderr, "%s: ", dir);
+			perror("mkdir");
+			exit(1);
+		}
+	}
+	free(copy);
+}
+
+void write_file(char *fname, unsigned char *buf, int len)
+{
+	char filename[PATH_MAX];
+	char *filename_c, *dirn;
+	int fd;
+	int remaining;
+	int ret;
+
+	strcpy(filename, "extracted/");
+	strcat(filename, fname);
+
+	if ((filename_c = strdup(filename)) == NULL) {
+		perror("strdup");
+		exit(1);
+	}
+	dirn = dirname(filename_c);
+	mkdir_p(dirn);
+	free(filename_c);
+
+	if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) == -1) {
+		fprintf(stderr, "%s: ", filename);
+		perror("open");
+		exit(1);
+	}
+
+	remaining = len;
+
+	while(remaining) {
+		ret = write(fd, buf + (len - remaining), remaining);
+		if (ret < 0) {
+			perror("write");
+			exit(1);
+		}
+		remaining -= ret;
+	}
+
+	printf(", %s written.\n", filename);
+
+	close(fd);
 }
 
 void extract_lz_file(unsigned char *buf, unsigned char *name)
@@ -572,29 +714,23 @@ void extract_lz_file(unsigned char *buf, unsigned char *name)
 	struct s_59b78 struct1;
 	unsigned int arr_59b7c[1024];
 
-	r7 = malloc(1024*1024*1024);
-	r10 = r7 + (1024*1024*1024);
+	if (*((unsigned int*)r11) != LZ_MAGIC)
+		fn_59788(__func__);
+
+	r3 = r11 + 4;
+	r5 = *((unsigned int*)r3);
+	printf(", length: %d", r5);
 
-	if (r7 == NULL) {
+	if ((r7 = malloc(r5)) == NULL) {
 		perror("malloc");
 		exit(1);
 	}
-
-	fn_59578(0, 0, 0x3f, 0x33);
-	fn_59578(4, 0x10000000, 0x33, 0x366);
-	fn_59578(5, 0x14000000, 0x1b, 0x733);
-	fn_59578(7, 0xc0000000, 0x3b, 0x33);
-	fn_59560(0x1005);
-
-	if (*((unsigned int*)r11) != LZ_MAGIC)
-		fn_59788();
-	r3 = r11 + 4;
-	r5 = *((unsigned int*)r3);
-	printf(", Length: %d\n", r5);
+	r10 = r7 + r5;
+	bzero(r7, r5);
 
 	r3 = r7 + r5;
 	if (r3 > r10)
-		fn_59788();
+		fn_59788(__func__);
 	
 	struct1.start = r11 + 8;
 	struct1.stop = r5 + r11;
@@ -606,14 +742,19 @@ void extract_lz_file(unsigned char *buf, unsigned char *name)
 
 	fn_5993c(&struct1, arr_59b7c);
 
+#if 0
+	/* This seems to still be completely broken */
 	r3 = r7 + 0x20;
 	r5 = *((unsigned int*)r3);
 
-	if (crc_check_59684(r7, r5, 0x46335053) != 0)
-		fn_59788();
-	
-	fn_59508();
+	if ((ret = crc_check_59684(r7, r5, 0x46335053)) != 0) {
+		printf("crc_check return: %d\n", ret);
+		fn_59788(__func__);
+	}
+#endif
 
+	write_file((char*)name, r7, r5);
+	
 	free(r7);
 }
 
@@ -625,19 +766,29 @@ void search_lz_sections(unsigned char *fw, int len)
 	for(i = 0; i < len - 4; i++) {
 		if (*((unsigned int*)(fw+i)) == LZ_MAGIC) {
 			j = fw + i - 1;
-			if (*j != 0x00)
-				continue;
 			printf("0x%02x: ", i);
 			j--;
 			while (j > fw) {
+				if (!strncmp("SP3", (char*)j, 3)) {
+					unsigned char fname[5];
+
+					bzero(fname, sizeof(fname));
+					memcpy(fname, j, 4);
+					printf("Firmware found: %s", fname);
+					extract_lz_file(fw + i, fname);
+					break;
+				}
 				if (*j == 0x00) {
+					if ((*(j+1) != '/')) {
+						printf("ignoring...\n");
+						break;
+					}
 					printf("%s", j+1);
 					extract_lz_file(fw + i, j+1);
 					break;
 				}
 				j--;
 			}
-			printf("\n");
 		}
 	}
 }