diff options
| -rw-r--r-- | partition.cpp | 6 | ||||
| -rw-r--r-- | twrp-functions.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/partition.cpp b/partition.cpp index 6c1c3e50b..2195d9d38 100644 --- a/partition.cpp +++ b/partition.cpp @@ -864,7 +864,7 @@ bool TWPartition::Find_Partition_Size(void) { char label[32], device[32]; unsigned long size = 0; - sscanf(line, "%s %lx %*lx %*lu %s", label, &size, device); + sscanf(line, "%s %lx %*x %*u %s", label, &size, device); // Skip header, annotation and blank lines if ((strncmp(device, "/dev/", 5) != 0) || (strlen(line) < 8)) @@ -1391,13 +1391,13 @@ string TWPartition::Get_Restore_File_System(string restore_folder) { first_period = Backup_FileName.find("."); if (first_period == string::npos) { LOGERR("Unable to find file system (first period).\n"); - return false; + return string(); } Restore_File_System = Backup_FileName.substr(first_period + 1, Backup_FileName.size() - first_period - 1); second_period = Restore_File_System.find("."); if (second_period == string::npos) { LOGERR("Unable to find file system (second period).\n"); - return false; + return string(); } Restore_File_System.resize(second_period); LOGINFO("Restore file system is: '%s'.\n", Restore_File_System.c_str()); diff --git a/twrp-functions.cpp b/twrp-functions.cpp index 89714dd7d..b96245751 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -66,7 +66,7 @@ int TWFunc::Exec_Cmd(const string& cmd, string &result) { memset(&buffer, 0, sizeof(buffer)); if (fgets(buffer, 128, exec) != NULL) { buffer[128] = '\n'; - buffer[129] = NULL; + buffer[129] = 0; result += buffer; } } |