2 Commits

Author SHA1 Message Date
80ffb3c6c3 Merge pull request 'Improve UUID parsing' (#78) from hannesbraun/reHDD:master into master
Reviewed-on: #78
Reviewed-by: Hendrik Schutter <localhorst@mosad.xyz>
2025-12-07 18:15:28 +01:00
664582f01d Improve UUID parsing
The previous approach only worked if the drive name had three letters (usually sda).
2025-07-25 14:26:20 +02:00

View File

@ -409,10 +409,11 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid
{ {
if (string(cLine).find("PTUUID") != string::npos) size_t ptuuidPos = string(cLine).find("PTUUID");
if (ptuuidPos != string::npos)
{ {
string sBlkidOut = string(cLine); string sBlkidOut = string(cLine);
sBlkidOut.erase(0, 18); sBlkidOut.erase(0, ptuuidPos + 8);
sBlkidOut.erase(8, sBlkidOut.length()); sBlkidOut.erase(8, sBlkidOut.length());
sUUID = sBlkidOut; sUUID = sBlkidOut;
// cout << "blkid uuid:" << sUUID << endl; // cout << "blkid uuid:" << sUUID << endl;