From 67bffa19a533c5d2b562db367d1823166ca714b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 17 Oct 2025 18:32:47 +0200
Subject: [PATCH] NullFileSystemObjectSink: Skip over file contents

---
 src/libutil/archive.cc                  | 7 ++++++-
 src/libutil/fs-sink.cc                  | 2 ++
 src/libutil/include/nix/util/fs-sink.hh | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index 3d96df75e..b8fef9ef3 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -132,6 +132,11 @@ static void parseContents(CreateRegularFileSink & sink, Source & source)
 
     sink.preallocateContents(size);
 
+    if (sink.skipContents) {
+        source.skip(size + (size % 8 ? 8 - (size % 8) : 0));
+        return;
+    }
+
     uint64_t left = size;
     std::array<char, 65536> buf;
 
@@ -166,7 +171,7 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
     auto expectTag = [&](std::string_view expected) {
         auto tag = getString();
         if (tag != expected)
-            throw badArchive("expected tag '%s', got '%s'", expected, tag);
+            throw badArchive("expected tag '%s', got '%s'", expected, tag.substr(0, 1024));
     };
 
     expectTag("(");
diff --git a/src/libutil/fs-sink.cc b/src/libutil/fs-sink.cc
index 6efd5e0c7..45ef57a9f 100644
--- a/src/libutil/fs-sink.cc
+++ b/src/libutil/fs-sink.cc
@@ -196,6 +196,8 @@ void NullFileSystemObjectSink::createRegularFile(
         void isExecutable() override {}
     } crf;
 
+    crf.skipContents = true;
+
     // Even though `NullFileSystemObjectSink` doesn't do anything, it's important
     // that we call the function, to e.g. advance the parser using this
     // sink.
diff --git a/src/libutil/include/nix/util/fs-sink.hh b/src/libutil/include/nix/util/fs-sink.hh
index f96fe3ef9..bd2db7f53 100644
--- a/src/libutil/include/nix/util/fs-sink.hh
+++ b/src/libutil/include/nix/util/fs-sink.hh
@@ -14,6 +14,14 @@ namespace nix {
  */
 struct CreateRegularFileSink : Sink
 {
+    /**
+     * If set to true, the sink will not be called with the contents
+     * of the file. `preallocateContents()` will still be called to
+     * convey the file size. Useful for sinks that want to efficiently
+     * discard the contents of the file.
+     */
+    bool skipContents = false;
+
     virtual void isExecutable() = 0;
 
     /**