localhorst/reHDD
1
0
Fork 1
Code Issues 6 Pull Requests 2 Releases 10 Wiki Activity

filter drives only based on UUID

Browse Source
This commit is contained in:
Hendrik Schutter
2022-01-26 19:21:38 +01:00
parent 84e42a430b
commit 25d8ca6920
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/reHDD.cpp
View File

@ -322,29 +322,30 @@ void reHDD::searchDrives(list <Drive>* plistDrives)
*/
void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
{
string sDelimiter = ":";
string sIgnoredDrivePath;
//string sDelimiter = ":";
// string sIgnoredDrivePath;
string sIgnoredDriveUUID;
list<tuple<string, string>> vtlIgnoredDevices; //store drives from ingnore file
list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
ifstream input( "ignoreDrives.conf" ); //read ingnore file
for(string sLine; getline( input, sLine );)
{
if (string(sLine).find("/dev/sd") != string::npos)
{
size_t pos = 0;
string token;
while ((pos = sLine.find(sDelimiter)) != string::npos)
{
token = sLine.substr(0, pos);
sIgnoredDrivePath = token;
sLine.erase(0, pos + sDelimiter.length());
// if (string(sLine).find("/dev/sd") != string::npos)
// {
//size_t pos = 0;
//string token;
// while ((pos = sLine.find(sDelimiter)) != string::npos)
// {
//token = sLine.substr(0, pos);
//sIgnoredDrivePath = token;
//sLine.erase(0, pos + sDelimiter.length());
sIgnoredDriveUUID = sLine;
} //end while
vtlIgnoredDevices.emplace_back(sIgnoredDrivePath, sIgnoredDriveUUID); //add found path and uuid from ignore file to vector
}
// } //end while
Logger::logThis()->info("read uuid: " + sIgnoredDriveUUID);
vtlIgnoredDevices.emplace_back(sIgnoredDriveUUID); //add found path and uuid from ignore file to vector
// }
}
//loop through found entries in ingnore file
for(auto row : vtlIgnoredDevices)
@ -353,8 +354,8 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
string sUUID;
if (!get<0>(row).compare(it->getPath())) //find same drive based on path
{
//if (!get<0>(row).compare(it->getPath())) //find same drive based on path
// {
char * cLine = NULL;
size_t len = 0;
string sCMD = "blkid ";
@ -380,11 +381,11 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
pclose(outputfileBlkid);
//cout << "blkid uuid:" << sUUID << endl;
if (get<1>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
if (get<0>(row).compare(sUUID)) //compare uuid from ignore file and uuid from drive
{
cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
Logger::logThis()->error("[ERROR] different uuid found than in ignore file: " + it->getPath() + " uuid from drive: " + sUUID);
exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
//cout << "[ERROR] different uuid found than in ignore file:" << it->getPath() << endl;
//Logger::logThis()->error("different uuid found than in ignore file: " + it->getPath() + " uuid from drive: " + sUUID);
//exit(EXIT_FAILURE); // exit to prevent accidentally shred a system drive
}
else
{
@ -395,7 +396,7 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
it = plistDrives->erase(it);
it--;
}
}
// }
}
}
}