Merge pull request 'Improve UUID parsing' (#78) from hannesbraun/reHDD:master into master
Reviewed-on: #78 Reviewed-by: Hendrik Schutter <localhorst@mosad.xyz>
This commit is contained in:
@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user