Update SIMH file error handling

uweseimet · Dec 10, 2024 · 00ee74d · 00ee74d
1 parent 6e85484
commit 00ee74d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cpp/shared/simh_util.cpp b/cpp/shared/simh_util.cpp
@@ -53,20 +53,22 @@ uint32_t simh_util::Pad(int length)
     return length + (length % 2 ? 1 : 0);
 }
 
-void simh_util::WriteFilemark(ostream &file)
+bool simh_util::WriteFilemark(ostream &file)
 {
     const array<uint8_t, 4> &filemark = { 0, 0, 0, 0 };
     file.write((const char*)filemark.data(), filemark.size());
+    return file.good();
 }
 
-void simh_util::WriteGoodData(ostream &file, span<const uint8_t> data, int length)
+bool simh_util::WriteGoodData(ostream &file, span<const uint8_t> data, int length)
 {
     const array<uint8_t, 4> good_data = { static_cast<uint8_t>(length & 0xff),
         static_cast<uint8_t>((length >> 8) & 0xff), static_cast<uint8_t>((length >> 16) & 0xff),
         static_cast<uint8_t>((length >> 24) & 0xff) };
     file.write((const char*)good_data.data(), good_data.size());
     file.write((const char*)data.data(), length);
     file.write((const char*)good_data.data(), good_data.size());
+    return file.good();
 }
 
 simh_util::SimhMetaData simh_util::FromLittleEndian(span<const uint8_t> value)

diff --git a/cpp/shared/simh_util.h b/cpp/shared/simh_util.h
@@ -56,8 +56,8 @@ bool IsRecord(const SimhMetaData&);
 
 uint32_t Pad(int);
 
-void WriteFilemark(ostream&);
-void WriteGoodData(ostream&, span<const uint8_t>, int);
+bool WriteFilemark(ostream&);
+bool WriteGoodData(ostream&, span<const uint8_t>, int);
 
 SimhMetaData FromLittleEndian(span<const uint8_t>);
 array<uint8_t, 4> ToLittleEndian(const SimhMetaData&);

diff --git a/cpp/test/simh_util_test.cpp b/cpp/test/simh_util_test.cpp
@@ -79,7 +79,7 @@ TEST(SimhUtilTest, WriteFilemark)
     const string &filename = CreateTempFile();
     fstream file(filename);
 
-    WriteFilemark(file);
+    EXPECT_TRUE(WriteFilemark(file));
     file.flush();
 
     EXPECT_EQ(4, file_size(filename));
@@ -96,7 +96,7 @@ TEST(SimhUtilTest, WriteGoodData)
     fstream file(filename);
 
     vector<uint8_t> data = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
-    WriteGoodData(file, data, 8);
+    EXPECT_TRUE(WriteGoodData(file, data, 8));
     file.flush();
 
     EXPECT_EQ(16, file_size(filename));