From 658e5c9e0b2cf8fbe2adfd791d3d51c8ab84407c Mon Sep 17 00:00:00 2001
From: Caleb Gardner <calebq23@gmail.com>
Date: Wed, 4 Jan 2023 06:01:12 -0600
Subject: [PATCH] Mount is non-blocking again

---
 fuse.go   | 17 ++++++++++-------
 reader.go |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/fuse.go b/fuse.go
index 81e572d..66ba79d 100644
--- a/fuse.go
+++ b/fuse.go
@@ -11,10 +11,8 @@ import (
 	"github.com/CalebQ42/squashfs/internal/inode"
 )
 
-// Mounts the archive to the given mountpoint using fuse3.
-// Blocks until the arhive is unmounted.
-// Hightly suggested to run in a goroutine.
-// Will take a moment before MountWait and Unmount will work correctly.
+// Mounts the archive to the given mountpoint using fuse3. Non-blocking.
+// If Unmount does not get called, the mount point must be unmounted using umount before the directory can be used again.
 func (r *Reader) Mount(mountpoint string) (err error) {
 	if r.con != nil {
 		return errors.New("squashfs archive already mounted")
@@ -23,14 +21,19 @@ func (r *Reader) Mount(mountpoint string) (err error) {
 	if err != nil {
 		return
 	}
-	err = fs.Serve(r.con, &squashFuse{r: r})
+	<-r.con.Ready
+	r.mountDone = make(chan struct{})
+	go func() {
+		fs.Serve(r.con, &squashFuse{r: r})
+		close(r.mountDone)
+	}()
 	return
 }
 
 // Blocks until the mount ends.
 func (r *Reader) MountWait() {
-	if r.con != nil {
-		<-r.con.Ready
+	if r.mountDone != nil {
+		<-r.mountDone
 	}
 }
 
diff --git a/reader.go b/reader.go
index d702766..97ddacc 100644
--- a/reader.go
+++ b/reader.go
@@ -18,6 +18,7 @@ import (
 type Reader struct {
 	*FS
 	con         *fuse.Conn
+	mountDone   chan struct{}
 	d           decompress.Decompressor
 	r           io.ReaderAt
 	fragEntries []fragEntry