From 6e4ace56aa97c4cd6abca460e158eedfa682db25 Mon Sep 17 00:00:00 2001 From: Rifat Azad <33044977+rifsxd@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:55:38 +0600 Subject: [PATCH 1/5] I/O optimizations, code refactor for better readability, pretty progress of extrction, output folder arg, -v -h args and overall improvements --- .gitignore | 2 + Makefile | 27 ++--- README.md | 2 +- pacextractor.c | 287 +++++++++++++++++++++++++++++++++++-------------- 4 files changed, 219 insertions(+), 99 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de7f8f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.vscode +*pacextractor \ No newline at end of file diff --git a/Makefile b/Makefile index b1b2175..b415500 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,16 @@ -#CFLAGS=-O3 -Wall -CFLAGS=-g -ggdb -Wall -#LDLIBS=-l +# Define compiler and flags +CC = gcc -all: pacextractor +# Target executable +TARGET = pacextractor -version.h: - if [ ! -f version.h ]; then \ - if [ -d .git ]; then \ - echo '#define VERSION_STR "$(shell git describe --tags --abbrev=0)"' > version.h; \ - else \ - echo '#define VERSION_STR ""' > version.h; \ - fi \ - fi +# Source files +SRC = pacextractor.c -pacextractor.o: version.h +# Rule to build the target +$(TARGET): $(SRC) + $(CC) $(SRC) -o $(TARGET) +# Clean up build artifacts clean: - rm -f pacextractor *.o version.h - -.PHONY: clean all \ No newline at end of file + rm -f $(TARGET) diff --git a/README.md b/README.md index 8519b60..dc3a08e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# Extractor of SpreadTrum firmware files with extension pac +# Extractor of SpreadTrum/UniSOC firmware files with .pac extension Extract all data that I may recognize in package. \ No newline at end of file diff --git a/pacextractor.c b/pacextractor.c index 6992ed7..d73938b 100644 --- a/pacextractor.c +++ b/pacextractor.c @@ -1,4 +1,3 @@ - #include #include #include @@ -9,6 +8,8 @@ #include #include +#define VERSION "1.0.0" + typedef struct { int16_t someField[24]; int32_t someInt; @@ -27,118 +28,240 @@ typedef struct { int16_t partitionName[256]; int16_t fileName[512]; uint32_t partitionSize; - int32_t someFileds1[2]; + int32_t someFields1[2]; uint32_t partitionAddrInPac; - int32_t someFileds2[3]; + int32_t someFields2[3]; int32_t dataArray[]; } PartitionHeader; -void getString(int16_t* baseString, char* resString) { - if(*baseString == 0) { - *resString = 0; +static void getString(const int16_t* baseString, char* resString) { + if (baseString == NULL || resString == NULL) { + *resString = '\0'; return; } - int length = 0; - do { - *resString = 0xFF & *baseString; - resString++; + + while (*baseString) { + *resString++ = (char)(*baseString & 0xFF); baseString++; - if(++length > 256) + if (resString - resString > 255) { // Prevent buffer overflow break; - } while(baseString > 0); - *resString = 0; + } + } + *resString = '\0'; // Null-terminate the result string } -int main(int argc, char** argv) { - if(argc < 2) { - printf("command format:\n capextractor .pac"); +static void printUsage(void) { + printf("Usage: pacextractor .pac \n"); + printf("Options:\n"); + printf(" -h Show this help message and exit\n"); + printf(" -v Show version information and exit\n"); +} + +static void printUsageAndExit(void) { + printUsage(); + exit(EXIT_FAILURE); +} + +static void handleOpenFileError(const char* fileName) { + perror(fileName); + exit(EXIT_FAILURE); +} + +static int openFirmwareFile(const char* filePath) { + int fd = open(filePath, O_RDONLY); + if (fd == -1) { + handleOpenFileError(filePath); + } + return fd; +} + +static void createOutputDirectory(const char* path) { + if (access(path, F_OK) == -1) { + if (mkdir(path, 0777) == -1) { + perror("Failed to create output directory"); + exit(EXIT_FAILURE); + } + printf("Created output directory: %s\n", path); + } +} + +static PacHeader readPacHeader(int fd) { + PacHeader header; + if (read(fd, &header, sizeof(PacHeader)) != sizeof(PacHeader)) { + perror("Error while reading PAC header"); + exit(EXIT_FAILURE); + } + return header; +} + +static PartitionHeader* readPartitionHeader(int fd, uint32_t* curPos) { + lseek(fd, *curPos, SEEK_SET); + uint32_t length; + if (read(fd, &length, sizeof(length)) != sizeof(length)) { + perror("Error while reading partition header length"); exit(EXIT_FAILURE); } - int fd = open(argv[1], O_RDONLY); - if (fd == -1) { - printf("file %s is not find", argv[1]); + PartitionHeader* header = malloc(length); + if (header == NULL) { + perror("Memory allocation failed"); exit(EXIT_FAILURE); } -// fseek(fd, 0, SEEK_END); -// int firmwareSize = (fd); -// fseek(fd, 0, SEEK_SET); - struct stat st; - stat(argv[1], &st); - int firmwareSize = st.st_size; - if(firmwareSize < sizeof(PacHeader)) { - printf("file %s is not firmware", argv[1]); + lseek(fd, *curPos, SEEK_SET); + if (read(fd, header, length) != length) { + perror("Error while reading partition header"); + free(header); exit(EXIT_FAILURE); } - PacHeader pacHeader; - size_t rb =read(fd, &pacHeader, sizeof(PacHeader)); - if(rb <= 0) { - printf("Error while parsing PAC header"); + *curPos += length; + return header; +} + +static void printProgressBar(uint32_t completed, uint32_t total) { + const int barWidth = 50; + float progress = (float)completed / total; + int pos = barWidth * progress; + + printf("\r["); + for (int i = 0; i < barWidth; ++i) { + if (i < pos) printf("="); + else if (i == pos) printf(">"); + else printf(" "); + } + printf("] %.2f%%", progress * 100.0); + fflush(stdout); +} + +static void extractPartition(int fd, const PartitionHeader* partHeader, const char* outputPath) { + if (partHeader->partitionSize == 0) { + return; + } + + lseek(fd, partHeader->partitionAddrInPac, SEEK_SET); + + // Increase buffer size for faster I/O operations + const size_t BUFFER_SIZE = 256 * 1024; // 256 KB + char* buffer = malloc(BUFFER_SIZE); + if (buffer == NULL) { + perror("Memory allocation failed"); exit(EXIT_FAILURE); } - char buffer[256]; - char buffer1[256]; - getString(pacHeader.firmwareName, buffer); - printf("Firmware name: %s\n", buffer); - uint32_t curPos = pacHeader.partitionsListStart; - PartitionHeader** partHeaders = malloc(sizeof(PartitionHeader**)*pacHeader.partitionCount); - int i; - for(i = 0; i < pacHeader.partitionCount; i++) { - lseek(fd, curPos, SEEK_SET); - uint32_t length; - rb =read(fd, &length, sizeof(uint32_t)); - if(rb <= 0) { - printf("Partition header error"); + char outputFilePath[768]; + char fileName[512]; + getString(partHeader->fileName, fileName); + snprintf(outputFilePath, sizeof(outputFilePath), "%s/%s", outputPath, fileName); + + if (remove(outputFilePath) == -1 && errno != ENOENT) { + perror("Error removing existing output file"); + free(buffer); + exit(EXIT_FAILURE); + } + + int fd_new = open(outputFilePath, O_WRONLY | O_CREAT | O_TRUNC, 0666); + if (fd_new == -1) { + perror("Error creating output file"); + free(buffer); + exit(EXIT_FAILURE); + } + + printf("Extracting to %s\n", outputFilePath); + + uint32_t dataSizeLeft = partHeader->partitionSize; + uint32_t dataSizeRead = 0; + + while (dataSizeLeft > 0) { + uint32_t copyLength = (dataSizeLeft > BUFFER_SIZE) ? BUFFER_SIZE : dataSizeLeft; + ssize_t rb = read(fd, buffer, copyLength); + if (rb != copyLength) { + perror("Error while reading partition data"); + close(fd_new); + free(buffer); exit(EXIT_FAILURE); } - partHeaders[i] = malloc(length); - lseek(fd, curPos, SEEK_SET); - curPos += length; - rb =read(fd, partHeaders[i], length); - if(rb <= 0) { - printf("Partition header error"); + ssize_t wb = write(fd_new, buffer, copyLength); + if (wb != copyLength) { + perror("Error while writing partition data"); + close(fd_new); + free(buffer); exit(EXIT_FAILURE); } - getString(partHeaders[i]->partitionName, buffer); - getString(partHeaders[i]->fileName, buffer1); - printf("Partition name: %s\n\twith file name: %s\n\twith size %u\n", buffer, buffer1, partHeaders[i]->partitionSize); + dataSizeLeft -= copyLength; + dataSizeRead += copyLength; + printProgressBar(dataSizeRead, partHeader->partitionSize); + } + printf("\n"); + close(fd_new); + free(buffer); +} + +int main(int argc, char** argv) { + if (argc < 2) { + printUsageAndExit(); + } + + if (strcmp(argv[1], "-h") == 0) { + printUsage(); + exit(EXIT_SUCCESS); + } else if (strcmp(argv[1], "-v") == 0) { + printf("pacextractor version %s\n", VERSION); + exit(EXIT_SUCCESS); + } + + if (argc < 3) { + printUsageAndExit(); + } + + int fd = openFirmwareFile(argv[1]); + + struct stat st; + if (fstat(fd, &st) == -1) { + perror("Error getting file stats"); + exit(EXIT_FAILURE); + } + int firmwareSize = st.st_size; + if (firmwareSize < sizeof(PacHeader)) { + fprintf(stderr, "file %s is not a valid firmware\n", argv[1]); + close(fd); + exit(EXIT_FAILURE); } + + char* outputPath = argv[2]; + createOutputDirectory(outputPath); + + PacHeader pacHeader = readPacHeader(fd); - for(i = 0; i < pacHeader.partitionCount; i++) { - if(partHeaders[i]->partitionSize == 0) { - free(partHeaders[i]); - continue; - } - lseek(fd, partHeaders[i]->partitionAddrInPac, SEEK_SET); - getString(partHeaders[i]->fileName, buffer); - remove(buffer); - int fd_new = open(buffer, O_WRONLY | O_CREAT, 0666); - printf("Extract %s\n", buffer); - uint32_t dataSizeLeft = partHeaders[i]->partitionSize; - while(dataSizeLeft > 0) { - uint32_t copyLength = (dataSizeLeft > 256) ? 256 : dataSizeLeft; - dataSizeLeft -= copyLength; - rb =read(fd, buffer, copyLength); - if(rb != copyLength) { - printf("Partition image extraction error"); - exit(EXIT_FAILURE); - } - rb = write(fd_new, buffer, copyLength); - if(rb != copyLength) { - printf("Partition image extraction error"); - exit(EXIT_FAILURE); - } - printf("\r\t%02d%%", (uint64_t)100 - (uint64_t)100*dataSizeLeft/partHeaders[i]->partitionSize); - } - printf("\n"); - close(fd_new); + char firmwareName[256]; + getString(pacHeader.firmwareName, firmwareName); + printf("Firmware name: %s\n", firmwareName); + + uint32_t curPos = pacHeader.partitionsListStart; + PartitionHeader** partHeaders = malloc(pacHeader.partitionCount * sizeof(PartitionHeader*)); + if (partHeaders == NULL) { + perror("Memory allocation failed for partition headers"); + close(fd); + exit(EXIT_FAILURE); + } + + for (int i = 0; i < pacHeader.partitionCount; i++) { + partHeaders[i] = readPartitionHeader(fd, &curPos); + + char partitionName[256]; + char fileName[512]; + getString(partHeaders[i]->partitionName, partitionName); + getString(partHeaders[i]->fileName, fileName); + printf("Partition name: %s\n\twith file name: %s\n\twith size %u\n", + partitionName, fileName, partHeaders[i]->partitionSize); + } + + for (int i = 0; i < pacHeader.partitionCount; i++) { + extractPartition(fd, partHeaders[i], outputPath); free(partHeaders[i]); } free(partHeaders); close(fd); return EXIT_SUCCESS; -} +} \ No newline at end of file From 6d6ebc1830ffde353f373e905f0ca4e99c3245c2 Mon Sep 17 00:00:00 2001 From: Rifat Azad <33044977+rifsxd@users.noreply.github.com> Date: Tue, 17 Sep 2024 04:10:23 +0600 Subject: [PATCH 2/5] update .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de7f8f9..c9d8649 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.vscode -*pacextractor \ No newline at end of file +*pacextractor +*.tar.gz +*ports \ No newline at end of file From f7badf441605c7174f47eb3e722abe21cb537f42 Mon Sep 17 00:00:00 2001 From: Rifat Azad <33044977+rifsxd@users.noreply.github.com> Date: Wed, 18 Sep 2024 06:27:50 +0600 Subject: [PATCH 3/5] added license --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..72f8a3d --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 LiteKite Startup + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file From a65d6e5be1a3c0bb31efbc4c90454e8aa1118a4a Mon Sep 17 00:00:00 2001 From: Rifat Azad <33044977+rifsxd@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:29:02 +0600 Subject: [PATCH 4/5] added -e (extract) -o (output) flags now the output supports recursive output path creation --- pacextractor.c | 122 +++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/pacextractor.c b/pacextractor.c index d73938b..6910652 100644 --- a/pacextractor.c +++ b/pacextractor.c @@ -8,7 +8,7 @@ #include #include -#define VERSION "1.0.0" +#define VERSION "1.1.0" typedef struct { int16_t someField[24]; @@ -51,7 +51,7 @@ static void getString(const int16_t* baseString, char* resString) { } static void printUsage(void) { - printf("Usage: pacextractor .pac \n"); + printf("Usage: pacextractor -e .pac -o \n"); printf("Options:\n"); printf(" -h Show this help message and exit\n"); printf(" -v Show version information and exit\n"); @@ -76,12 +76,25 @@ static int openFirmwareFile(const char* filePath) { } static void createOutputDirectory(const char* path) { - if (access(path, F_OK) == -1) { - if (mkdir(path, 0777) == -1) { + char temp[768]; + strcpy(temp, path); + for (char *p = temp; *p; p++) { + if (*p == '/') { + *p = 0; // Temporarily terminate the string + if (access(temp, F_OK) == -1) { + if (mkdir(temp, 0777) == -1) { + perror("Failed to create output directory"); + exit(EXIT_FAILURE); + } + } + *p = '/'; // Restore the string + } + } + if (access(temp, F_OK) == -1) { + if (mkdir(temp, 0777) == -1) { perror("Failed to create output directory"); exit(EXIT_FAILURE); } - printf("Created output directory: %s\n", path); } } @@ -198,7 +211,7 @@ static void extractPartition(int fd, const PartitionHeader* partHeader, const ch } int main(int argc, char** argv) { - if (argc < 2) { + if (argc < 5) { printUsageAndExit(); } @@ -208,60 +221,61 @@ int main(int argc, char** argv) { } else if (strcmp(argv[1], "-v") == 0) { printf("pacextractor version %s\n", VERSION); exit(EXIT_SUCCESS); - } - - if (argc < 3) { - printUsageAndExit(); - } + } else if (strcmp(argv[1], "-e") == 0 && strcmp(argv[3], "-o") == 0) { + // Process the extraction + int fd = openFirmwareFile(argv[2]); + + struct stat st; + if (fstat(fd, &st) == -1) { + perror("Error getting file stats"); + exit(EXIT_FAILURE); + } + int firmwareSize = st.st_size; + if (firmwareSize < sizeof(PacHeader)) { + fprintf(stderr, "File %s is not a valid firmware\n", argv[2]); + close(fd); + exit(EXIT_FAILURE); + } - int fd = openFirmwareFile(argv[1]); - - struct stat st; - if (fstat(fd, &st) == -1) { - perror("Error getting file stats"); - exit(EXIT_FAILURE); - } - int firmwareSize = st.st_size; - if (firmwareSize < sizeof(PacHeader)) { - fprintf(stderr, "file %s is not a valid firmware\n", argv[1]); - close(fd); - exit(EXIT_FAILURE); - } + char* outputPath = argv[4]; + createOutputDirectory(outputPath); - char* outputPath = argv[2]; - createOutputDirectory(outputPath); + PacHeader pacHeader = readPacHeader(fd); + + char firmwareName[256]; + getString(pacHeader.firmwareName, firmwareName); + printf("Firmware name: %s\n", firmwareName); + + uint32_t curPos = pacHeader.partitionsListStart; + PartitionHeader** partHeaders = malloc(pacHeader.partitionCount * sizeof(PartitionHeader*)); + if (partHeaders == NULL) { + perror("Memory allocation failed for partition headers"); + close(fd); + exit(EXIT_FAILURE); + } - PacHeader pacHeader = readPacHeader(fd); - - char firmwareName[256]; - getString(pacHeader.firmwareName, firmwareName); - printf("Firmware name: %s\n", firmwareName); + for (int i = 0; i < pacHeader.partitionCount; i++) { + partHeaders[i] = readPartitionHeader(fd, &curPos); + + char partitionName[256]; + char fileName[512]; + getString(partHeaders[i]->partitionName, partitionName); + getString(partHeaders[i]->fileName, fileName); + printf("Partition name: %s\n\twith file name: %s\n\twith size %u\n", + partitionName, fileName, partHeaders[i]->partitionSize); + } - uint32_t curPos = pacHeader.partitionsListStart; - PartitionHeader** partHeaders = malloc(pacHeader.partitionCount * sizeof(PartitionHeader*)); - if (partHeaders == NULL) { - perror("Memory allocation failed for partition headers"); + for (int i = 0; i < pacHeader.partitionCount; i++) { + extractPartition(fd, partHeaders[i], outputPath); + free(partHeaders[i]); + } + free(partHeaders); close(fd); - exit(EXIT_FAILURE); - } - - for (int i = 0; i < pacHeader.partitionCount; i++) { - partHeaders[i] = readPartitionHeader(fd, &curPos); - char partitionName[256]; - char fileName[512]; - getString(partHeaders[i]->partitionName, partitionName); - getString(partHeaders[i]->fileName, fileName); - printf("Partition name: %s\n\twith file name: %s\n\twith size %u\n", - partitionName, fileName, partHeaders[i]->partitionSize); + return EXIT_SUCCESS; + } else { + printUsageAndExit(); } - for (int i = 0; i < pacHeader.partitionCount; i++) { - extractPartition(fd, partHeaders[i], outputPath); - free(partHeaders[i]); - } - free(partHeaders); - close(fd); - return EXIT_SUCCESS; -} \ No newline at end of file +} From 56cd7d34b2d79167f502292d5b7f8e555e696f52 Mon Sep 17 00:00:00 2001 From: Rifat Azad Date: Sat, 28 Sep 2024 14:36:46 +0600 Subject: [PATCH 5/5] added pretty progression color --- pacextractor.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pacextractor.c b/pacextractor.c index 6910652..140b549 100644 --- a/pacextractor.c +++ b/pacextractor.c @@ -137,13 +137,24 @@ static void printProgressBar(uint32_t completed, uint32_t total) { float progress = (float)completed / total; int pos = barWidth * progress; - printf("\r["); + // Determine color based on progress + const char* color; + if (progress < 0.5) { + color = "\033[31m"; // Red + } else if (progress < 0.8) { + color = "\033[33m"; // Yellow + } else { + color = "\033[32m"; // Green + } + const char* reset = "\033[0m"; // Reset color + + printf("\r[%s", color); for (int i = 0; i < barWidth; ++i) { if (i < pos) printf("="); else if (i == pos) printf(">"); else printf(" "); } - printf("] %.2f%%", progress * 100.0); + printf("]%s %.2f%%", reset, progress * 100.0); fflush(stdout); }