Migrate to STL

native/jni/magiskboot/cpio.cpp

@@ -2,11 +2,14 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+#include <algorithm>
 
 #include "cpio.h"
 #include "utils.h"
 #include "logging.h"
 
+using namespace std;
+
 #define parse_align() lseek(fd, align(lseek(fd, 0, SEEK_CUR), 4), SEEK_SET)
 
 static uint32_t x8u(char *hex) {
@@ -40,8 +43,8 @@ cpio_entry::cpio_entry(int fd, cpio_newc_header &header) {
 	// rdevminor = x8u(header.rdevminor);
 	uint32_t namesize = x8u(header.namesize);
 	// check = x8u(header.check);
-	filename = CharArray(namesize);
-	xxread(fd, filename, filename.size());
+	filename.resize(namesize - 1);
+	xxread(fd, &filename[0], namesize);
 	parse_align();
 	if (filesize) {
 		data = xmalloc(filesize);
@@ -54,22 +57,13 @@ cpio_entry::~cpio_entry() {
 	free(data);
 }
 
-// Define the way to sort cpio_entry
-template<>
-int(*Vector<cpio_entry*>::_cmp)(cpio_entry*&, cpio_entry*&) = [](auto a, auto b) -> int {
-	if (a == b) return 0;
-	if (a == nullptr) return 1;
-	if (b == nullptr) return -1;
-	return a->filename.compare(b->filename);
-};
-
-
 cpio::cpio(const char *filename) {
 	int fd = open(filename, O_RDONLY);
 	if (fd < 0) return;
 	fprintf(stderr, "Loading cpio: [%s]\n", filename);
 	cpio_newc_header header;
 	cpio_entry *entry;
+	int i = 0;
 	while(xxread(fd, &header, sizeof(cpio_newc_header)) != -1) {
 		entry = new cpio_entry(fd, header);
 		if (entry->filename == "." || entry->filename == ".." || entry->filename == "TRAILER!!!") {
@@ -86,7 +80,7 @@ cpio::cpio(const char *filename) {
 
 cpio::~cpio() {
 	for (auto &e : arr)
-		if (e) delete e;
+		delete e;
 }
 
 #define dump_align() write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR), 4))
@@ -109,11 +103,11 @@ void cpio::dump(const char *file) {
 				0,          // e->devminor
 				0,          // e->rdevmajor
 				0,          // e->rdevminor
-				(uint32_t) e->filename.size(),
+				(uint32_t) e->filename.size() + 1,
 				0           // e->check
 		);
 		xwrite(fd, header, 110);
-		xwrite(fd, e->filename, e->filename.size());
+		xwrite(fd, e->filename.c_str(), e->filename.size() + 1);
 		dump_align();
 		if (e->filesize) {
 			xwrite(fd, e->data, e->filesize);
@@ -140,7 +134,7 @@ int cpio::find(const char *name) {
 }
 
 void cpio::insert(cpio_entry *e) {
-	int i = find(e->filename);
+	int i = find(e->filename.c_str());
 	if (i >= 0) {
 		delete arr[i];
 		arr[i] = e;
@@ -149,17 +143,12 @@ void cpio::insert(cpio_entry *e) {
 	}
 }
 
-void cpio::insert(Vector<cpio_entry *> &arr) {
-	for (auto &e : arr)
-		insert(e);
-}
-
 void cpio::rm(const char *name, bool r) {
 	size_t len = strlen(name);
 	for (auto &e : arr) {
 		if (!e)
 			continue;
-		if (e->filename.compare(name, len) == 0 &&
+		if (e->filename.compare(0, len, name) == 0 &&
 			((r && e->filename[len] == '/') || e->filename[len] == '\0')) {
 			fprintf(stderr, "Remove [%s]\n", e->filename.c_str());
 			delete e;
@@ -171,17 +160,15 @@ void cpio::rm(const char *name, bool r) {
 }
 
 void cpio::makedir(mode_t mode, const char *name) {
-	auto e = new cpio_entry();
+	auto e = new cpio_entry(name);
 	e->mode = S_IFDIR | mode;
-	e->filename = name;
 	insert(e);
 	fprintf(stderr, "Create directory [%s] (%04o)\n", name, mode);
 }
 
 void cpio::ln(const char *target, const char *name) {
-	auto e = new cpio_entry();
+	auto e = new cpio_entry(name);
 	e->mode = S_IFLNK;
-	e->filename = name;
 	e->filesize = strlen(target);
 	e->data = strdup(target);
 	insert(e);
@@ -190,9 +177,8 @@ void cpio::ln(const char *target, const char *name) {
 
 void cpio::add(mode_t mode, const char *name, const char *file) {
 	int fd = xopen(file, O_RDONLY);
-	auto e = new cpio_entry();
+	auto e = new cpio_entry(name);
 	e->mode = S_IFREG | mode;
-	e->filename = name;
 	e->filesize = lseek(fd, 0, SEEK_END);
 	lseek(fd, 0, SEEK_SET);
 	e->data = xmalloc(e->filesize);
@@ -239,17 +225,15 @@ static void extract_entry(cpio_entry *e, const char *file) {
 
 void cpio::extract() {
 	for (auto &e : arr) {
-		if (!e)
-			continue;
-		extract_entry(e, e->filename);
+		if (!e) continue;
+		extract_entry(e, e->filename.c_str());
 	}
 }
 
 bool cpio::extract(const char *name, const char *file) {
 	int i = find(name);
 	if (i > 0) {
-		auto e = arr[i];
-		extract_entry(e, file);
+		extract_entry(arr[i], file);
 		return true;
 	}
 	fprintf(stderr, "Cannot find the file entry [%s]\n", name);
@@ -257,7 +241,13 @@ bool cpio::extract(const char *name, const char *file) {
 }
 
 void cpio::sort() {
-	arr.sort();
+	std::sort(arr.begin(), arr.end(), [] (auto a, auto b) -> bool {
+		if (a == b || a == nullptr)
+			return false;
+		if (b == nullptr)
+			return true;
+		return a->filename.compare(b->filename) < 0;
+	});
 	while (arr.back() == nullptr)
 		arr.pop_back();
 }

native/jni/magiskboot/cpio.h

@@ -2,9 +2,8 @@
 #define _CPIO_H_
 
 #include <stdint.h>
-
-#include "Vector.h"
-#include "CharArray.h"
+#include <vector>
+#include <string>
 
 struct cpio_newc_header {
 	char magic[6];
@@ -38,17 +37,18 @@ struct cpio_entry {
 	// uint32_t namesize;
 	// uint32_t check;
 //	char *filename = nullptr;
-	CharArray filename;
+	std::string filename;
 	void *data = nullptr;
 
-	cpio_entry() {}
+	cpio_entry() = default;
+	explicit cpio_entry(const char *name) : filename(name) {}
 	cpio_entry(int fd, cpio_newc_header &header);
 	~cpio_entry();
 };
 
 class cpio {
 public:
-	cpio(const char *filename);
+	explicit cpio(const char *filename);
 	~cpio();
 	void dump(const char *file);
 	int find(const char *name);
@@ -57,14 +57,13 @@ public:
 	void makedir(mode_t mode, const char *name);
 	void ln(const char *target, const char *name);
 	void add(mode_t mode, const char *name, const char *file);
-	void insert(Vector<cpio_entry *> &arr);
 	bool mv(const char *from, const char *to);
 	void extract();
 	bool extract(const char *name, const char *file);
 	void sort();
 
 protected:
-	Vector<cpio_entry *> arr;
+	std::vector<cpio_entry *> arr;
 };
 
 #endif

native/jni/magiskboot/ramdisk.cpp

@@ -6,9 +6,11 @@
 #include "cpio.h"
 #include "utils.h"
 
+using namespace std;
+
 class magisk_cpio : public cpio {
 public:
-	magisk_cpio(const char *filename) : cpio(filename) {}
+	explicit magisk_cpio(const char *filename) : cpio(filename) {}
 	void patch(bool keepverity, bool keepforceencrypt);
 	int test();
 	char * sha1();
@@ -23,8 +25,8 @@ void magisk_cpio::patch(bool keepverity, bool keepforceencrypt) {
 		if (!e)
 			continue;
 		bool fstab = (!keepverity || !keepforceencrypt) &&
-				!e->filename.starts_with(".backup") &&
-					 e->filename.contains("fstab") && S_ISREG(e->mode);
+				!str_starts(e->filename, ".backup") &&
+				str_contains(e->filename, "fstab") && S_ISREG(e->mode);
 		if (!keepverity) {
 			if (fstab) {
 				patch_verity(&e->data, &e->filesize, 1);
@@ -98,7 +100,7 @@ char *magisk_cpio::sha1() {
 void magisk_cpio::restore() {
 	for (auto &e : arr) {
 		if (!e) continue;
-		if (e->filename.starts_with(".backup")) {
+		if (str_starts(e->filename, ".backup")) {
 			if (e->filename[7] == '\0') continue;
 			if (e->filename[8] == '.') {
 				if (strcmp(&e->filename[8], ".rmlist") == 0) {
@@ -106,7 +108,7 @@ void magisk_cpio::restore() {
 						rm((char *) e->data + pos, false);
 				}
 			} else {
-				mv(e->filename, e->filename + 8);
+				mv(e->filename.c_str(), &e->filename[8]);
 			}
 		}
 	}
@@ -120,17 +122,15 @@ void magisk_cpio::restore() {
 }
 
 void magisk_cpio::backup(const char *orig) {
-	Vector<cpio_entry*> bak;
+	vector<cpio_entry*> bak;
 	cpio_entry *m, *n, *rem;
 	char buf[PATH_MAX];
 
-	m = new cpio_entry();
-	m->filename = ".backup";
+	m = new cpio_entry(".backup");
 	m->mode = S_IFDIR;
 	bak.push_back(m);
 
-	rem = new cpio_entry();
-	rem->filename = ".backup/.rmlist";
+	rem = new cpio_entry(".backup/.rmlist");
 	rem->mode = S_IFREG;
 
 	magisk_cpio o(orig);
@@ -176,7 +176,7 @@ void magisk_cpio::backup(const char *orig) {
 			// Something new in ramdisk, record in rem
 			++j;
 			rem->data = xrealloc(rem->data, rem->filesize + n->filename.size());
-			memcpy((char *) rem->data + rem->filesize, n->filename, n->filename.size());
+			memcpy((char *) rem->data + rem->filesize, n->filename.c_str(), n->filename.size());
 			rem->filesize += n->filename.size();
 			fprintf(stderr, "Record new entry: [%s] -> [.backup/.rmlist]\n", n->filename.c_str());
 		}
@@ -196,7 +196,8 @@ void magisk_cpio::backup(const char *orig) {
 		delete rem;
 
 	if (bak.size() > 1)
-		insert(bak);
+		for (auto item : bak)
+			insert(item);
 }
 
 
@@ -249,11 +250,11 @@ int cpio_commands(int argc, char *argv[]) {
 				return 0;
 			}
 		} else if (cmdc == 3 && strcmp(cmdv[0], "mkdir") == 0) {
-			cpio.makedir(strtoul(cmdv[1], NULL, 8), cmdv[2]);
+			cpio.makedir(strtoul(cmdv[1], nullptr, 8), cmdv[2]);
 		} else if (cmdc == 3 && strcmp(cmdv[0], "ln") == 0) {
 			cpio.ln(cmdv[1], cmdv[2]);
 		} else if (cmdc == 4 && strcmp(cmdv[0], "add") == 0) {
-			cpio.add(strtoul(cmdv[1], NULL, 8), cmdv[2], cmdv[3]);
+			cpio.add(strtoul(cmdv[1], nullptr, 8), cmdv[2], cmdv[3]);
 		} else {
 			return 1;
 		}