PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of blkid output

Browse Source 
Fixed handling of blkid output when the output spans multiple
lines and the TYPE field ended up on next line.
This commit is contained in:
Dees_Troy
2013-01-18 21:05:47 +00:00
parent d4b22b0f4f
commit 4bb33ac46b
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
partition.cpp
+14 -15
View File
@@ -997,6 +997,7 @@ void TWPartition::Check_FS_Type() {
char* blk;
char* arg;
char* ptr;
int type_found = 0;
if (Fstab_File_System == "yaffs2" || Fstab_File_System == "mtd" || Fstab_File_System == "bml" || Ignore_Blkid)
return; // Running blkid on some mtd devices causes a massive crash or needs to be skipped
@@ -1025,35 +1026,33 @@ void TWPartition::Check_FS_Type() {
{
arg = ptr;
while (*ptr > 32) ptr++;
if (*ptr != 0)
{
if (*ptr != 0) {
*ptr = 0;
ptr++;
}
if (strlen(arg) > 6)
{
if (memcmp(arg, "TYPE=\"", 6) == 0) break;
if (strlen(arg) > 6) {
if (memcmp(arg, "TYPE=\"", 6) == 0) {
type_found = 1;
break;
}
}
if (*ptr == 0)
{
if (*ptr == 0) {
arg = NULL;
break;
}
}
if (arg && strlen(arg) > 7)
{
if (type_found) {
arg += 6; // Skip the TYPE=" portion
arg[strlen(arg)-1] = '\0'; // Drop the tail quote
}
else
if (Current_File_System != arg) {
LOGI("'%s' was '%s' now set to '%s'\n", Mount_Point.c_str(), Current_File_System.c_str(), arg);
Current_File_System = arg;
}
} else
continue;
if (Current_File_System != arg) {
LOGI("'%s' was '%s' now set to '%s'\n", Mount_Point.c_str(), Current_File_System.c_str(), arg);
Current_File_System = arg;
}
}
return;
}