Uninitialized Memory in cLine

This reverts commit bcabad0620.

README.md

@@ -9,7 +9,7 @@
 * process multiple drives at once
 
 ## Download USB Image ##
-[2.5GB image v1.0.0](https://schuttercloud.com/s/ggxGH9sA326aRfK)   (`wget` is your friend)
+See reHDD-Bootable how the live image created: https://git.mosad.xyz/localhorst/reHDD-Bootable
 
 Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootable USB drive .
 

include/drive.h

@@ -25,6 +25,14 @@ public:
         FROZEN
     } state;
 
+    enum ConnectionType
+    {
+        UNKNOWN,
+        USB,
+        SATA,
+        NVME
+    } connectionType;
+
     struct
     {
         time_t u32ShredTimeDelta;

include/printer.h

@@ -26,11 +26,11 @@ typedef struct
     char caDriveShredDuration[STR_BUFFER_SIZE];
     char caDriveCapacity[STR_BUFFER_SIZE];
     char caDriveState[STR_BUFFER_SIZE];
+    char caDriveConnectionType[STR_BUFFER_SIZE];
     char caDriveModelFamily[STR_BUFFER_SIZE];
     char caDriveModelName[STR_BUFFER_SIZE];
     char caDriveSerialnumber[STR_BUFFER_SIZE];
     char caDriveReHddVersion[STR_BUFFER_SIZE];
-
 } t_driveData;
 
 typedef struct

include/reHDD.h

@@ -8,7 +8,7 @@
 #ifndef REHDD_H_
 #define REHDD_H_
 
-#define REHDD_VERSION "V1.1.2"
+#define REHDD_VERSION "V1.2.1"
 
 // Drive handling Settings
 #define WORSE_HOURS 19200    // mark drive if at this limit or beyond
@@ -20,18 +20,18 @@
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2024"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
 #define DEVICE_ID "generic"
 #define SOFTWARE_VERSION REHDD_VERSION
 #define HARDWARE_VERSION "generic"
 
-// #define LOG_LEVEL_HIGH  //log everything, like drive scan thread
+// #define LOG_LEVEL_HIGH // log everything, like drive scan thread
 #ifndef LOG_LEVEL_HIGH
 #define LOG_LEVEL_LOW // log only user actions and tasks
 #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
 
@@ -86,6 +86,7 @@ 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);

include/tui.h

@@ -31,6 +31,7 @@ public:
         Delete,
         Enter,
         ESC,
+        Terminate,
         Undefined
     };
     struct MenuState
@@ -50,6 +51,8 @@ public:
 
     static enum UserInput readUserInput();
 
+    static void terminateTUI();
+
 private:
     static string sCpuUsage;
     static string sRamUsage;
@@ -66,7 +69,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, 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, string sConnection, 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);

src/drive.cpp

@@ -62,8 +62,12 @@ string Drive::sCapacityToText()
         dSize /= 1000;
         u16UnitIndex++;
     }
-
+    if (u16UnitIndex >= 9)
-    sprintf(acBuffer, "%.*f %s", u16UnitIndex - 3, dSize, units[u16UnitIndex]);
+    {
+        u16UnitIndex = 8;
+    }
+    int precision = (u16UnitIndex >= 3) ? (u16UnitIndex - 3) : 0;
+    sprintf(acBuffer, "%.*f %s", precision, dSize, units[u16UnitIndex]);
     return acBuffer;
 }
 
@@ -148,12 +152,20 @@ void Drive::setDriveSMARTData(string modelFamily,
 
 void Drive::setTimestamp()
 {
-    time(&this->u32Timestamp);
+    if (time(&this->u32Timestamp) == -1)
+    {
+        // handle error
+        this->u32Timestamp = 0U;
+    }
 }
 
 void Drive::setActionStartTimestamp()
 {
-    time(&this->u32TimestampTaskStart);
+    if (time(&this->u32TimestampTaskStart) == -1)
+    {
+        // handle error
+        this->u32TimestampTaskStart = 0U;
+    }
 }
 
 time_t Drive::getActionStartTimestamp()
@@ -164,7 +176,11 @@ time_t Drive::getActionStartTimestamp()
 void Drive::calculateTaskDuration()
 {
     time_t u32localtime;
-    time(&u32localtime);
+    if (time(&u32localtime) == -1)
+    {
+        // handle error
+        u32localtime = 0U;
+    }
 
     this->u32TaskDuration = u32localtime - this->u32TimestampTaskStart;
 }
@@ -178,6 +194,11 @@ void Drive::checkFrozenDrive(void)
 {
     time_t u32localtime;
     time(&u32localtime);
+    if (time(&u32localtime) == -1)
+    {
+        // handle error
+        u32localtime = 0U;
+    }
 
     if ((u32localtime - this->u32Timestamp) >= (FROZEN_TIMEOUT * 60) && (this->u32Timestamp > 0) && (this->getTaskPercentage() < 100.0))
     {

src/main.cpp

@@ -16,7 +16,7 @@ int main(void)
 {
     // cout << "refurbishingHddTool" << endl;
 
-    reHDD *app = new reHDD();
+    reHDD app;
-    app->app_logic();
+    app.app_logic();
     return EXIT_SUCCESS;
 }

src/printer.cpp

@@ -53,6 +53,23 @@ void Printer::print(Drive *drive)
     sprintf(msgQueueData.driveData.caDriveErrors, "%i", drive->getErrorCount());
     sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li", drive->getActionStartTimestamp());
     sprintf(msgQueueData.driveData.caDriveShredDuration, "%li", drive->getTaskDuration());
+
+    switch (drive->connectionType)
+    {
+    case Drive::USB:
+        strcpy(msgQueueData.driveData.caDriveConnectionType, "usb");
+        break;
+    case Drive::SATA:
+        strcpy(msgQueueData.driveData.caDriveConnectionType, "sata");
+        break;
+    case Drive::NVME:
+        strcpy(msgQueueData.driveData.caDriveConnectionType, "nvme");
+        break;
+    case Drive::UNKNOWN:
+    default:
+        strcpy(msgQueueData.driveData.caDriveConnectionType, "na");
+    }
+
     sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION);
 
     if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))

src/reHDD.cpp

@@ -43,8 +43,15 @@ void reHDD::app_logic(void)
     ui = new TUI();
     ui->initTUI();
 
-    pipe(fdNewDrivesInformPipe);
+    if (pipe(fdNewDrivesInformPipe) == -1)
-    pipe(fdShredInformPipe);
+    {
+        Logger::logThis()->error("Unable to open pipe 'fdNewDrivesInformPipe'");
+    }
+
+    if (pipe(fdShredInformPipe) == -1)
+    {
+        Logger::logThis()->error("Unable to open pipe 'fdShredInformPipe'");
+    }
 
     thread thDevices(ThreadScanDevices);                 // start thread that scans for drives
     thread thUserInput(ThreadUserInput);                 // start thread that reads user input
@@ -94,7 +101,7 @@ Drive *reHDD::getSelectedDrive()
     else
     {
         Logger::logThis()->warning("selected drive not present");
-        return {};
+        return nullptr;
     }
 }
 
@@ -135,6 +142,8 @@ void reHDD::ThreadUserInput()
 {
     while (true)
     {
+        Drive *tmpSelectedDrive = getSelectedDrive();
+
         // cout << TUI::readUserInput() << endl;
         switch (TUI::readUserInput())
         {
@@ -159,11 +168,11 @@ void reHDD::ThreadUserInput()
         case TUI::UserInput::Delete:
             // cout << "Delete" << endl;
 
-            if (getSelectedDrive() != nullptr)
+            if (tmpSelectedDrive != nullptr)
             {
-                if (getSelectedDrive()->state == Drive::NONE)
+                if (tmpSelectedDrive->state == Drive::NONE)
                 {
-                    getSelectedDrive()->state = Drive::DELETE_SELECTED;
+                    tmpSelectedDrive->state = Drive::DELETE_SELECTED;
                 }
             }
 
@@ -171,15 +180,13 @@ void reHDD::ThreadUserInput()
             break;
         case TUI::UserInput::Shred:
             // cout << "Shred" << endl;
-
+            if (tmpSelectedDrive != nullptr)
-            if (getSelectedDrive() != nullptr)
             {
-                if (getSelectedDrive()->state == Drive::NONE)
+                if (tmpSelectedDrive->state == Drive::NONE)
                 {
-                    getSelectedDrive()->state = Drive::SHRED_SELECTED;
+                    tmpSelectedDrive->state = Drive::SHRED_SELECTED;
                 }
             }
-
             ui->updateTUI(&listDrives, u8SelectedEntry);
             break;
         case TUI::UserInput::ShredAll:
@@ -197,6 +204,13 @@ void reHDD::ThreadUserInput()
             handleESC();
             ui->updateTUI(&listDrives, u8SelectedEntry);
             break;
+        case TUI::UserInput::Terminate:
+            // cout << "Terminate" << endl;
+            stopShredAllDrives(&listDrives);
+            ui->terminateTUI();
+            sleep(5);     // sleep 5 sec
+            std::exit(1); // Terminates main, doesn't wait for threads
+            break;
         default:
             break;
         }
@@ -217,13 +231,14 @@ void reHDD::ThreadShred(Drive *const pDrive)
 
 void reHDD::ThreadDelete()
 {
-    if (getSelectedDrive() != nullptr)
+    Drive *tmpSelectedDrive = getSelectedDrive();
+    if (tmpSelectedDrive != nullptr)
     {
-        getSelectedDrive()->setActionStartTimestamp();      // save timestamp at start of deleting
+        tmpSelectedDrive->setActionStartTimestamp();      // save timestamp at start of deleting
-        Delete::deleteDrive(getSelectedDrive());            // blocking, no thread
+        Delete::deleteDrive(tmpSelectedDrive);            // blocking, no thread
-        getSelectedDrive()->state = Drive::TaskState::NONE; // delete finished
+        tmpSelectedDrive->state = Drive::TaskState::NONE; // delete finished
-        getSelectedDrive()->bWasDeleted = true;
+        tmpSelectedDrive->bWasDeleted = true;
-        Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+        Logger::logThis()->info("Finished delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
         ui->updateTUI(&listDrives, u8SelectedEntry);
     }
 }
@@ -300,41 +315,51 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
  * \param	pointer of list <Drive>* plistDrives
  * \return  void
  */
-void reHDD::searchDrives(list<Drive> *plistDrives)
+void reHDD::searchDrives(std::list<Drive> *plistDrives)
 {
-    // Logger::logThis()->info("-->    search drives   <--");
+    FILE *fp = popen("lsblk -d -n -o NAME,TRAN", "r");
-    char *cLine = NULL;
+    if (!fp)
-    size_t len = 0;
-
-    FILE *outputfileHwinfo = popen("lsblk -e 11 -d -o NAME", "r");
-
-    if (outputfileHwinfo == NULL)
     {
-        Logger::logThis()->error("Unable to scan attached drives");
+        Logger::logThis()->error("Unable to execute lsblk to scan drives");
         exit(EXIT_FAILURE);
     }
 
-    while ((getline(&cLine, &len, outputfileHwinfo)) != -1)
+    char line[256];
+    while (fgets(line, sizeof(line), fp))
     {
-        if (string(cLine).length() == 4)
+        std::string devName, transport;
-        {
+        std::istringstream iss(line);
-            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 3));
+        iss >> devName >> transport;
-            tmpDrive->state = Drive::NONE;
+
-            tmpDrive->bIsOffline = false;
+        if (devName.empty())
-            plistDrives->push_back(*tmpDrive);
+            continue;
-            // Logger::logThis()->info("SATA drive found: " + tmpDrive->getPath());
+
+        Drive tmpDrive("/dev/" + devName);
+        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") +
+            ")");
     }
 
-        if (string(cLine).length() == 8)
+    pclose(fp);
-        {
-            Drive *tmpDrive = new Drive("/dev/" + string(cLine).substr(0, 7));
-            tmpDrive->state = Drive::NONE;
-            tmpDrive->bIsOffline = false;
-            plistDrives->push_back(*tmpDrive);
-            // Logger::logThis()->info("NVME drive found: " + tmpDrive->getPath());
-        }
-    }
-    pclose(outputfileHwinfo);
 }
 
 /**
@@ -359,7 +384,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
                 Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
 #endif
                 it = plistDrives->erase(it);
-                it--;
             }
         }
     }
@@ -392,15 +416,17 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
 
             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);
-                    sBlkidOut.erase(0, 18);
+                    sBlkidOut.erase(0, ptuuidPos + 8);
                     sBlkidOut.erase(8, sBlkidOut.length());
                     sUUID = sBlkidOut;
                     // cout << "blkid uuid:" << sUUID << endl;
                 }
             }
+            free(cLine);
             pclose(outputfileBlkid);
             // cout << "blkid uuid:" << sUUID << endl;
 
@@ -411,7 +437,6 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
                 Logger::logThis()->info("same uuid found than in ignore file --> ignore this drive: " + it->getPath());
 #endif
                 it = plistDrives->erase(it);
-                it--;
             }
         }
     }
@@ -433,7 +458,6 @@ void reHDD::filterInvalidDrives(list<Drive> *plistDrives)
             Logger::logThis()->info("Drive reports zero capacity --> ignore this drive: " + it->getPath());
 #endif
             it = plistDrives->erase(it);
-            it--;
         }
     }
 }
@@ -464,6 +488,34 @@ 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
@@ -573,22 +625,21 @@ void reHDD::handleArrowKey(TUI::UserInput userInput)
 
 void reHDD::handleEnter()
 {
-
+    Drive *tmpSelectedDrive = getSelectedDrive();
-    if (getSelectedDrive() != nullptr)
+    if (tmpSelectedDrive != nullptr)
     {
-        if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
+        if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED)
         {
-            Logger::logThis()->info("Started shred/check for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+            Logger::logThis()->info("Started shred/check for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
-            getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
+            tmpSelectedDrive->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 option
-            Drive *pTmpDrive = getSelectedDrive();
+            thread(ThreadShred, tmpSelectedDrive).detach();
-            thread(ThreadShred, pTmpDrive).detach();
         }
 
-        if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
+        if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED)
         {
-            Logger::logThis()->info("Started delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+            Logger::logThis()->info("Started delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
-            getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
+            tmpSelectedDrive->state = Drive::TaskState::DELETE_ACTIVE;
             // task for drive is running --> don't show  more task options
             thread(ThreadDelete).detach();
         }
@@ -597,17 +648,18 @@ void reHDD::handleEnter()
 
 void reHDD::handleESC()
 {
-    if (getSelectedDrive() != nullptr)
+    Drive *tmpSelectedDrive = getSelectedDrive();
+    if (tmpSelectedDrive != nullptr)
     {
-        if (getSelectedDrive()->state == Drive::TaskState::SHRED_SELECTED)
+        if (tmpSelectedDrive->state == Drive::TaskState::SHRED_SELECTED)
         {
-            getSelectedDrive()->state = Drive::TaskState::NONE;
+            tmpSelectedDrive->state = Drive::TaskState::NONE;
             // task for drive is selected --> remove selection
         }
 
-        if (getSelectedDrive()->state == Drive::TaskState::DELETE_SELECTED)
+        if (tmpSelectedDrive->state == Drive::TaskState::DELETE_SELECTED)
         {
-            getSelectedDrive()->state = Drive::TaskState::NONE;
+            tmpSelectedDrive->state = Drive::TaskState::NONE;
             // task for drive is selected --> remove selection
         }
     }
@@ -615,12 +667,13 @@ void reHDD::handleESC()
 
 void reHDD::handleAbort()
 {
-    if (getSelectedDrive() != nullptr)
+    Drive *tmpSelectedDrive = getSelectedDrive();
+    if (tmpSelectedDrive != nullptr)
     {
-        if (getSelectedDrive()->state == Drive::SHRED_ACTIVE || getSelectedDrive()->state == Drive::DELETE_ACTIVE)
+        if (tmpSelectedDrive->state == Drive::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::DELETE_ACTIVE)
         {
-            getSelectedDrive()->state = Drive::NONE;
+            tmpSelectedDrive->state = Drive::NONE;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+            Logger::logThis()->info("Abort-Shred-Signal for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
             // task for drive is running --> remove selection
         }
     }
@@ -665,6 +718,12 @@ bool reHDD::getSystemDrive(string &systemDrive)
             break;
         }
 
+        if (currentLine.ends_with(" /run/overlay/live\n"s))
+        {
+            systemDriveFound = true;
+            break;
+        }
+
         if (currentLine.ends_with(" /\n"s))
         {
             systemDriveFound = true;

src/shred.cpp

@@ -36,7 +36,7 @@ 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
+    drive->bWasShredStarted = true; // Mark drive as partly shredded
 
 #ifdef DRYRUN
     for (int i = 0; i <= 500; i++)
@@ -60,7 +60,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
     if (randomSrcFileDiscr == -1)
     {
-        std::string errorMsg(strerror(randomSrcFileDiscr));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(randomsrc);
         cleanup();
@@ -71,7 +71,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
     if (driveFileDiscr == -1)
     {
-        std::string errorMsg(strerror(driveFileDiscr));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(cpDrivePath);
         cleanup();
@@ -82,7 +82,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
     if (readRet <= 0)
     {
-        std::string errorMsg(strerror(readRet));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(randomsrc);
         cleanup();
@@ -132,7 +132,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
 
             if (iByteShredded <= 0)
             {
-                std::string errorMsg(strerror(iByteShredded));
+                std::string errorMsg(strerror(errno));
                 Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
                 perror("unable to write random data");
                 cleanup();
@@ -187,7 +187,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->u32DriveChecksumAferShredding != 0)
+    if (drive->u32DriveChecksumAfterShredding != 0)
     {
         Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }

src/tui.cpp

@@ -63,6 +63,11 @@ void TUI::initTUI()
 
 void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 {
+    if (isendwin())
+    {
+        return;
+    }
+
     mxUIrefresh.lock();
     uint16_t u16StdscrX, u16StdscrY;
     getmaxyx(stdscr, u16StdscrY, u16StdscrX);
@@ -93,6 +98,9 @@ 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;
 
@@ -182,7 +190,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, 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, sConnection, bSelectedEntry);
         wrefresh(tmp);
         u8Index++;
     } // end loop though drives
@@ -237,6 +245,9 @@ 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;
@@ -244,6 +255,11 @@ enum TUI::UserInput TUI::readUserInput()
     return TUI::UserInput::Undefined;
 }
 
+void TUI::terminateTUI()
+{
+    endwin();
+}
+
 void TUI::centerTitle(WINDOW *pwin, const char *title)
 {
     int x, maxX, stringSize;
@@ -342,7 +358,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, 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, string sConnection, bool bSelected)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -387,6 +403,7 @@ 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
@@ -403,6 +420,7 @@ 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());
@@ -482,8 +500,12 @@ 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;
 }