bmfslite - Update list output

Author: Ian Seyler

LICENSE

@@ -2,7 +2,7 @@
 BareMetal OS -- License
 ===============================================================================
 
-Copyright (C) 2008-2023 Return Infinity -- http://www.returninfinity.com
+Copyright (C) 2008-2024 Return Infinity -- http://www.returninfinity.com
 
 All rights reserved.
 

doc/BareMetal File System Lite.md

@@ -1,4 +1,3 @@
-
 # BareMetal File System Lite (BMFS-Lite) - Version 1
 
 BMFS-Lite is a new in-memory file system ([RAM Drive](https://en.wikipedia.org/wiki/RAM_drive)) used by BareMetal-OS. Based on BMFS, the design is extremely simplified compared to conventional file systems. The system is also geared more toward a small number of files (utilities, demos).

src/bmfslite.c

@@ -231,8 +231,8 @@ void bmfs_list(void)
 	int tint;
 
 	printf("BMFS-Lite Drive Size: %d bytes\n", disksize);
-	printf("Name                            |            Size (B)|        Reserved (B)\n");
-	printf("==========================================================================\n");
+	printf("Name                            |    Size | Reserved | Block\n");
+	printf("============================================================\n");
 	for (tint = 0; tint < 64; tint++)				// Max 64 entries
 	{
 		memcpy(pentry, Directory+(tint*64), 64);
@@ -246,21 +246,15 @@ void bmfs_list(void)
 		}
 		else							// Valid entry
 		{
-			printf("%-32s %20lld %20lld\n", entry.FileName, (long long int)entry.FileSize, (long long int)(entry.ReservedBlocks*2));
+			printf("%-32s %8lld %10lld %7lld\n", entry.FileName, (long long int)entry.FileSize, (long long int)(entry.ReservedBlocks*blockSize), entry.StartingBlock);
 		}
 	}
 }
 
 
 void bmfs_format(void)
 {
-//	memset(DiskInfo, 0, 512);
-//	memset(Directory, 0, 4096);
-//	memcpy(DiskInfo, fs_tag, 4);					// Add the 'BMFS' tag
-//	fseek(disk, 1024, SEEK_SET);					// Seek 1KiB in for disk information
-//	fwrite(DiskInfo, 512, 1, disk);					// Write 512 bytes for the DiskInfo
-//	fseek(disk, 4096, SEEK_SET);					// Seek 4KiB in for directory
-//	fwrite(Directory, 4096, 1, disk);				// Write 4096 bytes for the Directory
+// Todo - overwrite entire file with zeros
 }
 
 
@@ -477,6 +471,12 @@ void bmfs_create(char *filename, unsigned long long maxsize)
 		unsigned long long new_file_start = 0;
 		unsigned long long prev_file_end = 1;
 
+		if(strlen(filename) > 31)
+		{
+			printf("bmfs error: Filename too long.\n");
+			return;
+		}
+
 		// Make a copy of Directory to play with
 		memcpy(dir_copy, Directory, 4096);
 
@@ -654,7 +654,7 @@ void bmfs_write(char *filename)
 		rewind(tfile);
 		if (0 == bmfs_find(filename, &tempentry, &slot))
 		{
-			bmfs_create(filename, (tempfilesize+blockSize)/blockSize);
+			bmfs_create(filename, (tempfilesize+blockSize)/blockSize*2);
 			bmfs_find(filename, &tempentry, &slot);
 		}
 		if ((tempentry.ReservedBlocks*blockSize) < tempfilesize)
@@ -707,7 +707,7 @@ void bmfs_write(char *filename)
 			// Update directory
 			tempfilesize = ftell(tfile);
 			memcpy(Directory+(slot*64)+48, &tempfilesize, 8);
-			fseek(disk, 0, SEEK_SET);			// Seek 4KiB in for directory
+			fseek(disk, 0, SEEK_SET);			// Seek to directory
 			fwrite(Directory, 4096, 1, disk);		// Write new directory to disk
 		}
 		fclose(tfile);