X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/14ff7444fbe0e46226b640411372a5895db4fd74..81a1093d3e69b4996e56bc291759f1c17dbc2344:/firmware.c

diff --git a/firmware.c b/firmware.c
index 2c9960f..cd7927b 100644
--- a/firmware.c
+++ b/firmware.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <strings.h>
 #include "rsb-crc.h"
-#include "rsb-lz.h"
+#include "extract.h"
 
 #define FINDSTR(addr, str) (!strncmp((char*)addr, str, strlen(str)))
 
@@ -76,13 +76,13 @@ void show_properties(unsigned char *fw, int len)
 			}
 
 			if (prop->right_rw == 0x00 && prop->rw_mask == 0x00) {
-				printf("(R-) ");
+				printf("(R-)");
 			} else if (prop->right_rw == 0x01) {
-				printf("(RW mask: 0x%02x) ", prop->rw_mask);
+				printf("(RW mask: 0x%02x)", prop->rw_mask);
 			} else {
-				printf("(UNK 0x%02x 0x%02x) ", prop->right_rw, prop->rw_mask);
+				printf("(UNK 0x%02x 0x%02x)", prop->right_rw, prop->rw_mask);
 			}
-			printf("\n");
+			printf(", length: %d\n", *((unsigned int*)(fw + i - 4)));
 		}
 	}
 }
@@ -423,6 +423,7 @@ int main(int argc, char **argv)
 	ret = check_crc(fw, statbuf.st_size);
 	if ((ret != 0) && (!update_crc)) {
 		fprintf(stderr,"Checksum incorrect, aborting...\n");
+		exit(1);
 	}
 
 	if (patch_fw) {
@@ -461,7 +462,7 @@ int main(int argc, char **argv)
 	}
 
 	if (extract) {
-		search_lz_sections(fw, statbuf.st_size - 4);
+		extract_files(fw, statbuf.st_size - 4);
 	}
 
 	if (update_crc || patch_fw || patch_bd) {