Improve backup & wipe exclusion handling
Rename twrpDU.* to exclude.*
Remove global variable for du and replace with partition specific
variables.
Use separate exclusion lists for backups and wiping.
Clean up some includes
Fix some parenthesis in twrp.cpp that I messed up.
Note: twrpTarMain command line utility compiles but probably does
not work correctly yet due to not properly setting part_settings
Change-Id: Idec9c3e6a8782ba53f3420fa79ba33394f4f85fb
diff --git a/twrp.cpp b/twrp.cpp
index 8162659..3cd716f 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -45,7 +45,6 @@
#include "partitions.hpp"
#include "openrecoveryscript.hpp"
#include "variables.h"
-#include "twrpDU.hpp"
#ifdef TW_USE_NEW_MINADBD
#include "adb.h"
#else
@@ -64,7 +63,6 @@
TWPartitionManager PartitionManager;
int Log_Offset;
bool datamedia;
-twrpDU du;
static void Print_Prop(const char *key, const char *name, void *cookie) {
printf("%s=%s\n", key, name);
@@ -235,19 +233,19 @@
} else if (*argptr == 'p') {
Shutdown = true;
} else if (*argptr == 's') {
- if (strncmp(argptr, "send_intent", strlen("send_intent") == 0)) {
+ if (strncmp(argptr, "send_intent", strlen("send_intent")) == 0) {
ptr = argptr + strlen("send_intent") + 1;
Send_Intent = *ptr;
- } else if (strncmp(argptr, "security", strlen("security") == 0)) {
+ } else if (strncmp(argptr, "security", strlen("security")) == 0) {
LOGINFO("Security update\n");
- } else if (strncmp(argptr, "sideload", strlen("sideload") == 0)) {
+ } else if (strncmp(argptr, "sideload", strlen("sideload")) == 0) {
if (!OpenRecoveryScript::Insert_ORS_Command("sideload\n"))
break;
- } else if (strncmp(argptr, "stages", strlen("stages") == 0)) {
+ } else if (strncmp(argptr, "stages", strlen("stages")) == 0) {
LOGINFO("ignoring stages command\n");
}
} else if (*argptr == 'r') {
- if (strncmp(argptr, "reason", strlen("reason") == 0)) {
+ if (strncmp(argptr, "reason", strlen("reason")) == 0) {
ptr = argptr + strlen("reason") + 1;
gui_print("%s\n", ptr);
}