localhorst/reHDD
1
0
Fork 0
Code Issues 7 Pull Requests Releases 9 Wiki Activity

Disable delete after shred was once started. #69

Closed
localhorst wants to merge 4 commits from feature/block-delete-after-shred into master
pull from: feature/block-delete-after-shred
merge into: localhorst:master
Conversation 0 Commits 4 Files Changed 3 +10 -6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ad6a95c21b - Show all commits

14
src/delete.cpp
View File

@ -32,11 +32,15 @@ void Delete::deleteDrive(Drive *drive)
const char *cpComand = sCMD.c_str();
// cout << "delete: " << cpComand << endl;
FILE *deleteCmdOutput = popen(cpComand, "r");
while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
if (drive->bWasShredStarted == false)
{
// wipefs running
//only start delete if the drive was not shredded before
FILE *deleteCmdOutput = popen(cpComand, "r");
while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
{
// wipefs running
}
pclose(deleteCmdOutput);
}
pclose(deleteCmdOutput);
}

2
src/reHDD.cpp
View File

@ -585,7 +585,7 @@ void reHDD::handleEnter()
thread(ThreadShred, pTmpDrive).detach();
}
if ((getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED) && (getSelectedDrive()->bWasShredStarted == false))
if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
{
Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;