From 0b4ecc02263a226ad785eebb6a8e4b1196ca0109 Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Tue, 17 Mar 2026 08:24:05 -0500
Subject: [PATCH] Use fatal::abort() rather than assert in places

---
 src/fs_open_fd.cpp                          | 6 +++---
 src/fuse_readdir.cpp                        | 4 +++-
 src/fuse_readdir.hpp                        | 2 --
 {src => vendored/libfuse/include}/fatal.hpp | 0
 vendored/libfuse/lib/maintenance_thread.cpp | 7 +++----
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename {src => vendored/libfuse/include}/fatal.hpp (100%)

diff --git a/src/fs_open_fd.cpp b/src/fs_open_fd.cpp
index ca04a614..e8c475d8 100644
--- a/src/fs_open_fd.cpp
+++ b/src/fs_open_fd.cpp
@@ -21,15 +21,15 @@
 #if defined(__linux__)
 #include "fmt/core.h"
 #include "fs_openat.hpp"
+#include "fatal.hpp"
 #include "procfs.hpp"
 
-#include <cassert>
-
 int
 fs::open_fd(const int fd_,
             const int flags_)
 {
-  assert(procfs::PROC_SELF_FD_FD > 0);
+  if(procfs::PROC_SELF_FD_FD <= 0)
+    fatal::abort("procfs::PROC_SELF_FD_FD must be > 0");
 
   const int flags = (flags_ & ~O_NOFOLLOW);
 
diff --git a/src/fuse_readdir.cpp b/src/fuse_readdir.cpp
index 08a4eb69..614927d9 100644
--- a/src/fuse_readdir.cpp
+++ b/src/fuse_readdir.cpp
@@ -21,6 +21,7 @@
 #include "fuse_readdir_factory.hpp"
 
 #include "dirinfo.hpp"
+#include "fatal.hpp"
 #include "fuse_dirents.hpp"
 
 #include "config.hpp"
@@ -108,7 +109,8 @@ FUSE::ReadDir::operator()(const fuse_req_ctx_t   *ctx_,
   std::shared_ptr<FUSE::ReadDirBase> readdir;
 
   readdir = std::atomic_load(&_impl);
-  assert(readdir);
+  if(!readdir)
+    fatal::abort("readdir impl is null");
 
   rv = (*readdir)(ctx_,ffi_,buf_);
   if(rv == -ENOENT)
diff --git a/src/fuse_readdir.hpp b/src/fuse_readdir.hpp
index 79a1d4d1..8abf8820 100644
--- a/src/fuse_readdir.hpp
+++ b/src/fuse_readdir.hpp
@@ -25,8 +25,6 @@
 #include <memory>
 #include <mutex>
 
-#include <assert.h>
-
 
 namespace FUSE
 {
diff --git a/src/fatal.hpp b/vendored/libfuse/include/fatal.hpp
similarity index 100%
rename from src/fatal.hpp
rename to vendored/libfuse/include/fatal.hpp
diff --git a/vendored/libfuse/lib/maintenance_thread.cpp b/vendored/libfuse/lib/maintenance_thread.cpp
index fed1067e..f5f08c27 100644
--- a/vendored/libfuse/lib/maintenance_thread.cpp
+++ b/vendored/libfuse/lib/maintenance_thread.cpp
@@ -1,10 +1,8 @@
 #include "maintenance_thread.hpp"
 
+#include "fatal.hpp"
 #include "mutex.hpp"
 
-#include "fmt/core.h"
-
-#include <cassert>
 #include <vector>
 
 #include <pthread.h>
@@ -46,7 +44,8 @@ MaintenanceThread::setup()
   int rv;
 
   rv = pthread_create(&g_thread,NULL,_thread_loop,NULL);
-  assert((rv == 0) && "pthread_create failed");
+  if(rv != 0)
+    fatal::abort("pthread_create failed: rv={}",rv);
 }
 
 void