compressed main firmware now also gets extracted :-)

[rsbs2] / rsb-lz.c

diff --git a/rsb-lz.c b/rsb-lz.c
index 24977029e52f2cb64f00764f27202a732dd96399..b6242658d2b6322a9041fd10b53f80620a1ab4f4 100644 (file)
--- a/rsb-lz.c
+++ b/rsb-lz.c
@@ -719,7 +719,7 @@ void extract_lz_file(unsigned char *buf, unsigned char *name)
 
        r3 = r11 + 4;
        r5 = *((unsigned int*)r3);
-       printf(", length: %d\n", r5);
+       printf(", length: %d", r5);
 
        if ((r7 = malloc(r5)) == NULL) {
                perror("malloc");
@@ -766,13 +766,20 @@ 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) != '/') {
+                                       if ((*(j+1) != '/')) {
                                                printf("ignoring...\n");
                                                break;
                                        }