From a3cf27ca47328b11173147ca7180e0bae798bb2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 17 Jan 2024 22:19:51 +0100
Subject: [PATCH 1/2] Print a more helpful message if the daemon crashes

Instead of

   error: unexpected end-of-file

you now get

   error: Nix daemon disconnected unexpectedly (maybe it crashed?)
---
 src/libstore/remote-store.cc | 1 +
 src/libutil/serialise.cc     | 2 +-
 src/libutil/serialise.hh     | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 078b9fe00..ccf95beef 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -67,6 +67,7 @@ void RemoteStore::initConnection(Connection & conn)
 {
     /* Send the magic greeting, check for the reply. */
     try {
+        conn.from.endOfFileError = "Nix daemon disconnected unexpectedly (maybe it crashed?)";
         conn.to << WORKER_MAGIC_1;
         conn.to.flush();
         StringSink saved;
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 316105603..afbf66b9d 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -132,7 +132,7 @@ size_t FdSource::readUnbuffered(char * data, size_t len)
         n = ::read(fd, data, len);
     } while (n == -1 && errno == EINTR);
     if (n == -1) { _good = false; throw SysError("reading from file"); }
-    if (n == 0) { _good = false; throw EndOfFile("unexpected end-of-file"); }
+    if (n == 0) { _good = false; throw EndOfFile(endOfFileError); }
     read += n;
     return n;
 }
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 3f57ce88b..689b2070b 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -153,12 +153,13 @@ struct FdSource : BufferedSource
 {
     int fd;
     size_t read = 0;
+    std::string endOfFileError{"unexpected end-of-file"};
 
     FdSource() : fd(-1) { }
     FdSource(int fd) : fd(fd) { }
-    FdSource(FdSource&&) = default;
+    FdSource(FdSource &&) = default;
 
-    FdSource& operator=(FdSource && s)
+    FdSource & operator=(FdSource && s)
     {
         fd = s.fd;
         s.fd = -1;

From 1fe8f54bd30fead52d21ae472fb4f0f68a5c6fdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 18 Jan 2024 15:27:57 +0100
Subject: [PATCH 2/2] Use BackedStringView

---
 src/libutil/serialise.cc | 2 +-
 src/libutil/serialise.hh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index afbf66b9d..7fc211491 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -132,7 +132,7 @@ size_t FdSource::readUnbuffered(char * data, size_t len)
         n = ::read(fd, data, len);
     } while (n == -1 && errno == EINTR);
     if (n == -1) { _good = false; throw SysError("reading from file"); }
-    if (n == 0) { _good = false; throw EndOfFile(endOfFileError); }
+    if (n == 0) { _good = false; throw EndOfFile(std::string(*endOfFileError)); }
     read += n;
     return n;
 }
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 689b2070b..d9522566f 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -153,7 +153,7 @@ struct FdSource : BufferedSource
 {
     int fd;
     size_t read = 0;
-    std::string endOfFileError{"unexpected end-of-file"};
+    BackedStringView endOfFileError{"unexpected end-of-file"};
 
     FdSource() : fd(-1) { }
     FdSource(int fd) : fd(fd) { }