Minor fixes/changes.

Moved fsPrinter to a standalone tool.

Author: profi200

include/errors.h

@@ -0,0 +1,16 @@
+#pragma once
+
+
+enum
+{
+	// Everything ok = 0.
+	ERR_INVALID_ARG   = 1,
+	ERR_DEV_OPEN      = 2,
+	ERR_DEV_TOO_SMALL = 3,
+	ERR_ERASE         = 4,
+	ERR_PARTITION     = 5,
+	ERR_FORMAT        = 6,
+	ERR_CLOSE_DEV     = 7,
+	ERR_EXCEPTION     = 8,
+	ERR_UNK_EXCEPTION = 9
+};

include/format.h

@@ -11,7 +11,6 @@ union ArgFlags
 		u8 erase      : 1;
 		u8 secErase   : 1;
 		u8 forceFat32 : 1;
-		u8 printFs    : 1;
 		u8 verbose    : 1;
 	};
 	u8 allFlags;

include/fs_printer.h

@@ -119,7 +119,7 @@ int BlockDev::open(const char *const path, const bool rw) noexcept
 #endif
 
 		m_fd = fd;
-		m_sectors = diskSize / 512;
+		m_sectors = diskSize / m_sectorSize;
 	} while(0);
 
 	if(res != 0)
@@ -134,8 +134,8 @@ int BlockDev::read(u8 *buf, const u64 sector, const u64 count) const noexcept
 {
 	int res = 0;
 	const int fd = m_fd;
-	off_t offset = sector * 512;
-	u64 totSize = count * 512;
+	off_t offset = sector * m_sectorSize;
+	u64 totSize = count * m_sectorSize;
 	while(totSize > 0)
 	{
 		// Limit of 1 GiB chunks.
@@ -168,8 +168,8 @@ int BlockDev::write(const u8 *buf, const u64 sector, const u64 count) noexcept
 
 	int res = 0;
 	const int fd = m_fd;
-	off_t offset = sector * 512;
-	u64 totSize = count * 512;
+	off_t offset = sector * m_sectorSize;
+	u64 totSize = count * m_sectorSize;
 	while(totSize > 0)
 	{
 		// Limit of 1 GiB chunks.
@@ -195,7 +195,7 @@ int BlockDev::write(const u8 *buf, const u64 sector, const u64 count) noexcept
 int BlockDev::discardAll(const bool secure) const noexcept
 {
 	int res = 0;
-	const u64 wholeRange[2] = {0, m_sectors * 512};
+	const u64 wholeRange[2] = {0, m_sectors * m_sectorSize};
 	if(ioctl(m_fd, (secure ? BLKSECDISCARD : BLKDISCARD), wholeRange) == -1)
 	{
 		res = errno;

source/blockdev.cpp

@@ -6,14 +6,15 @@
 #include "mbr.h"
 #include "exfat.h"
 #include "fat.h"
+#include "errors.h"
 #include "buffered_fs_writer.h"
 #include "verbose_printf.h"
 #include "privileges.h"
 
 
 
 // TODO: fatBits is determined from SC and TS.
-static bool getFormatParams(const u64 totSec, const bool forceSdxcFat32, FormatParams *const paramsOut)
+static bool getFormatParams(const u64 totSec, const bool forceSdxcFat32, FormatParams &paramsOut)
 {
 	if(totSec == 0) return false;
 	if(totSec >= 1ull<<32 && forceSdxcFat32) return false;
@@ -59,12 +60,12 @@ static bool getFormatParams(const u64 totSec, const bool forceSdxcFat32, FormatP
 		{ 0,  0,    0,      0}  // Higher is not supported (yet).
 	};
 
-	paramsOut->totSec = totSec;
+	paramsOut.totSec = totSec;
 
 	const GeometryData *geometryData = geometryTable;
 	while(geometryData->cap != 0 && totSec>>11 > geometryData->cap) geometryData++;
-	paramsOut->heads     = geometryData->heads;
-	paramsOut->secPerTrk = geometryData->secPerTrk;
+	paramsOut.heads     = geometryData->heads;
+	paramsOut.secPerTrk = geometryData->secPerTrk;
 
 	const AlignData *alignParams = alignTable;
 	while(alignParams->capLog2 != 0 && totSec > 1ull<<alignParams->capLog2) alignParams++;
@@ -75,41 +76,41 @@ static bool getFormatParams(const u64 totSec, const bool forceSdxcFat32, FormatP
 	}
 
 	const u8 fatBits = (alignParams->capLog2 > 26 && forceSdxcFat32 ? 32 : alignParams->fatBits);
-	paramsOut->fatBits    = fatBits;
-	paramsOut->alignment  = alignParams->alignment;
-	paramsOut->secPerClus = alignParams->secPerClus;
+	paramsOut.fatBits    = fatBits;
+	paramsOut.alignment  = alignParams->alignment;
+	paramsOut.secPerClus = alignParams->secPerClus;
 
-	if(fatBits <= 16)      calcFormatFat((u32)totSec, *paramsOut);
-	else if(fatBits == 32) calcFormatFat32((u32)totSec, *paramsOut);
+	if(fatBits <= 16)      calcFormatFat((u32)totSec, paramsOut);
+	else if(fatBits == 32) calcFormatFat32((u32)totSec, paramsOut);
 	else                   calcFormatExFat(/*totSec, *paramsOut*/); // TODO
 
 	return true;
 }
 
-static void printFormatParams(const FormatParams *const params)
+static void printFormatParams(const FormatParams &params)
 {
 	const char *fsName;
-	if(params->fatBits == 12)      fsName = "FAT12";
-	else if(params->fatBits == 16) fsName = "FAT16";
-	else if(params->fatBits == 32) fsName = "FAT32";
-	else                           fsName = "exFAT";
+	if(params.fatBits == 12)      fsName = "FAT12";
+	else if(params.fatBits == 16) fsName = "FAT16";
+	else if(params.fatBits == 32) fsName = "FAT32";
+	else                          fsName = "exFAT";
 
 	printf("Filesystem type:      %s\n", fsName);
-	printf("Heads:                %" PRIu8 "\n", params->heads);
-	printf("Sectors per track:    %" PRIu8 "\n", params->secPerTrk);
-	printf("Alignment:            %" PRIu32 "\n", params->alignment);
-	printf("Reserved sectors:     %" PRIu32 "\n", params->rsvdSecCnt);
-	printf("Sectors per cluster:  %" PRIu32 "\n", params->secPerClus);
-	printf("Sectors per FAT:      %" PRIu32 "\n", params->secPerFat);
-	printf("Filesystem area size: %" PRIu32 "\n", params->fsAreaSize);
-	printf("Partition start:      %" PRIu32 "\n", params->partStart);
-	printf("Maximum clusters:     %" PRIu32 "\n", params->maxClus);
+	printf("Heads:                %" PRIu8 "\n", params.heads);
+	printf("Sectors per track:    %" PRIu8 "\n", params.secPerTrk);
+	printf("Alignment:            %" PRIu32 "\n", params.alignment);
+	printf("Reserved sectors:     %" PRIu32 "\n", params.rsvdSecCnt);
+	printf("Sectors per cluster:  %" PRIu32 "\n", params.secPerClus);
+	printf("Sectors per FAT:      %" PRIu32 "\n", params.secPerFat);
+	printf("Filesystem area size: %" PRIu32 "\n", params.fsAreaSize);
+	printf("Partition start:      %" PRIu32 "\n", params.partStart);
+	printf("Maximum clusters:     %" PRIu32 "\n", params.maxClus);
 }
 
 u32 formatSd(const char *const path, const char *const label, const ArgFlags flags, const u64 overrTotSec)
 {
 	BufferedFsWriter dev;
-	if(dev.open(path) != 0) return 2;
+	if(dev.open(path) != 0) return ERR_DEV_OPEN;
 	dropPrivileges();
 
 	// The smallest card we can format without running into issues is 64 KiB.
@@ -118,7 +119,7 @@ u32 formatSd(const char *const path, const char *const label, const ArgFlags fla
 	if(totSec < (1024 * 64 / 512))
 	{
 		fputs("SD card capacity too small.\n", stderr);
-		return 3;
+		return ERR_DEV_TOO_SMALL;
 	}
 
 	// Allow overriding the capacity only if the new capacity is lower.
@@ -137,28 +138,28 @@ u32 formatSd(const char *const path, const char *const label, const ArgFlags fla
 		{
 			fputs("SD card can't be erased. Ignoring.\n", stderr);
 		}
-		else if(discardRes != 0) return 4;
+		else if(discardRes != 0) return ERR_ERASE;
 	}
 
 	FormatParams params{};
-	getFormatParams(totSec, flags.forceFat32, &params);
+	getFormatParams(totSec, flags.forceFat32, params);
 
 	// Create a new Master Boot Record and partition.
 	verbosePuts("Creating new partition table and partition...");
-	if(createMbrAndPartition(&params, dev) != 0) return 5;
+	if(createMbrAndPartition(&params, dev) != 0) return ERR_PARTITION;
 
 	// Clear filesystem areas and write a new Volume Boot Record.
 	// TODO: Label should be upper case and some chars are not allowed. Implement conversion + checks.
 	//       mkfs.fat allows lower case but warns about it.
 	verbosePuts("Formatting the partition...");
 	// TODO: Depending on FS type call the format function here.
-	if(makeFsFat(params, dev, label) != 0) return 6;
+	if(makeFsFat(params, dev, label) != 0) return ERR_FORMAT;
 
 	// Explicitly close dev to get the result.
-	if(dev.close() != 0) return 7;
+	if(dev.close() != 0) return ERR_CLOSE_DEV;
 
 	puts("Successfully formatted the card.");
-	printFormatParams(&params);
+	printFormatParams(params);
 
 	return 0;
 }

source/format.cpp

@@ -3,7 +3,7 @@
 #include <cstring>
 #include <exception>
 #include <getopt.h>
-#include "fs_printer.h"
+#include "errors.h"
 #include "format.h"
 #include "verbose_printf.h"
 
@@ -23,7 +23,6 @@ static void printHelp(void)
 	     "  -f, --force-fat32        Force format SDXC cards as FAT32.\n"
 	     "                           No effect on other types of SD cards.\n"
 	     "  -l, --label LABEL        Volume label. Maximum 11 uppercase characters.\n"
-	     "  -p, --print-fs           Don't format. Print the filesystem structure.\n"
 	     "  -v, --verbose            Show format details.\n"
 	     "  -h, --help               Output this help.\n");
 }
@@ -36,7 +35,6 @@ int main(const int argc, char *const argv[])
 	 {      "erase", required_argument, NULL, 'e'},
 	 {"force-fat32",       no_argument, NULL, 'f'},
 	 {      "label", required_argument, NULL, 'l'},
-	 {   "print-fs",       no_argument, NULL, 'p'},
 	 {    "verbose",       no_argument, NULL, 'v'},
 	 {       "help",       no_argument, NULL, 'h'},
 	 {         NULL,                 0, NULL,   0}};
@@ -46,7 +44,7 @@ int main(const int argc, char *const argv[])
 	char label[12]{};
 	while(1)
 	{
-		const int c = getopt_long(argc, argv, "c:de:fl:pvh", long_options, NULL);
+		const int c = getopt_long(argc, argv, "c:" /*d*/ "e:fl:vh", long_options, NULL);
 		if(c == -1) break;
 
 		switch(c)
@@ -57,7 +55,7 @@ int main(const int argc, char *const argv[])
 					if(overrTotSec == 0 || overrTotSec > 1ull<<32) // Max 2 TiB.
 					{
 						fputs("Error: Image size 0 or out of range.\n", stderr);
-						return 1;
+						return ERR_INVALID_ARG;
 					}
 				}
 				break;
@@ -66,14 +64,15 @@ int main(const int argc, char *const argv[])
 				break;*/
 			case 'e':
 				{
+					// TODO: Support full overwrite?
 					if(strcmp(optarg, "trim") == 0)
 						flags.erase = 1;
 					else if(strcmp(optarg, "secure") == 0)
 						flags.secErase = 1;
 					else
 					{
 						fprintf(stderr, "Error: Invalid erase type '%s'.\n", optarg);
-						return 1;
+						return ERR_INVALID_ARG;
 					}
 				}
 				break;
@@ -85,7 +84,7 @@ int main(const int argc, char *const argv[])
 					if(strlen(optarg) > 11)
 					{
 						fputs("Error: Label is longer than 11 characters.\n", stderr);
-						return 1;
+						return ERR_INVALID_ARG;
 					}
 					strncpy(label, optarg, 11);
 					/*for(u32 i = 0; i < 11; i++)
@@ -99,17 +98,14 @@ int main(const int argc, char *const argv[])
 						   lc == 0x7C)
 						{
 							fputs("Error: Label contains invalid characters.\n", stderr);
-							return 1;
+							return ERR_INVALID_ARG;
 						}
 						// TODO: The label should be encoded in the system's DOS code page. Convert from UTF-8 to DOS code page.
 						// TODO: Check for uppercase chars and give a warning.
 						// TODO: Do not allow the "NO NAME" label?
 					}*/
 				}
 				break;
-			case 'p':
-				flags.printFs = 1;
-				break;
 			case 'v':
 				flags.verbose = 1;
 				break;
@@ -121,36 +117,32 @@ int main(const int argc, char *const argv[])
 				// Fallthrough.
 			default:
 				printHelp();
-				return 1;
+				return ERR_INVALID_ARG;
 		}
 	}
 
 	if(argc - optind < 1 || argc - optind > 1)
 	{
 		printHelp();
-		return 1;
+		return ERR_INVALID_ARG;
 	}
 
 	const char *const devPath = argv[optind];
 	int res;
 	try
 	{
-		if(!flags.printFs)
-		{
-			setVerboseMode(flags.verbose);
-			res = formatSd(devPath, (*label != 0 ? label : NULL), flags, overrTotSec);
-		}
-		else res = printDiskInfo(devPath);
+		setVerboseMode(flags.verbose);
+		res = formatSd(devPath, (*label != 0 ? label : NULL), flags, overrTotSec);
 	}
-	catch(const std::exception& e)
+	catch(const std::exception &e)
 	{
 		fprintf(stderr, "An exception occurred: what(): '%s'\n", e.what());
-		res = 8;
+		res = ERR_EXCEPTION;
 	}
 	catch(...)
 	{
 		fprintf(stderr, "Unknown exception. Aborting...\n");
-		res = 9;
+		res = ERR_UNK_EXCEPTION;
 	}
 
 	return res;