From 6e8c27a52b67e3474936113f897f309a0091910a Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 22 Dec 2016 17:55:57 -0600 Subject: Support v2 fstab format Auto detect and support both the v1 and v2 fstab formats Support putting TWRP style flags in a separate /etc/twrp.flags file twrp.flags format is the same as twrp.fstab (v1 with TWRP flags) Support using a wildcard in a block device and find all partitions: /usb-otg vfat /dev/block/sda* Support using sysfs entries (voldmanaged) and read uevents and scan for wildcard partitions from uevent data. (twvold?) May not be complete for some of the newer flags found in fstabs in newer build trees and there is a slim chance of a crash if the user removes a removable device while TWRP is performing actions. May need to add some kind of mutex to prevent the 2 threads from causing this crash. We need to start somewhere though and this change is pretty innocuous when not using a v2 fstab. Change-Id: I617d97c7db332cbe671a9d2b8ad98b3d9c4f03cc --- mtp/MtpMessage.hpp | 4 ++-- mtp/mtp_MtpServer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mtp') diff --git a/mtp/MtpMessage.hpp b/mtp/MtpMessage.hpp index 272da1743..31465d8c6 100644 --- a/mtp/MtpMessage.hpp +++ b/mtp/MtpMessage.hpp @@ -25,8 +25,8 @@ struct mtpmsg { int message_type; // 1 is add, 2 is remove, see above unsigned int storage_id; - const char* display; - const char* path; + char display[1024]; + char path[1024]; uint64_t maxFileSize; }; diff --git a/mtp/mtp_MtpServer.cpp b/mtp/mtp_MtpServer.cpp index 8d6038c77..1ebe5f55d 100644 --- a/mtp/mtp_MtpServer.cpp +++ b/mtp/mtp_MtpServer.cpp @@ -170,7 +170,7 @@ int twmtp_MtpServer::mtppipe_thread(void) if (mtp_message.storage_id) { long reserveSpace = 1; bool removable = false; - MtpStorage* storage = new MtpStorage(mtp_message.storage_id, mtp_message.path, mtp_message.display, reserveSpace, removable, mtp_message.maxFileSize, refserver); + MtpStorage* storage = new MtpStorage(mtp_message.storage_id, &mtp_message.path[0], &mtp_message.display[0], reserveSpace, removable, mtp_message.maxFileSize, refserver); server->addStorage(storage); MTPD("mtppipe done adding storage\n"); } else { -- cgit v1.2.3