Switched to C++ for some code.

Added support for discard/TRIM.
Now tells the kernel to re-read the partition table.

Author: profi200

Makefile

@@ -0,0 +1,101 @@
+.SUFFIXES:
+
+# Sources and defines
+TARGET   := $(notdir $(CURDIR))
+BUILD    := build
+INCLUDES := include
+SOURCES  := source
+DEFINES  :=
+
+
+# Compiler settings
+ARCH     :=
+CFLAGS   := $(ARCH) -std=c17 -O2 -g -fstrict-aliasing -ffunction-sections \
+			-fdata-sections -Wall -Wextra -Wstrict-aliasing=2
+CXXFLAGS := $(ARCH) -std=c++20 -O2 -g -fstrict-aliasing -ffunction-sections \
+			-fdata-sections -Wall -Wextra -Wstrict-aliasing=2
+ASFLAGS  := $(ARCH) -O2 -g -x assembler-with-cpp
+ARFLAGS  := -rcs
+LDFLAGS  := $(ARCH) -O2 -g -Wl,--gc-sections
+
+PREFIX   :=
+CC       := $(PREFIX)gcc
+CXX      := $(PREFIX)g++
+AS       := $(PREFIX)gcc
+AR       := $(PREFIX)gcc-ar
+
+
+# Do not change anything after this
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+
+export OUTPUT := $(CURDIR)/$(TARGET)
+export VPATH  := $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
+				 $(foreach dir,$(SOURCES),$(CURDIR)/$(dir))
+
+CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+CFILES   := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+SFILES   := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+
+ifeq ($(strip $(CPPFILES)),)
+	export LD := $(CC)
+else
+	export LD := $(CXX)
+endif
+
+export OFILES  := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) -I$(CURDIR)/$(BUILD)
+
+
+.PHONY: $(BUILD) clean release
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+clean:
+	@echo clean ...
+	@rm -rf $(BUILD) $(TARGET)
+
+release:
+	@[ -d $(BUILD) ] || mkdir -p $(BUILD)
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile NO_DEBUG=1
+
+else
+
+ifneq ($(strip $(NO_DEBUG)),)
+	DEFINES += -DNDEBUG
+endif
+
+#VERS_STRING := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/i')
+#VERS_MAJOR  := $(shell echo "$(VERS_STRING)" | sed 's/v\([0-9]*\)\..*/\1/i')
+#VERS_MINOR  := $(shell echo "$(VERS_STRING)" | sed 's/.*\.\([0-9]*\).*/\1/')
+
+#DEFINES += -DVERS_STRING=\"$(VERS_STRING)\"
+#DEFINES += -DVERS_MAJOR=$(shell echo "$(VERS_STRING)" | sed 's/v\([0-9]*\)\..*/\1/i')
+#DEFINES += -DVERS_MINOR=$(shell echo "$(VERS_STRING)" | sed 's/.*\.\([0-9]*\).*/\1/')
+
+
+# Main target
+$(OUTPUT): $(OFILES)
+	$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@echo built ... $(notdir $@)
+
+
+%.o: %.cpp
+	@echo $(notdir $<)
+	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDE) -c $< -o $@
+
+%.o: %.c
+	@echo $(notdir $<)
+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE) -c $< -o $@
+
+%.o: %.s
+	@echo $(notdir $<)
+	$(AS) $(ASFLAGS) $(DEFINES) $(INCLUDE) -c $< -o $@
+
+%.a:
+	@echo $(notdir $@)
+	$(AR) $(ARFLAGS) $@ $^
+
+endif

blockdev.h

@@ -0,0 +1,90 @@
+#pragma once
+
+#include "types.h"
+
+
+
+class BlockDev
+{
+	bool m_isRegularFile;
+	bool m_isDevDirty;
+	int m_fd;
+	u64 m_diskSectors; // TODO: Store sector size along with this. ioctl(..., BLKSSZGET, ...). Or maybe BLKPBSZGET like dosfstools?
+
+
+	BlockDev(const BlockDev&) noexcept = delete; // Copy
+	BlockDev(BlockDev&&) noexcept = delete;      // Move
+
+	BlockDev& operator =(const BlockDev&) noexcept = delete; // Copy
+	BlockDev& operator =(BlockDev&&) noexcept = delete;      // Move
+
+
+public:
+	BlockDev(void) noexcept : m_isRegularFile(false), m_isDevDirty(false), m_fd(-1), m_diskSectors(0) {}
+	~BlockDev(void) noexcept
+	{
+		if(m_fd != -1) close();
+	}
+
+	/**
+	 * @brief      Opens the block device.
+	 *
+	 * @param[in]  path  The path.
+	 * @param[in]  rw    When true open device in read + write mode.
+	 *
+	 * @return     Returns 0 on success or errno.
+	 */
+	int open(const char *const path, const bool rw = false) noexcept;
+
+	/**
+	 * @brief      Returns the number of sectors.
+	 *
+	 * @return     The number of sectors.
+	 */
+	u64 getSectors(void) const noexcept {return m_diskSectors;}
+
+	/**
+	 * @brief      Reads sectors from the block device.
+	 *
+	 * @param      buf     The output buffer.
+	 * @param[in]  sector  The start sector.
+	 * @param[in]  count   The number of sectors to read.
+	 *
+	 * @return     Returns 0 on success or errno.
+	 */
+	int read(u8 *buf, const u64 sector, const u64 count) const noexcept;
+
+	/**
+	 * @brief      Writes sectors to the block device.
+	 *
+	 * @param[in]  buf     The input buffer.
+	 * @param[in]  sector  The start sector.
+	 * @param[in]  count   The number of sectors to write.
+	 *
+	 * @return     Returns 0 on success or errno.
+	 */
+	int write(const u8 *buf, const u64 sector, const u64 count) noexcept;
+
+	/**
+	 * @brief      Truncates to the specified size if the device is a regular file. Otherwise not supported.
+	 *
+	 * @param[in]  sectors  The size in sectors.
+	 *
+	 * @return     Returns 0 on success or errno.
+	 */
+	int truncate(const u64 sectors) noexcept;
+
+	/**
+	 * @brief      Perform a TRIM/erase on the whole block device. Not supported for regular files.
+	 *
+	 * @param[in]  secure  If true do a secure erase.
+	 *
+	 * @return     Returns 0 on success or errno.
+	 */
+	int discardAll(const bool secure = false) const noexcept;
+
+	/**
+	 * @brief      Closes the block device.
+	 */
+	void close(void) noexcept;
+};

compile.sh

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <stdbool.h>
+#include "types.h"
+
+
+#define FLAGS_DRY_RUN       (1u)
+#define FLAGS_ERASE         (1u<<1)
+#define FLAGS_SECURE_ERASE  (1u<<2)
+#define FLAGS_FORCE_FAT32   (1u<<3)
+#define FLAGS_PRINT_FS      (1u<<4)
+#define FLAGS_VERBOSE       (1u<<5)
+
+
+
+void setVerboseMode(const bool verbose);
+u32 formatSd(const char *const path, const char *const label, const u32 flags, const u64 overrTotSec);