Compare commits
No commits in common. "master" and "b1.1.0" have entirely different histories.
@ -9,7 +9,7 @@
|
||||
* process multiple drives at once
|
||||
|
||||
## Download USB Image ##
|
||||
See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable
|
||||
[2.5GB image v1.0.0](https://schuttercloud.com/s/ggxGH9sA326aRfK) (`wget` is your friend)
|
||||
|
||||
Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .
|
||||
|
||||
|
||||
17
astyle.sh
Normal file
17
astyle.sh
Normal file
@ -0,0 +1,17 @@
|
||||
#! /bin/bash
|
||||
|
||||
echo starting astyle for $PWD
|
||||
|
||||
astyle --style=gnu src/*.cpp
|
||||
rm -f src/*.orig
|
||||
|
||||
astyle --style=gnu src/logger/*.cpp
|
||||
rm -f src/logger/*.orig
|
||||
|
||||
astyle --style=gnu include/*.h
|
||||
rm -f include/*.orig
|
||||
|
||||
astyle --style=gnu include/logger/*.h
|
||||
rm -f include//logger/*.orig
|
||||
|
||||
echo finished astyle for $PWD
|
||||
@ -13,11 +13,13 @@
|
||||
class Delete
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
static void deleteDrive(Drive* drive);
|
||||
|
||||
private:
|
||||
Delete(void);
|
||||
|
||||
};
|
||||
|
||||
#endif // DELETE_H_
|
||||
|
||||
@ -14,9 +14,7 @@ class Drive
|
||||
{
|
||||
|
||||
public:
|
||||
enum TaskState
|
||||
{
|
||||
NONE,
|
||||
enum TaskState {NONE,
|
||||
SHRED_SELECTED,
|
||||
SHRED_ACTIVE, //shred iterations active
|
||||
CHECK_ACTIVE, //optional checking active
|
||||
@ -25,14 +23,6 @@ public:
|
||||
FROZEN
|
||||
} state;
|
||||
|
||||
enum ConnectionType
|
||||
{
|
||||
UNKNOWN,
|
||||
USB,
|
||||
SATA,
|
||||
NVME
|
||||
} connectionType;
|
||||
|
||||
struct
|
||||
{
|
||||
time_t u32ShredTimeDelta;
|
||||
@ -42,7 +32,6 @@ public:
|
||||
} sShredSpeed;
|
||||
|
||||
bool bWasShredded = false; //all shred iterations done
|
||||
bool bWasShredStarted = false; // shred was atleast once started
|
||||
bool bWasChecked = false; //all shred iterations and optional checking done
|
||||
bool bWasDeleted = false;
|
||||
bool bIsOffline = false;
|
||||
@ -71,6 +60,7 @@ private:
|
||||
void setTimestamp();
|
||||
|
||||
protected:
|
||||
|
||||
public:
|
||||
Drive(string path)
|
||||
{
|
||||
@ -111,6 +101,7 @@ public:
|
||||
|
||||
void calculateTaskDuration();
|
||||
time_t getTaskDuration();
|
||||
|
||||
};
|
||||
|
||||
#endif // DRIVE_H_
|
||||
@ -68,6 +68,7 @@ private:
|
||||
~Logger();
|
||||
|
||||
public:
|
||||
|
||||
void info(string s);
|
||||
void warning(string s);
|
||||
void error(string s);
|
||||
|
||||
@ -39,9 +39,11 @@ typedef struct
|
||||
t_driveData driveData;
|
||||
} t_msgQueueData;
|
||||
|
||||
|
||||
class Printer
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
static Printer* getPrinter();
|
||||
void print(Drive* drive);
|
||||
@ -52,5 +54,7 @@ private:
|
||||
int msqid;
|
||||
Printer();
|
||||
~Printer();
|
||||
|
||||
|
||||
};
|
||||
#endif // PRINTER_H_
|
||||
@ -8,7 +8,7 @@
|
||||
#ifndef REHDD_H_
|
||||
#define REHDD_H_
|
||||
|
||||
#define REHDD_VERSION "V1.2.0"
|
||||
#define REHDD_VERSION "bV1.1.0"
|
||||
|
||||
// Drive handling Settings
|
||||
#define WORSE_HOURS 19200 //mark drive if at this limit or beyond
|
||||
@ -20,9 +20,9 @@
|
||||
|
||||
// Logger Settings
|
||||
#define LOG_PATH "./reHDD.log"
|
||||
#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
|
||||
#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2022"
|
||||
#define DEVICE_ID "generic"
|
||||
#define SOFTWARE_VERSION REHDD_VERSION
|
||||
#define SOFTWARE_VERSION "alpha"
|
||||
#define HARDWARE_VERSION "generic"
|
||||
|
||||
//#define LOG_LEVEL_HIGH //log everything, like drive scan thread
|
||||
@ -31,7 +31,7 @@
|
||||
#endif
|
||||
|
||||
// Logic
|
||||
// #define DRYRUN // don't touch the drives
|
||||
//#define DRYRUN //don´t touch the drives
|
||||
#define FROZEN_ALERT //show alert if drive is frozen
|
||||
#define ZERO_CHECK //check drive after shred if all bytes are zero, show alert if this fails
|
||||
|
||||
@ -69,8 +69,7 @@ using namespace std;
|
||||
|
||||
extern Logger* logging;
|
||||
|
||||
template <typename T, typename I>
|
||||
T *iterator_to_pointer(I i)
|
||||
template <typename T, typename I> T* iterator_to_pointer(I i)
|
||||
{
|
||||
return (&(*i));
|
||||
}
|
||||
@ -78,18 +77,18 @@ T *iterator_to_pointer(I i)
|
||||
class reHDD
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
reHDD(void);
|
||||
static void app_logic();
|
||||
|
||||
private:
|
||||
|
||||
static void searchDrives(list <Drive>* plistDrives);
|
||||
static void printDrives(list <Drive>* plistDrives);
|
||||
static void startShredAllDrives(list <Drive>* plistDrives);
|
||||
static void stopShredAllDrives(list<Drive> *plistDrives);
|
||||
static void updateShredMetrics(list <Drive>* plistDrives);
|
||||
static void filterIgnoredDrives(list <Drive>* plistDrives);
|
||||
static void filterInvalidDrives(list<Drive> *plistDrives);
|
||||
static void filterNewDrives(list <Drive>* plistOldDrives, list <Drive>* plistNewDrives);
|
||||
static void addSMARTData(list <Drive>* plistDrives);
|
||||
static void ThreadScanDevices();
|
||||
@ -102,7 +101,6 @@ private:
|
||||
static void handleESC();
|
||||
static void handleAbort();
|
||||
static Drive* getSelectedDrive();
|
||||
static bool getSystemDrive(string &systemDrive);
|
||||
};
|
||||
|
||||
#endif // REHDD_H_
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
#define CHUNK_SIZE 1024*1024*32 //amount of bytes that are overwritten at once --> 32MB
|
||||
#define TFNG_DATA_SIZE CHUNK_SIZE //amount of bytes used by tfng
|
||||
|
||||
@ -30,7 +31,9 @@ typedef int fileDescriptor;
|
||||
class Shred
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
|
||||
Shred();
|
||||
~Shred();
|
||||
int shredDrive(Drive* drive, int* ipSignalFd);
|
||||
@ -50,6 +53,7 @@ private:
|
||||
unsigned long getDriveSizeInBytes(fileDescriptor file);
|
||||
unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
|
||||
void cleanup();
|
||||
|
||||
};
|
||||
|
||||
#endif // SHRED_H_
|
||||
|
||||
@ -13,21 +13,30 @@
|
||||
class SMART
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
static void readSMARTData(Drive* drive);
|
||||
|
||||
private:
|
||||
SMART(void);
|
||||
|
||||
static bool parseExitStatus(string sLine, uint8_t &status);
|
||||
static bool parseModelFamily(string sLine, string &modelFamily);
|
||||
static bool parseModelName(string sLine, string &modelName);
|
||||
static bool parseSerial(string sLine, string &serial);
|
||||
static bool parseCapacity(string sLine, uint64_t &capacity);
|
||||
static bool parseErrorCount(string sLine, uint32_t &errorCount);
|
||||
static bool parsePowerOnHours(string sLine, uint32_t &powerOnHours);
|
||||
static bool parsePowerCycles(string sLine, uint32_t &powerCycles);
|
||||
static bool parseTemperature(string sLine, uint32_t &temperature);
|
||||
static void parseModelFamily(string sLine);
|
||||
static void parseModelName(string sLine);
|
||||
static void parseSerial(string sLine);
|
||||
static void parseCapacity(string sLine);
|
||||
static void parseErrorCount(string sLine);
|
||||
static void parsePowerOnHours(string sLine);
|
||||
static void parsePowerCycle(string sLine);
|
||||
static void parseTemperature(string sLine);
|
||||
|
||||
static string modelFamily;
|
||||
static string modelName;
|
||||
static string serial;
|
||||
static uint64_t capacity;
|
||||
static uint32_t errorCount;
|
||||
static uint32_t powerOnHours;
|
||||
static uint32_t powerCycle;
|
||||
static uint32_t temperature;
|
||||
};
|
||||
|
||||
#endif // SMART_H_
|
||||
@ -20,20 +20,10 @@
|
||||
class TUI
|
||||
{
|
||||
protected:
|
||||
|
||||
public:
|
||||
enum UserInput
|
||||
{
|
||||
UpKey,
|
||||
DownKey,
|
||||
Abort,
|
||||
Shred,
|
||||
ShredAll,
|
||||
Delete,
|
||||
Enter,
|
||||
ESC,
|
||||
Terminate,
|
||||
Undefined
|
||||
};
|
||||
|
||||
enum UserInput { UpKey, DownKey, Abort, Shred, ShredAll, Delete, Enter, ESC, Undefined};
|
||||
struct MenuState
|
||||
{
|
||||
bool bAbort;
|
||||
@ -67,7 +57,7 @@ private:
|
||||
static WINDOW *createOverViewWindow( int iXSize, int iYSize);
|
||||
static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
|
||||
static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
|
||||
static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected);
|
||||
static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected);
|
||||
static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart);
|
||||
static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate);
|
||||
static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB);
|
||||
|
||||
4
makefile
4
makefile
@ -10,9 +10,9 @@ SRC_PATH = src
|
||||
# Space-separated pkg-config libraries used by this project
|
||||
LIBS = lib
|
||||
# General compiler flags
|
||||
COMPILE_FLAGS = -std=c++23 -Wall -Wextra -g
|
||||
COMPILE_FLAGS = -std=c++17 -Wall -Wextra -g
|
||||
# Additional release-specific flags
|
||||
RCOMPILE_FLAGS = -D NDEBUG -Ofast
|
||||
RCOMPILE_FLAGS = -D NDEBUG -O3
|
||||
# Additional debug-specific flags
|
||||
DCOMPILE_FLAGS = -D DEBUG
|
||||
# Add additional include paths
|
||||
|
||||
@ -32,9 +32,6 @@ void Delete::deleteDrive(Drive *drive)
|
||||
const char* cpComand = sCMD.c_str();
|
||||
//cout << "delete: " << cpComand << endl;
|
||||
|
||||
if (drive->bWasShredStarted == false)
|
||||
{
|
||||
//only start delete if the drive was not shredded before
|
||||
FILE* deleteCmdOutput = popen(cpComand, "r");
|
||||
|
||||
while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
|
||||
@ -43,4 +40,3 @@ void Delete::deleteDrive(Drive *drive)
|
||||
}
|
||||
pclose(deleteCmdOutput);
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,8 +98,7 @@ string Drive::sPowerCyclesToText()
|
||||
|
||||
string Drive::sTemperatureToText()
|
||||
{
|
||||
return to_string(getTemperature()) + " C";
|
||||
;
|
||||
return to_string(getTemperature())+" C";;
|
||||
}
|
||||
|
||||
void Drive::setTaskPercentage(double d32TaskPercentage)
|
||||
@ -115,6 +114,7 @@ double Drive::getTaskPercentage(void)
|
||||
return this->d32TaskPercentage;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* \brief set S.M.A.R.T. values in model
|
||||
* \param string modelFamily
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
* @date 04.09.2020
|
||||
*/
|
||||
|
||||
|
||||
#include "../../include/reHDD.h" //for logger settings
|
||||
#include "../../include/logger/logger.h"
|
||||
|
||||
@ -152,6 +153,7 @@ string Logger::getMacAddress()
|
||||
if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
|
||||
{
|
||||
strcpy(ifr.ifr_name, "eno1");
|
||||
|
||||
}
|
||||
|
||||
unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
|
||||
@ -227,3 +229,5 @@ Logger *Logger::logThis()
|
||||
return single; //return existing obj
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -58,13 +58,12 @@ void Printer::print(Drive *drive)
|
||||
if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))
|
||||
{
|
||||
Logger::logThis()->error("Printer: Send mgs queue failed!");
|
||||
}
|
||||
else
|
||||
{
|
||||
}else{
|
||||
Logger::logThis()->info("Printer: print triggered - Drive: " + drive->getSerial());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* \brief return a instance of the printer
|
||||
* \return printer obj
|
||||
|
||||
184
src/reHDD.cpp
184
src/reHDD.cpp
@ -107,7 +107,6 @@ void reHDD::ThreadScanDevices()
|
||||
searchDrives(&listNewDrives); //search for new drives and store them in list
|
||||
filterIgnoredDrives(&listNewDrives); //filter out ignored drives
|
||||
addSMARTData(&listNewDrives); //add S.M.A.R.T. Data to the drives
|
||||
filterInvalidDrives(&listNewDrives); // filter out drives that report zero capacity
|
||||
mxDrives.unlock();
|
||||
write(fdNewDrivesInformPipe[1], "A",1);
|
||||
sleep(5); //sleep 5 sec
|
||||
@ -197,12 +196,6 @@ void reHDD::ThreadUserInput()
|
||||
handleESC();
|
||||
ui->updateTUI(&listDrives, u8SelectedEntry);
|
||||
break;
|
||||
case TUI::UserInput::Terminate:
|
||||
cout << "Terminate" << endl;
|
||||
stopShredAllDrives(&listDrives);
|
||||
sleep(5); // sleep 5 sec
|
||||
std::exit(1); // Terminates main, doesn't wait for threads
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -306,51 +299,32 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
|
||||
* \param pointer of list <Drive>* plistDrives
|
||||
* \return void
|
||||
*/
|
||||
void reHDD::searchDrives(std::list<Drive> *plistDrives)
|
||||
void reHDD::searchDrives(list <Drive>* plistDrives)
|
||||
{
|
||||
FILE *fp = popen("lsblk -d -n -o NAME,TRAN", "r");
|
||||
if (!fp)
|
||||
//Logger::logThis()->info("--> search drives <--");
|
||||
char * cLine = NULL;
|
||||
size_t len = 0;
|
||||
|
||||
FILE* outputfileHwinfo = popen("lsblk -I 8 -d -o NAME", "r");
|
||||
|
||||
if (outputfileHwinfo == NULL)
|
||||
{
|
||||
Logger::logThis()->error("Unable to execute lsblk to scan drives");
|
||||
Logger::logThis()->error("Unable to scan attached drives");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
char line[256];
|
||||
while (fgets(line, sizeof(line), fp))
|
||||
while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
|
||||
{
|
||||
std::string devName, transport;
|
||||
std::istringstream iss(line);
|
||||
iss >> devName >> transport;
|
||||
|
||||
if (devName.empty())
|
||||
continue;
|
||||
|
||||
Drive *tmpDrive = new Drive("/dev/" + devName);
|
||||
if (string(cLine).length() == 4)
|
||||
{
|
||||
Drive* tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
|
||||
tmpDrive->state = Drive::NONE;
|
||||
tmpDrive->bIsOffline = false;
|
||||
|
||||
// Set connection type
|
||||
if (transport == "sata")
|
||||
tmpDrive->connectionType = Drive::SATA;
|
||||
else if (transport == "usb")
|
||||
tmpDrive->connectionType = Drive::USB;
|
||||
else if (transport == "nvme")
|
||||
tmpDrive->connectionType = Drive::NVME;
|
||||
else
|
||||
tmpDrive->connectionType = Drive::UNKNOWN;
|
||||
|
||||
plistDrives->push_back(*tmpDrive);
|
||||
|
||||
Logger::logThis()->info(
|
||||
"Drive found: " + tmpDrive->getPath() +
|
||||
" (type: " +
|
||||
(tmpDrive->connectionType == Drive::USB ? "USB" : tmpDrive->connectionType == Drive::SATA ? "SATA"
|
||||
: tmpDrive->connectionType == Drive::NVME ? "NVME"
|
||||
: "UNKNOWN") +
|
||||
")");
|
||||
//Logger::logThis()->info("drive found: " + tmpDrive->getPath());
|
||||
}
|
||||
|
||||
pclose(fp);
|
||||
}
|
||||
pclose(outputfileHwinfo);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -360,26 +334,6 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
|
||||
*/
|
||||
void reHDD::filterIgnoredDrives(list <Drive>* plistDrives)
|
||||
{
|
||||
string systemDrivePath;
|
||||
if (getSystemDrive(systemDrivePath))
|
||||
{
|
||||
// Logger::logThis()->info("Found system drive: " + systemDrivePath);
|
||||
|
||||
list<Drive>::iterator it;
|
||||
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
|
||||
{
|
||||
if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
|
||||
{
|
||||
// system drive found --> ignore this drive
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
|
||||
#endif
|
||||
it = plistDrives->erase(it);
|
||||
it--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
list<tuple<string>> vtlIgnoredDevices; //store drives from ignore file
|
||||
ifstream input( "ignoreDrives.conf" ); //read ignore file
|
||||
|
||||
@ -433,27 +387,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief filter out drives that are not indented for processing
|
||||
* \param pointer of list <Drive>* plistDrives
|
||||
* \return void
|
||||
*/
|
||||
void reHDD::filterInvalidDrives(list<Drive> *plistDrives)
|
||||
{
|
||||
list<Drive>::iterator it;
|
||||
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
|
||||
{
|
||||
if (it->getCapacity() == 0U)
|
||||
{
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath());
|
||||
#endif
|
||||
it = plistDrives->erase(it);
|
||||
it--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief start shred for all drives
|
||||
* \param pointer of list <Drive>* plistDrives
|
||||
@ -480,34 +413,6 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
|
||||
mxDrives.unlock();
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief stop shred for all drives
|
||||
* \param pointer of list <Drive>* plistDrives
|
||||
* \return void
|
||||
*/
|
||||
void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
|
||||
{
|
||||
list<Drive>::iterator it;
|
||||
mxDrives.lock();
|
||||
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
|
||||
{
|
||||
|
||||
if (it->state == Drive::SHRED_ACTIVE || it->state == Drive::DELETE_ACTIVE)
|
||||
{
|
||||
it->state = Drive::NONE;
|
||||
Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
|
||||
// task for drive is running --> remove selection
|
||||
}
|
||||
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
ostringstream address;
|
||||
address << (void const *)&(*it);
|
||||
Logger::logThis()->info("Started shred (all) for: " + it->getModelName() + "-" + it->getSerial() + " @" + address.str());
|
||||
#endif
|
||||
}
|
||||
mxDrives.unlock();
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief print drives with all information
|
||||
* \param pointer of list <Drive>* plistDrives
|
||||
@ -624,7 +529,7 @@ void reHDD::handleEnter()
|
||||
{
|
||||
Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
|
||||
getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
|
||||
// task for drive is running --> don't show more task options
|
||||
//task for drive is running --> don´t show more task options
|
||||
Drive* pTmpDrive = getSelectedDrive();
|
||||
thread(ThreadShred, pTmpDrive).detach();
|
||||
}
|
||||
@ -633,7 +538,7 @@ void reHDD::handleEnter()
|
||||
{
|
||||
Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
|
||||
getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
|
||||
// task for drive is running --> don't show more task options
|
||||
//task for drive is running --> don´t show more task options
|
||||
thread(ThreadDelete).detach();
|
||||
}
|
||||
}
|
||||
@ -670,58 +575,5 @@ void reHDD::handleAbort()
|
||||
}
|
||||
}
|
||||
|
||||
bool reHDD::getSystemDrive(string &systemDrive)
|
||||
{
|
||||
char *cLine = NULL;
|
||||
size_t len = 0;
|
||||
bool systemDriveFound = false;
|
||||
|
||||
FILE *outputfileHwinfo = popen("lsblk -e 11 -o NAME,MOUNTPOINT", "r");
|
||||
|
||||
if (outputfileHwinfo == NULL)
|
||||
{
|
||||
Logger::logThis()->error("Unable to scan attached drives for system drive");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
|
||||
{
|
||||
string currentLine = cLine;
|
||||
|
||||
if (currentLine.find("NAME") != std::string::npos)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Logger::logThis()->info(currentLine);
|
||||
|
||||
if ((cLine[0U] != '|') && (cLine[0U] != '`'))
|
||||
{
|
||||
systemDrive = currentLine;
|
||||
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end()); // remove newline
|
||||
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), ' '), systemDrive.end()); // remove spaces
|
||||
// Logger::logThis()->info("Drive found: " + systemDrive);
|
||||
}
|
||||
|
||||
if (currentLine.ends_with(" /boot/efi\n"s))
|
||||
{
|
||||
systemDriveFound = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (currentLine.ends_with(" /run/overlay/live\n"s))
|
||||
{
|
||||
systemDriveFound = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (currentLine.ends_with(" /\n"s))
|
||||
{
|
||||
systemDriveFound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
pclose(outputfileHwinfo);
|
||||
|
||||
return systemDriveFound;
|
||||
}
|
||||
@ -8,8 +8,7 @@
|
||||
#include "../include/reHDD.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
extern "C" {
|
||||
#endif
|
||||
#include "../tfnoisegen/tfprng.h"
|
||||
#ifdef __cplusplus
|
||||
@ -36,7 +35,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
|
||||
ostringstream address;
|
||||
address << (void const *)&(*drive);
|
||||
Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
|
||||
drive->bWasShredStarted = true; //Mark drive as partly shredded
|
||||
|
||||
#ifdef DRYRUN
|
||||
for(int i = 0; i<=500; i++)
|
||||
@ -49,7 +47,6 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
|
||||
write(*ipSignalFd, "A",1);
|
||||
usleep(20000);
|
||||
}
|
||||
drive->bWasShredded = true;
|
||||
#endif
|
||||
|
||||
#ifndef DRYRUN
|
||||
@ -92,7 +89,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
|
||||
tfng_prng_seedkey(ucKey);
|
||||
|
||||
this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
|
||||
drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
|
||||
drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();; //set inital timestamp for speed metric
|
||||
drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; //uses to calculate speed metric
|
||||
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
@ -187,7 +184,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
|
||||
Logger::logThis()->info("Check-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
|
||||
drive->u32DriveChecksumAfterShredding = uiCalcChecksum(driveFileDiscr, drive, ipSignalFd);
|
||||
#ifdef LOG_LEVEL_HIGH
|
||||
if (drive->u32DriveChecksumAfterShredding != 0)
|
||||
if (drive->u32DriveChecksumAferShredding != 0)
|
||||
{
|
||||
Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
|
||||
}
|
||||
|
||||
197
src/smart.cpp
197
src/smart.cpp
@ -7,6 +7,15 @@
|
||||
|
||||
#include "../include/reHDD.h"
|
||||
|
||||
string SMART::modelFamily;
|
||||
string SMART::modelName;
|
||||
string SMART::serial;
|
||||
uint64_t SMART::capacity = 0U;
|
||||
uint32_t SMART::errorCount = 0U;
|
||||
uint32_t SMART::powerOnHours = 0U;
|
||||
uint32_t SMART::powerCycle = 0U;
|
||||
uint32_t SMART::temperature = 0U;
|
||||
|
||||
/**
|
||||
* \brief get and set S.M.A.R.T. values in Drive
|
||||
* \param pointer of Drive instance
|
||||
@ -14,138 +23,81 @@
|
||||
*/
|
||||
void SMART::readSMARTData(Drive* drive)
|
||||
{
|
||||
string modelFamily;
|
||||
string modelName;
|
||||
string serial;
|
||||
uint64_t capacity = 0U;
|
||||
uint32_t errorCount = 0U;
|
||||
uint32_t powerOnHours = 0U;
|
||||
uint32_t powerCycles = 0U;
|
||||
uint32_t temperature = 0U;
|
||||
|
||||
modelFamily.clear();
|
||||
modelName.clear();
|
||||
serial.clear();
|
||||
capacity = 0U;
|
||||
errorCount = 0U;
|
||||
powerOnHours = 0U;
|
||||
powerCycle = 0U;
|
||||
temperature = 0U;
|
||||
|
||||
string sSmartctlCommands[] = {" --json -a ", " --json -d sntjmicron -a ", " --json -d sntasmedia -a ", " --json -d sntrealtek -a ", " --json -d sat -a "};
|
||||
size_t len = 0; //lenght of found line
|
||||
char* cLine = NULL; //found line
|
||||
|
||||
for (string sSmartctlCommand : sSmartctlCommands)
|
||||
{
|
||||
string sCMD = ("smartctl");
|
||||
sCMD.append(sSmartctlCommand);
|
||||
string sCMD = ("smartctl --json -a ");
|
||||
sCMD.append(drive->getPath());
|
||||
const char* cpComand = sCMD.c_str();
|
||||
|
||||
//Logger::logThis()->info(cpComand);
|
||||
|
||||
FILE* outputfileSmart = popen(cpComand, "r");
|
||||
size_t len = 0U; // length of found line
|
||||
char *cLine = NULL; // found line
|
||||
uint8_t status = 255U;
|
||||
|
||||
while ((getline(&cLine, &len, outputfileSmart)) != -1)
|
||||
{
|
||||
string sLine = string(cLine);
|
||||
|
||||
SMART::parseExitStatus(sLine, status);
|
||||
SMART::parseModelFamily(sLine, modelFamily);
|
||||
SMART::parseModelName(sLine, modelName);
|
||||
SMART::parseSerial(sLine, serial);
|
||||
SMART::parseCapacity(sLine, capacity);
|
||||
SMART::parseErrorCount(sLine, errorCount);
|
||||
SMART::parsePowerOnHours(sLine, powerOnHours);
|
||||
SMART::parsePowerCycles(sLine, powerCycles);
|
||||
SMART::parseTemperature(sLine, temperature);
|
||||
SMART::parseModelFamily(sLine);
|
||||
SMART::parseModelName(sLine);
|
||||
SMART::parseSerial(sLine);
|
||||
SMART::parseCapacity(sLine);
|
||||
SMART::parseErrorCount(sLine);
|
||||
SMART::parsePowerOnHours(sLine);
|
||||
SMART::parsePowerCycle(sLine);
|
||||
SMART::parseTemperature(sLine);
|
||||
}
|
||||
|
||||
pclose(outputfileSmart);
|
||||
|
||||
if (status == 0U)
|
||||
{
|
||||
// Found S.M.A.R.T. data with this command
|
||||
//Logger::logThis()->info("Found S.M.A.R.T. data with this command");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycles, temperature); // write data in drive
|
||||
drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycle, temperature); //wirte data in drive
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse ExitStatus
|
||||
* \brief parse ModelFamiliy
|
||||
* \param string output line of smartctl
|
||||
* \param uint8_t parsed status
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseExitStatus(string sLine, uint8_t &status)
|
||||
{
|
||||
string search("\"exit_status\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found != string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 1U);
|
||||
status = stol(sLine);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse ModelFamily
|
||||
* \param string output line of smartctl
|
||||
* \param string parsed model family
|
||||
* \return bool if parsing was possible
|
||||
*/
|
||||
bool SMART::parseModelFamily(string sLine, string &modelFamily)
|
||||
void SMART::parseModelFamily(string sLine)
|
||||
{
|
||||
string search("\"model_family\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found!=string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 3U);
|
||||
sLine.erase(sLine.length() - 3U, 3U);
|
||||
sLine.erase(0, sLine.find(": ") + 3);
|
||||
sLine.erase(sLine.length()-3, 3);
|
||||
modelFamily = sLine;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse ModelName
|
||||
* \param string output line of smartctl
|
||||
* \param string parsed model name
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseModelName(string sLine, string &modelName)
|
||||
void SMART::parseModelName(string sLine)
|
||||
{
|
||||
string search("\"model_name\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found!=string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 3U);
|
||||
sLine.erase(sLine.length() - 3U, 3U);
|
||||
sLine.erase(0, sLine.find(": ") + 3);
|
||||
sLine.erase(sLine.length()-3, 3);
|
||||
modelName = sLine;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse Serial
|
||||
* \param string output line of smartctl
|
||||
* \param string parsed serial
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseSerial(string sLine, string &serial)
|
||||
void SMART::parseSerial(string sLine)
|
||||
{
|
||||
string search("\"serial_number\": ");
|
||||
size_t found = sLine.find(search);
|
||||
@ -154,21 +106,15 @@ bool SMART::parseSerial(string sLine, string &serial)
|
||||
sLine.erase(0, sLine.find(": ") + 3);
|
||||
sLine.erase(sLine.length()-3, 3);
|
||||
serial = sLine;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse Capacity
|
||||
* \param string output line of smartctl
|
||||
* \param string parsed capacity
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseCapacity(string sLine, uint64_t &capacity)
|
||||
void SMART::parseCapacity(string sLine)
|
||||
{
|
||||
string search("\"bytes\": ");
|
||||
size_t found = sLine.find(search);
|
||||
@ -177,67 +123,50 @@ bool SMART::parseCapacity(string sLine, uint64_t &capacity)
|
||||
sLine.erase(0, sLine.find(": ") + 2);
|
||||
sLine.erase(sLine.length()-1, 1);
|
||||
capacity = stol(sLine);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse ErrorCount
|
||||
* \param string output line of smartctl
|
||||
* \param uint32_t parsed error count
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
|
||||
void SMART::parseErrorCount(string sLine)
|
||||
{
|
||||
string search("\"error_count_total\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found!=string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 2U);
|
||||
sLine.erase(sLine.length() - 2U, 2U);
|
||||
sLine.erase(0, sLine.find(": ")+2);
|
||||
sLine.erase(sLine.length()-2, 2);
|
||||
errorCount = stol(sLine);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse PowerOnHours
|
||||
* \param string output line of smartctl\
|
||||
* \param uint32_t parsed power on hours
|
||||
* \return bool if parsing was possible
|
||||
* \param string output line of smartctl
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
|
||||
void SMART::parsePowerOnHours(string sLine)
|
||||
{
|
||||
string search("\"hours\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found!=string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 2U);
|
||||
sLine.erase(sLine.length() - 1U, 1U);
|
||||
sLine.erase(0, sLine.find(": ") + 2);
|
||||
sLine.erase(sLine.length()-1, 1);
|
||||
powerOnHours = stol(sLine);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse PowerCycle
|
||||
* \param string output line of smartctl
|
||||
* \param uint32_t parsed power cycles
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
|
||||
void SMART::parsePowerCycle(string sLine)
|
||||
{
|
||||
string search("\"power_cycle_count\": ");
|
||||
size_t found = sLine.find(search);
|
||||
@ -245,41 +174,31 @@ bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
|
||||
{
|
||||
sLine.erase(0, sLine.find(": ") + 2);
|
||||
sLine.erase(sLine.length()-2, 2);
|
||||
powerCycles = stol(sLine);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
powerCycle = stol(sLine);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief parse temperature
|
||||
* \param string output line of smartctl
|
||||
* \param uint32_t parsed temperature
|
||||
* \return bool if parsing was possible
|
||||
* \return void
|
||||
*/
|
||||
bool SMART::parseTemperature(string sLine, uint32_t &temperature)
|
||||
void SMART::parseTemperature(string sLine)
|
||||
{
|
||||
string search("\"current\": ");
|
||||
size_t found = sLine.find(search);
|
||||
if (found!=string::npos)
|
||||
{
|
||||
sLine.erase(0U, sLine.find(": ") + 2U);
|
||||
sLine.erase(sLine.length() - 1U, 2U);
|
||||
sLine.erase(0, sLine.find(": ") + 2);
|
||||
sLine.erase(sLine.length()-1, 2);
|
||||
if(sLine == "{")
|
||||
{
|
||||
temperature = 0U; // this drive doesn't support temperature
|
||||
temperature = 0U; // this drive doesn't support temperatur
|
||||
}
|
||||
else
|
||||
{
|
||||
temperature = stol(sLine);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
34
src/tui.cpp
34
src/tui.cpp
@ -11,6 +11,7 @@ static std::mutex mxUIrefresh;
|
||||
|
||||
TUI::TUI(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -43,21 +44,11 @@ void TUI::initTUI()
|
||||
|
||||
init_pair(COLOR_AREA_ENTRY_EVEN, COLOR_BLACK, COLOR_WHITE);
|
||||
init_pair(COLOR_AREA_ENTRY_ODD, COLOR_BLUE, COLOR_WHITE);
|
||||
|
||||
#ifdef DRYRUN
|
||||
init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_GREEN);
|
||||
#else
|
||||
init_pair(COLOR_AREA_ENTRY_SELECTED, COLOR_WHITE, COLOR_RED);
|
||||
#endif
|
||||
|
||||
init_pair(COLOR_AREA_OVERVIEW, COLOR_BLACK, COLOR_WHITE);
|
||||
init_pair(COLOR_AREA_DETAIL, COLOR_BLACK, COLOR_WHITE);
|
||||
|
||||
#ifdef DRYRUN
|
||||
mvprintw(0, 2, "reHDD - HDD refurbishing tool - GPL 3.0 DRYRUN is active! Don't use in production!");
|
||||
#else
|
||||
mvprintw(0, 2, "reHDD - HDD refurbishing tool - GPL 3.0 ");
|
||||
#endif
|
||||
Logger::logThis()->info("UI successfully initialized");
|
||||
}
|
||||
|
||||
@ -93,9 +84,6 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
|
||||
string sSpeed = " ";
|
||||
string sTime = " ";
|
||||
string sTemp = it->sTemperatureToText();
|
||||
string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA"
|
||||
: it->connectionType == Drive::NVME ? "NVME"
|
||||
: "");
|
||||
|
||||
bool bSelectedEntry = false;
|
||||
|
||||
@ -185,7 +173,7 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
|
||||
|
||||
uint16_t u16StartOffsetY = (2 * (u8Index));
|
||||
|
||||
WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, sConnection, bSelectedEntry);
|
||||
WINDOW * tmp = createEntryWindow( (int)(u16StdscrX *(float)(3.0/7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it)+1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry);
|
||||
wrefresh(tmp);
|
||||
u8Index++;
|
||||
}//end loop though drives
|
||||
@ -240,9 +228,6 @@ enum TUI::UserInput TUI::readUserInput()
|
||||
case 'S':
|
||||
return TUI::UserInput::ShredAll;
|
||||
break;
|
||||
case 'T':
|
||||
return TUI::UserInput::Terminate;
|
||||
break;
|
||||
default:
|
||||
return TUI::UserInput::Undefined;
|
||||
break;
|
||||
@ -348,7 +333,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
|
||||
return newWindow;
|
||||
}
|
||||
|
||||
WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected)
|
||||
WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected)
|
||||
{
|
||||
WINDOW *newWindow;
|
||||
newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
|
||||
@ -393,7 +378,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
|
||||
37-43: Capacity
|
||||
44: space
|
||||
47-49: Temp
|
||||
57-60: Connection Type
|
||||
|
||||
line:02
|
||||
0-2: space
|
||||
@ -410,7 +394,6 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
|
||||
mvwaddstr(newWindow, 0, 3, sModelFamily.c_str());
|
||||
mvwaddstr(newWindow, 0, 37, sCapacity.c_str());
|
||||
mvwaddstr(newWindow, 0, 47, sTemp.c_str());
|
||||
mvwaddstr(newWindow, 0, 57, sConnection.c_str());
|
||||
|
||||
vTruncateText(&sSerial, 28);
|
||||
mvwaddstr(newWindow, 1, 3, sSerial.c_str());
|
||||
@ -490,12 +473,8 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
|
||||
{
|
||||
string sLineTmp = "Press d for Delete";
|
||||
mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
|
||||
u16Line++;
|
||||
}
|
||||
|
||||
string sLineTmp = "Press T for terminating reHDD";
|
||||
mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
|
||||
|
||||
return newWindow;
|
||||
}
|
||||
|
||||
@ -625,7 +604,6 @@ void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
|
||||
void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
|
||||
{
|
||||
struct MenuState menustate;
|
||||
static bool dialogIsActive;
|
||||
menustate.bAbort = false;
|
||||
menustate.bConfirmDelete = false;
|
||||
menustate.bConfirmShred = false;
|
||||
@ -672,21 +650,15 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
|
||||
{
|
||||
dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm SHRED", "Press ENTER for SHRED", "Press ESC for cancel");
|
||||
wrefresh(dialog);
|
||||
dialogIsActive = true;
|
||||
}
|
||||
else if(menustate.bConfirmDelete == true)
|
||||
{
|
||||
dialog=createDialog(40, 10, ((stdscrX)-(int)(stdscrX/3)-7)-(int)((stdscrX/3)+5)/2,(int)(stdscrY/2)-5, "Confirm DELETE", "Press ENTER for DELETE", "Press ESC for cancel");
|
||||
wrefresh(dialog);
|
||||
dialogIsActive = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dialogIsActive)
|
||||
{
|
||||
delwin(dialog);
|
||||
dialogIsActive = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user