add comments

fixes #95

Reviewed-on: #96
Co-authored-by: localhorst <localhorst@mosad.xyz>
Co-committed-by: localhorst <localhorst@mosad.xyz>

README.md

@@ -16,9 +16,9 @@ Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootab
 ## Screenshot 
 ![Screenshot of reHDD with multiple drives in different states](https://git.mosad.xyz/localhorst/reHDD/raw/commit/c40dfe2cbb8f86490b49caf82db70a10015f06f9/doc/screenshot.png "Screenshot")
 
-## Debian Build Notes
+## openSUSE Build Notes
 
-* `apt-get install ncurses-dev git make g++`
+* `zypper install ncurses-devel git make gcc-c++`
 * `git submodule init`
 * `git submodule update`
 * `make release`
@@ -28,16 +28,8 @@ Use [Etcher](https://www.balena.io/etcher/#download) or `dd` to create an bootab
 Just install [reHDDPrinter](https://git.mosad.xyz/localhorst/reHDDPrinter).
 No further settings needed.
 
-## Create Standalone with Debian 11
-
-Instructions how to create a standalone machine that boots directly to reHDD. This is aimed for production use, like several drives a day shredding.
-* Start reHDD after boot without login (as a tty1 shell)
-* Start dmesg after boot without login (as a tty2 shell)
-* Start htop after boot without login (as a tty3 shell)
-* Upload reHDD log every 12h if wanted
-
 ### Software requirements
-* `apt-get install hwinfo smartmontools curl htop sudo`
+* `zypper install hwinfo smartmontools curl htop sudo`
 
 ### Installation
 
@@ -56,7 +48,7 @@ git submodule update
 
 If you want to upload the logs, edit `scripts/reHDDLogUploader.bash` with your nextcloud token
 
-Add your system drive in `/root/reHDD/ignoreDrives.conf` like:
+Add ignored drives in `/root/reHDD/ignoreDrives.conf` like:
 ```e102f49d```
 Get the first 8 Bytes from your UUID via `blkid /dev/sdX`
 

include/drive.h

@@ -14,32 +14,39 @@ class Drive
 {
 
 public:
-    enum TaskState
+    enum class TaskState
     {
         NONE,
         SHRED_SELECTED,
         SHRED_ACTIVE, // shred iterations active
         CHECK_ACTIVE, // optional checking active
+        CHECK_SUCCESSFUL,
+        CHECK_FAILED,
         DELETE_SELECTED,
         DELETE_ACTIVE,
         FROZEN
-    } state;
+    };
 
-    enum ConnectionType
+    enum class ConnectionType
     {
         UNKNOWN,
         USB,
         SATA,
         NVME
-    } connectionType;
+    };
 
-    struct
+    struct ShredSpeed
     {
         time_t u32ShredTimeDelta;
-        std::chrono::time_point<std::chrono::system_clock> chronoShredTimestamp;
+        std::chrono::time_point<std::chrono::system_clock>
+            chronoShredTimestamp;
         unsigned long ulWrittenBytes;
         unsigned long ulSpeedMetricBytesWritten;
-    } sShredSpeed;
+    };
+
+    std::atomic<TaskState> state;
+    std::atomic<ConnectionType> connectionType;
+    std::atomic<ShredSpeed> sShredSpeed;
 
     bool bWasShredded = false;     // all shred iterations done
     bool bWasShredStarted = false; // shred was atleast once started
@@ -47,9 +54,10 @@ public:
     bool bWasDeleted = false;
     bool bIsOffline = false;
     uint32_t u32DriveChecksumAfterShredding = 0U;
+    uint16_t u16DriveIndex = 0U; // Index of TUI list
 
 private:
-    string sPath;
+    std::string sPath;
     time_t u32Timestamp = 0U;          // unix timestamp for detecting a frozen drive
     double d32TaskPercentage = 0U;     // in percent for Shred (1 to 100)
     time_t u32TimestampTaskStart = 0U; // unix timestamp for duration of an action
@@ -57,14 +65,17 @@ private:
 
     struct
     {
-        string sModelFamily;
+        std::string sModelFamily;
-        string sModelName;
+        std::string sModelName;
-        string sSerial;
+        std::string sSerial;
         uint64_t u64Capacity = 0U; // in byte
         uint32_t u32ErrorCount = 0U;
         uint32_t u32PowerOnHours = 0U; // in hours
         uint32_t u32PowerCycles = 0U;
         uint32_t u32Temperature = 0U;          // in Fahrenheit, just kidding: degree Celsius
+        uint32_t u32ReallocatedSectors = 0U;   // ID 0x05 - Reallocated Sectors Count
+        uint32_t u32PendingSectors = 0U;       // ID 0xC5 - Current Pending Sector Count
+        uint32_t u32UncorrectableSectors = 0U; // ID 0xC6 - Offline Uncorrectable Sector Count
     } sSmartData;
 
 private:
@@ -72,36 +83,54 @@ private:
 
 protected:
 public:
-    Drive(string path)
+    // Copy constructor
+    Drive(const Drive &other);
+
+    // Copy assignment operator
+    Drive &operator=(const Drive &other);
+
+    // Move constructor
+    Drive(Drive &&other) noexcept;
+
+    // Move assignment operator
+    Drive &operator=(Drive &&other) noexcept;
+
+    Drive(std::string path)
     {
         this->sPath = path;
     }
 
-    string getPath(void);
+    std::string getPath(void);
-    string getModelFamily(void);
+    std::string getModelFamily(void);
-    string getModelName(void);
+    std::string getModelName(void);
-    string getSerial(void);
+    std::string getSerial(void);
     uint64_t getCapacity(void); // in byte
     uint32_t getErrorCount(void);
     uint32_t getPowerOnHours(void); // in hours
     uint32_t getPowerCycles(void);
     uint32_t getTemperature(void); // in Fahrenheit, just kidding: degree Celsius
+    uint32_t getReallocatedSectors(void);
+    uint32_t getPendingSectors(void);
+    uint32_t getUncorrectableSectors(void);
     void checkFrozenDrive(void);
 
-    void setDriveSMARTData(string modelFamily,
+    void setDriveSMARTData(std::string modelFamily,
-                           string modelName,
+                           std::string modelName,
-                           string serial,
+                           std::string serial,
                            uint64_t capacity,
                            uint32_t errorCount,
                            uint32_t powerOnHours,
                            uint32_t powerCycles,
-                           uint32_t temperature);
+                           uint32_t temperature,
+                           uint32_t reallocatedSectors,
+                           uint32_t pendingSectors,
+                           uint32_t uncorrectableSectors);
 
-    string sCapacityToText();
+    std::string sCapacityToText();
-    string sErrorCountToText();
+    std::string sErrorCountToText();
-    string sPowerOnHoursToText();
+    std::string sPowerOnHoursToText();
-    string sPowerCyclesToText();
+    std::string sPowerCyclesToText();
-    string sTemperatureToText();
+    std::string sTemperatureToText();
 
     void setTaskPercentage(double d32TaskPercentage);
     double getTaskPercentage(void);

include/logger/logger.h

@@ -16,6 +16,10 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <ifaddrs.h>
+#include <netpacket/packet.h>
+#include <cstring>
+#include <string>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>

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.2.0"
+#define REHDD_VERSION "V1.4.0-dev"
 
 // Drive handling Settings
 #define WORSE_HOURS 19200    // mark drive if at this limit or beyond
@@ -20,7 +20,7 @@
 
 // Logger Settings
 #define LOG_PATH "./reHDD.log"
-#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2025"
+#define DESCRIPTION "reHDD - Copyright Hendrik Schutter 2026"
 #define DEVICE_ID "generic"
 #define SOFTWARE_VERSION REHDD_VERSION
 #define HARDWARE_VERSION "generic"
@@ -56,9 +56,7 @@
 #include <sstream>
 #include <iomanip>
 #include <signal.h>
-
+#include <atomic>
-using namespace std;
-
 #include "drive.h"
 #include "smart.h"
 #include "shred.h"
@@ -92,10 +90,12 @@ private:
     static void filterInvalidDrives(list<Drive> *plistDrives);
     static void filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDrives);
     static void addSMARTData(list<Drive> *plistDrives);
+    static void printAllDrives(list<Drive> *plistDrives);
+    static void printDrive(Drive *const pDrive);
     static void ThreadScanDevices();
     static void ThreadUserInput();
     static void ThreadShred(Drive *const pDrive);
-    static void ThreadDelete();
+    static void ThreadDelete(Drive *const pDrive);
     static void ThreadCheckFrozenDrives();
     static void handleArrowKey(TUI::UserInput userInput);
     static void handleEnter();

include/shred.h

@@ -16,9 +16,28 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <chrono>
 
-#define CHUNK_SIZE 1024 * 1024 * 32 // amount of bytes that are overwritten at once --> 32MB
+// Adaptive chunk size optimization - uncomment to enable
-#define TFNG_DATA_SIZE CHUNK_SIZE   // amount of bytes used by tfng
+#define ADAPTIVE_CHUNK_SIZE
+
+// Chunk size configuration
+#define CHUNK_SIZE_START 1024 * 1024 * 32 // Starting chunk size: 32MB
+#define CHUNK_SIZE_MIN 1024 * 1024 * 4 // Minimum chunk size: 4MB
+#define CHUNK_SIZE_MAX 1024 * 1024 * 128 // Maximum chunk size: 128MB
+#define CHUNK_SIZE_STEP_UP 1024 * 1024 * 2 // Increase step: 2MB
+#define CHUNK_SIZE_STEP_DOWN 1024 * 1024 * 4 // Decrease step: 4MB
+#define CHUNK_MEASURE_INTERVAL 64 // Measure performance every 64 chunks
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+// Use max buffer size when adaptive mode is enabled
+#define CHUNK_SIZE CHUNK_SIZE_MAX
+#define TFNG_DATA_SIZE CHUNK_SIZE_MAX
+#else
+// Use fixed chunk size when adaptive mode is disabled
+#define CHUNK_SIZE CHUNK_SIZE_START
+#define TFNG_DATA_SIZE CHUNK_SIZE
+#endif
 
 // #define DEMO_DRIVE_SIZE 1024*1024*256L // 256MB
 // #define DEMO_DRIVE_SIZE 1024*1024*1024L // 1GB
@@ -38,16 +57,41 @@ public:
 private:
     fileDescriptor randomSrcFileDiscr;
     fileDescriptor driveFileDiscr;
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+    unsigned char* caTfngData; // Dynamic buffer allocation for adaptive mode
+    unsigned char* caReadBuffer; // Dynamic buffer allocation for adaptive mode
+#else
     unsigned char caTfngData[TFNG_DATA_SIZE];
     unsigned char caReadBuffer[CHUNK_SIZE];
+#endif
+
     unsigned long ulDriveByteSize;
     unsigned long ulDriveByteOverallCount = 0; // all bytes shredded in all iterations + checking -> used for progress calculation
     double d32Percent = 0.0;
     double d32TmpPercent = 0.0;
 
+#ifdef ADAPTIVE_CHUNK_SIZE
+    // Adaptive chunk size optimization members
+    size_t currentChunkSize;
+    size_t bestChunkSize;
+    unsigned int chunkCounter;
+    std::chrono::high_resolution_clock::time_point measurementStartTime;
+    double bestThroughputMBps;
+    double lastThroughputMBps;
+    unsigned long bytesWrittenInMeasurement;
+    bool throughputIncreasing;
+
+    // Adaptive methods
+    void startMeasurement();
+    void evaluateThroughput(Drive* drive);
+    void adjustChunkSize(Drive* drive);
+    size_t getCurrentChunkSize() const;
+#endif
+
     inline double calcProgress();
     int iRewindDrive(fileDescriptor file);
-    unsigned long getDriveSizeInBytes(fileDescriptor file);
+    long getDriveSizeInBytes(fileDescriptor file);
     unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
     void cleanup();
 };

include/smart.h

@@ -10,24 +10,29 @@
 
 #include "reHDD.h"
 
+/**
+ * @brief SMART data reader for drives
+ *
+ * Parses smartctl JSON output to extract:
+ * - Device information (model, serial, capacity)
+ * - Power statistics (hours, cycles)
+ * - Temperature
+ * - Critical sector counts (reallocated, pending, uncorrectable)
+ *
+ * Uses deterministic state machine parser for reliable multi-line JSON parsing.
+ */
 class SMART
 {
 protected:
 public:
+    /**
+     * @brief Read S.M.A.R.T. data from drive and populate Drive object
+     * @param drive Pointer to Drive instance to populate with SMART data
+     */
     static void readSMARTData(Drive *drive);
 
 private:
-    SMART(void);
+    SMART(void); // Utility class - no instances
-
-    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);
 };
 
 #endif // SMART_H_

include/tui.h

@@ -32,6 +32,8 @@ public:
         Enter,
         ESC,
         Terminate,
+        Print,
+        PrintAll,
         Undefined
     };
     struct MenuState
@@ -47,14 +49,16 @@ public:
 
     static void initTUI();
 
-    void updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry);
+    void updateTUI(std::list<Drive> *plistDrives, uint8_t u8SelectedEntry);
 
     static enum UserInput readUserInput();
 
+    static void terminateTUI();
+
 private:
-    static string sCpuUsage;
+    static std::string sCpuUsage;
-    static string sRamUsage;
+    static std::string sRamUsage;
-    static string sLocalTime;
+    static std::string sLocalTime;
 
     WINDOW *overview;
     WINDOW *systemview;
@@ -65,19 +69,19 @@ private:
 
     static void centerTitle(WINDOW *pwin, const char *title);
     static WINDOW *createOverViewWindow(int iXSize, int iYSize);
-    static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive);
+    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, std::string sModelFamily, std::string sSerial, std::string sCapacity, std::string sState, std::string sTime, std::string sSpeed, std::string sTemp, std::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);
+    static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, std::string selectedTask, std::string optionA, std::string optionB);
-    static WINDOW *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
+    static WINDOW *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, std::string sProgress);
-    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
+    static WINDOW *createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature, uint32_t u32ReallocatedSectors, uint32_t u32PendingSectors, uint32_t u32UncorrectableSectors);
-    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
+    static WINDOW *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, std::string sPath, std::string sModelFamily, std::string sModelName, std::string sSerial, uint32_t u32Checksum);
 
-    void displaySelectedDrive(Drive drive, int stdscrX, int stdscrY);
+    void displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY);
-    string formatTimeDuration(time_t u32Duration);
+    std::string formatTimeDuration(time_t u32Duration);
-    string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
+    std::string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
-    static void vTruncateText(string *psText, uint16_t u16MaxLenght);
+    static void vTruncateText(std::string *psText, uint16_t u16MaxLenght);
 };
 #endif // TUI_H_

makefile

@@ -18,7 +18,7 @@ DCOMPILE_FLAGS = -D DEBUG
 # Add additional include paths
 INCLUDES = include
 # General linker settings
-LINK_FLAGS = -Llib -lpthread -lncurses -ltfng
+LINK_FLAGS = -Llib -lpthread -lncurses -ltfng -latomic
 
 # Doc
 DOCDIR = doc

src/delete.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 /**
  * \brief   delete drive with wipefs
@@ -41,6 +42,8 @@ void Delete::deleteDrive(Drive *drive)
         {
             // wipefs running
         }
+
+        free(cLine);
         pclose(deleteCmdOutput);
     }
 }

src/drive.cpp

@@ -6,6 +6,95 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
+
+// Copy constructor
+Drive::Drive(const Drive &other)
+    : state(other.state.load()),
+      connectionType(other.connectionType.load()),
+      sShredSpeed(other.sShredSpeed.load()),
+      bWasShredded(other.bWasShredded),
+      bWasShredStarted(other.bWasShredStarted),
+      bWasChecked(other.bWasChecked),
+      bWasDeleted(other.bWasDeleted),
+      bIsOffline(other.bIsOffline),
+      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
+      sPath(other.sPath),
+      u32Timestamp(other.u32Timestamp),
+      d32TaskPercentage(other.d32TaskPercentage),
+      u32TimestampTaskStart(other.u32TimestampTaskStart),
+      u32TaskDuration(other.u32TaskDuration),
+      sSmartData(other.sSmartData)
+{
+}
+
+// Copy assignment operator
+Drive &Drive::operator=(const Drive &other)
+{
+    if (this != &other)
+    {
+        state = other.state.load();
+        connectionType = other.connectionType.load();
+        sShredSpeed = other.sShredSpeed.load();
+        bWasShredded = other.bWasShredded;
+        bWasShredStarted = other.bWasShredStarted;
+        bWasChecked = other.bWasChecked;
+        bWasDeleted = other.bWasDeleted;
+        bIsOffline = other.bIsOffline;
+        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
+        sPath = other.sPath;
+        u32Timestamp = other.u32Timestamp;
+        d32TaskPercentage = other.d32TaskPercentage;
+        u32TimestampTaskStart = other.u32TimestampTaskStart;
+        u32TaskDuration = other.u32TaskDuration;
+        sSmartData = other.sSmartData;
+    }
+    return *this;
+}
+
+// Move constructor
+Drive::Drive(Drive &&other) noexcept
+    : state(other.state.load()),
+      connectionType(other.connectionType.load()),
+      sShredSpeed(other.sShredSpeed.load()),
+      bWasShredded(other.bWasShredded),
+      bWasShredStarted(other.bWasShredStarted),
+      bWasChecked(other.bWasChecked),
+      bWasDeleted(other.bWasDeleted),
+      bIsOffline(other.bIsOffline),
+      u32DriveChecksumAfterShredding(other.u32DriveChecksumAfterShredding),
+      sPath(std::move(other.sPath)),
+      u32Timestamp(other.u32Timestamp),
+      d32TaskPercentage(other.d32TaskPercentage),
+      u32TimestampTaskStart(other.u32TimestampTaskStart),
+      u32TaskDuration(other.u32TaskDuration),
+      sSmartData(std::move(other.sSmartData))
+{
+}
+
+// Move assignment operator
+Drive &Drive::operator=(Drive &&other) noexcept
+{
+    if (this != &other)
+    {
+        state = other.state.load();
+        connectionType = other.connectionType.load();
+        sShredSpeed = other.sShredSpeed.load();
+        bWasShredded = other.bWasShredded;
+        bWasShredStarted = other.bWasShredStarted;
+        bWasChecked = other.bWasChecked;
+        bWasDeleted = other.bWasDeleted;
+        bIsOffline = other.bIsOffline;
+        u32DriveChecksumAfterShredding = other.u32DriveChecksumAfterShredding;
+        sPath = std::move(other.sPath);
+        u32Timestamp = other.u32Timestamp;
+        d32TaskPercentage = other.d32TaskPercentage;
+        u32TimestampTaskStart = other.u32TimestampTaskStart;
+        u32TaskDuration = other.u32TaskDuration;
+        sSmartData = std::move(other.sSmartData);
+    }
+    return *this;
+}
 
 string Drive::getPath(void)
 {
@@ -51,6 +140,21 @@ uint32_t Drive::getTemperature(void)
     return sSmartData.u32Temperature;
 }
 
+uint32_t Drive::getReallocatedSectors(void)
+{
+    return sSmartData.u32ReallocatedSectors;
+}
+
+uint32_t Drive::getPendingSectors(void)
+{
+    return sSmartData.u32PendingSectors;
+}
+
+uint32_t Drive::getUncorrectableSectors(void)
+{
+    return sSmartData.u32UncorrectableSectors;
+}
+
 string Drive::sCapacityToText()
 {
     char acBuffer[16];
@@ -62,8 +166,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;
 }
 
@@ -99,7 +207,6 @@ string Drive::sPowerCyclesToText()
 string Drive::sTemperatureToText()
 {
     return to_string(getTemperature()) + " C";
-    ;
 }
 
 void Drive::setTaskPercentage(double d32TaskPercentage)
@@ -134,7 +241,10 @@ void Drive::setDriveSMARTData(string modelFamily,
                               uint32_t errorCount,
                               uint32_t powerOnHours,
                               uint32_t powerCycle,
-                              uint32_t temperature)
+                              uint32_t temperature,
+                              uint32_t reallocatedSectors,
+                              uint32_t pendingSectors,
+                              uint32_t uncorrectableSectors)
 {
     this->sSmartData.sModelFamily = modelFamily;
     this->sSmartData.sModelName = modelName;
@@ -144,16 +254,27 @@ void Drive::setDriveSMARTData(string modelFamily,
     this->sSmartData.u32PowerOnHours = powerOnHours;
     this->sSmartData.u32PowerCycles = powerCycle;
     this->sSmartData.u32Temperature = temperature;
+    this->sSmartData.u32ReallocatedSectors = reallocatedSectors;
+    this->sSmartData.u32PendingSectors = pendingSectors;
+    this->sSmartData.u32UncorrectableSectors = uncorrectableSectors;
 }
 
 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 +285,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,12 +303,17 @@ 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))
     {
         Logger::logThis()->warning("Drive Frozen: " + this->getModelName() + " " + this->getSerial());
         this->bWasDeleted = false;
         this->bWasShredded = false;
-        this->state = Drive::FROZEN;
+        this->state = Drive::TaskState::FROZEN;
     }
 }

src/logger/logger.cpp

@@ -134,7 +134,7 @@ string Logger::getTimestamp()
     }
     timeinfo = localtime(&tv.tv_sec);
     strftime(cpDate, 80, "%d/%m/%Y %T", timeinfo);
-    sprintf(buffer, "%s.%03d", cpDate, millisec);
+    snprintf(buffer, sizeof(buffer), "%s.%03d", cpDate, millisec);
     return buffer;
 }
 
@@ -143,24 +143,44 @@ string Logger::getTimestamp()
  * \param	void
  * \return  string MAC address (formatted)
  */
-string Logger::getMacAddress()
+std::string Logger::getMacAddress()
 {
-    struct ifreq ifr;
+    struct ifaddrs *ifaddr, *ifa;
-    int s = socket(AF_INET, SOCK_STREAM, 0);
 
-    strcpy(ifr.ifr_name, "eth0");
+    // default MAC if none found
-    if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
+    std::string result = "00:00:00:00:00:00";
+
+    if (getifaddrs(&ifaddr) == -1)
+        return result;
+
+    for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
     {
-        strcpy(ifr.ifr_name, "eno1");
+        if (!ifa->ifa_addr)
+            continue;
+
+        // We want AF_PACKET interfaces (Ethernet)
+        if (ifa->ifa_addr->sa_family == AF_PACKET &&
+            !(ifa->ifa_flags & IFF_LOOPBACK) && // skip loopback interface
+            (ifa->ifa_flags & IFF_UP))          // must be up
+        {
+            struct sockaddr_ll *s = (struct sockaddr_ll *)ifa->ifa_addr;
+
+            if (s->sll_halen == 6)
+            {
+                char buf[32];
+                snprintf(buf, sizeof(buf),
+                         "%02X:%02X:%02X:%02X:%02X:%02X",
+                         s->sll_addr[0], s->sll_addr[1], s->sll_addr[2],
+                         s->sll_addr[3], s->sll_addr[4], s->sll_addr[5]);
+
+                freeifaddrs(ifaddr);
+                return std::string(buf);
+            }
+        }
     }
 
-    unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
+    freeifaddrs(ifaddr);
-    char buffer[80];
+    return result;
-    sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
-            hwaddr[3], hwaddr[4], hwaddr[5]);
-    close(s);
-    string tmp = buffer;
-    return tmp;
 }
 
 /**

src/main.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 /**
  * \brief   app entry point
@@ -16,7 +17,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

@@ -42,18 +42,35 @@ void Printer::print(Drive *drive)
     t_msgQueueData msgQueueData;
     msgQueueData.msg_queue_type = 1;
 
-    sprintf(msgQueueData.driveData.caDriveIndex, "%i", 42); // TODO: get from tui
+    snprintf(msgQueueData.driveData.caDriveIndex, STR_BUFFER_SIZE, "%i", drive->u16DriveIndex);
-    sprintf(msgQueueData.driveData.caDriveState, "shredded");
+    snprintf(msgQueueData.driveData.caDriveState, STR_BUFFER_SIZE, "shredded");
-    strcpy(msgQueueData.driveData.caDriveModelFamily, drive->getModelFamily().c_str());
+    snprintf(msgQueueData.driveData.caDriveModelFamily, STR_BUFFER_SIZE, "%s", drive->getModelFamily().c_str());
-    strcpy(msgQueueData.driveData.caDriveModelName, drive->getModelName().c_str());
+    snprintf(msgQueueData.driveData.caDriveModelName, STR_BUFFER_SIZE, "%s", drive->getModelName().c_str());
-    sprintf(msgQueueData.driveData.caDriveCapacity, "%li", drive->getCapacity());
+    snprintf(msgQueueData.driveData.caDriveCapacity, STR_BUFFER_SIZE, "%li", drive->getCapacity());
-    strcpy(msgQueueData.driveData.caDriveSerialnumber, drive->getSerial().c_str());
+    snprintf(msgQueueData.driveData.caDriveSerialnumber, STR_BUFFER_SIZE, "%s", drive->getSerial().c_str());
-    sprintf(msgQueueData.driveData.caDriveHours, "%i", drive->getPowerOnHours());
+    snprintf(msgQueueData.driveData.caDriveHours, STR_BUFFER_SIZE, "%i", drive->getPowerOnHours());
-    sprintf(msgQueueData.driveData.caDriveCycles, "%i", drive->getPowerCycles());
+    snprintf(msgQueueData.driveData.caDriveCycles, STR_BUFFER_SIZE, "%i", drive->getPowerCycles());
-    sprintf(msgQueueData.driveData.caDriveErrors, "%i", drive->getErrorCount());
+    snprintf(msgQueueData.driveData.caDriveErrors, STR_BUFFER_SIZE, "%i", drive->getErrorCount());
-    sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li", drive->getActionStartTimestamp());
+    snprintf(msgQueueData.driveData.caDriveShredTimestamp, STR_BUFFER_SIZE, "%li", drive->getActionStartTimestamp());
-    sprintf(msgQueueData.driveData.caDriveShredDuration, "%li", drive->getTaskDuration());
+    snprintf(msgQueueData.driveData.caDriveShredDuration, STR_BUFFER_SIZE, "%li", drive->getTaskDuration());
-    sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION);
+
+    switch (drive->connectionType)
+    {
+    case Drive::ConnectionType::USB:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "usb", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::SATA:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "sata", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::NVME:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "nvme", STR_BUFFER_SIZE);
+        break;
+    case Drive::ConnectionType::UNKNOWN:
+    default:
+        strncpy(msgQueueData.driveData.caDriveConnectionType, "na", STR_BUFFER_SIZE);
+    }
+
+    snprintf(msgQueueData.driveData.caDriveReHddVersion, STR_BUFFER_SIZE, "%s", REHDD_VERSION);
 
     if (-1 == msgsnd(this->msqid, &msgQueueData, sizeof(t_msgQueueData) - sizeof(long), 0))
     {

src/reHDD.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 static int fdNewDrivesInformPipe[2]; // File descriptor for pipe that informs if new drives are found
 
@@ -19,7 +20,7 @@ static list<Drive> listDrives; // stores all drive data from scan thread
 
 TUI *ui;
 
-static uint8_t u8SelectedEntry;
+static uint16_t u16SelectedEntry;
 
 static fd_set selectSet;
 
@@ -30,7 +31,7 @@ static fd_set selectSet;
  */
 reHDD::reHDD(void)
 {
-    u8SelectedEntry = 0U;
+    u16SelectedEntry = 0U;
 }
 
 /**
@@ -43,8 +44,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
@@ -76,7 +84,7 @@ void reHDD::app_logic(void)
             Logger::logThis()->info("got progress signal from a shred task");
 #endif
         }
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        ui->updateTUI(&listDrives, u16SelectedEntry);
     } // endless loop
     thDevices.join();
     thUserInput.join();
@@ -85,16 +93,20 @@ void reHDD::app_logic(void)
 
 Drive *reHDD::getSelectedDrive()
 {
-    if (u8SelectedEntry < listDrives.size())
+    mxDrives.lock();
+    if (u16SelectedEntry < listDrives.size())
     {
         list<Drive>::iterator it = listDrives.begin();
-        advance(it, u8SelectedEntry);
+        advance(it, u16SelectedEntry);
+        it->u16DriveIndex = u16SelectedEntry;
+        mxDrives.unlock();
         return &(*it);
     }
     else
     {
         Logger::logThis()->warning("selected drive not present");
-        return {};
+        mxDrives.unlock();
+        return nullptr;
     }
 }
 
@@ -121,7 +133,7 @@ void reHDD::ThreadCheckFrozenDrives()
         mxDrives.lock();
         for (auto it = begin(listDrives); it != end(listDrives); ++it)
         {
-            if (it->state == Drive::SHRED_ACTIVE)
+            if (it->state == Drive::TaskState::SHRED_ACTIVE)
             {
                 it->checkFrozenDrive();
             }
@@ -135,18 +147,20 @@ void reHDD::ThreadUserInput()
 {
     while (true)
     {
+        Drive *tmpSelectedDrive = getSelectedDrive();
+
         // cout << TUI::readUserInput() << endl;
         switch (TUI::readUserInput())
         {
         case TUI::UserInput::DownKey:
             // cout << "Down" << endl;
             handleArrowKey(TUI::UserInput::DownKey);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::UpKey:
             // cout << "Up" << endl;
             handleArrowKey(TUI::UserInput::UpKey);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::Undefined:
             // cout << "Undefined" << endl;
@@ -154,83 +168,133 @@ void reHDD::ThreadUserInput()
         case TUI::UserInput::Abort:
             // cout << "Abort" << endl;
             handleAbort();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::Delete:
             // cout << "Delete" << endl;
 
-            if (getSelectedDrive() != nullptr)
+            if (tmpSelectedDrive != nullptr)
             {
-                if (getSelectedDrive()->state == Drive::NONE)
+                if (tmpSelectedDrive->state == Drive::TaskState::NONE)
                 {
-                    getSelectedDrive()->state = Drive::DELETE_SELECTED;
+                    tmpSelectedDrive->state = Drive::TaskState::DELETE_SELECTED;
                 }
             }
 
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::Shred:
             // cout << "Shred" << endl;
-
+            if (tmpSelectedDrive != nullptr)
-            if (getSelectedDrive() != nullptr)
             {
-                if (getSelectedDrive()->state == Drive::NONE)
+                if (tmpSelectedDrive->state == Drive::TaskState::NONE)
                 {
-                    getSelectedDrive()->state = Drive::SHRED_SELECTED;
+                    tmpSelectedDrive->state = Drive::TaskState::SHRED_SELECTED;
                 }
             }
-
+            ui->updateTUI(&listDrives, u16SelectedEntry);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
             break;
         case TUI::UserInput::ShredAll:
             // cout << "ShredAll" << endl;
             startShredAllDrives(&listDrives);
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::Enter:
             // cout << "Enter" << endl;
             handleEnter();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::ESC:
             // cout << "ESC" << endl;
             handleESC();
-            ui->updateTUI(&listDrives, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             break;
         case TUI::UserInput::Terminate:
-            cout << "Terminate" << endl;
+            // cout << "Terminate" << endl;
             stopShredAllDrives(&listDrives);
+            ui->terminateTUI();
             sleep(5);     // sleep 5 sec
             std::exit(1); // Terminates main, doesn't wait for threads
             break;
+        case TUI::UserInput::Print:
+            // cout << "Print" << endl;
+            if (tmpSelectedDrive != nullptr)
+            {
+                printDrive(tmpSelectedDrive);
+            }
+            ui->updateTUI(&listDrives, u16SelectedEntry);
+            break;
+        case TUI::UserInput::PrintAll:
+            // cout << "PrintAll" << endl;
+            printAllDrives(&listDrives);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
+            break;
         default:
             break;
         }
     }
 }
 
+/**
+ * \brief   print all shredded drives
+ * \param	pointer of list <Drive>* plistDrives
+ * \return  void
+ */
+void reHDD::printAllDrives(list<Drive> *plistDrives)
+{
+    list<Drive>::iterator it;
+    mxDrives.lock();
+    for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
+    {
+        Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
+        printDrive(pTmpDrive);
+    }
+    mxDrives.unlock();
+}
+
+/**
+ * \brief   print a shredded drives
+ * \param	pointer of a drive
+ * \return  void
+ */
+void reHDD::printDrive(Drive *const pDrive)
+{
+    if (pDrive->bWasShredded)
+    {
+#ifdef ZERO_CHECK
+        if (pDrive->bWasChecked && (pDrive->u32DriveChecksumAfterShredding != 0U))
+        {
+            return; // Drive was shredded&checked but checksum failed, don't print label
+        }
+#endif
+        Logger::logThis()->info("User print for: " + pDrive->getModelName() + "-" + pDrive->getSerial());
+        Printer::getPrinter()->print(pDrive);
+    }
+}
+
 void reHDD::ThreadShred(Drive *const pDrive)
 {
     if (pDrive != nullptr)
     {
         pDrive->setActionStartTimestamp();                         // save timestamp at start of shredding
-        Shred *pShredTask = new Shred();                       // create new shred task
+        Shred *pShredInstance = new Shred();                       // create new shred task
-        pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
+        pShredInstance->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
-        delete pShredTask;                                     // delete shred task
+        delete pShredInstance;                                     // delete shred task
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        ui->updateTUI(&listDrives, u16SelectedEntry);
     }
 }
 
-void reHDD::ThreadDelete()
+void reHDD::ThreadDelete(Drive *const pDrive)
 {
-    if (getSelectedDrive() != nullptr)
+    if (pDrive != nullptr)
     {
-        getSelectedDrive()->setActionStartTimestamp();      // save timestamp at start of deleting
+        pDrive->state = Drive::TaskState::DELETE_ACTIVE;
-        Delete::deleteDrive(getSelectedDrive());            // blocking, no thread
+        pDrive->setActionStartTimestamp();      // save timestamp at start of deleting
-        getSelectedDrive()->state = Drive::TaskState::NONE; // delete finished
+        Delete::deleteDrive(pDrive);            // blocking, no thread
-        getSelectedDrive()->bWasDeleted = true;
+        pDrive->state = Drive::TaskState::NONE; // delete finished
-        Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+        pDrive->bWasDeleted = true;
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        Logger::logThis()->info("Finished delete for: " + pDrive->getModelName() + "-" + pDrive->getSerial());
+        ui->updateTUI(&listDrives, u16SelectedEntry);
     }
 }
 
@@ -268,7 +332,7 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
             {
                 itOld->bIsOffline = false; // drive is still attached
                 // copy new smart data to existing drive
-                itOld->setDriveSMARTData(itNew->getModelFamily(), itNew->getModelName(), itNew->getSerial(), itNew->getCapacity(), itNew->getErrorCount(), itNew->getPowerOnHours(), itNew->getPowerCycles(), itNew->getTemperature());
+                itOld->setDriveSMARTData(itNew->getModelFamily(), itNew->getModelName(), itNew->getSerial(), itNew->getCapacity(), itNew->getErrorCount(), itNew->getPowerOnHours(), itNew->getPowerCycles(), itNew->getTemperature(), itNew->getReallocatedSectors(), itNew->getPendingSectors(), itNew->getUncorrectableSectors());
 #ifdef LOG_LEVEL_HIGH
                 Logger::logThis()->info("Delete new drive, because already attached: " + itNew->getModelName());
 #endif
@@ -288,7 +352,7 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
         {
             // cout << "offline drive found: " << itOld->getPath() << endl;
             Logger::logThis()->warning("Mark offline drive found: " + itOld->getPath());
-            itOld->state = Drive::NONE; // clear state --> shred task will terminate
+            itOld->state = Drive::TaskState::NONE; // clear state --> shred task will terminate
         }
     }
 
@@ -325,27 +389,27 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
         if (devName.empty())
             continue;
 
-        Drive *tmpDrive = new Drive("/dev/" + devName);
+        Drive tmpDrive("/dev/" + devName);
-        tmpDrive->state = Drive::NONE;
+        tmpDrive.state = Drive::TaskState::NONE;
-        tmpDrive->bIsOffline = false;
+        tmpDrive.bIsOffline = false;
 
         // Set connection type
         if (transport == "sata")
-            tmpDrive->connectionType = Drive::SATA;
+            tmpDrive.connectionType = Drive::ConnectionType::SATA;
         else if (transport == "usb")
-            tmpDrive->connectionType = Drive::USB;
+            tmpDrive.connectionType = Drive::ConnectionType::USB;
         else if (transport == "nvme")
-            tmpDrive->connectionType = Drive::NVME;
+            tmpDrive.connectionType = Drive::ConnectionType::NVME;
         else
-            tmpDrive->connectionType = Drive::UNKNOWN;
+            tmpDrive.connectionType = Drive::ConnectionType::UNKNOWN;
 
-        plistDrives->push_back(*tmpDrive);
+        plistDrives->push_back(tmpDrive);
 
         Logger::logThis()->info(
-            "Drive found: " + tmpDrive->getPath() +
+            "Drive found: " + tmpDrive.getPath() +
             " (type: " +
-            (tmpDrive->connectionType == Drive::USB ? "USB" : tmpDrive->connectionType == Drive::SATA ? "SATA"
+            (tmpDrive.connectionType == Drive::ConnectionType::USB ? "USB" : tmpDrive.connectionType == Drive::ConnectionType::SATA ? "SATA"
-                                                          : tmpDrive->connectionType == Drive::NVME   ? "NVME"
+                                                                         : tmpDrive.connectionType == Drive::ConnectionType::NVME   ? "NVME"
                                                                                                                                     : "UNKNOWN") +
             ")");
     }
@@ -354,7 +418,7 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
 }
 
 /**
- * \brief   filter out drives that are listed in "ignoreDrives.conf"
+ * \brief   filter out drives that are listed in "ignoreDrives.conf", loop devices, and optical drives
  * \param   pointer of list <Drive>* plistDrives
  * \return  void
  */
@@ -364,70 +428,140 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
     if (getSystemDrive(systemDrivePath))
     {
         // Logger::logThis()->info("Found system drive: " + systemDrivePath);
-
+        list<Drive>::iterator it = plistDrives->begin();
-        list<Drive>::iterator it;
+        while (it != plistDrives->end())
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
         {
-            if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
+            string driveName = it->getPath();
+            // Remove /dev/ prefix
+            if (driveName.find("/dev/") == 0)
+            {
+                driveName = driveName.substr(5); // Skip "/dev/"
+            }
+
+            if (systemDrivePath.find(driveName) != 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--;
+            }
+            else
+            {
+                ++it;
             }
         }
     }
 
-    list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
+    // Filter out loop devices (loop0, loop1, etc.)
-    ifstream input("ignoreDrives.conf");   // read ignore file
+    list<Drive>::iterator it = plistDrives->begin();
+    while (it != plistDrives->end())
+    {
+        string driveName = it->getPath();
+        if (driveName.find("/dev/") == 0)
+        {
+            driveName = driveName.substr(5);
+        }
+
+        if (driveName.find("loop") == 0)
+        {
+#ifdef LOG_LEVEL_HIGH
+            Logger::logThis()->info("loop device found --> ignore this drive: " + it->getPath());
+#endif
+            it = plistDrives->erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    // Filter out optical drives (sr0, sr1, cdrom, dvd, etc.)
+    it = plistDrives->begin();
+    while (it != plistDrives->end())
+    {
+        string driveName = it->getPath();
+        if (driveName.find("/dev/") == 0)
+        {
+            driveName = driveName.substr(5);
+        }
+
+        if (driveName.find("sr") == 0 ||
+            driveName.find("cdrom") == 0 ||
+            driveName.find("dvd") == 0 ||
+            driveName.find("cdrw") == 0)
+        {
+#ifdef LOG_LEVEL_HIGH
+            Logger::logThis()->info("optical drive found --> ignore this drive: " + it->getPath());
+#endif
+            it = plistDrives->erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    // Read ignored drives from config file
+    list<tuple<string>> vtlIgnoredDevices;
+    ifstream input("ignoreDrives.conf");
 
     for (string sLine; getline(input, sLine);)
     {
-        // Logger::logThis()->info("read uuid: " + sLine);
+        // Skip empty lines and comments
-        vtlIgnoredDevices.emplace_back(sLine); // add found path and uuid from ignore file to vector
+        if (!sLine.empty() && sLine[0] != '#')
+        {
+            vtlIgnoredDevices.emplace_back(sLine);
         }
-    // loop through found entries in ignore file
+    }
+
+    // Loop through found entries in ignore file
     for (auto row : vtlIgnoredDevices)
     {
-        list<Drive>::iterator it;
+        it = plistDrives->begin();
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
+        while (it != plistDrives->end())
         {
             string sUUID;
             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
+            FILE *outputfileBlkid = popen(sCMD.c_str(), "r");
             if (outputfileBlkid == NULL)
             {
-                exit(EXIT_FAILURE);
+                Logger::logThis()->error("Failed to execute blkid for: " + it->getPath());
+                ++it;
+                continue;
             }
 
-            while ((getline(&cLine, &len, outputfileBlkid)) != -1) // parse UUID from blkid
+            while ((getline(&cLine, &len, outputfileBlkid)) != -1)
             {
-                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);
+                    if (sBlkidOut.length() >= 8)
+                    {
                         sBlkidOut.erase(8, sBlkidOut.length());
+                    }
                     sUUID = sBlkidOut;
-                    // cout << "blkid uuid:" << sUUID << endl;
                 }
             }
+            free(cLine);
             pclose(outputfileBlkid);
-            // cout << "blkid uuid:" << sUUID << endl;
 
-            if (!get<0>(row).compare(sUUID)) // compare uuid from ignore file and uuid from drive
+            if (!get<0>(row).compare(sUUID))
             {
-                // same uuid found than in ignore file --> ignore this drive
 #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 in ignore file --> ignore this drive: " + it->getPath());
 #endif
                 it = plistDrives->erase(it);
-                it--;
+            }
+            else
+            {
+                ++it;
             }
         }
     }
@@ -449,7 +583,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--;
         }
     }
 }
@@ -465,7 +598,7 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
     mxDrives.lock();
     for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
     {
-        if (it->state == Drive::NONE)
+        if (it->state == Drive::TaskState::NONE)
         {
             Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
 #ifdef LOG_LEVEL_HIGH
@@ -473,7 +606,6 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
             address << (void const *)&(*pTmpDrive);
             Logger::logThis()->info("Started shred (all) for: " + pTmpDrive->getModelName() + "-" + pTmpDrive->getSerial() + " @" + address.str());
 #endif
-            pTmpDrive->state = Drive::TaskState::SHRED_ACTIVE;
             thread(ThreadShred, pTmpDrive).detach();
         }
     }
@@ -492,9 +624,9 @@ void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
     for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
     {
 
-        if (it->state == Drive::SHRED_ACTIVE || it->state == Drive::DELETE_ACTIVE)
+        if (it->state == Drive::TaskState::SHRED_ACTIVE || it->state == Drive::TaskState::DELETE_ACTIVE)
         {
-            it->state = Drive::NONE;
+            it->state = Drive::TaskState::NONE;
             Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
             // task for drive is running --> remove selection
         }
@@ -553,18 +685,20 @@ void reHDD::updateShredMetrics(list<Drive> *plistDrives)
     list<Drive>::iterator it;
     for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
     {
-        if (it->state == Drive::SHRED_ACTIVE)
+        if (it->state == Drive::TaskState::SHRED_ACTIVE)
         {
             Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
             // set metrics for calculating shred speed
             std::chrono::time_point<std::chrono::system_clock> chronoCurrentTimestamp = std::chrono::system_clock::now();
-            time_t u32ShredTimeDelta = (chronoCurrentTimestamp - pTmpDrive->sShredSpeed.chronoShredTimestamp).count();
+            auto shredSpeed = pTmpDrive->sShredSpeed.load();
+            time_t u32ShredTimeDelta = (chronoCurrentTimestamp - shredSpeed.chronoShredTimestamp).count();
             if (u32ShredTimeDelta > METRIC_THRESHOLD)
             {
-                pTmpDrive->sShredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
+                shredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
-                pTmpDrive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
+                shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                pTmpDrive->sShredSpeed.ulWrittenBytes = pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten;
+                shredSpeed.ulWrittenBytes = shredSpeed.ulSpeedMetricBytesWritten;
-                pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten = 0U;
+                shredSpeed.ulSpeedMetricBytesWritten = 0U;
+                pTmpDrive->sShredSpeed.store(shredSpeed);
             }
         }
     }
@@ -587,28 +721,28 @@ void reHDD::addSMARTData(list<Drive> *plistDrives)
 
 void reHDD::handleArrowKey(TUI::UserInput userInput)
 {
-    int8_t u8EntrySize = (int8_t)listDrives.size();
+    uint8_t u8EntrySize = (uint8_t)listDrives.size();
     switch (userInput)
     {
     case TUI::UserInput::DownKey:
-        u8SelectedEntry++;
+        u16SelectedEntry++;
-        if (u8SelectedEntry >= u8EntrySize)
+        if (u16SelectedEntry >= u8EntrySize)
         {
-            u8SelectedEntry = 0;
+            u16SelectedEntry = 0;
         }
         break;
     case TUI::UserInput::UpKey:
-        if (u8SelectedEntry == 0)
+        if (u16SelectedEntry == 0)
         {
-            u8SelectedEntry = (u8EntrySize - 1);
+            u16SelectedEntry = (u8EntrySize - 1);
         }
         else
         {
-            u8SelectedEntry--;
+            u16SelectedEntry--;
         }
         break;
     default:
-        u8SelectedEntry = 0;
+        u16SelectedEntry = 0;
         break;
     }
 
@@ -617,41 +751,37 @@ 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;
+            thread(ThreadShred, tmpSelectedDrive).detach();
-            // task for drive is running --> don't show  more task options
-            Drive *pTmpDrive = getSelectedDrive();
-            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;
+            thread(ThreadDelete, tmpSelectedDrive).detach();
-            // task for drive is running --> don't show  more task options
-            thread(ThreadDelete).detach();
         }
     }
 }
 
 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
         }
     }
@@ -659,12 +789,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::TaskState::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::TaskState::DELETE_ACTIVE)
         {
-            getSelectedDrive()->state = Drive::NONE;
+            tmpSelectedDrive->state = Drive::TaskState::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
         }
     }
@@ -693,14 +824,23 @@ bool reHDD::getSystemDrive(string &systemDrive)
             continue;
         }
 
-        // Logger::logThis()->info(currentLine);
+        // Extract drive name from line (removing tree characters)
-
         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
+            // Find the actual drive name (after tree characters like └─, ├─)
-            // Logger::logThis()->info("Drive found: " + systemDrive);
+            size_t lastAlpha = 0;
+            for (size_t i = 0; i < systemDrive.length(); i++)
+            {
+                if (isalpha(systemDrive[i]))
+                {
+                    lastAlpha = i;
+                    break;
+                }
+            }
+
+            systemDrive = systemDrive.substr(lastAlpha);
         }
 
         if (currentLine.ends_with(" /boot/efi\n"s))
@@ -723,5 +863,17 @@ bool reHDD::getSystemDrive(string &systemDrive)
     }
     pclose(outputfileHwinfo);
 
+    // Remove mountpoint (everything after first space)
+    size_t spacePos = systemDrive.find(' ');
+    if (spacePos != std::string::npos)
+    {
+        systemDrive = systemDrive.substr(0, spacePos);
+    }
+
+    // Remove all unwanted characters
+    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end());
+    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '/'), systemDrive.end());
+    systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\r'), systemDrive.end());
+
     return systemDriveFound;
 }

src/shred.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 #ifdef __cplusplus
 extern "C"
@@ -20,143 +21,448 @@ const static char *randomsrc = (char *)"/dev/urandom";
 
 Shred::Shred()
 {
+#ifdef ADAPTIVE_CHUNK_SIZE
+    // Allocate aligned buffers for maximum chunk size
+    if (posix_memalign((void **)&caTfngData, 4096, CHUNK_SIZE_MAX) != 0)
+    {
+        Logger::logThis()->error("Failed to allocate aligned buffer for tfng data");
+        caTfngData = nullptr;
+    }
+
+    if (posix_memalign((void **)&caReadBuffer, 4096, CHUNK_SIZE_MAX) != 0)
+    {
+        Logger::logThis()->error("Failed to allocate aligned buffer for read buffer");
+        caReadBuffer = nullptr;
+    }
+
+    // Initialize adaptive tracking variables
+    currentChunkSize = CHUNK_SIZE_START;
+    bestChunkSize = CHUNK_SIZE_START;
+    chunkCounter = 0;
+    bestThroughputMBps = 0.0;
+    lastThroughputMBps = 0.0;
+    bytesWrittenInMeasurement = 0;
+    throughputIncreasing = true;
+
+    Logger::logThis()->info("Adaptive chunk size optimization ENABLED - Starting with " +
+                            to_string(currentChunkSize / (1024 * 1024)) + " MB chunks");
+#endif
 }
 
 Shred::~Shred()
 {
+#ifdef ADAPTIVE_CHUNK_SIZE
+    if (caTfngData != nullptr)
+    {
+        free(caTfngData);
+        caTfngData = nullptr;
+    }
+    if (caReadBuffer != nullptr)
+    {
+        free(caReadBuffer);
+        caReadBuffer = nullptr;
+    }
+#endif
+}
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+/**
+ * \brief   Start performance measurement interval
+ * \return  void
+ */
+void Shred::startMeasurement()
+{
+    measurementStartTime = std::chrono::high_resolution_clock::now();
+    bytesWrittenInMeasurement = 0;
+    chunkCounter = 0;
 }
 
 /**
  * \brief   shred drive with shred
  * \param   pointer of Drive instance
+ * \param   file descriptor for signaling
+ * \return  0 on success, -1 on error
+ */
+void Shred::evaluateThroughput(Drive *drive)
+{
+    auto measurementEndTime = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed = measurementEndTime - measurementStartTime;
+    double elapsedSeconds = elapsed.count();
+
+    if (elapsedSeconds > 0.0)
+    {
+        double throughputMBps = (bytesWrittenInMeasurement / (1024.0 * 1024.0)) / elapsedSeconds;
+        lastThroughputMBps = throughputMBps;
+
+        Logger::logThis()->info("Throughput measurement - ChunkSize: " +
+                                to_string(currentChunkSize / (1024 * 1024)) + " MB, " +
+                                "Throughput: " + to_string((int)throughputMBps) + " MB/s, " +
+                                "Best: " + to_string((int)bestThroughputMBps) + " MB/s" +
+                                " - Drive: " + drive->getSerial());
+
+        // Check if this is better than our best
+        if (throughputMBps > bestThroughputMBps)
+        {
+            bestThroughputMBps = throughputMBps;
+            bestChunkSize = currentChunkSize;
+            throughputIncreasing = true;
+
+            Logger::logThis()->info("NEW BEST throughput: " + to_string((int)bestThroughputMBps) +
+                                    " MB/s with " + to_string(currentChunkSize / (1024 * 1024)) +
+                                    " MB chunks - Drive: " + drive->getSerial());
+        }
+        else
+        {
+            throughputIncreasing = false;
+        }
+    }
+
+    // Adjust chunk size for next measurement interval
+    adjustChunkSize(drive);
+
+    // Start new measurement
+    startMeasurement();
+}
+
+/**
+ * \brief   Adjust chunk size based on throughput trend
+ * \param   pointer to Drive instance
  * \return  void
  */
+void Shred::adjustChunkSize(Drive *drive)
+{
+    size_t oldChunkSize = currentChunkSize;
+
+    if (throughputIncreasing)
+    {
+        // Throughput is improving - increase chunk size
+        currentChunkSize += CHUNK_SIZE_STEP_UP;
+
+        // Clamp to maximum
+        if (currentChunkSize > CHUNK_SIZE_MAX)
+        {
+            currentChunkSize = CHUNK_SIZE_MAX;
+            Logger::logThis()->info("Reached maximum chunk size: " +
+                                    to_string(currentChunkSize / (1024 * 1024)) + " MB" +
+                                    " - Drive: " + drive->getSerial());
+        }
+    }
+    else
+    {
+        // Throughput decreased - decrease chunk size to find sweet spot
+        if (currentChunkSize > CHUNK_SIZE_STEP_DOWN)
+        {
+            currentChunkSize -= CHUNK_SIZE_STEP_DOWN;
+        }
+
+        // Clamp to minimum
+        if (currentChunkSize < CHUNK_SIZE_MIN)
+        {
+            currentChunkSize = CHUNK_SIZE_MIN;
+            Logger::logThis()->info("Reached minimum chunk size: " +
+                                    to_string(currentChunkSize / (1024 * 1024)) + " MB" +
+                                    " - Drive: " + drive->getSerial());
+        }
+    }
+
+    if (oldChunkSize != currentChunkSize)
+    {
+        Logger::logThis()->info("Adjusted chunk size: " +
+                                to_string(oldChunkSize / (1024 * 1024)) + " MB -> " +
+                                to_string(currentChunkSize / (1024 * 1024)) + " MB" +
+                                " - Drive: " + drive->getSerial());
+    }
+}
+
+/**
+ * \brief   Get current chunk size for adaptive mode
+ * \return  current chunk size in bytes
+ */
+size_t Shred::getCurrentChunkSize() const
+{
+    return currentChunkSize;
+}
+#endif
+
+/**
+ * \brief   shred drive with shred
+ * \param   pointer of Drive instance
+ * \param   file descriptor for signaling
+ * \return  0 on success, -1 on error
+ */
 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
+
+    // Mark as started but NOT shredded yet
+    drive->bWasShredStarted = true;
+    drive->bWasShredded = false;
+    drive->bWasChecked = false;
+    drive->setTaskPercentage(0.0);
+    drive->u32DriveChecksumAfterShredding = UINT32_MAX;
+    drive->state = Drive::TaskState::SHRED_ACTIVE;
 
 #ifdef DRYRUN
-    for (int i = 0; i <= 500; i++)
+    for (int i = 0; i <= 100; i++)
     {
-        if (drive->state != Drive::SHRED_ACTIVE)
+        if (drive->state.load() != Drive::TaskState::SHRED_ACTIVE)
         {
-            return 0;
+            Logger::logThis()->info("Shred-Task aborted during DRYRUN - Drive: " + drive->getSerial());
-        }
             drive->setTaskPercentage(i + 0.05);
+            drive->state = Drive::TaskState::NONE;
+            drive->bWasShredded = false; // CRITICAL: Mark as NOT shredded on abort
+            return -1;
+        }
+        drive->setTaskPercentage((double)i);
         write(*ipSignalFd, "A", 1);
         usleep(20000);
     }
+
+    // Only mark as shredded if DRYRUN completed successfully
     drive->bWasShredded = true;
+    drive->setTaskPercentage(0.0);
+    drive->state = Drive::TaskState::NONE;
+    Logger::logThis()->info("DRYRUN completed - Drive: " + drive->getSerial());
+    return 0;
 #endif
 
 #ifndef DRYRUN
-    const char *cpDrivePath = drive->getPath().c_str();
+    string sDrivePath = drive->getPath();
+    const char *cpDrivePath = sDrivePath.c_str();
     unsigned char ucKey[TFNG_KEY_SIZE];
 
-    // open random source
+#ifdef ADAPTIVE_CHUNK_SIZE
+    // Validate buffers were allocated
+    if (caTfngData == nullptr || caReadBuffer == nullptr)
+    {
+        Logger::logThis()->error("Shred-Task: Aligned buffers not allocated! - Drive: " + drive->getSerial());
+        return -1;
+    }
+#endif
+
+    // Open random source
+    Logger::logThis()->info("Shred-Task: Opening random source: " + string(randomsrc) + " - Drive: " + drive->getSerial());
     randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
     if (randomSrcFileDiscr == -1)
     {
-        std::string errorMsg(strerror(randomSrcFileDiscr));
+        int savedErrno = errno;
-        Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
+        Logger::logThis()->error("Shred-Task: Open random source failed! Path: " + string(randomsrc) +
-        perror(randomsrc);
+                                 " - Error: " + strerror(savedErrno) + " (errno: " + to_string(savedErrno) + ")" +
-        cleanup();
+                                 " - Drive: " + drive->getSerial());
+
+        // Reset drive state on error - NOT shredded
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        drive->bWasShredStarted = false;
+        drive->bWasShredded = false;
         return -1;
     }
+    Logger::logThis()->info("Shred-Task: Random source opened successfully (fd: " + to_string(randomSrcFileDiscr) + ") - Drive: " + drive->getSerial());
 
-    // open disk
+    // Open disk
     driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
     if (driveFileDiscr == -1)
     {
-        std::string errorMsg(strerror(driveFileDiscr));
+        int savedErrno = errno;
-        Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+        string errorDetail;
-        perror(cpDrivePath);
+
-        cleanup();
+        switch (savedErrno)
-        return -1;
+        {
+        case ENOMEDIUM:
+            errorDetail = "No medium found (drive may be empty or disconnected)";
+            break;
+        case EACCES:
+            errorDetail = "Permission denied (need root/sudo?)";
+            break;
+        case ENOENT:
+            errorDetail = "Drive not found (device may have been removed)";
+            break;
+        case EROFS:
+            errorDetail = "Read-only file system";
+            break;
+        case EBUSY:
+            errorDetail = "Drive is busy (may be mounted or in use)";
+            break;
+        case EINVAL:
+            errorDetail = "Invalid argument";
+            break;
+        default:
+            errorDetail = strerror(savedErrno);
+            break;
         }
 
-    // read key for random generator
+        Logger::logThis()->error("Shred-Task: Open drive failed! Path: " + string(cpDrivePath) +
+                                 " - Error: " + errorDetail + " (errno: " + to_string(savedErrno) + ")" +
+                                 " - Drive: " + drive->getSerial() + " - Model: " + drive->getModelName());
+
+        // Close random source before returning
+        close(randomSrcFileDiscr);
+        randomSrcFileDiscr = -1;
+
+        // Reset drive state on error - NOT shredded
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        drive->bWasShredStarted = false;
+        drive->bWasShredded = false;
+        return -1;
+    }
+    Logger::logThis()->info("Shred-Task: Drive opened successfully (fd: " + to_string(driveFileDiscr) + ") - Drive: " + drive->getSerial());
+
+    // Read key for random generator
+    Logger::logThis()->info("Shred-Task: Reading random key - Drive: " + drive->getSerial());
     ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
     if (readRet <= 0)
     {
-        std::string errorMsg(strerror(readRet));
+        int savedErrno = errno;
-        Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
+        Logger::logThis()->error("Shred-Task: Read random key failed! Expected: " + to_string(sizeof(ucKey)) +
-        perror(randomsrc);
+                                 " bytes, Got: " + to_string(readRet) + " bytes" +
+                                 " - Error: " + strerror(savedErrno) + " (errno: " + to_string(savedErrno) + ")" +
+                                 " - Drive: " + drive->getSerial());
         cleanup();
+
+        // Reset drive state on error - NOT shredded
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        drive->bWasShredStarted = false;
+        drive->bWasShredded = false;
         return -1;
     }
+    Logger::logThis()->info("Shred-Task: Random key read successfully (" + to_string(readRet) + " bytes) - Drive: " + drive->getSerial());
 
     tfng_prng_seedkey(ucKey);
 
     this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
-    drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
+    if (this->ulDriveByteSize == 0)
-    drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; // uses to calculate speed metric
+    {
+        Logger::logThis()->error("Shred-Task: Drive size is 0 bytes! Drive may be empty or size detection failed - Drive: " + drive->getSerial());
+        cleanup();
+
+        // Reset drive state on error - NOT shredded
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        drive->bWasShredStarted = false;
+        drive->bWasShredded = false;
+        return -1;
+    }
+
+    Drive::ShredSpeed shredSpeed = drive->sShredSpeed.load();
+    shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
+    shredSpeed.ulSpeedMetricBytesWritten = 0U;
+    drive->sShredSpeed.store(shredSpeed);
 
 #ifdef LOG_LEVEL_HIGH
     Logger::logThis()->info("Shred-Task: Bytes-Size of Drive: " + to_string(this->ulDriveByteSize) + " - Drive: " + drive->getSerial());
 #endif
 
+#ifdef ADAPTIVE_CHUNK_SIZE
+    // Start first measurement interval
+    startMeasurement();
+#endif
+    // Main shredding loop
     for (unsigned int uiShredIterationCounter = 0U; uiShredIterationCounter < SHRED_ITERATIONS; uiShredIterationCounter++)
     {
-        unsigned long ulDriveByteCounter = 0U; // used for one shred-iteration to keep track of the current drive position
+        // Logger::logThis()->info("Shred-Task: Starting iteration " + to_string(uiShredIterationCounter + 1) + "/" + to_string(SHRED_ITERATIONS) + " - Drive: " + drive->getSerial());
+
+        unsigned long ulDriveByteCounter = 0U;
 
         if (uiShredIterationCounter == (SHRED_ITERATIONS - 1))
         {
             // last shred iteration --> overwrite (just the write chunk) bytes with zeros instead with random data
+#ifdef ADAPTIVE_CHUNK_SIZE
+            memset(caTfngData, 0U, CHUNK_SIZE_MAX);
+#else
             memset(caTfngData, 0U, CHUNK_SIZE);
+#endif
         }
 
         while (ulDriveByteCounter < ulDriveByteSize)
         {
-            int iBytesToShred = 0; // Bytes that will be overwritten in this chunk-iteration
+#ifdef ADAPTIVE_CHUNK_SIZE
+            size_t activeChunkSize = getCurrentChunkSize();
+#else
+            size_t activeChunkSize = CHUNK_SIZE;
+#endif
+
+            int iBytesToShred = 0;
 
             if (uiShredIterationCounter != (SHRED_ITERATIONS - 1))
             {
-                // NOT last shred iteration --> generate new random data
+#ifdef ADAPTIVE_CHUNK_SIZE
+                tfng_prng_genrandom(caTfngData, activeChunkSize);
+#else
                 tfng_prng_genrandom(caTfngData, TFNG_DATA_SIZE);
+#endif
             }
 
-            if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
+            if ((ulDriveByteSize - ulDriveByteCounter) < activeChunkSize)
             {
                 iBytesToShred = (ulDriveByteSize - ulDriveByteCounter);
             }
             else
             {
-                iBytesToShred = CHUNK_SIZE;
+                iBytesToShred = activeChunkSize;
             }
 
             int iByteShredded = write(driveFileDiscr, caTfngData, iBytesToShred);
 
             if (iByteShredded <= 0)
             {
-                std::string errorMsg(strerror(iByteShredded));
+                int savedErrno = errno;
-                Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
+                Logger::logThis()->error("Shred-Task: Write to drive failed! Attempted: " + to_string(iBytesToShred) +
-                perror("unable to write random data");
+                                         " bytes, Written: " + to_string(iByteShredded) + " bytes" +
+                                         " - Position: " + to_string(ulDriveByteCounter) + "/" + to_string(ulDriveByteSize) +
+                                         " - Iteration: " + to_string(uiShredIterationCounter + 1) + "/" + to_string(SHRED_ITERATIONS) +
+                                         " - Error: " + strerror(savedErrno) + " (errno: " + to_string(savedErrno) + ")" +
+                                         " - Drive: " + drive->getSerial());
                 cleanup();
+
+                // CRITICAL: Mark as NOT shredded on write failure
+                drive->state = Drive::TaskState::NONE;
+                drive->setTaskPercentage(0.0);
+                drive->bWasShredded = false;
+                drive->bWasChecked = false;
                 return -1;
             }
 
+            auto shredSpeed = drive->sShredSpeed.load();
+            shredSpeed.ulSpeedMetricBytesWritten += iByteShredded;
+            drive->sShredSpeed.store(shredSpeed);
+
             ulDriveByteCounter += iByteShredded;
             ulDriveByteOverallCount += iByteShredded;
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+            bytesWrittenInMeasurement += iByteShredded;
+            chunkCounter++;
+
+            // Evaluate throughput after measurement interval
+            if (chunkCounter >= CHUNK_MEASURE_INTERVAL)
+            {
+                evaluateThroughput(drive);
+            }
+#endif
+
             d32Percent = this->calcProgress();
-            drive->sShredSpeed.ulSpeedMetricBytesWritten += iByteShredded;
 
 #ifdef LOG_LEVEL_HIGH
-            Logger::logThis()->info("Shred-Task: ByteCount: " + to_string(ulDriveByteCounter) + " - iteration: " + to_string((uiShredIterationCounter + 1)) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+            Logger::logThis()->info("Shred-Task: ByteCount: " + to_string(ulDriveByteCounter) +
+                                    " - iteration: " + to_string((uiShredIterationCounter + 1)) +
+                                    " - progress: " + to_string(d32Percent) + "%" +
+                                    " - Drive: " + drive->getSerial());
 #endif
+
             if ((d32Percent - d32TmpPercent) >= 0.01)
             {
-                // set shred percantage
+                // set shred percentage
                 drive->setTaskPercentage(d32TmpPercent);
                 d32TmpPercent = d32Percent;
-                // signal process in shreding
+                // signal process in shredding
                 write(*ipSignalFd, "A", 1);
             }
 
-            if (drive->state != Drive::SHRED_ACTIVE)
+            if (drive->state != Drive::TaskState::SHRED_ACTIVE)
             {
                 drive->setTaskPercentage(0);
                 d32Percent = 0.00;
@@ -166,54 +472,92 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
                 cleanup();
                 return -1;
             }
-            // end one chunk write
         }
+
+        Logger::logThis()->info("Shred-Task: Iteration " + to_string(uiShredIterationCounter + 1) + "/" +
+                                to_string(SHRED_ITERATIONS) + " completed - Drive: " + drive->getSerial());
+
+        // Rewind drive for next iteration
         if (0 != iRewindDrive(driveFileDiscr))
         {
-            Logger::logThis()->error("Shred-Task: Unable to rewind drive! - Drive: " + drive->getSerial());
+            Logger::logThis()->error("Shred-Task: Unable to rewind drive after iteration " +
+                                     to_string(uiShredIterationCounter + 1) + " - Drive: " + drive->getSerial());
             cleanup();
+
+            // CRITICAL: Mark as NOT shredded on rewind failure
+            drive->state = Drive::TaskState::NONE;
+            drive->setTaskPercentage(0.0);
+            drive->bWasShredded = false;
+            drive->bWasChecked = false;
             return -1;
         }
-        // end one shred iteration
     }
-    // end of all shred iteratio
 
-    tfng_prng_seedkey(NULL); // reset random generator
+#ifdef ADAPTIVE_CHUNK_SIZE
+    Logger::logThis()->info("Shred completed - Optimal chunk size: " +
+                            to_string(bestChunkSize / (1024 * 1024)) + " MB, " +
+                            "Best throughput: " + to_string((int)bestThroughputMBps) + " MB/s" +
+                            " - Drive: " + drive->getSerial());
+#endif
 
+    // All shred iterations completed successfully
+    tfng_prng_seedkey(NULL);
+
+    // ONLY mark as shredded if ALL iterations completed AND fsync succeeded
     drive->bWasShredded = true;
     Logger::logThis()->info("Shred-Task finished - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
+
 #ifdef ZERO_CHECK
-    drive->state = Drive::CHECK_ACTIVE;
+    drive->state = Drive::TaskState::CHECK_ACTIVE;
     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)
     {
-        Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
+        drive->state = Drive::TaskState::CHECK_FAILED;
+        Logger::logThis()->error("Check-Task: Checksum verification failed! Expected: 0, Got: " +
+                                 to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }
     else
     {
-        Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
+        drive->state = Drive::TaskState::CHECK_SUCCESSFUL;
+        drive->bWasChecked = true;
+        Logger::logThis()->info("Check-Task: Checksum verification passed (zero) - Drive: " + drive->getSerial());
     }
-#endif
-#endif
 #endif
 
     cleanup();
+#endif
 
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
+    // Final state handling - ONLY process if shred actually completed
+    Drive::TaskState finalState = drive->state.load();
+
+    // Only do final processing if we reached a completion state
+    // (not if we returned early with errors)
+    if ((finalState == Drive::TaskState::SHRED_ACTIVE) ||
+        (finalState == Drive::TaskState::CHECK_SUCCESSFUL) ||
+        (finalState == Drive::TaskState::CHECK_FAILED))
     {
-        drive->state = Drive::NONE;
+        if (finalState != Drive::TaskState::CHECK_FAILED)
-        drive->setTaskPercentage(0.0);
+        {
+            Logger::logThis()->info("Shred-Task: Triggering print for drive - Drive: " + drive->getSerial());
             Printer::getPrinter()->print(drive);
-        Logger::logThis()->info("Finished shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
         }
+        else
+        {
+            Logger::logThis()->warning("Shred-Task: Skipping print due to checksum failure - Drive: " + drive->getSerial());
+        }
+
+        drive->state = Drive::TaskState::NONE;
+        drive->setTaskPercentage(0.0);
+        Logger::logThis()->info("Completed shred/check for: " + drive->getModelName() + "-" + drive->getSerial());
+    }
+
     return 0;
 }
+
 /**
  * \brief   calc shredding progress in %
- * \param	current byte index of the drive
- * \param	current shred iteration
  * \return  double percentage
  */
 double Shred::calcProgress()
@@ -223,53 +567,121 @@ double Shred::calcProgress()
 #ifdef ZERO_CHECK
     uiMaxShredIteration++; // increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
 #endif
-    return (double)(((double)ulDriveByteOverallCount) / ((double)this->ulDriveByteSize * uiMaxShredIteration)) * 100.0f;
+
+    if (this->ulDriveByteSize == 0)
+        return 0.0;
+
+    return (double)(((double)ulDriveByteOverallCount) / ((double)this->ulDriveByteSize * uiMaxShredIteration)) * 100.0;
 }
 
+/**
+ * \brief   rewind drive to beginning
+ * \param   file descriptor
+ * \return  0 on success, -1 on error
+ */
 int Shred::iRewindDrive(fileDescriptor file)
 {
-    if (0 != lseek(file, 0L, SEEK_SET))
+    off_t result = lseek(file, 0L, SEEK_SET);
+
+    if (result == -1)
     {
-        perror("unable to rewind drive");
+        int savedErrno = errno;
+        Logger::logThis()->error("Unable to rewind drive! Error: " + string(strerror(savedErrno)) +
+                                 " (errno: " + to_string(savedErrno) + ") - fileDescriptor: " + to_string(file));
         return -1;
     }
-    else
+    else if (result != 0)
     {
-        return 0;
+        Logger::logThis()->error("Rewind position mismatch! Expected: 0, Got: " + to_string(result) +
-    }
+                                 " - fileDescriptor: " + to_string(file));
+        return -1;
     }
 
-unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
+    return 0;
+}
+
+/**
+ * \brief   get drive size in bytes
+ * \param   file descriptor
+ * \return  size in bytes, 0 on error
+ */
+long Shred::getDriveSizeInBytes(fileDescriptor file)
 {
-    unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
+    off_t liDriveSizeTmp = lseek(file, 0L, SEEK_END);
+
+    if (liDriveSizeTmp == -1)
+    {
+        int savedErrno = errno;
+        Logger::logThis()->error("Unable to get drive size! Error: " + string(strerror(savedErrno)) +
+                                 " (errno: " + to_string(savedErrno) + ") - fileDescriptor: " + to_string(file));
+        return 0L;
+    }
 
     if (0 != iRewindDrive(file))
     {
-        ulDriveSizeTmp = 0U;
+        Logger::logThis()->error("Unable to rewind after size detection - fileDescriptor: " + to_string(file));
+        return 0L;
     }
 
 #ifdef DEMO_DRIVE_SIZE
-    ulDriveSizeTmp = DEMO_DRIVE_SIZE;
+    liDriveSizeTmp = DEMO_DRIVE_SIZE;
+    Logger::logThis()->info("DEMO_DRIVE_SIZE active - using size: " + to_string(liDriveSizeTmp) + " bytes");
 #endif
-    return ulDriveSizeTmp;
+
+    return liDriveSizeTmp;
 }
 
+/**
+ * \brief   calculate checksum of drive (verify all zeros)
+ * \param   file descriptor
+ * \param   pointer to Drive instance
+ * \param   signal file descriptor
+ * \return  checksum value (0 = all zeros)
+ */
 unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd)
 {
     unsigned int uiChecksum = 0;
     unsigned long ulDriveByteCounter = 0U;
+
+    Logger::logThis()->info("Check-Task: Starting checksum verification - Drive: " + drive->getSerial());
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+    size_t checkChunkSize = CHUNK_SIZE_MAX;
+#else
+    size_t checkChunkSize = CHUNK_SIZE;
+#endif
+
     while (ulDriveByteCounter < ulDriveByteSize)
     {
+        // Check if task was aborted
+        if (drive->state.load() != Drive::TaskState::CHECK_ACTIVE)
+        {
+            Logger::logThis()->info("Check-Task: Aborted by user at " + to_string(d32Percent) + "% - Drive: " + drive->getSerial());
+            return UINT32_MAX; // Return non-zero to indicate incomplete check
+        }
+
         int iBytesToCheck = 0;
-        if ((ulDriveByteSize - ulDriveByteCounter) < CHUNK_SIZE)
+        if ((ulDriveByteSize - ulDriveByteCounter) < checkChunkSize)
         {
             iBytesToCheck = (ulDriveByteSize - ulDriveByteCounter);
         }
         else
         {
-            iBytesToCheck = CHUNK_SIZE;
+            iBytesToCheck = checkChunkSize;
         }
         int iReadBytes = read(file, caReadBuffer, iBytesToCheck);
+
+        if (iReadBytes <= 0)
+        {
+            int savedErrno = errno;
+            Logger::logThis()->error("Check-Task: Read failed! Attempted: " + to_string(iBytesToCheck) +
+                                     " bytes, Read: " + to_string(iReadBytes) + " bytes" +
+                                     " - Position: " + to_string(ulDriveByteCounter) + "/" + to_string(ulDriveByteSize) +
+                                     " - Error: " + strerror(savedErrno) + " (errno: " + to_string(savedErrno) + ")" +
+                                     " - Drive: " + drive->getSerial());
+            return UINT32_MAX; // Return non-zero to indicate read failure
+        }
+
         for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
         {
             uiChecksum += caReadBuffer[iReadBytesCounter];
@@ -277,10 +689,15 @@ unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSig
         ulDriveByteCounter += iReadBytes;
         ulDriveByteOverallCount += iReadBytes;
         d32Percent = this->calcProgress();
-        drive->sShredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
+        auto shredSpeed = drive->sShredSpeed.load();
+        shredSpeed.ulSpeedMetricBytesWritten += iReadBytes;
+        drive->sShredSpeed.store(shredSpeed);
 
 #ifdef LOG_LEVEL_HIGH
-        Logger::logThis()->info("Shred-Task (Checksum): ByteCount: " + to_string(ulDriveByteCounter) + " - progress: " + to_string(d32Percent) + " - Drive: " + drive->getSerial());
+        Logger::logThis()->info("Check-Task: ByteCount: " + to_string(ulDriveByteCounter) +
+                                " - progress: " + to_string(d32Percent) + "%" +
+                                " - checksum so far: " + to_string(uiChecksum) +
+                                " - Drive: " + drive->getSerial());
 #endif
 
         if (((d32Percent - d32TmpPercent) >= 0.01) || (d32Percent == 100.0))
@@ -293,12 +710,29 @@ unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSig
             write(*ipSignalFd, "A", 1);
         }
     }
+
+    Logger::logThis()->info("Check-Task: Verification complete - Final checksum: " + to_string(uiChecksum) + " - Drive: " + drive->getSerial());
     drive->bWasChecked = true;
+
     return uiChecksum;
 }
 
+/**
+ * \brief   cleanup - close file descriptors
+ */
 void Shred::cleanup()
 {
+    if (driveFileDiscr != -1)
+    {
+        Logger::logThis()->info("Shred-Task: Closing drive file descriptor: " + to_string(driveFileDiscr));
         close(driveFileDiscr);
+        driveFileDiscr = -1;
+    }
+
+    if (randomSrcFileDiscr != -1)
+    {
+        Logger::logThis()->info("Shred-Task: Closing random source file descriptor: " + to_string(randomSrcFileDiscr));
         close(randomSrcFileDiscr);
+        randomSrcFileDiscr = -1;
+    }
 }

src/smart.cpp

@@ -6,6 +6,257 @@
  */
 
 #include "../include/reHDD.h"
+#include <sys/wait.h> // For WIFSIGNALED, WTERMSIG
+using namespace std;
+
+/**
+ * \brief   Parse context for SMART attribute values
+ */
+struct SMARTParseContext
+{
+    // Device information (top-level JSON fields)
+    string modelFamily;
+    string modelName;
+    string serial;
+    uint64_t capacity;
+
+    // Power and temperature (top-level JSON fields)
+    uint32_t errorCount;
+    uint32_t powerOnHours;
+    uint32_t powerCycles;
+    uint32_t temperature;
+
+    // Critical sector counts (from ata_smart_attributes table)
+    uint32_t reallocatedSectors;   // ID 5
+    uint32_t pendingSectors;       // ID 197
+    uint32_t uncorrectableSectors; // ID 198
+
+    // Parser state machine
+    enum State
+    {
+        SEARCHING,        // Looking for next field
+        IN_ATTRIBUTE_5,   // Inside ID 5 object
+        IN_ATTRIBUTE_197, // Inside ID 197 object
+        IN_ATTRIBUTE_198, // Inside ID 198 object
+        IN_RAW_SECTION    // Inside "raw": { } of current attribute
+    };
+
+    State state;
+    int currentAttributeId; // Which attribute are we parsing? (5, 197, 198)
+
+    SMARTParseContext()
+        : capacity(0),
+          errorCount(0),
+          powerOnHours(0),
+          powerCycles(0),
+          temperature(0),
+          reallocatedSectors(0),
+          pendingSectors(0),
+          uncorrectableSectors(0),
+          state(SEARCHING),
+          currentAttributeId(0)
+    {
+    }
+};
+
+/**
+ * \brief   Extract JSON string value
+ * \param   line containing "key": "value"
+ * \return  extracted string value
+ */
+static string extractStringValue(const string &line)
+{
+    size_t colonPos = line.find(": ");
+    if (colonPos == string::npos)
+        return "";
+
+    size_t firstQuote = line.find('"', colonPos + 2);
+    if (firstQuote == string::npos)
+        return "";
+
+    size_t secondQuote = line.find('"', firstQuote + 1);
+    if (secondQuote == string::npos)
+        return "";
+
+    return line.substr(firstQuote + 1, secondQuote - firstQuote - 1);
+}
+
+/**
+ * \brief   Extract JSON integer value
+ * \param   line containing "key": number
+ * \return  extracted integer value
+ */
+static uint64_t extractIntegerValue(const string &line)
+{
+    size_t colonPos = line.find(": ");
+    if (colonPos == string::npos)
+        return 0;
+
+    string valueStr = line.substr(colonPos + 2);
+
+    // Remove whitespace, commas, braces
+    valueStr.erase(remove_if(valueStr.begin(), valueStr.end(),
+                             [](char c)
+                             { return c == ' ' || c == ',' || c == '}' || c == '\n'; }),
+                   valueStr.end());
+
+    // Verify it's a valid number
+    if (valueStr.empty() || valueStr.find_first_not_of("0123456789") != string::npos)
+        return 0;
+
+    try
+    {
+        return stoull(valueStr);
+    }
+    catch (...)
+    {
+        return 0;
+    }
+}
+
+/**
+ * \brief   Process a single line of JSON output
+ * \param   line from smartctl JSON output
+ * \param   context parsing context with state
+ * \return  void
+ */
+static void processLine(const string &line, SMARTParseContext &ctx)
+{
+    // Trim whitespace for consistent parsing
+    string trimmed = line;
+    size_t firstNonSpace = trimmed.find_first_not_of(" \t\r\n");
+    if (firstNonSpace != string::npos)
+    {
+        trimmed = trimmed.substr(firstNonSpace);
+    }
+
+    // Parse top-level device information
+    if (trimmed.find("\"model_family\":") == 0)
+    {
+        ctx.modelFamily = extractStringValue(line);
+        return;
+    }
+
+    if (trimmed.find("\"model_name\":") == 0)
+    {
+        ctx.modelName = extractStringValue(line);
+        return;
+    }
+
+    if (trimmed.find("\"serial_number\":") == 0)
+    {
+        ctx.serial = extractStringValue(line);
+        return;
+    }
+
+    // Parse capacity from user_capacity.bytes
+    if (trimmed.find("\"bytes\":") == 0)
+    {
+        ctx.capacity = extractIntegerValue(line);
+        return;
+    }
+
+    // Parse error count from self_test log
+    if (trimmed.find("\"error_count_total\":") == 0)
+    {
+        ctx.errorCount = extractIntegerValue(line);
+        return;
+    }
+
+    // Parse power-on hours
+    if (trimmed.find("\"hours\":") == 0)
+    {
+        ctx.powerOnHours = extractIntegerValue(line);
+        return;
+    }
+
+    // Parse power cycle count
+    if (trimmed.find("\"power_cycle_count\":") == 0)
+    {
+        ctx.powerCycles = extractIntegerValue(line);
+        return;
+    }
+
+    // Parse temperature
+    if (trimmed.find("\"current\":") == 0 && ctx.temperature == 0)
+    {
+        // Only parse first occurrence (temperature section, not other "current" fields)
+        ctx.temperature = extractIntegerValue(line);
+        return;
+    }
+
+    // State machine for SMART attributes parsing
+    switch (ctx.state)
+    {
+    case SMARTParseContext::SEARCHING:
+        // Look for critical attribute IDs
+        if (trimmed.find("\"id\": 5,") == 0)
+        {
+            ctx.state = SMARTParseContext::IN_ATTRIBUTE_5;
+            ctx.currentAttributeId = 5;
+        }
+        else if (trimmed.find("\"id\": 197,") == 0)
+        {
+            ctx.state = SMARTParseContext::IN_ATTRIBUTE_197;
+            ctx.currentAttributeId = 197;
+        }
+        else if (trimmed.find("\"id\": 198,") == 0)
+        {
+            ctx.state = SMARTParseContext::IN_ATTRIBUTE_198;
+            ctx.currentAttributeId = 198;
+        }
+        break;
+
+    case SMARTParseContext::IN_ATTRIBUTE_5:
+    case SMARTParseContext::IN_ATTRIBUTE_197:
+    case SMARTParseContext::IN_ATTRIBUTE_198:
+        // Look for "raw": { start
+        if (trimmed.find("\"raw\":") == 0)
+        {
+            ctx.state = SMARTParseContext::IN_RAW_SECTION;
+        }
+        // Look for end of attribute object (more indented closing brace = end of attribute)
+        // "      }," or "      }" at attribute level (6 spaces)
+        else if (line.find("      },") == 0 || line.find("      }") == 0)
+        {
+            ctx.state = SMARTParseContext::SEARCHING;
+            ctx.currentAttributeId = 0;
+        }
+        break;
+
+    case SMARTParseContext::IN_RAW_SECTION:
+        // Look for "value": number inside raw section
+        if (trimmed.find("\"value\":") == 0)
+        {
+            uint64_t value = extractIntegerValue(line);
+
+            // Store value in appropriate field based on current attribute
+            if (ctx.currentAttributeId == 5)
+            {
+                ctx.reallocatedSectors = static_cast<uint32_t>(value);
+            }
+            else if (ctx.currentAttributeId == 197)
+            {
+                ctx.pendingSectors = static_cast<uint32_t>(value);
+            }
+            else if (ctx.currentAttributeId == 198)
+            {
+                ctx.uncorrectableSectors = static_cast<uint32_t>(value);
+            }
+
+            // Stay in raw section - closing brace will exit
+        }
+        // Look for end of raw object (less indented = back to attribute level)
+        // "        }" at raw level (8 spaces)
+        else if (line.find("        }") == 0)
+        {
+            // Return to attribute state (raw section closed)
+            ctx.state = (ctx.currentAttributeId == 5) ? SMARTParseContext::IN_ATTRIBUTE_5 : (ctx.currentAttributeId == 197) ? SMARTParseContext::IN_ATTRIBUTE_197
+                                                                                                                            : SMARTParseContext::IN_ATTRIBUTE_198;
+        }
+        break;
+    }
+}
 
 /**
  * \brief   get and set S.M.A.R.T. values in Drive
@@ -14,272 +265,123 @@
  */
 void SMART::readSMARTData(Drive *drive)
 {
-    string modelFamily;
+    SMARTParseContext ctx;
-    string modelName;
+    uint8_t exitStatus = 255U;
-    string serial;
-    uint64_t capacity = 0U;
-    uint32_t errorCount = 0U;
-    uint32_t powerOnHours = 0U;
-    uint32_t powerCycles = 0U;
-    uint32_t temperature = 0U;
 
-    modelFamily.clear();
+    // Command order optimized for USB adapters
-    modelName.clear();
+    // Standard commands first, then device-specific variants
-    serial.clear();
+    string sSmartctlCommands[] = {
+        " --json -a ",                // Try standard first
+        " --json -d sat -a ",         // SAT (SCSI/ATA Translation) - most USB adapters
+        " --json -d usbjmicron -a ",  // USB JMicron
+        " --json -d usbprolific -a ", // USB Prolific
+        " --json -d usbsunplus -a "   // USB Sunplus
+    };
 
-    string sSmartctlCommands[] = {" --json -a ", " --json -d sntjmicron -a ", " --json -d sntasmedia -a ", " --json -d sntrealtek -a ", " --json -d sat -a "};
+    for (const string &sSmartctlCommand : sSmartctlCommands)
-
-    for (string sSmartctlCommand : sSmartctlCommands)
     {
-        string sCMD = ("smartctl");
+        // Build command with timeout
+        string sCMD = "timeout 5 smartctl"; // 5 second timeout prevents hanging
         sCMD.append(sSmartctlCommand);
         sCMD.append(drive->getPath());
-        const char *cpComand = sCMD.c_str();
+        // Note: stderr NOT suppressed for debugging
 
-        //Logger::logThis()->info(cpComand);
+        Logger::logThis()->info("SMART: Executing: " + sCMD);
 
-        FILE *outputfileSmart = popen(cpComand, "r");
+        // Execute smartctl with timeout protection
-        size_t len = 0U;     // length of found line
+        FILE *outputfileSmart = popen(sCMD.c_str(), "r");
-        char *cLine = NULL; // found line
+        if (outputfileSmart == nullptr)
-        uint8_t status = 255U;
-
-        while ((getline(&cLine, &len, outputfileSmart)) != -1)
         {
-            string sLine = string(cLine);
+            Logger::logThis()->error("SMART: Failed to execute smartctl");
-
+            continue;
-            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);
         }
 
-        pclose(outputfileSmart);
+        // Reset context for new attempt
+        ctx = SMARTParseContext();
 
-        if (status == 0U)
+        // Parse output line by line
+        char *cLine = nullptr;
+        size_t len = 0;
+        int lineCount = 0;
+
+        while (getline(&cLine, &len, outputfileSmart) != -1)
         {
-            // Found S.M.A.R.T. data with this command
+            string sLine(cLine);
-            //Logger::logThis()->info("Found S.M.A.R.T. data with this command");
+            lineCount++;
-            break;
+
-        }
+            // Parse exit status
+            if (sLine.find("\"exit_status\":") != string::npos)
+            {
+                exitStatus = static_cast<uint8_t>(extractIntegerValue(sLine));
             }
 
-    drive->setDriveSMARTData(modelFamily, modelName, serial, capacity, errorCount, powerOnHours, powerCycles, temperature); // write data in drive
+            // Process this line
+            processLine(sLine, ctx);
         }
 
-/**
+        free(cLine);
- * \brief parse ExitStatus
+        int pcloseStatus = pclose(outputfileSmart);
- * \param string output line of smartctl
+
- * \param uint8_t parsed status
+        Logger::logThis()->info("SMART: Parsed " + to_string(lineCount) + " lines, exit status: " + to_string(exitStatus));
- * \return bool if parsing was possible
+
- */
+        // Check if timeout killed the process
-bool SMART::parseExitStatus(string sLine, uint8_t &status)
+        if (WIFSIGNALED(pcloseStatus) && WTERMSIG(pcloseStatus) == SIGTERM)
         {
-    string search("\"exit_status\": ");
+            Logger::logThis()->warning("SMART: Command timed out (5s) - skipping to next variant");
-    size_t found = sLine.find(search);
+            continue;
-    if (found != string::npos)
+        }
+
+        // IGNORE exit status - instead check if we got valid data!
+        // Exit status 64 means "error log contains errors" but SMART data is still valid
+        // Exit status 4 means "some prefail attributes concerning" but data is valid
+        // What matters: Did we parse model name and serial?
+        if (!ctx.modelName.empty() && !ctx.serial.empty())
         {
-        sLine.erase(0U, sLine.find(": ") + 1U);
+            Logger::logThis()->info("SMART: Successfully parsed data");
-        status = stol(sLine);
+            Logger::logThis()->info("SMART: Model: " + ctx.modelName);
-        return true;
+            Logger::logThis()->info("SMART: Serial: " + ctx.serial);
+            Logger::logThis()->info("SMART: Capacity: " + to_string(ctx.capacity) + " bytes");
+            Logger::logThis()->info("SMART: Power-On Hours: " + to_string(ctx.powerOnHours));
+            Logger::logThis()->info("SMART: Temperature: " + to_string(ctx.temperature) + " C");
+            Logger::logThis()->info("SMART: Reallocated Sectors: " + to_string(ctx.reallocatedSectors));
+            Logger::logThis()->info("SMART: Pending Sectors: " + to_string(ctx.pendingSectors));
+            Logger::logThis()->info("SMART: Uncorrectable Sectors: " + to_string(ctx.uncorrectableSectors));
+
+            if (exitStatus != 0)
+            {
+                Logger::logThis()->info("SMART: Note - exit status " + to_string(exitStatus) + " indicates warnings/errors in SMART log");
+            }
+
+            break; // Success - we got data!
         }
         else
         {
-        return false;
+            Logger::logThis()->warning("SMART: No valid data parsed (exit status: " + to_string(exitStatus) + ")");
         }
     }
 
-/**
+    // Check if we got ANY data
- * \brief parse ModelFamily
+    if (ctx.modelName.empty() && ctx.serial.empty())
- * \param string output line of smartctl
- * \param string parsed model family
- * \return bool if parsing was possible
- */
-bool SMART::parseModelFamily(string sLine, string &modelFamily)
     {
-    string search("\"model_family\": ");
+        Logger::logThis()->warning("SMART: No SMART data available for this drive - may not support SMART or need root privileges");
-    size_t found = sLine.find(search);
+
-    if (found != string::npos)
+        // Try basic device info without SMART (use hdparm or similar as fallback)
-    {
+        // For now, just log that SMART is not available
-        sLine.erase(0U, sLine.find(": ") + 3U);
+        ctx.modelName = "SMART not available";
-        sLine.erase(sLine.length() - 3U, 3U);
+        ctx.serial = "N/A";
-        modelFamily = sLine;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
     }
 
-/**
+    // Write parsed data to drive
- * \brief parse ModelName
+    drive->setDriveSMARTData(
- * \param string output line of smartctl
+        ctx.modelFamily,
- * \param string parsed model name
+        ctx.modelName,
- * \return bool if parsing was possible
+        ctx.serial,
- */
+        ctx.capacity,
-bool SMART::parseModelName(string sLine, string &modelName)
+        ctx.errorCount,
-{
+        ctx.powerOnHours,
-    string search("\"model_name\": ");
+        ctx.powerCycles,
-    size_t found = sLine.find(search);
+        ctx.temperature,
-    if (found != string::npos)
+        ctx.reallocatedSectors,
-    {
+        ctx.pendingSectors,
-        sLine.erase(0U, sLine.find(": ") + 3U);
+        ctx.uncorrectableSectors);
-        sLine.erase(sLine.length() - 3U, 3U);
-        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
- */
-bool SMART::parseSerial(string sLine, string &serial)
-{
-    string search("\"serial_number\": ");
-    size_t found = sLine.find(search);
-    if (found != string::npos)
-    {
-        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
- */
-bool SMART::parseCapacity(string sLine, uint64_t &capacity)
-{
-    string search("\"bytes\": ");
-    size_t found = sLine.find(search);
-    if (found != string::npos)
-    {
-        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
- */
-bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
-{
-    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);
-        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
- */
-bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
-{
-    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);
-        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
- */
-bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
-{
-    string search("\"power_cycle_count\": ");
-    size_t found = sLine.find(search);
-    if (found != string::npos)
-    {
-        sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 2, 2);
-        powerCycles = stol(sLine);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/**
- * \brief parse temperature
- * \param string output line of smartctl
- * \param uint32_t parsed temperature
- * \return bool if parsing was possible
- */
-bool SMART::parseTemperature(string sLine, uint32_t &temperature)
-{
-    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);
-        if (sLine == "{")
-        {
-            temperature = 0U; // this drive doesn't support temperature
-        }
-        else
-        {
-            temperature = stol(sLine);
-        }
-        return true;
-    }
-    else
-    {
-        return false;
-    }
 }

src/tui.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 static std::mutex mxUIrefresh;
 
@@ -63,6 +64,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,8 +99,8 @@ 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"
+        string sConnection = (it->connectionType == Drive::ConnectionType::USB ? "USB" : it->connectionType == Drive::ConnectionType::SATA ? "SATA"
-                                                                     : it->connectionType == Drive::NVME   ? "NVME"
+                                                                                     : it->connectionType == Drive::ConnectionType::NVME   ? "NVME"
                                                                                                                                            : "");
 
         bool bSelectedEntry = false;
@@ -104,10 +110,10 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
             bSelectedEntry = true; // mark this drive in entries list
             displaySelectedDrive(*it, u16StdscrX, u16StdscrY);
 
-            if ((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0) || (it->getTemperature() >= WORSE_TEMPERATURE))
+            if ((it->getPowerOnHours() >= WORSE_HOURS) || (it->getPowerCycles() >= WORSE_POWERUP) || (it->getErrorCount() > 0) || (it->getTemperature() >= WORSE_TEMPERATURE) || (it->getReallocatedSectors() > 0) || (it->getPendingSectors() > 0) || (it->getUncorrectableSectors() > 0))
             {
                 // smart values are bad --> show warning
-                smartWarning = createSmartWarning(50, 10, ((u16StdscrX) - (int)(u16StdscrX / 2) + 35), (int)(u16StdscrY / 2) - 5, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount(), it->getTemperature());
+                smartWarning = createSmartWarning(50, 14, ((u16StdscrX) - (int)(u16StdscrX / 2) + 35), (int)(u16StdscrY / 2) - 7, it->getPath(), it->getPowerOnHours(), it->getPowerCycles(), it->getErrorCount(), it->getTemperature(), it->getReallocatedSectors(), it->getPendingSectors(), it->getUncorrectableSectors());
                 wrefresh(smartWarning);
             }
         }
@@ -116,30 +122,40 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
 
         switch (it->state)
         {
-        case Drive::SHRED_ACTIVE:
+        case Drive::TaskState::SHRED_ACTIVE:
-
+        {
             stream << fixed << setprecision(3) << (it->getTaskPercentage());
             sState = "Shredding: " + stream.str() + "%";
 
             it->calculateTaskDuration();
             sTime = this->formatTimeDuration(it->getTaskDuration());
-            sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
+            auto shredSpeed = it->sShredSpeed.load();
+            sSpeed = this->formatSpeed(shredSpeed.u32ShredTimeDelta, shredSpeed.ulWrittenBytes);
             break;
-        case Drive::CHECK_ACTIVE:
+        }
+        case Drive::TaskState::CHECK_ACTIVE:
+        {
             stream << fixed << setprecision(3) << (it->getTaskPercentage());
             sState = "Checking: " + stream.str() + "%";
             it->calculateTaskDuration();
             sTime = this->formatTimeDuration(it->getTaskDuration());
-            sSpeed = this->formatSpeed(it->sShredSpeed.u32ShredTimeDelta, it->sShredSpeed.ulWrittenBytes);
+            auto shredSpeed = it->sShredSpeed.load();
+            sSpeed = this->formatSpeed(shredSpeed.u32ShredTimeDelta, shredSpeed.ulWrittenBytes);
             break;
-        case Drive::DELETE_ACTIVE:
+        }
+        case Drive::TaskState::DELETE_ACTIVE:
+        {
+
             sState = "Deleting ...";
             it->calculateTaskDuration();
             sTime = this->formatTimeDuration(it->getTaskDuration());
             break;
-        case Drive::NONE:
+        }
-        case Drive::SHRED_SELECTED:
+        case Drive::TaskState::NONE:
-        case Drive::DELETE_SELECTED:
+        case Drive::TaskState::SHRED_SELECTED:
+        case Drive::TaskState::DELETE_SELECTED:
+        case Drive::TaskState::CHECK_SUCCESSFUL:
+        {
             if (it->bWasDeleted)
             {
                 sState = "DELETED"; // mark drive as deleted previously
@@ -166,9 +182,9 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
                 wrefresh(dialog);
             }
 #endif
-
             break;
-        case Drive::FROZEN:
+        }
+        case Drive::TaskState::FROZEN:
             stream << fixed << setprecision(3) << (it->getTaskPercentage());
 #ifdef FROZEN_ALERT
             if (bSelectedEntry)
@@ -243,6 +259,12 @@ enum TUI::UserInput TUI::readUserInput()
     case 'T':
         return TUI::UserInput::Terminate;
         break;
+    case 'p':
+        return TUI::UserInput::Print;
+        break;
+    case 'P':
+        return TUI::UserInput::PrintAll;
+        break;
     default:
         return TUI::UserInput::Undefined;
         break;
@@ -250,6 +272,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;
@@ -279,7 +306,7 @@ WINDOW *TUI::createOverViewWindow(int iXSize, int iYSize)
     return newWindow;
 }
 
-WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive)
+WINDOW *TUI::createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive &drive)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, 1, iXStart);
@@ -327,7 +354,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart)
 
     string sLine01 = "reHDD - hard drive refurbishing tool";
     string sLine02 = "Version: " + string(REHDD_VERSION);
-    string sLine03 = "Available under GPL 3.0";
+    string sLine03 = "Free software under the GNU GPL 3.0";
     string sLine04 = "https://git.mosad.xyz/localhorst/reHDD";
     string sLine05 = "Delete: Wipe format table - this is NOT secure";
     string sLine06 = "Shred: Overwrite drive " + to_string(SHRED_ITERATIONS) + " iterations - this is secure";
@@ -445,7 +472,7 @@ WINDOW *TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
     sLine03.append(__DATE__);
     sLine03.append(" ");
     sLine03.append(__TIME__);
-    string sLine04 = "Available under GPL 3.0";
+    string sLine04 = "Free software under the GNU GPL 3.0";
     string sLine05 = "https://git.mosad.xyz/localhorst/reHDD";
 
     uint16_t u16Line = 2;
@@ -472,7 +499,7 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
 
     centerTitle(newWindow, "Controls");
 
-    uint16_t u16Line = 4;
+    uint16_t u16Line = 2;
 
     if (menustate.bAbort)
     {
@@ -493,7 +520,11 @@ WINDOW *TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
         u16Line++;
     }
 
-    string sLineTmp = "Press T for terminating reHDD";
+    string sLineTmp = "Press p for Print (P for all drives)";
+    mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
+    u16Line++;
+
+    sLineTmp = "Press T for terminating reHDD";
     mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLineTmp.size() / 2), sLineTmp.c_str());
 
     return newWindow;
@@ -622,7 +653,7 @@ void TUI::vTruncateText(string *psText, uint16_t u16MaxLenght)
     }
 }
 
-void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
+void TUI::displaySelectedDrive(Drive &drive, int stdscrX, int stdscrY)
 {
     struct MenuState menustate;
     static bool dialogIsActive;
@@ -635,27 +666,27 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
     // set menustate based on drive state
     switch (drive.state)
     {
-    case Drive::NONE: // no task running or selected for this drive
+    case Drive::TaskState::NONE: // no task running or selected for this drive
         menustate.bShred = true;
         menustate.bDelete = true;
         break;
-    case Drive::DELETE_ACTIVE: // delete task running for this drive
+    case Drive::TaskState::DELETE_ACTIVE: // delete task running for this drive
         menustate.bAbort = true;
         break;
 
-    case Drive::SHRED_ACTIVE: // shred task running for this drive
+    case Drive::TaskState::SHRED_ACTIVE: // shred task running for this drive
         menustate.bAbort = true;
         break;
 
-    case Drive::CHECK_ACTIVE: // check task running for this drive
+    case Drive::TaskState::CHECK_ACTIVE: // check task running for this drive
         menustate.bAbort = true;
         break;
 
-    case Drive::DELETE_SELECTED: // delete task selected for this drive
+    case Drive::TaskState::DELETE_SELECTED: // delete task selected for this drive
         menustate.bConfirmDelete = true;
         break;
 
-    case Drive::SHRED_SELECTED: // shred task selected for this drive
+    case Drive::TaskState::SHRED_SELECTED: // shred task selected for this drive
         menustate.bConfirmShred = true;
         break;
     default:
@@ -690,7 +721,7 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
     }
 }
 
-WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature)
+WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature, uint32_t u32ReallocatedSectors, uint32_t u32PendingSectors, uint32_t u32UncorrectableSectors)
 {
     WINDOW *newWindow;
     newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
@@ -732,6 +763,28 @@ WINDOW *TUI::createSmartWarning(int iXSize, int iYSize, int iXStart, int iYStart
     {
         string sLineTmp = "Drive too hot: " + to_string(u32Temperature) + " C";
         mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+        u16Line++;
     }
+
+    if (u32ReallocatedSectors > 0)
+    {
+        string sLineTmp = "CRITICAL: Reallocated sectors detected: " + to_string(u32ReallocatedSectors);
+        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+        u16Line++;
+    }
+
+    if (u32PendingSectors > 0)
+    {
+        string sLineTmp = "CRITICAL: Pending sectors detected: " + to_string(u32PendingSectors);
+        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+        u16Line++;
+    }
+
+    if (u32UncorrectableSectors > 0)
+    {
+        string sLineTmp = "CRITICAL: Uncorrectable sectors: " + to_string(u32UncorrectableSectors);
+        mvwaddstr(newWindow, u16Line++, (iXSize / 2) - (sLine01.size() / 2), sLineTmp.c_str());
+    }
+
     return newWindow;
 }