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

change drive filter for system drive #36

Merged
localhorst merged 2 commits from develop into master 2022-01-26 19:34:38 +01:00
Conversation 0 Commits 2 Files Changed 1 +29 -54
1 changed files with 29 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/reHDD.cpp
View File

@ -322,29 +322,13 @@ void reHDD::searchDrives(list <Drive>* plistDrives)
*/ */
void reHDD::filterIgnoredDrives(list <Drive>* plistDrives) void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
{ {
string sDelimiter = ":"; list<tuple<string>> vtlIgnoredDevices; //store drives from ingnore file
string sIgnoredDrivePath;
string sIgnoredDriveUUID;
list<tuple<string, string>> vtlIgnoredDevices; //store drives from ingnore file
ifstream input( "ignoreDrives.conf" ); //read ingnore file ifstream input( "ignoreDrives.conf" ); //read ingnore file
for(string sLine; getline( input, sLine );) for(string sLine; getline( input, sLine );)
{ {
if (string(sLine).find("/dev/sd") != string::npos) Logger::logThis()->info("read uuid: " + sLine);
{ vtlIgnoredDevices.emplace_back(sLine); //add found path and uuid from ignore file to vector
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
}
} }
//loop through found entries in ingnore file //loop through found entries in ingnore file
for(auto row : vtlIgnoredDevices) for(auto row : vtlIgnoredDevices)
@ -353,48 +337,39 @@ void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
for (it = plistDrives->begin(); it != plistDrives->end(); ++it) for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{ {
string sUUID; string sUUID;
if (!get<0>(row).compare(it->getPath())) //find same drive based on path char * cLine = NULL;
size_t len = 0;
string sCMD = "blkid ";
sCMD.append(it->getPath());
//cout << "cmd: " << sCMD << endl;
FILE* outputfileBlkid = popen(sCMD.c_str(), "r"); //get UUID from drive
if (outputfileBlkid == NULL)
{ {
char * cLine = NULL; exit(EXIT_FAILURE);
size_t len = 0; }
string sCMD = "blkid ";
sCMD.append(it->getPath());
//cout << "cmd: " << sCMD << endl;
FILE* outputfileBlkid = popen(sCMD.c_str(), "r"); //get UUID from drive
if (outputfileBlkid == NULL)
{
exit(EXIT_FAILURE);
}
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)
{ {
if (string(cLine).find("PTUUID") != string::npos) string sBlkidOut = string(cLine);
{ sBlkidOut.erase(0, 18);
string sBlkidOut = string(cLine); sBlkidOut.erase(36, sBlkidOut.length() - 36);
sBlkidOut.erase(0, 18); sUUID = sBlkidOut;
sBlkidOut.erase(36, sBlkidOut.length() - 36); //cout << "blkid uuid:" << sUUID << endl;
sUUID = sBlkidOut;
//cout << "blkid uuid:" << sUUID << endl;
}
} }
pclose(outputfileBlkid); }
//cout << "blkid uuid:" << sUUID << endl; 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; // same uuid found than in ignore file --> ignore this drive
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
}
else
{
// same uuid found than in ignore file --> ignore this drive
#ifdef LOG_LEVEL_HIGH #ifdef LOG_LEVEL_HIGH
Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath()); Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
#endif #endif
it = plistDrives->erase(it); it = plistDrives->erase(it);
it--; it--;
}
} }
} }
} }