Enable FatFS on a bunch of formats; better error reporting (i.e., some).

lib/vfs/fatfs.cc

@@ -103,12 +103,12 @@ public:
 
         while (!f_eof(&fil))
         {
-			uint8_t buffer[4096];
+            uint8_t buffer[4096];
-			UINT done;
+            UINT done;
-			res = f_read(&fil, buffer, sizeof(buffer), &done);
+            res = f_read(&fil, buffer, sizeof(buffer), &done);
-			throwError(res);
+            throwError(res);
 
-			bw += Bytes(buffer, done);
+            bw += Bytes(buffer, done);
         }
 
         f_close(&fil);
@@ -167,7 +167,8 @@ private:
                 throw BadFilesystemException();
 
             default:
-                throw FilesystemException();
+                throw FilesystemException(
+                    fmt::format("unknown fatfs error {}", res));
         }
     }
 

lib/vfs/vfs.cc

@@ -30,7 +30,7 @@ Path::Path(const std::string& path)
 
 std::string Path::to_str() const
 {
-	return join(*this, "/");
+    return join(*this, "/");
 }
 
 Filesystem::Filesystem(std::shared_ptr<SectorInterface> sectors):

lib/vfs/vfs.h

@@ -21,7 +21,7 @@ struct Dirent
     std::string filename;
     FileType file_type;
     uint64_t length;
-	std::string mode;
+    std::string mode;
 };
 
 enum FilesystemStatus
@@ -33,60 +33,112 @@ enum FilesystemStatus
     FS_BAD
 };
 
-class FilesystemException : public ErrorException {};
+class FilesystemException
-class BadPathException : public FilesystemException {};
+{
-class FileNotFoundException : public FilesystemException {};
+public:
-class BadFilesystemException : public FilesystemException {};
+    FilesystemException(const std::string& message): message(message) {}
-class ReadOnlyFilesystemException : public FilesystemException {};
+
-class UnimplementedFilesystemException : public FilesystemException {};
+public:
+    std::string message;
+};
+
+class BadPathException : public FilesystemException
+{
+public:
+    BadPathException(): FilesystemException("Bad path") {}
+};
+
+class FileNotFoundException : public FilesystemException
+{
+public:
+    FileNotFoundException(): FilesystemException("File not found") {}
+};
+
+class BadFilesystemException : public FilesystemException
+{
+public:
+    BadFilesystemException(): FilesystemException("Invalid filesystem") {}
+};
+
+class ReadOnlyFilesystemException : public FilesystemException
+{
+public:
+    ReadOnlyFilesystemException(): FilesystemException("Read only filesystem")
+    {
+    }
+};
+
+class UnimplementedFilesystemException : public FilesystemException
+{
+public:
+    UnimplementedFilesystemException():
+        FilesystemException("Unimplemented operation")
+    {
+    }
+};
 
 class Path : public std::vector<std::string>
 {
 public:
-	Path() {}
+    Path() {}
-	Path(const std::string& text);
+    Path(const std::string& text);
 
 public:
-	std::string to_str() const;
+    std::string to_str() const;
 };
 
 class Filesystem
 {
 public:
-	virtual void create()
+    virtual void create()
-	{ throw UnimplementedFilesystemException(); }
+    {
-	
+        throw UnimplementedFilesystemException();
+    }
+
     virtual FilesystemStatus check()
-	{ throw UnimplementedFilesystemException(); }
+    {
+        throw UnimplementedFilesystemException();
+    }
 
     virtual std::vector<std::unique_ptr<Dirent>> list(const Path& path)
-	{ throw UnimplementedFilesystemException(); }
+    {
+        throw UnimplementedFilesystemException();
+    }
 
     virtual Bytes getFile(const Path& path)
-	{ throw UnimplementedFilesystemException(); }
+    {
+        throw UnimplementedFilesystemException();
+    }
 
     virtual void putFile(const Path& path, const Bytes& data)
-	{ throw UnimplementedFilesystemException(); }
+    {
+        throw UnimplementedFilesystemException();
+    }
 
-	virtual std::map<std::string, std::string> getMetadata(const Path& path)
+    virtual std::map<std::string, std::string> getMetadata(const Path& path)
-	{ throw UnimplementedFilesystemException(); }
+    {
+        throw UnimplementedFilesystemException();
+    }
 
-	virtual void putMetadata(const Path& path, const std::map<std::string, std::string>& metadata)
+    virtual void putMetadata(
-	{ throw UnimplementedFilesystemException(); }
+        const Path& path, const std::map<std::string, std::string>& metadata)
+    {
+        throw UnimplementedFilesystemException();
+    }
 
 protected:
-	Filesystem(std::shared_ptr<SectorInterface> sectors);
+    Filesystem(std::shared_ptr<SectorInterface> sectors);
 
-	Bytes getLogicalSector(uint32_t number, uint32_t count = 1);
+    Bytes getLogicalSector(uint32_t number, uint32_t count = 1);
-	void putLogicalSector(uint32_t number, const Bytes& data);
+    void putLogicalSector(uint32_t number, const Bytes& data);
 
-	unsigned getLogicalSectorCount();
+    unsigned getLogicalSectorCount();
-	unsigned getLogicalSectorSize();
+    unsigned getLogicalSectorSize();
 
 private:
-	typedef std::tuple<unsigned, unsigned, unsigned> location_t;
+    typedef std::tuple<unsigned, unsigned, unsigned> location_t;
-	std::vector<location_t> _locations;
+    std::vector<location_t> _locations;
-	std::shared_ptr<SectorInterface> _sectors;
+    std::shared_ptr<SectorInterface> _sectors;
 
 public:
     static std::unique_ptr<Filesystem> createBrother120Filesystem(
@@ -96,8 +148,8 @@ public:
     static std::unique_ptr<Filesystem> createFatFsFilesystem(
         const FilesystemProto& config, std::shared_ptr<SectorInterface> image);
 
-	static std::unique_ptr<Filesystem> createFilesystem(
+    static std::unique_ptr<Filesystem> createFilesystem(
-		const FilesystemProto& config, std::shared_ptr<SectorInterface> image);
+        const FilesystemProto& config, std::shared_ptr<SectorInterface> image);
 };
 
 #endif

src/fe-getfile.cc

@@ -16,7 +16,7 @@
 #include <google/protobuf/text_format.h>
 #include <fstream>
 
-static FlagGroup flags({ &fileFlags });
+static FlagGroup flags({&fileFlags});
 
 static StringFlag directory({"-p", "--path"}, "path to work on", "");
 static StringFlag output({"-o", "--output"}, "local filename to write to", "");
@@ -27,18 +27,25 @@ int mainGetFile(int argc, const char* argv[])
         showProfiles("getfile", formats);
     flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
-	Path inputFilename(directory);
+    try
-	if (inputFilename.size() == 0)
+    {
-		Error() << "you must supply a filename to read";
+        Path inputFilename(directory);
+        if (inputFilename.size() == 0)
+            Error() << "you must supply a filename to read";
 
-	std::string outputFilename = output;
+        std::string outputFilename = output;
-	if (outputFilename.empty())
+        if (outputFilename.empty())
-		outputFilename = inputFilename.back();
+            outputFilename = inputFilename.back();
-	fmt::print("{}\n", outputFilename);
+        fmt::print("{}\n", outputFilename);
-		
+
-	auto filesystem = createFilesystemFromConfig();
+        auto filesystem = createFilesystemFromConfig();
-	auto data = filesystem->getFile(inputFilename);
+        auto data = filesystem->getFile(inputFilename);
-	data.writeToFile(outputFilename);
+        data.writeToFile(outputFilename);
+    }
+    catch (const FilesystemException& e)
+    {
+        Error() << e.message;
+    }
 
     return 0;
 }

src/fe-getfileinfo.cc

@@ -16,7 +16,7 @@
 #include <google/protobuf/text_format.h>
 #include <fstream>
 
-static FlagGroup flags({ &fileFlags });
+static FlagGroup flags({&fileFlags});
 
 static StringFlag directory({"-p", "--path"}, "path to work on", "");
 
@@ -26,11 +26,18 @@ int mainGetFileInfo(int argc, const char* argv[])
         showProfiles("getfileinfo", formats);
     flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
-	auto filesystem = createFilesystemFromConfig();
+    try
-	auto attributes = filesystem->getMetadata(Path(directory));
+    {
+        auto filesystem = createFilesystemFromConfig();
+        auto attributes = filesystem->getMetadata(Path(directory));
 
-	for (const auto& e : attributes)
+        for (const auto& e : attributes)
-		fmt::print("{} = {}\n", e.first, e.second);
+            fmt::print("{} = {}\n", e.first, e.second);
+    }
+    catch (const FilesystemException& e)
+    {
+        Error() << e.message;
+    }
 
     return 0;
 }

src/fe-ls.cc

@@ -15,7 +15,7 @@
 #include <google/protobuf/text_format.h>
 #include <fstream>
 
-static FlagGroup flags({ &fileFlags });
+static FlagGroup flags({&fileFlags});
 
 static StringFlag directory({"-p", "--path"}, "path to list", "");
 
@@ -40,24 +40,31 @@ int mainLs(int argc, const char* argv[])
         showProfiles("ls", formats);
     flags.parseFlagsWithConfigFiles(argc, argv, formats);
 
-	auto filesystem = createFilesystemFromConfig();
+    try
-    auto files = filesystem->list(Path(directory));
-
-    int maxlen = 0;
-    for (const auto& dirent : files)
-        maxlen = std::max(maxlen, (int)dirent->filename.size());
-
-	uint32_t total = 0;
-    for (const auto& dirent : files)
     {
-        fmt::print("{} {:{}}  {:6}\n",
+        auto filesystem = createFilesystemFromConfig();
-            fileTypeChar(dirent->file_type),
+        auto files = filesystem->list(Path(directory));
-            dirent->filename,
+
-            maxlen,
+        int maxlen = 0;
-            dirent->length);
+        for (const auto& dirent : files)
-		total += dirent->length;
+            maxlen = std::max(maxlen, (int)dirent->filename.size());
+
+        uint32_t total = 0;
+        for (const auto& dirent : files)
+        {
+            fmt::print("{} {:{}}  {:6}\n",
+                fileTypeChar(dirent->file_type),
+                dirent->filename,
+                maxlen,
+                dirent->length);
+            total += dirent->length;
+        }
+        fmt::print("({} files, {} bytes)\n", files.size(), total);
+    }
+    catch (const FilesystemException& e)
+    {
+        Error() << e.message;
     }
-    fmt::print("({} files, {} bytes)\n", files.size(), total);
 
     return 0;
 }

src/formats/atarist360.textpb

@@ -69,3 +69,7 @@ heads {
 	end: 0
 }
 
+filesystem {
+	fatfs {}
+}
+

src/formats/atarist370.textpb

@@ -68,3 +68,8 @@ heads {
 	end: 0
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist400.textpb

@@ -69,3 +69,8 @@ heads {
 	end: 0
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist410.textpb

@@ -69,3 +69,8 @@ heads {
 	end: 0
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist720.textpb

@@ -68,3 +68,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist740.textpb

@@ -68,3 +68,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist800.textpb

@@ -69,3 +69,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/atarist820.textpb

@@ -69,3 +69,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/ibm1200.textpb

@@ -73,3 +73,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/ibm1232.textpb

@@ -67,3 +67,8 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/ibm1440.textpb

@@ -72,3 +72,7 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+

src/formats/ibm180.textpb

@@ -68,3 +68,9 @@ heads {
 }
 
 tpi: 48
+
+filesystem {
+	fatfs {}
+}
+
+

src/formats/ibm360.textpb

@@ -65,3 +65,8 @@ heads {
 
 tpi: 48
 
+filesystem {
+	fatfs {}
+}
+
+

src/formats/ibm720.textpb

@@ -69,3 +69,7 @@ heads {
 	end: 1
 }
 
+filesystem {
+	fatfs {}
+}
+