repack: update repacking
This will support updating the ramdisk to a different
compression format and co-exist with magisk.
We are also moving twrp repacking to its own class. We
check the new ramdisk format and if it's different
we have magisk compress using the new ramdisk format.
Change-Id: I770030aae7797e75817178b2f0fccd9f39dc23af
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index e77d1eb..983d277 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -66,12 +66,15 @@
struct selabel_handle *selinux_handle;
/* Execute a command */
-int TWFunc::Exec_Cmd(const string& cmd, string &result) {
+int TWFunc::Exec_Cmd(const string& cmd, string &result, bool combine_stderr) {
FILE* exec;
char buffer[130];
int ret = 0;
- exec = __popen(cmd.c_str(), "r");
- if (!exec) return -1;
+ std::string popen_cmd = cmd;
+ if (combine_stderr)
+ popen_cmd = cmd + " 2>&1";
+ exec = __popen(popen_cmd.c_str(), "r");
+
while (!feof(exec)) {
if (fgets(buffer, 128, exec) != NULL) {
result += buffer;
@@ -521,7 +524,7 @@
if (type == COMPRESSED) {
std::string destFileBuffer;
std::string getCompressedContents = "pigz -c -d " + Destination;
- if (Exec_Cmd(getCompressedContents, destFileBuffer) < 0) {
+ if (Exec_Cmd(getCompressedContents, destFileBuffer, false) < 0) {
LOGINFO("Unable to get destination logfile contents.\n");
return;
}
@@ -1222,7 +1225,7 @@
std::string dmesgCmd = "/sbin/dmesg";
std::string result;
- Exec_Cmd(dmesgCmd, result);
+ Exec_Cmd(dmesgCmd, result, false);
write_to_file(dmesgDst, result);
gui_msg(Msg("copy_kernel_log=Copied kernel log to {1}")(dmesgDst));
tw_set_default_metadata(dmesgDst.c_str());