Merge pull request #164 from davidgiven/cpmfs

Avoid a weird mkfs.cpm bug where it doesn't always create the directory.

.github/workflows/ccpp.yml

@@ -30,7 +30,7 @@ jobs:
       run: make LLVM=$HOME/llvm-mos/bin -j`nproc` +all +mametest
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ github.event.repository.name }}.${{ github.sha }}
         path: |

build/zip.py

@@ -22,7 +22,7 @@ def zip(self, name, flags="", items: TargetsMap = {}):
     for k, v in items.items():
         cs += [
             "cat %s | $(ZIP) -q %s {outs[0]} -" % (filenameof(v), flags),
-            "echo '@ -\\n@=%s\\n' | $(ZIPNOTE) -w {outs[0]}" % k,
+            "printf '@ -\\n@=%s\\n' | $(ZIPNOTE) -w {outs[0]}" % k,
         ]
         ins += [v]
 

tools/build.py

@@ -1,29 +1,38 @@
-from build.ab import Rule, Target, simplerule, filenameof, TargetsMap, filenamesof
+from build.ab import (
+    Rule,
+    Target,
+    simplerule,
+    filenameof,
+    TargetsMap,
+    filenamesof,
+)
 from build.c import cxxprogram, cprogram
 
 cxxprogram(name="multilink", srcs=["./multilink.cc"], deps=["+libfmt"])
 cxxprogram(name="xextobin", srcs=["./xextobin.cc"], deps=["+libfmt"])
 cxxprogram(name="shuffle", srcs=["./shuffle.cc"], deps=["+libfmt"])
 cxxprogram(name="mkoricdsk", srcs=["./mkoricdsk.cc"], deps=["+libfmt"])
 cxxprogram(name="mkcombifs", srcs=["./mkcombifs.cc"], deps=["+libfmt"])
+cxxprogram(name="fillfile", srcs=["./fillfile.cc"], deps=["+libfmt"])
 cprogram(name="unixtocpm", srcs=["./unixtocpm.c"])
 cprogram(name="mkdfs", srcs=["./mkdfs.c"])
 cprogram(name="mkimd", srcs=["./mkimd.c"])
 cprogram(
     name="fontconvert", srcs=["./fontconvert.c", "./libbdf.c", "./libbdf.h"]
 )
 
+
 @Rule
-def unixtocpm(
-    self, name, src:Target=None):
+def unixtocpm(self, name, src: Target = None):
     simplerule(
         replaces=self,
         ins=[src],
         outs=[f"={name}.txt"],
         deps=["tools+unixtocpm"],
-        commands=[
-            "{deps[0]} < {ins[0]} > {outs[0]}"],
-            label="UNIXTOCPM")
+        commands=["{deps[0]} < {ins[0]} > {outs[0]}"],
+        label="UNIXTOCPM",
+    )
+
 
 @Rule
 def multilink(
@@ -65,6 +74,9 @@ def mkcpmfs(
     if template:
         cs += ["cp %s {outs[0]}" % filenameof(template)]
     else:
+        # Some versions of mkfs.cpm don't work right if the input file
+        # doesn't exist.
+        cs += ["{deps[1]} -f {outs[0]} -b 0xe5 -n 100000"]
         mkfs = "mkfs.cpm -f %s" % format
         if bootimage:
             mkfs += " -b %s" % filenameof(bootimage)
@@ -89,11 +101,14 @@ def mkcpmfs(
         replaces=self,
         ins=ins,
         outs=[f"={name}.img"],
-        deps=["diskdefs"] + [bootimage]
-        if bootimage
-        else [] + [template]
-        if template
-        else [],
+        deps=(
+            ["diskdefs", "tools+fillfile"]
+            + (
+                [bootimage]
+                if bootimage
+                else [] + [template] if template else []
+            )
+        ),
         commands=cs,
         label="MKCPMFS",
     )

tools/fillfile.cc

@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <fstream>
+#include <fmt/format.h>
+
+static std::string filename;
+static int byteCount;
+static int byteValue;
+
+static void parseArgs(int argc, char* argv[])
+{
+    for (;;)
+    {
+        switch (getopt(argc, argv, "f:n:b:"))
+        {
+            case -1:
+                return;
+
+            case 'f':
+                filename = optarg;
+                break;
+
+            case 'n':
+                byteCount = strtol(optarg, nullptr, 0);
+                break;
+
+            case 'b':
+                byteValue = strtol(optarg, nullptr, 0);
+                break;
+
+            default:
+                fmt::print(stderr,
+                    "Usage: fillfile -f <img> -n <count> -b <byte>\n");
+                exit(1);
+        }
+    }
+}
+
+int main(int argc, char* argv[])
+{
+    parseArgs(argc, argv);
+
+    std::ofstream of(filename);
+    if (!of)
+    {
+        fmt::print(stderr,
+            "fillfile: cannot open output file: {}\n", strerror(errno));
+        exit(1);
+    }
+
+    for (int i=0; i<byteCount; i++)
+        of.put(byteValue);
+
+    of.close();
+    return 0;
+}