gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3

Browse Source 
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
gugelfrei
Android Build Merger (Role) 6 years ago
parent 2403b4d056 98bb129cd3
commit 0c5a0d65c9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
Utils.cpp
Unescape View File

@ -211,17 +211,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType,
for (auto line : output) { for (auto line : output) {
// Extract values from blkid output, if defined // Extract values from blkid output, if defined
const char* cline = line.c_str(); const char* cline = line.c_str();
char* start = strstr(cline, "TYPE="); char* start = strstr(cline, "TYPE=\"");
if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
fsType = value; fsType = value;
} }
start = strstr(cline, "UUID="); start = strstr(cline, "UUID=\"");
if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
fsUuid = value; fsUuid = value;
} }
start = strstr(cline, "LABEL="); start = strstr(cline, "LABEL=\"");
if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) { if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) {
fsLabel = value; fsLabel = value;
} }

Write Preview
Loading…
Cancel
Save