Best throughput tracker with chunksize

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

.clang-format

@@ -0,0 +1,92 @@
+# reHDD Code Style - clang-format configuration
+# Based on analyzed codebase formatting
+
+BasedOnStyle: LLVM
+
+# Indentation
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ContinuationIndentWidth: 4
+
+# Braces
+BreakBeforeBraces: Allman
+# Allman style:
+# if (condition)
+# {
+#     statement;
+# }
+
+# Spacing
+SpaceAfterCStyleCast: false
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Alignment
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: false
+
+# Line breaks
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+
+# Column limit
+ColumnLimit: 0
+# 0 = no limit (observed in the code)
+
+# Breaking
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: false
+
+# Pointers and references
+PointerAlignment: Left
+# Type *variable (not Type* variable)
+
+# Include sorting
+SortIncludes: false
+# Keep includes in original order
+
+# Comments
+ReflowComments: false
+# Don't reformat comments
+
+# Access modifiers
+AccessModifierOffset: -4
+# public: is outdented
+
+# Constructor initializers
+ConstructorInitializerIndentWidth: 6
+# Observed 6 spaces for initializer lists
+
+# Other
+Cpp11BracedListStyle: true
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: false
+IndentPPDirectives: None
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakBeforeFirstCallParameter: 100
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000

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,9 +65,9 @@ private:
 
     struct
     {
-        string sModelFamily;
-        string sModelName;
-        string sSerial;
+        std::string sModelFamily;
+        std::string sModelName;
+        std::string sSerial;
         uint64_t u64Capacity = 0U; // in byte
         uint32_t u32ErrorCount = 0U;
         uint32_t u32PowerOnHours = 0U; // in hours
@@ -72,15 +80,27 @@ 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);
-    string getModelFamily(void);
-    string getModelName(void);
-    string getSerial(void);
+    std::string getPath(void);
+    std::string getModelFamily(void);
+    std::string getModelName(void);
+    std::string getSerial(void);
     uint64_t getCapacity(void); // in byte
     uint32_t getErrorCount(void);
     uint32_t getPowerOnHours(void); // in hours
@@ -88,20 +108,20 @@ public:
     uint32_t getTemperature(void); // in Fahrenheit, just kidding: degree Celsius
     void checkFrozenDrive(void);
 
-    void setDriveSMARTData(string modelFamily,
-                           string modelName,
-                           string serial,
+    void setDriveSMARTData(std::string modelFamily,
+                           std::string modelName,
+                           std::string serial,
                            uint64_t capacity,
                            uint32_t errorCount,
                            uint32_t powerOnHours,
                            uint32_t powerCycles,
                            uint32_t temperature);
 
-    string sCapacityToText();
-    string sErrorCountToText();
-    string sPowerOnHoursToText();
-    string sPowerCyclesToText();
-    string sTemperatureToText();
+    std::string sCapacityToText();
+    std::string sErrorCountToText();
+    std::string sPowerOnHoursToText();
+    std::string sPowerCyclesToText();
+    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.3.0"
 
 // Drive handling Settings
 #define WORSE_HOURS 19200    // mark drive if at this limit or beyond
@@ -31,7 +31,7 @@
 #endif
 
 // Logic
-// #define DRYRUN    // don't touch the drives
+// #define DRYRUN       // don't touch the drives
 #define FROZEN_ALERT // show alert if drive is frozen
 #define ZERO_CHECK   // check drive after shred if all bytes are zero, show alert if this fails
 
@@ -56,9 +56,7 @@
 #include <sstream>
 #include <iomanip>
 #include <signal.h>
-
-using namespace std;
-
+#include <atomic>
 #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
-#define TFNG_DATA_SIZE CHUNK_SIZE   // amount of bytes used by tfng
+// Adaptive chunk size optimization - uncomment to enable
+#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
@@ -33,22 +52,47 @@ protected:
 public:
     Shred();
     ~Shred();
-    int shredDrive(Drive *drive, int *ipSignalFd);
+    int shredDrive(Drive* drive, int* ipSignalFd);
 
 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);
-    unsigned int uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd);
+    long getDriveSizeInBytes(fileDescriptor file);
+    unsigned int uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd);
     void cleanup();
 };
 

include/smart.h

@@ -19,15 +19,15 @@ public:
 private:
     SMART(void);
 
-    static bool parseExitStatus(string sLine, uint8_t &status);
-    static bool parseModelFamily(string sLine, string &modelFamily);
-    static bool parseModelName(string sLine, string &modelName);
-    static bool parseSerial(string sLine, string &serial);
-    static bool parseCapacity(string sLine, uint64_t &capacity);
-    static bool parseErrorCount(string sLine, uint32_t &errorCount);
-    static bool parsePowerOnHours(string sLine, uint32_t &powerOnHours);
-    static bool parsePowerCycles(string sLine, uint32_t &powerCycles);
-    static bool parseTemperature(string sLine, uint32_t &temperature);
+    static bool parseExitStatus(std::string sLine, uint8_t &status);
+    static bool parseModelFamily(std::string sLine, std::string &modelFamily);
+    static bool parseModelName(std::string sLine, std::string &modelName);
+    static bool parseSerial(std::string sLine, std::string &serial);
+    static bool parseCapacity(std::string sLine, uint64_t &capacity);
+    static bool parseErrorCount(std::string sLine, uint32_t &errorCount);
+    static bool parsePowerOnHours(std::string sLine, uint32_t &powerOnHours);
+    static bool parsePowerCycles(std::string sLine, uint32_t &powerCycles);
+    static bool parseTemperature(std::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,37 +49,39 @@ 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 string sRamUsage;
-    static string sLocalTime;
+    static std::string sCpuUsage;
+    static std::string sRamUsage;
+    static std::string sLocalTime;
 
-    WINDOW *overview;
-    WINDOW *systemview;
-    WINDOW *detailview;
-    WINDOW *menuview;
-    WINDOW *dialog;
-    WINDOW *smartWarning;
+    WINDOW* overview;
+    WINDOW* systemview;
+    WINDOW* detailview;
+    WINDOW* menuview;
+    WINDOW* dialog;
+    WINDOW* smartWarning;
 
-    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 *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 *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 *createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, 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 *createZeroChecksumWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, uint32_t u32Checksum);
+    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* overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart);
+    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, std::string selectedTask, std::string optionA, std::string optionB);
+    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, std::string sPath, uint32_t u32PowerOnHours, uint32_t u32PowerCycles, uint32_t u32ErrorCount, uint32_t u32Temperature);
+    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);
-    string formatTimeDuration(time_t u32Duration);
-    string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
-    static void vTruncateText(string *psText, uint16_t u16MaxLenght);
+    void displaySelectedDrive(Drive& drive, int stdscrX, int stdscrY);
+    std::string formatTimeDuration(time_t u32Duration);
+    std::string formatSpeed(time_t u32ShredTimeDelta, unsigned long ulWrittenBytes);
+    static void vTruncateText(std::string* psText, uint16_t u16MaxLenght);
 };
-#endif // TUI_H_
+#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
@@ -34,13 +35,15 @@ void Delete::deleteDrive(Drive *drive)
 
     if (drive->bWasShredStarted == false)
     {
-        //only start delete if the drive was not shredded before
+        // only start delete if the drive was not shredded before
         FILE *deleteCmdOutput = popen(cpComand, "r");
 
         while ((getline(&cLine, &len, deleteCmdOutput)) != -1)
         {
             // 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)
 {
@@ -62,8 +151,12 @@ string Drive::sCapacityToText()
         dSize /= 1000;
         u16UnitIndex++;
     }
-
-    sprintf(acBuffer, "%.*f %s", u16UnitIndex - 3, dSize, units[u16UnitIndex]);
+    if (u16UnitIndex >= 9)
+    {
+        u16UnitIndex = 8;
+    }
+    int precision = (u16UnitIndex >= 3) ? (u16UnitIndex - 3) : 0;
+    sprintf(acBuffer, "%.*f %s", precision, dSize, units[u16UnitIndex]);
     return acBuffer;
 }
 
@@ -99,7 +192,6 @@ string Drive::sPowerCyclesToText()
 string Drive::sTemperatureToText()
 {
     return to_string(getTemperature()) + " C";
-    ;
 }
 
 void Drive::setTaskPercentage(double d32TaskPercentage)
@@ -148,12 +240,20 @@ void Drive::setDriveSMARTData(string modelFamily,
 
 void Drive::setTimestamp()
 {
-    time(&this->u32Timestamp);
+    if (time(&this->u32Timestamp) == -1)
+    {
+        // handle error
+        this->u32Timestamp = 0U;
+    }
 }
 
 void Drive::setActionStartTimestamp()
 {
-    time(&this->u32TimestampTaskStart);
+    if (time(&this->u32TimestampTaskStart) == -1)
+    {
+        // handle error
+        this->u32TimestampTaskStart = 0U;
+    }
 }
 
 time_t Drive::getActionStartTimestamp()
@@ -164,7 +264,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 +282,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;
-    int s = socket(AF_INET, SOCK_STREAM, 0);
+    struct ifaddrs *ifaddr, *ifa;
 
-    strcpy(ifr.ifr_name, "eth0");
-    if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
+    // default MAC if none found
+    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;
-    char buffer[80];
-    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;
+    freeifaddrs(ifaddr);
+    return result;
 }
 
 /**

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();
-    app->app_logic();
+    reHDD app;
+    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
-    sprintf(msgQueueData.driveData.caDriveState, "shredded");
-    strcpy(msgQueueData.driveData.caDriveModelFamily, drive->getModelFamily().c_str());
-    strcpy(msgQueueData.driveData.caDriveModelName, drive->getModelName().c_str());
-    sprintf(msgQueueData.driveData.caDriveCapacity, "%li", drive->getCapacity());
-    strcpy(msgQueueData.driveData.caDriveSerialnumber, drive->getSerial().c_str());
-    sprintf(msgQueueData.driveData.caDriveHours, "%i", drive->getPowerOnHours());
-    sprintf(msgQueueData.driveData.caDriveCycles, "%i", drive->getPowerCycles());
-    sprintf(msgQueueData.driveData.caDriveErrors, "%i", drive->getErrorCount());
-    sprintf(msgQueueData.driveData.caDriveShredTimestamp, "%li", drive->getActionStartTimestamp());
-    sprintf(msgQueueData.driveData.caDriveShredDuration, "%li", drive->getTaskDuration());
-    sprintf(msgQueueData.driveData.caDriveReHddVersion, REHDD_VERSION);
+    snprintf(msgQueueData.driveData.caDriveIndex, STR_BUFFER_SIZE, "%i", drive->u16DriveIndex);
+    snprintf(msgQueueData.driveData.caDriveState, STR_BUFFER_SIZE, "shredded");
+    snprintf(msgQueueData.driveData.caDriveModelFamily, STR_BUFFER_SIZE, "%s", drive->getModelFamily().c_str());
+    snprintf(msgQueueData.driveData.caDriveModelName, STR_BUFFER_SIZE, "%s", drive->getModelName().c_str());
+    snprintf(msgQueueData.driveData.caDriveCapacity, STR_BUFFER_SIZE, "%li", drive->getCapacity());
+    snprintf(msgQueueData.driveData.caDriveSerialnumber, STR_BUFFER_SIZE, "%s", drive->getSerial().c_str());
+    snprintf(msgQueueData.driveData.caDriveHours, STR_BUFFER_SIZE, "%i", drive->getPowerOnHours());
+    snprintf(msgQueueData.driveData.caDriveCycles, STR_BUFFER_SIZE, "%i", drive->getPowerCycles());
+    snprintf(msgQueueData.driveData.caDriveErrors, STR_BUFFER_SIZE, "%i", drive->getErrorCount());
+    snprintf(msgQueueData.driveData.caDriveShredTimestamp, STR_BUFFER_SIZE, "%li", drive->getActionStartTimestamp());
+    snprintf(msgQueueData.driveData.caDriveShredDuration, STR_BUFFER_SIZE, "%li", drive->getTaskDuration());
+
+    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);
-    pipe(fdShredInformPipe);
+    if (pipe(fdNewDrivesInformPipe) == -1)
+    {
+        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 (getSelectedDrive() != nullptr)
+            if (tmpSelectedDrive != 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, u8SelectedEntry);
+            ui->updateTUI(&listDrives, u16SelectedEntry);
             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
-        pShredTask->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
-        delete pShredTask;                                     // delete shred task
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        pDrive->setActionStartTimestamp();                         // save timestamp at start of shredding
+        Shred *pShredInstance = new Shred();                       // create new shred task
+        pShredInstance->shredDrive(pDrive, &fdShredInformPipe[1]); // start new shred task
+        delete pShredInstance;                                     // delete shred task
+        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
-        Delete::deleteDrive(getSelectedDrive());            // blocking, no thread
-        getSelectedDrive()->state = Drive::TaskState::NONE; // delete finished
-        getSelectedDrive()->bWasDeleted = true;
-        Logger::logThis()->info("Finished delete for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
-        ui->updateTUI(&listDrives, u8SelectedEntry);
+        pDrive->state = Drive::TaskState::DELETE_ACTIVE;
+        pDrive->setActionStartTimestamp();      // save timestamp at start of deleting
+        Delete::deleteDrive(pDrive);            // blocking, no thread
+        pDrive->state = Drive::TaskState::NONE; // delete finished
+        pDrive->bWasDeleted = true;
+        Logger::logThis()->info("Finished delete for: " + pDrive->getModelName() + "-" + pDrive->getSerial());
+        ui->updateTUI(&listDrives, u16SelectedEntry);
     }
 }
 
@@ -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,28 +389,28 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
         if (devName.empty())
             continue;
 
-        Drive *tmpDrive = new Drive("/dev/" + devName);
-        tmpDrive->state = Drive::NONE;
-        tmpDrive->bIsOffline = false;
+        Drive tmpDrive("/dev/" + devName);
+        tmpDrive.state = Drive::TaskState::NONE;
+        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::NVME   ? "NVME"
-                                                                                                      : "UNKNOWN") +
+            (tmpDrive.connectionType == Drive::ConnectionType::USB ? "USB" : tmpDrive.connectionType == Drive::ConnectionType::SATA ? "SATA"
+                                                                         : tmpDrive.connectionType == Drive::ConnectionType::NVME   ? "NVME"
+                                                                                                                                    : "UNKNOWN") +
             ")");
     }
 
@@ -354,8 +418,8 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
 }
 
 /**
- * \brief   filter out drives that are listed in "ignoreDrives.conf"
- * \param	pointer of list <Drive>* plistDrives
+ * \brief   filter out drives that are listed in "ignoreDrives.conf", loop devices, and optical drives
+ * \param   pointer of list <Drive>* plistDrives
  * \return  void
  */
 void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
@@ -364,70 +428,140 @@ void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
     if (getSystemDrive(systemDrivePath))
     {
         // Logger::logThis()->info("Found system drive: " + systemDrivePath);
-
-        list<Drive>::iterator it;
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
+        list<Drive>::iterator it = plistDrives->begin();
+        while (it != plistDrives->end())
         {
-            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
-    ifstream input("ignoreDrives.conf");   // read ignore file
+    // Filter out loop devices (loop0, loop1, etc.)
+    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);
-        vtlIgnoredDevices.emplace_back(sLine); // add found path and uuid from ignore file to vector
+        // Skip empty lines and comments
+        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;
-        for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
+        it = plistDrives->begin();
+        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(8, sBlkidOut.length());
+                    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;
-                pTmpDrive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
-                pTmpDrive->sShredSpeed.ulWrittenBytes = pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten;
-                pTmpDrive->sShredSpeed.ulSpeedMetricBytesWritten = 0U;
+                shredSpeed.u32ShredTimeDelta = u32ShredTimeDelta;
+                shredSpeed.chronoShredTimestamp = std::chrono::system_clock::now();
+                shredSpeed.ulWrittenBytes = shredSpeed.ulSpeedMetricBytesWritten;
+                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++;
-        if (u8SelectedEntry >= u8EntrySize)
+        u16SelectedEntry++;
+        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()
 {
-
-    if (getSelectedDrive() != nullptr)
+    Drive *tmpSelectedDrive = getSelectedDrive();
+    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());
-            getSelectedDrive()->state = Drive::TaskState::SHRED_ACTIVE;
-            // task for drive is running --> don't show  more task options
-            Drive *pTmpDrive = getSelectedDrive();
-            thread(ThreadShred, pTmpDrive).detach();
+            Logger::logThis()->info("Started shred/check for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
+            thread(ThreadShred, tmpSelectedDrive).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());
-            getSelectedDrive()->state = Drive::TaskState::DELETE_ACTIVE;
-            // task for drive is running --> don't show  more task options
-            thread(ThreadDelete).detach();
+            Logger::logThis()->info("Started delete for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
+            thread(ThreadDelete, tmpSelectedDrive).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;
-            Logger::logThis()->info("Abort-Shred-Signal for: " + getSelectedDrive()->getModelName() + "-" + getSelectedDrive()->getSerial());
+            tmpSelectedDrive->state = Drive::TaskState::NONE;
+            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
-            // Logger::logThis()->info("Drive found: " + systemDrive);
+
+            // Find the actual drive name (after tree characters like └─, ├─)
+            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"
@@ -16,35 +17,192 @@ extern "C"
 }
 #endif
 
-const static char *randomsrc = (char *)"/dev/urandom";
+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
+ * \brief   Evaluate throughput after measurement interval and adjust chunk size
+ * \param   pointer to Drive instance
  * \return  void
  */
-int Shred::shredDrive(Drive *drive, int *ipSignalFd)
+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);
+    address << (void const*)&(*drive);
     Logger::logThis()->info("Shred-Task started - Drive: " + drive->getModelName() + "-" + drive->getSerial() + " @" + address.str());
-    drive->bWasShredStarted = true; //Mark drive as partly shredded
+    drive->bWasShredStarted = true;
+    drive->bWasShredded = 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)
-        {
-            return 0;
-        }
         drive->setTaskPercentage(i + 0.05);
         write(*ipSignalFd, "A", 1);
         usleep(20000);
@@ -53,14 +211,23 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
 #endif
 
 #ifndef DRYRUN
-    const char *cpDrivePath = drive->getPath().c_str();
+    const char* cpDrivePath = drive->getPath().c_str();
     unsigned char ucKey[TFNG_KEY_SIZE];
 
+#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
     randomSrcFileDiscr = open(randomsrc, O_RDONLY | O_LARGEFILE);
     if (randomSrcFileDiscr == -1)
     {
-        std::string errorMsg(strerror(randomSrcFileDiscr));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Open random source failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(randomsrc);
         cleanup();
@@ -71,7 +238,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     driveFileDiscr = open(cpDrivePath, O_RDWR | O_LARGEFILE);
     if (driveFileDiscr == -1)
     {
-        std::string errorMsg(strerror(driveFileDiscr));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Open drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(cpDrivePath);
         cleanup();
@@ -82,7 +249,7 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     ssize_t readRet = read(randomSrcFileDiscr, ucKey, sizeof(ucKey));
     if (readRet <= 0)
     {
-        std::string errorMsg(strerror(readRet));
+        std::string errorMsg(strerror(errno));
         Logger::logThis()->error("Shred-Task: Read random key failed! " + errorMsg + " - Drive: " + drive->getSerial());
         perror(randomsrc);
         cleanup();
@@ -92,128 +259,170 @@ int Shred::shredDrive(Drive *drive, int *ipSignalFd)
     tfng_prng_seedkey(ucKey);
 
     this->ulDriveByteSize = getDriveSizeInBytes(driveFileDiscr);
-    drive->sShredSpeed.chronoShredTimestamp = std::chrono::system_clock::now(); // set inital timestamp for speed metric
-    drive->sShredSpeed.ulSpeedMetricBytesWritten = 0U; // uses to calculate speed metric
+    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
+
     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
+        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));
+                std::string errorMsg(strerror(errno));
                 Logger::logThis()->error("Shred-Task: Write to drive failed! " + errorMsg + " - Drive: " + drive->getSerial());
                 perror("unable to write random data");
                 cleanup();
                 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());
 #endif
+
             if ((d32Percent - d32TmpPercent) >= 0.01)
             {
-                // set shred percantage
                 drive->setTaskPercentage(d32TmpPercent);
                 d32TmpPercent = d32Percent;
-                // signal process in shreding
                 write(*ipSignalFd, "A", 1);
             }
 
-            if (drive->state != Drive::SHRED_ACTIVE)
+            if (drive->state != Drive::TaskState::SHRED_ACTIVE)
             {
                 drive->setTaskPercentage(0);
                 d32Percent = 0.00;
                 d32TmpPercent = 0.00;
                 ulDriveByteCounter = 0U;
-                Logger::logThis()->info("Aborted shred  for: " + drive->getModelName() + "-" + drive->getSerial());
+                Logger::logThis()->info("Aborted shred for: " + drive->getModelName() + "-" + drive->getSerial());
                 cleanup();
                 return -1;
             }
-            // end one chunk write
         }
+
         if (0 != iRewindDrive(driveFileDiscr))
         {
             Logger::logThis()->error("Shred-Task: Unable to rewind drive! - Drive: " + drive->getSerial());
             cleanup();
             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
+
+    tfng_prng_seedkey(NULL);
 
     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)
     {
+        drive->state = Drive::TaskState::CHECK_FAILED;
         Logger::logThis()->info("Shred-Task: Checksum not zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }
     else
     {
+        drive->state = Drive::TaskState::CHECK_SUCCESSFUL;
         Logger::logThis()->info("Shred-Task: Checksum zero: " + to_string(drive->u32DriveChecksumAfterShredding) + " - Drive: " + drive->getSerial());
     }
 #endif
-#endif
-#endif
-
     cleanup();
+#endif
 
-    if ((drive->state == Drive::SHRED_ACTIVE) || (drive->state == Drive::CHECK_ACTIVE))
+    if ((drive->state.load() == Drive::TaskState::SHRED_ACTIVE) || (drive->state.load() == Drive::TaskState::CHECK_SUCCESSFUL) || (drive->state == Drive::TaskState::CHECK_FAILED))
     {
-        drive->state = Drive::NONE;
+        if (drive->state != Drive::TaskState::CHECK_FAILED)
+        {
+            Printer::getPrinter()->print(drive);
+        }
+        drive->state = Drive::TaskState::NONE;
         drive->setTaskPercentage(0.0);
-        Printer::getPrinter()->print(drive);
         Logger::logThis()->info("Finished 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()
@@ -221,8 +430,10 @@ double Shred::calcProgress()
     unsigned int uiMaxShredIteration = SHRED_ITERATIONS;
 
 #ifdef ZERO_CHECK
-    uiMaxShredIteration++; // increment because we will check after SHRED_ITERATIONS the drive for non-zero bytes
+    uiMaxShredIteration++;
 #endif
+    if (this->ulDriveByteSize == 0)
+        return 0.0;
     return (double)(((double)ulDriveByteOverallCount) / ((double)this->ulDriveByteSize * uiMaxShredIteration)) * 100.0f;
 }
 
@@ -231,6 +442,7 @@ int Shred::iRewindDrive(fileDescriptor file)
     if (0 != lseek(file, 0L, SEEK_SET))
     {
         perror("unable to rewind drive");
+        Logger::logThis()->info("Unable to rewind drive! - fileDescriptor: " + to_string(file));
         return -1;
     }
     else
@@ -239,35 +451,49 @@ int Shred::iRewindDrive(fileDescriptor file)
     }
 }
 
-unsigned long Shred::getDriveSizeInBytes(fileDescriptor file)
+long Shred::getDriveSizeInBytes(fileDescriptor file)
 {
-    unsigned long ulDriveSizeTmp = lseek(file, 0L, SEEK_END);
+    long liDriveSizeTmp = lseek(file, 0L, SEEK_END);
+
+    if (liDriveSizeTmp == -1)
+    {
+        perror("unable to get drive size");
+        Logger::logThis()->info("Unable to get drive size! - fileDescriptor: " + to_string(file));
+        return 0L;
+    }
 
     if (0 != iRewindDrive(file))
     {
-        ulDriveSizeTmp = 0U;
+        liDriveSizeTmp = 0L;
     }
 
 #ifdef DEMO_DRIVE_SIZE
-    ulDriveSizeTmp = DEMO_DRIVE_SIZE;
+    liDriveSizeTmp = DEMO_DRIVE_SIZE;
 #endif
-    return ulDriveSizeTmp;
+    return liDriveSizeTmp;
 }
 
-unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive *drive, int *ipSignalFd)
+unsigned int Shred::uiCalcChecksum(fileDescriptor file, Drive* drive, int* ipSignalFd)
 {
     unsigned int uiChecksum = 0;
     unsigned long ulDriveByteCounter = 0U;
+
+#ifdef ADAPTIVE_CHUNK_SIZE
+    size_t checkChunkSize = CHUNK_SIZE_MAX;
+#else
+    size_t checkChunkSize = CHUNK_SIZE;
+#endif
+
     while (ulDriveByteCounter < ulDriveByteSize)
     {
         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);
         for (int iReadBytesCounter = 0U; iReadBytesCounter < iReadBytes; iReadBytesCounter++)
@@ -277,7 +503,9 @@ 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());
@@ -301,4 +529,4 @@ void Shred::cleanup()
 {
     close(driveFileDiscr);
     close(randomSrcFileDiscr);
-}
+}

src/smart.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "../include/reHDD.h"
+using namespace std;
 
 /**
  * \brief   get and set S.M.A.R.T. values in Drive
@@ -36,10 +37,10 @@ void SMART::readSMARTData(Drive *drive)
         sCMD.append(drive->getPath());
         const char *cpComand = sCMD.c_str();
 
-        //Logger::logThis()->info(cpComand);
+        // Logger::logThis()->info(cpComand);
 
         FILE *outputfileSmart = popen(cpComand, "r");
-        size_t len = 0U;     // length of found line
+        size_t len = 0U;    // length of found line
         char *cLine = NULL; // found line
         uint8_t status = 255U;
 
@@ -58,12 +59,13 @@ void SMART::readSMARTData(Drive *drive)
             SMART::parseTemperature(sLine, temperature);
         }
 
+        free(cLine);
         pclose(outputfileSmart);
 
         if (status == 0U)
         {
             // Found S.M.A.R.T. data with this command
-            //Logger::logThis()->info("Found S.M.A.R.T. data with this command");
+            // Logger::logThis()->info("Found S.M.A.R.T. data with this command");
             break;
         }
     }
@@ -106,7 +108,10 @@ bool SMART::parseModelFamily(string sLine, string &modelFamily)
     if (found != string::npos)
     {
         sLine.erase(0U, sLine.find(": ") + 3U);
-        sLine.erase(sLine.length() - 3U, 3U);
+        if (sLine.length() >= 3U)
+        {
+            sLine.erase(sLine.length() - 3U, 3U);
+        }
         modelFamily = sLine;
         return true;
     }
@@ -129,7 +134,10 @@ bool SMART::parseModelName(string sLine, string &modelName)
     if (found != string::npos)
     {
         sLine.erase(0U, sLine.find(": ") + 3U);
-        sLine.erase(sLine.length() - 3U, 3U);
+        if (sLine.length() >= 3U)
+        {
+            sLine.erase(sLine.length() - 3U, 3U);
+        }
         modelName = sLine;
         return true;
     }
@@ -152,7 +160,10 @@ bool SMART::parseSerial(string sLine, string &serial)
     if (found != string::npos)
     {
         sLine.erase(0, sLine.find(": ") + 3);
-        sLine.erase(sLine.length() - 3, 3);
+        if (sLine.length() >= 3U)
+        {
+            sLine.erase(sLine.length() - 3U, 3U);
+        }
         serial = sLine;
         return true;
     }
@@ -175,7 +186,10 @@ bool SMART::parseCapacity(string sLine, uint64_t &capacity)
     if (found != string::npos)
     {
         sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 1, 1);
+        if (sLine.length() >= 1U)
+        {
+            sLine.erase(sLine.length() - 1U, 1U);
+        }
         capacity = stol(sLine);
         return true;
     }
@@ -198,7 +212,10 @@ bool SMART::parseErrorCount(string sLine, uint32_t &errorCount)
     if (found != string::npos)
     {
         sLine.erase(0U, sLine.find(": ") + 2U);
-        sLine.erase(sLine.length() - 2U, 2U);
+        if (sLine.length() >= 2U)
+        {
+            sLine.erase(sLine.length() - 2U, 2U);
+        }
         errorCount = stol(sLine);
         return true;
     }
@@ -221,7 +238,10 @@ bool SMART::parsePowerOnHours(string sLine, uint32_t &powerOnHours)
     if (found != string::npos)
     {
         sLine.erase(0U, sLine.find(": ") + 2U);
-        sLine.erase(sLine.length() - 1U, 1U);
+        if (sLine.length() >= 1U)
+        {
+            sLine.erase(sLine.length() - 1U, 1U);
+        }
         powerOnHours = stol(sLine);
         return true;
     }
@@ -244,7 +264,10 @@ bool SMART::parsePowerCycles(string sLine, uint32_t &powerCycles)
     if (found != string::npos)
     {
         sLine.erase(0, sLine.find(": ") + 2);
-        sLine.erase(sLine.length() - 2, 2);
+        if (sLine.length() >= 2U)
+        {
+            sLine.erase(sLine.length() - 2U, 2U);
+        }
         powerCycles = stol(sLine);
         return true;
     }
@@ -267,7 +290,10 @@ bool SMART::parseTemperature(string sLine, uint32_t &temperature)
     if (found != string::npos)
     {
         sLine.erase(0U, sLine.find(": ") + 2U);
-        sLine.erase(sLine.length() - 1U, 2U);
+        if (sLine.length() >= 1U)
+        {
+            sLine.erase(sLine.length() - 1U, 2U);
+        }
         if (sLine == "{")
         {
             temperature = 0U; // this drive doesn't support temperature

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,9 +99,9 @@ void TUI::updateTUI(list<Drive> *plistDrives, uint8_t u8SelectedEntry)
         string sSpeed = " ";
         string sTime = " ";
         string sTemp = it->sTemperatureToText();
-        string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA"
-                                                                     : it->connectionType == Drive::NVME   ? "NVME"
-                                                                                                           : "");
+        string sConnection = (it->connectionType == Drive::ConnectionType::USB ? "USB" : it->connectionType == Drive::ConnectionType::SATA ? "SATA"
+                                                                                     : it->connectionType == Drive::ConnectionType::NVME   ? "NVME"
+                                                                                                                                           : "");
 
         bool bSelectedEntry = false;
 
@@ -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::DELETE_SELECTED:
+        }
+        case Drive::TaskState::NONE:
+        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: