bftw: Actually stop if the callback returns BFTW_STOP

Otherwise, bftw_ids() or bftw_eds() might keep going! Fixes: 5f16169 ("bftw: Share the bftw_state between iterations of ids/eds")
tavianator · Feb 1, 2024 · 670ebd9 · 670ebd9
1 parent a726c71
commit 670ebd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/bftw.c b/src/bftw.c
@@ -1791,7 +1791,7 @@ static int bftw_impl(struct bftw_state *state) {
 			break;
 		}
 		if (bftw_visit(state, NULL) != 0) {
-			break;
+			return -1;
 		}
 	}
 

diff --git a/tests/bsd/s_quit.out b/tests/bsd/s_quit.out
@@ -0,0 +1 @@
+basic/j/foo
diff --git a/tests/bsd/s_quit.sh b/tests/bsd/s_quit.sh
@@ -0,0 +1,4 @@
+# Regression test: bfs -S ids -s -name foo -quit would not actually quit,
+# ending up in a confused state and erroring/crashing
+
+bfs_diff -s basic -name foo -print -quit