From a1bd70db67ddbe167caf15b7334b3588653d3b91 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 31 Jan 2023 11:26:41 -0500
Subject: Release 2.6.3

---
 docs/CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'docs')

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index ff1c1f7..f67e68a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,46 @@
 2.*
 ===
 
+2.6.3
+-----
+
+**January 31, 2023**
+
+- Fixed running the tests as root on Linux [`8b24de3`]
+
+- Fixed some tests on Android [`2724dfb`] [`0a5a80c`]
+
+- Stopped relying on non-POSIX touch(1) features in the tests.
+  This should fix the tests on at least OpenBSD.
+  [`2d5edb3`]
+
+- User/group caches are now filled lazily instead of eagerly [`b41dca5`]
+
+- More caches and I/O streams are flushed before -exec/-ok [`f98a1c4`]
+
+- Fixed various memory safety issues found by fuzzing \
+  [`712b137`] [`5ce883d`] [`da02def`] [`c55e855`]
+
+- Fixed a test failure on certain macOS versions [`8b24de3`]
+
+- Mitigated a race condition when determining filesystem types ([#97])
+
+- Lots of refactoring and optimization
+
+[`8b24de3`]: https://github.com/tavianator/bfs/commit/8b24de3882ff5a3e33b82ab20bb4eadf134cf559
+[`2724dfb`]: https://github.com/tavianator/bfs/commit/2724dfbd17552f892a0d8b39b96cbe9e49d66fdb
+[`0a5a80c`]: https://github.com/tavianator/bfs/commit/0a5a80c98cc7e5d8735b615fa197a6cff2bb08cc
+[`2d5edb3`]: https://github.com/tavianator/bfs/commit/2d5edb37b924715b4fbee4d917ac334c773fca61
+[`b41dca5`]: https://github.com/tavianator/bfs/commit/b41dca52762c5188638236ae81b9f4597bb29ac9
+[`f98a1c4`]: https://github.com/tavianator/bfs/commit/f98a1c4a1cf61ff7d6483388ca1fac365fb0b31b
+[`712b137`]: https://github.com/tavianator/bfs/commit/712b13756a09014ef730c8f9b96da4dc2f09b762
+[`5ce883d`]: https://github.com/tavianator/bfs/commit/5ce883daaafc69f83b01dac5db0647e9662a6e87
+[`da02def`]: https://github.com/tavianator/bfs/commit/da02defb91c3a1bda0ea7e653d81f997f1c8884a
+[`c55e855`]: https://github.com/tavianator/bfs/commit/c55e85580df10c5afdc6fc0710e756a456aa8e93
+[`8b24de3`]: https://github.com/tavianator/bfs/commit/8b24de3882ff5a3e33b82ab20bb4eadf134cf559
+[#97]: https://github.com/tavianator/bfs/issues/97
+
+
 2.6.2
 -----
 
-- 
cgit v1.2.3


From a2b723200c0e077d1720956ccfa65ec2546259a9 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 3 Feb 2023 09:49:13 -0500
Subject: Move SPDX blurb out of LICENSE so that it can be autodetected

---
 LICENSE         | 10 ----------
 docs/HACKING.md |  6 ++++++
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'docs')

diff --git a/LICENSE b/LICENSE
index 290e3d3..240d2ac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,13 +9,3 @@ SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL D
 ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
 USE OR PERFORMANCE OF THIS SOFTWARE.
-
----
-
-bfs is licensed under the Zero Clause BSD License.  Individual files contain the following
-tag instead of the full license text:
-
-    SPDX-License-Identifier: 0BSD
-
-This enables machine processing of license information based on the SPDX License
-Identifiers that are available here: https://spdx.org/licenses/
diff --git a/docs/HACKING.md b/docs/HACKING.md
index c9bbe14..d129a28 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -7,6 +7,12 @@ License
 `bfs` is licensed under the [Zero-Clause BSD License](https://opensource.org/licenses/0BSD), a maximally permissive license.
 Contributions must use the same license.
 
+Individual files contain the following tag instead of the full license text:
+
+    SPDX-License-Identifier: 0BSD
+
+This enables machine processing of license information based on the SPDX License Identifiers that are available here: https://spdx.org/licenses/
+
 
 Implementation
 --------------
-- 
cgit v1.2.3


From c023cceb3f50d92ed565ea3f085883f86de0f3f0 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 9 Jun 2023 16:34:41 -0400
Subject: bftw: Use an I/O queue to open directories

Parallelism is controlled by the new -j flag.
---
 docs/bfs.1  |   8 +++-
 src/bftw.c  | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/bftw.h  |   2 +
 src/ctx.c   |   1 +
 src/ctx.h   |   2 +
 src/eval.c  |  22 +++++++++
 src/parse.c |  26 +++++++++-
 7 files changed, 206 insertions(+), 9 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 53a9831..bc82457 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -171,12 +171,18 @@ consumes too much memory.
 .TP
 .I eds
 Exponential deepening search.
-A compromise between breadth- and depth-first search, which searches exponentially increasing depth ranges (e.g 0-1, 1-2, 2-4, 4-8, etc.).
+A compromise between breadth- and depth-first search, which searches exponentially increasing depth ranges (e.g. 0-1, 1-2, 2-4, 4-8, etc.).
 Provides many of the benefits of breadth-first search with depth-first's reduced memory consumption.
 Typically far faster than
 .B \-S
 .IR ids .
 .RE
+.TP
+\fB\-j\fIN\fR
+Search with
+.I N
+threads in parallel (default: number of CPUs, up to
+.IR 8 ).
 .SH OPERATORS
 .TP
 \fB( \fIexpression \fB)\fR
diff --git a/src/bftw.c b/src/bftw.c
index 4a49457..e711963 100644
--- a/src/bftw.c
+++ b/src/bftw.c
@@ -22,6 +22,7 @@
 #include "diag.h"
 #include "dir.h"
 #include "dstring.h"
+#include "ioq.h"
 #include "list.h"
 #include "mtab.h"
 #include "stat.h"
@@ -58,6 +59,8 @@ struct bftw_file {
 	size_t pincount;
 	/** An open descriptor to this file, or -1. */
 	int fd;
+	/** Whether this file has a pending ioq request. */
+	bool ioqueued;
 	/** An open directory for this file, if any. */
 	struct bfs_dir *dir;
 
@@ -264,6 +267,7 @@ static struct bftw_file *bftw_file_new(struct bftw_file *parent, const char *nam
 	file->refcount = 1;
 	file->pincount = 0;
 	file->fd = -1;
+	file->ioqueued = false;
 	file->dir = NULL;
 
 	file->type = BFS_UNKNOWN;
@@ -439,6 +443,8 @@ struct bftw_state {
 
 	/** The cache of open directories. */
 	struct bftw_cache cache;
+	/** The async I/O queue. */
+	struct ioq *ioq;
 	/** The queue of directories to read. */
 	struct bftw_list dirs;
 	/** The queue of files to visit. */
@@ -494,6 +500,25 @@ static int bftw_state_init(struct bftw_state *state, const struct bftw_args *arg
 
 	bftw_cache_init(&state->cache, args->nopenfd);
 
+	size_t qdepth = args->nopenfd - 1;
+	if (qdepth > 1024) {
+		qdepth = 1024;
+	}
+
+	size_t nthreads = args->nthreads;
+	if (nthreads > qdepth) {
+		nthreads = qdepth;
+	}
+
+	state->ioq = NULL;
+	if (nthreads > 0) {
+		state->ioq = ioq_create(qdepth, nthreads);
+		if (!state->ioq) {
+			dstrfree(state->path);
+			return -1;
+		}
+	}
+
 	SLIST_INIT(&state->dirs);
 	SLIST_INIT(&state->files);
 	SLIST_INIT(&state->batch);
@@ -846,15 +871,122 @@ static enum bftw_action bftw_call_back(struct bftw_state *state, const char *nam
 	}
 }
 
+/** Push a directory onto the queue. */
+static void bftw_push_dir(struct bftw_state *state, struct bftw_file *file) {
+	bfs_assert(file->type == BFS_DIR);
+
+	struct bftw_cache *cache = &state->cache;
+
+	if (!state->ioq) {
+		goto append;
+	}
+
+	int dfd = AT_FDCWD;
+	if (file->parent) {
+		dfd = file->parent->fd;
+		if (dfd < 0) {
+			goto append;
+		}
+		bftw_cache_pin(cache, file->parent);
+	}
+
+	if (cache->capacity == 0) {
+		if (bftw_cache_pop(cache) != 0) {
+			goto unpin;
+		}
+	}
+	--cache->capacity;
+
+	if (ioq_opendir(state->ioq, dfd, file->name, file) != 0) {
+		++cache->capacity;
+		goto unpin;
+	}
+
+	file->ioqueued = true;
+
+	if (state->flags & BFTW_SORT) {
+		goto append;
+	} else {
+		return;
+	}
+
+unpin:
+	if (file->parent) {
+		bftw_cache_unpin(cache, file->parent);
+	}
+append:
+	SLIST_APPEND(&state->dirs, file);
+}
+
+/** Pop a response from the I/O queue. */
+static int bftw_ioq_pop(struct bftw_state *state, bool block) {
+	if (!state->ioq) {
+		return -1;
+	}
+
+	struct ioq_res *res;
+	if (block) {
+		res = ioq_pop(state->ioq);
+	} else {
+		res = ioq_trypop(state->ioq);
+	}
+
+	if (!res) {
+		return -1;
+	}
+
+	struct bftw_cache *cache = &state->cache;
+	++cache->capacity;
+
+	struct bftw_file *file = res->ptr;
+	file->ioqueued = false;
+
+	if (file->parent) {
+		bftw_cache_unpin(cache, file->parent);
+	}
+
+	if (res->dir) {
+		bftw_file_set_dir(cache, file, res->dir);
+	}
+
+	ioq_free(state->ioq, res);
+
+	if (!(state->flags & BFTW_SORT)) {
+		SLIST_PREPEND(&state->dirs, file);
+	}
+
+	return 0;
+}
+
 /** Pop a directory to read from the queue. */
 static bool bftw_pop_dir(struct bftw_state *state) {
 	bfs_assert(!state->file);
 
-	if (state->files.head && state->strategy == BFTW_BFS) {
+	bool have_dirs = state->dirs.head;
+	bool have_files = state->files.head;
+	bool have_room = state->cache.capacity > 0;
+
+	if (state->flags & BFTW_SORT) {
+		// Keep strict breadth-first order when sorting
+		if (state->strategy != BFTW_DFS && have_files) {
+			return false;
+		}
+	} else {
+		// Block if we have no other files/dirs to visit, or no room in the cache
+		bool block = !(have_dirs || have_files) || !have_room;
+		bftw_ioq_pop(state, block);
+	}
+
+	struct bftw_file *dir = state->file = SLIST_POP(&state->dirs);
+	if (!dir) {
 		return false;
 	}
 
-	return (state->file = SLIST_POP(&state->dirs));
+	while (dir->ioqueued) {
+		bftw_ioq_pop(state, true);
+	}
+
+	return true;
 }
 
 /** Pop a file to visit from the queue. */
@@ -872,16 +1004,22 @@ static int bftw_opendir(struct bftw_state *state) {
 
 	state->direrror = 0;
 
-	if (bftw_build_path(state, NULL) != 0) {
-		return -1;
+	struct bftw_file *file = state->file;
+	if (file->dir) {
+		state->dir = file->dir;
+	} else {
+		if (bftw_build_path(state, NULL) != 0) {
+			return -1;
+		}
+		state->dir = bftw_file_opendir(&state->cache, file, state->path);
 	}
 
-	state->dir = bftw_file_opendir(&state->cache, state->file, state->path);
 	if (state->dir) {
-		bftw_cache_pin(&state->cache, state->file);
+		bftw_cache_pin(&state->cache, file);
 	} else {
 		state->direrror = errno;
 	}
+
 	return 0;
 }
 
@@ -988,6 +1126,8 @@ static int bftw_state_destroy(struct bftw_state *state) {
 		bftw_gc(state, BFTW_VISIT_NONE);
 	} while (bftw_pop_dir(state) || bftw_pop_file(state));
 
+	ioq_destroy(state->ioq);
+
 	bftw_cache_destroy(&state->cache);
 
 	errno = state->error;
@@ -1100,7 +1240,7 @@ static int bftw_visit(struct bftw_state *state, const char *name) {
 		}
 
 		bftw_save_ftwbuf(file, &state->ftwbuf);
-		SLIST_APPEND(&state->dirs, file);
+		bftw_push_dir(state, file);
 		return 0;
 
 	case BFTW_PRUNE:
diff --git a/src/bftw.h b/src/bftw.h
index 77697ed..940532c 100644
--- a/src/bftw.h
+++ b/src/bftw.h
@@ -186,6 +186,8 @@ struct bftw_args {
 	void *ptr;
 	/** The maximum number of file descriptors to keep open. */
 	int nopenfd;
+	/** The maximum number of threads to use. */
+	int nthreads;
 	/** Flags that control bftw() behaviour. */
 	enum bftw_flags flags;
 	/** The search strategy to use. */
diff --git a/src/ctx.c b/src/ctx.c
index c4b2fb2..e8ce0e8 100644
--- a/src/ctx.c
+++ b/src/ctx.c
@@ -56,6 +56,7 @@ struct bfs_ctx *bfs_ctx_new(void) {
 	ctx->maxdepth = INT_MAX;
 	ctx->flags = BFTW_RECOVER;
 	ctx->strategy = BFTW_BFS;
+	ctx->threads = 0;
 	ctx->optlevel = 3;
 	ctx->debug = 0;
 	ctx->ignore_races = false;
diff --git a/src/ctx.h b/src/ctx.h
index 0dc9f08..2b8e8cb 100644
--- a/src/ctx.h
+++ b/src/ctx.h
@@ -68,6 +68,8 @@ struct bfs_ctx {
 	/** bftw() search strategy. */
 	enum bftw_strategy strategy;
 
+	/** Threads (-j). */
+	int threads;
 	/** Optimization level (-O). */
 	int optlevel;
 	/** Debugging flags (-D). */
diff --git a/src/eval.c b/src/eval.c
index e2c19a9..b9bce6c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1505,6 +1505,19 @@ static int infer_fdlimit(const struct bfs_ctx *ctx, int limit) {
 	return ret;
 }
 
+static int infer_nproc(void) {
+	long nproc = sysconf(_SC_NPROCESSORS_ONLN);
+
+	if (nproc < 0) {
+		nproc = 0;
+	} else if (nproc > 8) {
+		// Not much speedup after 8 threads
+		nproc = 8;
+	}
+
+	return nproc;
+}
+
 /**
  * Dump the bftw() flags for -D search.
  */
@@ -1593,12 +1606,20 @@ int bfs_eval(const struct bfs_ctx *ctx) {
 	int fdlimit = raise_fdlimit(ctx);
 	fdlimit = infer_fdlimit(ctx, fdlimit);
 
+	int nthreads;
+	if (ctx->threads > 0) {
+		nthreads = ctx->threads - 1;
+	} else {
+		nthreads = infer_nproc();
+	}
+
 	struct bftw_args bftw_args = {
 		.paths = ctx->paths,
 		.npaths = darray_length(ctx->paths),
 		.callback = eval_callback,
 		.ptr = &args,
 		.nopenfd = fdlimit,
+		.nthreads = nthreads,
 		.flags = ctx->flags,
 		.strategy = ctx->strategy,
 		.mtab = bfs_ctx_mtab(ctx),
@@ -1618,6 +1639,7 @@ int bfs_eval(const struct bfs_ctx *ctx) {
 		fprintf(stderr, "\t.callback = eval_callback,\n");
 		fprintf(stderr, "\t.ptr = &args,\n");
 		fprintf(stderr, "\t.nopenfd = %d,\n", bftw_args.nopenfd);
+		fprintf(stderr, "\t.nthreads = %d,\n", bftw_args.nthreads);
 		fprintf(stderr, "\t.flags = ");
 		dump_bftw_flags(bftw_args.flags);
 		fprintf(stderr, ",\n\t.strategy = %s,\n", dump_bftw_strategy(bftw_args.strategy));
diff --git a/src/parse.c b/src/parse.c
index 59a1e7d..96def14 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1636,6 +1636,23 @@ static struct bfs_expr *parse_inum(struct parser_state *state, int arg1, int arg
 	return parse_test_icmp(state, eval_inum);
 }
 
+/**
+ * Parse -j<n>.
+ */
+static struct bfs_expr *parse_jobs(struct parser_state *state, int arg1, int arg2) {
+	struct bfs_expr *expr = parse_nullary_flag(state);
+	if (!expr) {
+		return NULL;
+	}
+
+	if (!parse_int(state, expr->argv, expr->argv[0] + 2, &state->ctx->threads, IF_INT | IF_UNSIGNED)) {
+		bfs_expr_free(expr);
+		return NULL;
+	}
+
+	return expr;
+}
+
 /**
  * Parse -links N.
  */
@@ -2753,7 +2770,9 @@ static struct bfs_expr *parse_help(struct parser_state *state, int arg1, int arg
 	cfprintf(cout, "      Enable optimization level ${bld}N${rs} (default: ${bld}3${rs})\n");
 	cfprintf(cout, "  ${cyn}-S${rs} ${bld}bfs${rs}|${bld}dfs${rs}|${bld}ids${rs}|${bld}eds${rs}\n");
 	cfprintf(cout, "      Use ${bld}b${rs}readth-${bld}f${rs}irst/${bld}d${rs}epth-${bld}f${rs}irst/${bld}i${rs}terative/${bld}e${rs}xponential ${bld}d${rs}eepening ${bld}s${rs}earch\n");
-	cfprintf(cout, "      (default: ${cyn}-S${rs} ${bld}bfs${rs})\n\n");
+	cfprintf(cout, "      (default: ${cyn}-S${rs} ${bld}bfs${rs})\n");
+	cfprintf(cout, "  ${cyn}-j${bld}N${rs}\n");
+	cfprintf(cout, "      Search with ${bld}N${rs} threads in parallel (default: number of CPUs, up to ${bld}8${rs})\n\n");
 
 	cfprintf(cout, "${bld}Operators:${rs}\n\n");
 
@@ -3060,6 +3079,7 @@ static const struct table_entry parse_table[] = {
 	{"-ipath", T_TEST, parse_path, true},
 	{"-iregex", T_TEST, parse_regex, BFS_REGEX_ICASE},
 	{"-iwholename", T_TEST, parse_path, true},
+	{"-j", T_FLAG, parse_jobs, 0, 0, true},
 	{"-links", T_TEST, parse_links},
 	{"-lname", T_TEST, parse_lname, false},
 	{"-ls", T_ACTION, parse_ls},
@@ -3552,6 +3572,10 @@ void bfs_ctx_dump(const struct bfs_ctx *ctx, enum debug_flags flag) {
 		cfprintf(cerr, " ${cyn}-O${bld}%d${rs}", ctx->optlevel);
 	}
 
+	if (ctx->threads > 0) {
+		cfprintf(cerr, " ${cyn}-j${bld}%d${rs}", ctx->threads);
+	}
+
 	cfprintf(cerr, " ${cyn}-S${rs} ${bld}%s${rs}", bftw_strategy_name(ctx->strategy));
 
 	enum debug_flags debug = ctx->debug;
-- 
cgit v1.2.3


From 5c3572dc323527a5c168cc12a31b730e0749002d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sat, 24 Jun 2023 12:00:22 -0400
Subject: Unify macro naming conventions

In particular, macros that decide whether to use a particular API/
dependency should be spelled BFS_USE_*, and should be configurable.
---
 Makefile         | 20 ++++++++++----------
 docs/BUILDING.md | 18 +++++++++---------
 src/config.h     |  6 ++++--
 src/diag.h       |  6 ++----
 src/dir.c        | 28 ++++++++++++++--------------
 src/mtab.c       | 28 ++++++++++++++--------------
 src/parse.c      |  4 ++--
 src/stat.c       | 16 +++++++++-------
 src/trie.c       |  2 +-
 src/xregex.c     | 14 +++++++-------
 10 files changed, 72 insertions(+), 70 deletions(-)

(limited to 'docs')

diff --git a/Makefile b/Makefile
index d38f581..f7af9cc 100644
--- a/Makefile
+++ b/Makefile
@@ -104,11 +104,11 @@ LOCAL_CFLAGS += -fno-sanitize-recover=all
 endif
 
 ifndef NOLIBS
-WITH_ONIGURUMA := y
+USE_ONIGURUMA := y
 endif
 
-ifdef WITH_ONIGURUMA
-LOCAL_CPPFLAGS += -DBFS_WITH_ONIGURUMA=1
+ifdef USE_ONIGURUMA
+LOCAL_CPPFLAGS += -DBFS_USE_ONIGURUMA=1
 
 ONIG_CONFIG := $(shell command -v onig-config 2>/dev/null)
 ifdef ONIG_CONFIG
@@ -120,28 +120,28 @@ endif
 
 LOCAL_CFLAGS += $(ONIG_CFLAGS)
 LOCAL_LDLIBS += $(ONIG_LDLIBS)
-endif # WITH_ONIGURUMA
+endif # USE_ONIGURUMA
 
 ifeq ($(OS),Linux)
 ifndef NOLIBS
-WITH_ACL := y
-WITH_ATTR := y
-WITH_LIBCAP := y
+USE_ACL := y
+USE_ATTR := y
+USE_LIBCAP := y
 endif
 
-ifdef WITH_ACL
+ifdef USE_ACL
 LOCAL_LDLIBS += -lacl
 else
 LOCAL_CPPFLAGS += -DBFS_USE_SYS_ACL_H=0
 endif
 
-ifdef WITH_ATTR
+ifdef USE_ATTR
 LOCAL_LDLIBS += -lattr
 else
 LOCAL_CPPFLAGS += -DBFS_USE_SYS_XATTR_H=0
 endif
 
-ifdef WITH_LIBCAP
+ifdef USE_LIBCAP
 LOCAL_LDLIBS += -lcap
 else
 LOCAL_CPPFLAGS += -DBFS_USE_SYS_CAPABILITY_H=0
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 5219160..d0cb1fc 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -56,7 +56,7 @@ Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 | `CC`                             | The C compiler to use, e.g. `make CC=clang` |
 | `CFLAGS`<br>`EXTRA_CFLAGS`       | Override/add to the default compiler flags  |
 | `LDFLAGS`<br>`EXTRA_LDFLAGS`     | Override/add to the linker flags            |
-| `WITH_ACL`<br>`WITH_ATTR`<br>... | Enable/disable [optional dependencies]      |
+| `USE_ACL`<br>`USE_ATTR`<br>...   | Enable/disable [optional dependencies]      |
 | `TEST_FLAGS`                     | `tests.sh` flags for `make check`           |
 | `BUILDDIR`                       | The build output directory (default: `.`)   |
 | `DESTDIR`                        | The root directory for `make install`       |
@@ -68,14 +68,14 @@ Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 ### Dependencies
 
 `bfs` depends on some system libraries for some of its features.
-These dependencies are optional, and can be turned off at build time if necessary by setting the appropriate variable to the empty string (e.g. `make WITH_ONIGURUMA=`).
-
-| Dependency  | Platforms  | `make` flag      |
-|-------------|------------|------------------|
-| [acl]       | Linux only | `WITH_ACL`       |
-| [attr]      | Linux only | `WITH_ATTR`      |
-| [libcap]    | Linux only | `WITH_LIBCAP`    |
-| [Oniguruma] | All        | `WITH_ONIGURUMA` |
+These dependencies are optional, and can be turned off at build time if necessary by setting the appropriate variable to the empty string (e.g. `make USE_ONIGURUMA=`).
+
+| Dependency  | Platforms  | `make` flag     |
+|-------------|------------|-----------------|
+| [acl]       | Linux only | `USE_ACL`       |
+| [attr]      | Linux only | `USE_ATTR`      |
+| [libcap]    | Linux only | `USE_LIBCAP`    |
+| [Oniguruma] | All        | `USE_ONIGURUMA` |
 
 [acl]: https://savannah.nongnu.org/projects/acl
 [attr]: https://savannah.nongnu.org/projects/attr
diff --git a/src/config.h b/src/config.h
index 1671a0d..79bd931 100644
--- a/src/config.h
+++ b/src/config.h
@@ -189,8 +189,10 @@
 /**
  * Check if function multiversioning via GNU indirect functions (ifunc) is supported.
  */
-#if !defined(BFS_TARGET_CLONES) && __has_attribute(target_clones) && (__GLIBC__ || __FreeBSD__ || __NetBSD__)
-#  define BFS_TARGET_CLONES true
+#ifndef BFS_USE_TARGET_CLONES
+#  if __has_attribute(target_clones) && (__GLIBC__ || __FreeBSD__ || __NetBSD__)
+#    define BFS_USE_TARGET_CLONES true
+#  endif
 #endif
 
 /**
diff --git a/src/diag.h b/src/diag.h
index 8d02da6..c909da5 100644
--- a/src/diag.h
+++ b/src/diag.h
@@ -18,8 +18,8 @@
 #if __STDC_VERSION__ >= 202311L
 #  define bfs_static_assert static_assert
 #else
-#  define bfs_static_assert(...) BFS_STATIC_ASSERT(__VA_ARGS__, #__VA_ARGS__, )
-#  define BFS_STATIC_ASSERT(expr, msg, ...) _Static_assert(expr, msg)
+#  define bfs_static_assert(...) bfs_static_assert_(__VA_ARGS__, #__VA_ARGS__, )
+#  define bfs_static_assert_(expr, msg, ...) _Static_assert(expr, msg)
 #endif
 
 /**
@@ -62,8 +62,6 @@ noreturn void bfs_abortf(const struct bfs_loc *loc, const char *format, ...);
 #  define bfs_bug bfs_abort
 #endif
 
-
-
 /**
  * Unconditional assert.
  */
diff --git a/src/dir.c b/src/dir.c
index a24b572..685bac5 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -15,11 +15,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifndef BFS_GETDENTS
-#  define BFS_GETDENTS (__linux__ || __FreeBSD__)
+#ifndef BFS_USE_GETDENTS
+#  define BFS_USE_GETDENTS (__linux__ || __FreeBSD__)
 #endif
 
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 #  if __linux__
 #    include <sys/syscall.h>
 #  endif
@@ -43,9 +43,9 @@ static ssize_t bfs_getdents(int fd, void *buf, size_t size) {
 	return ret;
 }
 
-#endif // BFS_GETDENTS
+#endif // BFS_USE_GETDENTS
 
-#if BFS_GETDENTS && __linux__
+#if BFS_USE_GETDENTS && __linux__
 /** Directory entry type for bfs_getdents() */
 typedef struct dirent64 sys_dirent;
 #else
@@ -101,7 +101,7 @@ enum bfs_type bfs_mode_to_type(mode_t mode) {
 }
 
 struct bfs_dir {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	alignas(sys_dirent) int fd;
 	unsigned short pos;
 	unsigned short size;
@@ -114,7 +114,7 @@ struct bfs_dir {
 	bool eof;
 };
 
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 #  define DIR_SIZE (64 << 10)
 #  define BUF_SIZE (DIR_SIZE - sizeof(struct bfs_dir))
 #else
@@ -143,7 +143,7 @@ int bfs_opendir(struct bfs_dir *dir, int at_fd, const char *at_path) {
 		return -1;
 	}
 
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	dir->fd = fd;
 	dir->pos = 0;
 	dir->size = 0;
@@ -163,7 +163,7 @@ int bfs_opendir(struct bfs_dir *dir, int at_fd, const char *at_path) {
 }
 
 int bfs_dirfd(const struct bfs_dir *dir) {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	return dir->fd;
 #else
 	return dirfd(dir->dir);
@@ -171,7 +171,7 @@ int bfs_dirfd(const struct bfs_dir *dir) {
 }
 
 int bfs_polldir(struct bfs_dir *dir) {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	if (dir->pos < dir->size) {
 		return 1;
 	} else if (dir->eof) {
@@ -203,7 +203,7 @@ int bfs_polldir(struct bfs_dir *dir) {
 	}
 
 	return 1;
-#else // !BFS_GETDENTS
+#else // !BFS_USE_GETDENTS
 	if (dir->de) {
 		return 1;
 	} else if (dir->eof) {
@@ -227,7 +227,7 @@ int bfs_polldir(struct bfs_dir *dir) {
 static int bfs_getdent(struct bfs_dir *dir, const sys_dirent **de) {
 	int ret = bfs_polldir(dir);
 	if (ret > 0) {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 		char *buf = (char *)(dir + 1);
 		*de = (const sys_dirent *)(buf + dir->pos);
 		dir->pos += (*de)->d_reclen;
@@ -283,7 +283,7 @@ int bfs_readdir(struct bfs_dir *dir, struct bfs_dirent *de) {
 }
 
 int bfs_closedir(struct bfs_dir *dir) {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	int ret = xclose(dir->fd);
 #else
 	int ret = closedir(dir->dir);
@@ -297,7 +297,7 @@ int bfs_closedir(struct bfs_dir *dir) {
 }
 
 int bfs_fdclosedir(struct bfs_dir *dir, bool same_fd) {
-#if BFS_GETDENTS
+#if BFS_USE_GETDENTS
 	int ret = dir->fd;
 #elif __FreeBSD__
 	int ret = fdclosedir(dir->dir);
diff --git a/src/mtab.c b/src/mtab.c
index e5c25ba..384fdfc 100644
--- a/src/mtab.c
+++ b/src/mtab.c
@@ -14,22 +14,22 @@
 #include <string.h>
 #include <sys/types.h>
 
-#if BFS_USE_MNTENT_H
-#  define BFS_MNTENT 1
-#elif BSD
-#  define BFS_MNTINFO 1
-#elif __SVR4
-#  define BFS_MNTTAB 1
+#if !defined(BFS_USE_MNTENT) && BFS_USE_MNTENT_H
+#  define BFS_USE_MNTENT true
+#elif !defined(BFS_USE_MNTINFO) && BSD
+#  define BFS_USE_MNTINFO true
+#elif !defined(BFS_USE_MNTTAB) && __SVR4
+#  define BFS_USE_MNTTAB true
 #endif
 
-#if BFS_MNTENT
+#if BFS_USE_MNTENT
 #  include <mntent.h>
 #  include <paths.h>
 #  include <stdio.h>
-#elif BFS_MNTINFO
+#elif BFS_USE_MNTINFO
 #  include <sys/mount.h>
 #  include <sys/ucred.h>
-#elif BFS_MNTTAB
+#elif BFS_USE_MNTTAB
 #  include <stdio.h>
 #  include <sys/mnttab.h>
 #endif
@@ -45,7 +45,7 @@ struct bfs_mtab_entry {
 };
 
 struct bfs_mtab {
-	/** The list of mount points. */
+	/** The array of mount points. */
 	struct bfs_mtab_entry *entries;
 	/** The basenames of every mount point. */
 	struct trie names;
@@ -59,7 +59,7 @@ struct bfs_mtab {
 /**
  * Add an entry to the mount table.
  */
-static int bfs_mtab_add(struct bfs_mtab *mtab, const char *path, const char *type) {
+static inline int bfs_mtab_add(struct bfs_mtab *mtab, const char *path, const char *type) {
 	struct bfs_mtab_entry entry = {
 		.path = strdup(path),
 		.type = strdup(type),
@@ -98,7 +98,7 @@ struct bfs_mtab *bfs_mtab_parse(void) {
 
 	int error = 0;
 
-#if BFS_MNTENT
+#if BFS_USE_MNTENT
 
 	FILE *file = setmntent(_PATH_MOUNTED, "r");
 	if (!file) {
@@ -121,7 +121,7 @@ struct bfs_mtab *bfs_mtab_parse(void) {
 
 	endmntent(file);
 
-#elif BFS_MNTINFO
+#elif BFS_USE_MNTINFO
 
 #if __NetBSD__
 	typedef struct statvfs bfs_statfs;
@@ -143,7 +143,7 @@ struct bfs_mtab *bfs_mtab_parse(void) {
 		}
 	}
 
-#elif BFS_MNTTAB
+#elif BFS_USE_MNTTAB
 
 	FILE *file = xfopen(MNTTAB, O_RDONLY | O_CLOEXEC);
 	if (!file) {
diff --git a/src/parse.c b/src/parse.c
index cf4f696..1321270 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -2296,7 +2296,7 @@ static struct bfs_expr *parse_regextype(struct parser_state *state, int arg1, in
 		state->regex_type = BFS_REGEX_POSIX_BASIC;
 	} else if (strcmp(type, "posix-extended") == 0) {
 		state->regex_type = BFS_REGEX_POSIX_EXTENDED;
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	} else if (strcmp(type, "emacs") == 0) {
 		state->regex_type = BFS_REGEX_EMACS;
 	} else if (strcmp(type, "grep") == 0) {
@@ -2318,7 +2318,7 @@ list_types:
 	cfprintf(cfile, "  ${bld}posix-basic${rs}:    POSIX basic regular expressions (BRE)\n");
 	cfprintf(cfile, "  ${bld}posix-extended${rs}: POSIX extended regular expressions (ERE)\n");
 	cfprintf(cfile, "  ${bld}ed${rs}:             Like ${grn}ed${rs} (same as ${bld}posix-basic${rs})\n");
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	cfprintf(cfile, "  ${bld}emacs${rs}:          Like ${grn}emacs${rs}\n");
 	cfprintf(cfile, "  ${bld}grep${rs}:           Like ${grn}grep${rs}\n");
 #endif
diff --git a/src/stat.c b/src/stat.c
index e3e5aaa..7a413cd 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -14,15 +14,17 @@
 #include <sys/stat.h>
 
 #if defined(STATX_BASIC_STATS) && (!__ANDROID__ || __ANDROID_API__ >= 30)
-#  define BFS_LIBC_STATX true
+#  define BFS_HAS_LIBC_STATX true
 #elif __linux__
 #  include <linux/stat.h>
 #  include <sys/syscall.h>
 #  include <unistd.h>
 #endif
 
-#if BFS_LIBC_STATX || defined(SYS_statx)
-#  define BFS_STATX true
+#ifndef BFS_USE_STATX
+#  if BFS_HAS_LIBC_STATX || defined(SYS_statx)
+#    define BFS_USE_STATX true
+#  endif
 #endif
 
 const char *bfs_stat_field_name(enum bfs_stat_field field) {
@@ -128,13 +130,13 @@ static int bfs_stat_impl(int at_fd, const char *at_path, int at_flags, struct bf
 	return ret;
 }
 
-#if BFS_STATX
+#if BFS_USE_STATX
 
 /**
  * Wrapper for the statx() system call, which had no glibc wrapper prior to 2.28.
  */
 static int bfs_statx(int at_fd, const char *at_path, int at_flags, unsigned int mask, struct statx *buf) {
-#if BFS_LIBC_STATX
+#if BFS_HAS_LIBC_STATX
 	int ret = statx(at_fd, at_path, at_flags, mask, buf);
 #else
 	int ret = syscall(SYS_statx, at_fd, at_path, at_flags, mask, buf);
@@ -242,13 +244,13 @@ static int bfs_statx_impl(int at_fd, const char *at_path, int at_flags, struct b
 	return ret;
 }
 
-#endif // BFS_STATX
+#endif // BFS_USE_STATX
 
 /**
  * Calls the stat() implementation with explicit flags.
  */
 static int bfs_stat_explicit(int at_fd, const char *at_path, int at_flags, int x_flags, struct bfs_stat *buf) {
-#if BFS_STATX
+#if BFS_USE_STATX
 	static atomic bool has_statx = true;
 
 	if (load(&has_statx, relaxed)) {
diff --git a/src/trie.c b/src/trie.c
index 992d42b..0206509 100644
--- a/src/trie.c
+++ b/src/trie.c
@@ -94,7 +94,7 @@
 
 bfs_static_assert(CHAR_WIDTH == 8);
 
-#if BFS_TARGET_CLONES && (__i386__ || __x86_64__)
+#if BFS_USE_TARGET_CLONES && (__i386__ || __x86_64__)
 #  define TARGET_CLONES_POPCNT __attribute__((target_clones("popcnt", "default")))
 #else
 #  define TARGET_CLONES_POPCNT
diff --git a/src/xregex.c b/src/xregex.c
index ab5f793..88df082 100644
--- a/src/xregex.c
+++ b/src/xregex.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 #  include <langinfo.h>
 #  include <oniguruma.h>
 #else
@@ -19,7 +19,7 @@
 #endif
 
 struct bfs_regex {
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	unsigned char *pattern;
 	OnigRegex impl;
 	int err;
@@ -30,7 +30,7 @@ struct bfs_regex {
 #endif
 };
 
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 
 static int bfs_onig_status;
 static OnigEncoding bfs_onig_enc;
@@ -121,7 +121,7 @@ int bfs_regcomp(struct bfs_regex **preg, const char *pattern, enum bfs_regex_typ
 		return -1;
 	}
 
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	// onig_error_code_to_str() says
 	//
 	//     don't call this after the pattern argument of onig_new() is freed
@@ -204,7 +204,7 @@ fail:
 int bfs_regexec(struct bfs_regex *regex, const char *str, enum bfs_regexec_flags flags) {
 	size_t len = strlen(str);
 
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	const unsigned char *ustr = (const unsigned char *)str;
 	const unsigned char *end = ustr + len;
 
@@ -263,7 +263,7 @@ int bfs_regexec(struct bfs_regex *regex, const char *str, enum bfs_regexec_flags
 
 void bfs_regfree(struct bfs_regex *regex) {
 	if (regex) {
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 		onig_free(regex->impl);
 		free(regex->pattern);
 #else
@@ -278,7 +278,7 @@ char *bfs_regerror(const struct bfs_regex *regex) {
 		return strdup(strerror(ENOMEM));
 	}
 
-#if BFS_WITH_ONIGURUMA
+#if BFS_USE_ONIGURUMA
 	unsigned char *str = malloc(ONIG_MAX_ERROR_MESSAGE_LEN);
 	if (str) {
 		onig_error_code_to_str(str, regex->err, &regex->einfo);
-- 
cgit v1.2.3


From 75b6e1b49e37c6eecd2225c9602ac7aa266c4023 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 30 Jun 2023 11:20:43 -0400
Subject: docs: Start preparing for the 3.0 release

---
 Makefile          |  2 +-
 docs/CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++
 src/config.h      |  2 +-
 3 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/Makefile b/Makefile
index 5d7461e..beaf59d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 2.6.3
+VERSION := 3.0
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f67e68a..933ddc3 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,42 @@
+3.*
+===
+
+3.0
+---
+
+**Coming soon**
+
+### New features
+
+- `bfs` now reads directories asynchronously and in parallel ([#101]).
+  Performance is significantly improved as a result.
+  Parallelism is controlled by the new `-j` flag, e.g. `-j1`, `-j2`, etc.
+
+[#101]: https://github.com/tavianator/bfs/issues/101
+
+### Changes
+
+- `bfs` now uses the [C17] standard version, up from C11
+
+- Due to [#101], `bfs` now requires some additional C and POSIX features:
+  - [Standard C atomics] (`<stdatomic.h>`)
+  - [POSIX threads] (`<pthread.h>`)
+
+- `$LS_COLORS` extensions written in different cases (e.g. `*.jpg=35:*.JPG=01;35`) are now matched case-sensitively, to match the new behaviour of GNU ls since coreutils version 9.2
+
+- Added a warning/error if `$LS_COLORS` can't be parsed, depending on whether `-color` is requested explicitly
+
+- Build flags like `WITH_ONIGURUMA` have been renamed to `USE_ONIGURUMA`
+
+[C17]: https://en.cppreference.com/w/c/17
+[Standard C atomics]: https://en.cppreference.com/w/c/atomic
+[POSIX threads]: https://pubs.opengroup.org/onlinepubs/9699919799/idx/threads.html
+
+### Bug fixes
+
+- Fixed handling of the "normal text" color (`no` in `$LS_COLORS`) to match GNU ls
+
+
 2.*
 ===
 
diff --git a/src/config.h b/src/config.h
index 79bd931..59d2671 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,7 +22,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "2.6.3"
+#  define BFS_VERSION "3.0"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From 57a2d70f9b4aa992df1ee510204ae3ce0b32ee26 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 13 Jul 2023 21:19:09 -0400
Subject: Release 3.0

---
 docs/CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 933ddc3..a1b0049 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,7 +4,7 @@
 3.0
 ---
 
-**Coming soon**
+**July 13, 2023**
 
 ### New features
 
@@ -26,6 +26,8 @@
 
 - Added a warning/error if `$LS_COLORS` can't be parsed, depending on whether `-color` is requested explicitly
 
+- Filenames with control characters are now escaped when printing with `-color`
+
 - Build flags like `WITH_ONIGURUMA` have been renamed to `USE_ONIGURUMA`
 
 [C17]: https://en.cppreference.com/w/c/17
-- 
cgit v1.2.3


From fb023fdeea088fa66b0df6cbf4e7becf8edeebbb Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 18 Jul 2023 12:23:21 -0400
Subject: Release 3.0.1

---
 Makefile          |  2 +-
 docs/CHANGELOG.md | 18 ++++++++++++++++++
 src/config.h      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/Makefile b/Makefile
index db955b5..406506b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.0
+VERSION := 3.0.1
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a1b0049..1cc95e9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,24 @@
 3.*
 ===
 
+3.0.1
+-----
+
+**July 18, 2023**
+
+### Bug fixes
+
+- Traversal fixes that mostly affect large directory trees ([#107])
+
+  - `bfs` could encounter `EMFILE`, close a file, and retry many times, particularly with `-j1`
+
+  - Breadth-first search could become highly unbalanced, negating many of the benefits of `bfs`
+
+  - On non-{Linux,FreeBSD} plaforms, directories could stay open longer than necessary, consuming extra memory
+
+[#107]: https://github.com/tavianator/bfs/pull/107
+
+
 3.0
 ---
 
diff --git a/src/config.h b/src/config.h
index 59d2671..fd4961f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,7 +22,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.0"
+#  define BFS_VERSION "3.0.1"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From 44cf900b78f7a9e6a838c82be38ddad3c0c60a25 Mon Sep 17 00:00:00 2001
From: Raf Czlonka <rczlonka@gmail.com>
Date: Thu, 20 Jul 2023 16:58:51 +0100
Subject: Rename Makefile to GNUmakefile

---
 GNUmakefile      | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile         | 331 -------------------------------------------------------
 docs/BUILDING.md |   4 +-
 docs/USAGE.md    |   2 +-
 4 files changed, 334 insertions(+), 334 deletions(-)
 create mode 100644 GNUmakefile
 delete mode 100644 Makefile

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..069c548
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,331 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+ifneq ($(wildcard .git),)
+VERSION := $(shell git describe --always 2>/dev/null)
+endif
+
+ifndef VERSION
+VERSION := 3.0.1
+endif
+
+ifndef OS
+OS := $(shell uname)
+endif
+
+ifndef ARCH
+ARCH := $(shell uname -m)
+endif
+
+CC ?= gcc
+INSTALL ?= install
+MKDIR ?= mkdir -p
+RM ?= rm -f
+
+export BUILDDIR ?= .
+DESTDIR ?=
+PREFIX ?= /usr
+MANDIR ?= $(PREFIX)/share/man
+
+BIN := $(BUILDDIR)/bin
+OBJ := $(BUILDDIR)/obj
+
+DEFAULT_CFLAGS := \
+    -g \
+    -Wall \
+    -Wformat=2 \
+    -Werror=implicit \
+    -Wimplicit-fallthrough \
+    -Wmissing-declarations \
+    -Wshadow \
+    -Wsign-compare \
+    -Wstrict-prototypes
+
+CFLAGS ?= $(DEFAULT_CFLAGS)
+LDFLAGS ?=
+DEPFLAGS ?= -MD -MP -MF $(@:.o=.d)
+
+LOCAL_CPPFLAGS := \
+    -D__EXTENSIONS__ \
+    -D_ATFILE_SOURCE \
+    -D_BSD_SOURCE \
+    -D_DARWIN_C_SOURCE \
+    -D_DEFAULT_SOURCE \
+    -D_GNU_SOURCE \
+    -D_LARGEFILE64_SOURCE \
+    -D_FILE_OFFSET_BITS=64 \
+    -D_TIME_BITS=64 \
+    -DBFS_VERSION=\"$(VERSION)\"
+
+LOCAL_CFLAGS := -std=c17 -pthread
+LOCAL_LDFLAGS :=
+LOCAL_LDLIBS :=
+
+ASAN := $(filter asan,$(MAKECMDGOALS))
+LSAN := $(filter lsan,$(MAKECMDGOALS))
+MSAN := $(filter msan,$(MAKECMDGOALS))
+TSAN := $(filter tsan,$(MAKECMDGOALS))
+UBSAN := $(filter ubsan,$(MAKECMDGOALS))
+
+ifdef ASAN
+LOCAL_CFLAGS += -fsanitize=address
+SANITIZE := y
+endif
+
+ifdef LSAN
+LOCAL_CFLAGS += -fsanitize=leak
+SANITIZE := y
+endif
+
+ifdef MSAN
+# msan needs all code instrumented
+NOLIBS := y
+LOCAL_CFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
+SANITIZE := y
+endif
+
+ifdef TSAN
+# tsan needs all code instrumented
+NOLIBS := y
+# https://github.com/google/sanitizers/issues/342
+LOCAL_CPPFLAGS += -DBFS_USE_TARGET_CLONES=0
+LOCAL_CFLAGS += -fsanitize=thread
+SANITIZE := y
+endif
+
+ifdef UBSAN
+LOCAL_CFLAGS += -fsanitize=undefined
+SANITIZE := y
+endif
+
+ifdef SANITIZE
+LOCAL_CFLAGS += -fno-sanitize-recover=all
+endif
+
+ifndef NOLIBS
+USE_ONIGURUMA := y
+endif
+
+ifdef USE_ONIGURUMA
+LOCAL_CPPFLAGS += -DBFS_USE_ONIGURUMA=1
+
+ONIG_CONFIG := $(shell command -v onig-config 2>/dev/null)
+ifdef ONIG_CONFIG
+ONIG_CFLAGS := $(shell $(ONIG_CONFIG) --cflags)
+ONIG_LDLIBS := $(shell $(ONIG_CONFIG) --libs)
+else
+ONIG_LDLIBS := -lonig
+endif
+
+LOCAL_CFLAGS += $(ONIG_CFLAGS)
+LOCAL_LDLIBS += $(ONIG_LDLIBS)
+endif # USE_ONIGURUMA
+
+ifeq ($(OS),Linux)
+ifndef NOLIBS
+USE_ACL := y
+USE_ATTR := y
+USE_LIBCAP := y
+endif
+
+ifdef USE_ACL
+LOCAL_LDLIBS += -lacl
+else
+LOCAL_CPPFLAGS += -DBFS_USE_SYS_ACL_H=0
+endif
+
+ifdef USE_ATTR
+LOCAL_LDLIBS += -lattr
+else
+LOCAL_CPPFLAGS += -DBFS_USE_SYS_XATTR_H=0
+endif
+
+ifdef USE_LIBCAP
+LOCAL_LDLIBS += -lcap
+else
+LOCAL_CPPFLAGS += -DBFS_USE_SYS_CAPABILITY_H=0
+endif
+
+LOCAL_LDFLAGS += -Wl,--as-needed
+LOCAL_LDLIBS += -lrt
+endif # Linux
+
+ifeq ($(OS),NetBSD)
+LOCAL_LDLIBS += -lutil
+endif
+
+ifneq ($(filter gcov,$(MAKECMDGOALS)),)
+LOCAL_CFLAGS += --coverage
+# gcov only intercepts fork()/exec() with -std=gnu*
+LOCAL_CFLAGS := $(patsubst -std=c%,-std=gnu%,$(LOCAL_CFLAGS))
+endif
+
+ifneq ($(filter release,$(MAKECMDGOALS)),)
+LOCAL_CPPFLAGS += -DNDEBUG
+CFLAGS := $(DEFAULT_CFLAGS) -O3 -flto=auto
+endif
+
+ALL_CPPFLAGS = $(LOCAL_CPPFLAGS) $(CPPFLAGS) $(EXTRA_CPPFLAGS)
+ALL_CFLAGS = $(ALL_CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEPFLAGS)
+ALL_LDFLAGS = $(ALL_CFLAGS) $(LOCAL_LDFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS)
+ALL_LDLIBS = $(LOCAL_LDLIBS) $(LDLIBS) $(EXTRA_LDLIBS)
+
+# Default make target
+bfs: $(BIN)/bfs
+.PHONY: bfs
+
+# Goals that are treated like flags by this makefile
+FLAG_GOALS := asan lsan msan tsan ubsan gcov release
+
+# These are the remaining non-flag goals
+GOALS := $(filter-out $(FLAG_GOALS),$(MAKECMDGOALS))
+
+# Build the default goal if only flag goals are specified
+FLAG_PREREQS :=
+ifndef GOALS
+FLAG_PREREQS += bfs
+endif
+
+# Make sure that "make release" builds everything, but "make release obj/src/main.o" doesn't
+$(FLAG_GOALS): $(FLAG_PREREQS)
+	@:
+.PHONY: $(FLAG_GOALS)
+
+all: bfs tests
+.PHONY: all
+
+$(BIN)/%:
+	@$(MKDIR) $(@D)
+	+$(CC) $(ALL_LDFLAGS) $^ $(ALL_LDLIBS) -o $@
+ifeq ($(OS) $(SANITIZE),FreeBSD y)
+	elfctl -e +noaslr $@
+endif
+
+$(OBJ)/%.o: %.c $(OBJ)/FLAGS
+	@$(MKDIR) $(@D)
+	$(CC) $(ALL_CFLAGS) -c $< -o $@
+
+# Save the full set of flags to rebuild everything when they change
+$(OBJ)/FLAGS.new:
+	@$(MKDIR) $(@D)
+	@echo $(CC) : $(ALL_CFLAGS) : $(ALL_LDFLAGS) : $(ALL_LDLIBS) >$@
+.PHONY: $(OBJ)/FLAGS.new
+
+# Only update obj/FLAGS if obj/FLAGS.new is different
+$(OBJ)/FLAGS: $(OBJ)/FLAGS.new
+	@test -e $@ && cmp -s $@ $< && rm $< || mv $< $@
+
+# All object files except the entry point
+LIBBFS := \
+    $(OBJ)/src/alloc.o \
+    $(OBJ)/src/bar.o \
+    $(OBJ)/src/bfstd.o \
+    $(OBJ)/src/bftw.o \
+    $(OBJ)/src/color.o \
+    $(OBJ)/src/ctx.o \
+    $(OBJ)/src/darray.o \
+    $(OBJ)/src/diag.o \
+    $(OBJ)/src/dir.o \
+    $(OBJ)/src/dstring.o \
+    $(OBJ)/src/eval.o \
+    $(OBJ)/src/exec.o \
+    $(OBJ)/src/fsade.o \
+    $(OBJ)/src/ioq.o \
+    $(OBJ)/src/mtab.o \
+    $(OBJ)/src/opt.o \
+    $(OBJ)/src/parse.o \
+    $(OBJ)/src/printf.o \
+    $(OBJ)/src/pwcache.o \
+    $(OBJ)/src/stat.o \
+    $(OBJ)/src/trie.o \
+    $(OBJ)/src/typo.o \
+    $(OBJ)/src/xregex.o \
+    $(OBJ)/src/xspawn.o \
+    $(OBJ)/src/xtime.o
+
+# The main executable
+$(BIN)/bfs: $(OBJ)/src/main.o $(LIBBFS)
+
+# Standalone unit tests
+UNITS := alloc bfstd bit trie xtimegm
+UNIT_TESTS := $(UNITS:%=$(BIN)/tests/%)
+UNIT_CHECKS := $(UNITS:%=check-%)
+
+# Testing utilities
+TEST_UTILS := $(BIN)/tests/mksock $(BIN)/tests/xtouch
+
+TESTS := $(UNIT_TESTS) $(TEST_UTILS)
+
+tests: $(TESTS)
+.PHONY: tests
+
+$(TESTS): $(BIN)/tests/%: $(OBJ)/tests/%.o $(LIBBFS)
+
+# The different search strategies that we test
+STRATEGIES := bfs dfs ids eds
+STRATEGY_CHECKS := $(STRATEGIES:%=check-%)
+
+# All the different checks we run
+CHECKS := $(UNIT_CHECKS) $(STRATEGY_CHECKS)
+
+check: $(CHECKS)
+.PHONY: check $(CHECKS)
+
+$(UNIT_CHECKS): check-%: $(BIN)/tests/%
+	$<
+
+$(STRATEGY_CHECKS): check-%: $(BIN)/bfs $(TEST_UTILS)
+	./tests/tests.sh --bfs="$(BIN)/bfs -S $*" $(TEST_FLAGS)
+
+# Custom test flags for distcheck
+DISTCHECK_FLAGS := -s TEST_FLAGS="--sudo --verbose=skipped"
+
+distcheck:
+	+$(MAKE) -B asan ubsan check $(DISTCHECK_FLAGS)
+ifneq ($(OS),Darwin)
+	+$(MAKE) -B msan ubsan check CC=clang $(DISTCHECK_FLAGS)
+endif
+	+$(MAKE) -B tsan ubsan check CC=clang $(DISTCHECK_FLAGS)
+ifeq ($(OS) $(ARCH),Linux x86_64)
+	+$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= $(DISTCHECK_FLAGS)
+endif
+	+$(MAKE) -B release check $(DISTCHECK_FLAGS)
+	+$(MAKE) -B check $(DISTCHECK_FLAGS)
+	+$(MAKE) check-install $(DISTCHECK_FLAGS)
+.PHONY: distcheck
+
+clean:
+	$(RM) -r $(BIN) $(OBJ)
+.PHONY: clean
+
+install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) -m755 $(BIN)/bfs $(DESTDIR)$(PREFIX)/bin/bfs
+	$(MKDIR) $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) -m644 docs/bfs.1 $(DESTDIR)$(MANDIR)/man1/bfs.1
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/bash-completion/completions
+	$(INSTALL) -m644 completions/bfs.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/zsh/site-functions
+	$(INSTALL) -m644 completions/bfs.zsh $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d
+	$(INSTALL) -m644 completions/bfs.fish $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
+.PHONY: install
+
+uninstall:
+	$(RM) $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
+	$(RM) $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
+	$(RM) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
+	$(RM) $(DESTDIR)$(MANDIR)/man1/bfs.1
+	$(RM) $(DESTDIR)$(PREFIX)/bin/bfs
+.PHONY: uninstall
+
+check-install:
+	+$(MAKE) install DESTDIR=$(BUILDDIR)/pkg
+	+$(MAKE) uninstall DESTDIR=$(BUILDDIR)/pkg
+	$(BIN)/bfs $(BUILDDIR)/pkg -not -type d -print -exit 1
+	$(RM) -r $(BUILDDIR)/pkg
+.PHONY: check-install
+
+.SUFFIXES:
+
+-include $(wildcard $(OBJ)/*/*.d)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7987687..0000000
--- a/Makefile
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-ifneq ($(wildcard .git),)
-VERSION := $(shell git describe --always 2>/dev/null)
-endif
-
-ifndef VERSION
-VERSION := 3.0.1
-endif
-
-ifndef OS
-OS := $(shell uname)
-endif
-
-ifndef ARCH
-ARCH := $(shell uname -m)
-endif
-
-CC ?= gcc
-INSTALL ?= install
-MKDIR ?= mkdir -p
-RM ?= rm -f
-
-export BUILDDIR ?= .
-DESTDIR ?=
-PREFIX ?= /usr
-MANDIR ?= $(PREFIX)/share/man
-
-BIN := $(BUILDDIR)/bin
-OBJ := $(BUILDDIR)/obj
-
-DEFAULT_CFLAGS := \
-    -g \
-    -Wall \
-    -Wformat=2 \
-    -Werror=implicit \
-    -Wimplicit-fallthrough \
-    -Wmissing-declarations \
-    -Wshadow \
-    -Wsign-compare \
-    -Wstrict-prototypes
-
-CFLAGS ?= $(DEFAULT_CFLAGS)
-LDFLAGS ?=
-DEPFLAGS ?= -MD -MP -MF $(@:.o=.d)
-
-LOCAL_CPPFLAGS := \
-    -D__EXTENSIONS__ \
-    -D_ATFILE_SOURCE \
-    -D_BSD_SOURCE \
-    -D_DARWIN_C_SOURCE \
-    -D_DEFAULT_SOURCE \
-    -D_GNU_SOURCE \
-    -D_LARGEFILE64_SOURCE \
-    -D_FILE_OFFSET_BITS=64 \
-    -D_TIME_BITS=64 \
-    -DBFS_VERSION=\"$(VERSION)\"
-
-LOCAL_CFLAGS := -std=c17 -pthread
-LOCAL_LDFLAGS :=
-LOCAL_LDLIBS :=
-
-ASAN := $(filter asan,$(MAKECMDGOALS))
-LSAN := $(filter lsan,$(MAKECMDGOALS))
-MSAN := $(filter msan,$(MAKECMDGOALS))
-TSAN := $(filter tsan,$(MAKECMDGOALS))
-UBSAN := $(filter ubsan,$(MAKECMDGOALS))
-
-ifdef ASAN
-LOCAL_CFLAGS += -fsanitize=address
-SANITIZE := y
-endif
-
-ifdef LSAN
-LOCAL_CFLAGS += -fsanitize=leak
-SANITIZE := y
-endif
-
-ifdef MSAN
-# msan needs all code instrumented
-NOLIBS := y
-LOCAL_CFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
-SANITIZE := y
-endif
-
-ifdef TSAN
-# tsan needs all code instrumented
-NOLIBS := y
-# https://github.com/google/sanitizers/issues/342
-LOCAL_CPPFLAGS += -DBFS_USE_TARGET_CLONES=0
-LOCAL_CFLAGS += -fsanitize=thread
-SANITIZE := y
-endif
-
-ifdef UBSAN
-LOCAL_CFLAGS += -fsanitize=undefined
-SANITIZE := y
-endif
-
-ifdef SANITIZE
-LOCAL_CFLAGS += -fno-sanitize-recover=all
-endif
-
-ifndef NOLIBS
-USE_ONIGURUMA := y
-endif
-
-ifdef USE_ONIGURUMA
-LOCAL_CPPFLAGS += -DBFS_USE_ONIGURUMA=1
-
-ONIG_CONFIG := $(shell command -v onig-config 2>/dev/null)
-ifdef ONIG_CONFIG
-ONIG_CFLAGS := $(shell $(ONIG_CONFIG) --cflags)
-ONIG_LDLIBS := $(shell $(ONIG_CONFIG) --libs)
-else
-ONIG_LDLIBS := -lonig
-endif
-
-LOCAL_CFLAGS += $(ONIG_CFLAGS)
-LOCAL_LDLIBS += $(ONIG_LDLIBS)
-endif # USE_ONIGURUMA
-
-ifeq ($(OS),Linux)
-ifndef NOLIBS
-USE_ACL := y
-USE_ATTR := y
-USE_LIBCAP := y
-endif
-
-ifdef USE_ACL
-LOCAL_LDLIBS += -lacl
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_ACL_H=0
-endif
-
-ifdef USE_ATTR
-LOCAL_LDLIBS += -lattr
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_XATTR_H=0
-endif
-
-ifdef USE_LIBCAP
-LOCAL_LDLIBS += -lcap
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_CAPABILITY_H=0
-endif
-
-LOCAL_LDFLAGS += -Wl,--as-needed
-LOCAL_LDLIBS += -lrt
-endif # Linux
-
-ifeq ($(OS),NetBSD)
-LOCAL_LDLIBS += -lutil
-endif
-
-ifneq ($(filter gcov,$(MAKECMDGOALS)),)
-LOCAL_CFLAGS += --coverage
-# gcov only intercepts fork()/exec() with -std=gnu*
-LOCAL_CFLAGS := $(patsubst -std=c%,-std=gnu%,$(LOCAL_CFLAGS))
-endif
-
-ifneq ($(filter release,$(MAKECMDGOALS)),)
-LOCAL_CPPFLAGS += -DNDEBUG
-CFLAGS := $(DEFAULT_CFLAGS) -O3 -flto=auto
-endif
-
-ALL_CPPFLAGS = $(LOCAL_CPPFLAGS) $(CPPFLAGS) $(EXTRA_CPPFLAGS)
-ALL_CFLAGS = $(ALL_CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEPFLAGS)
-ALL_LDFLAGS = $(ALL_CFLAGS) $(LOCAL_LDFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS)
-ALL_LDLIBS = $(LOCAL_LDLIBS) $(LDLIBS) $(EXTRA_LDLIBS)
-
-# Default make target
-bfs: $(BIN)/bfs
-.PHONY: bfs
-
-# Goals that are treated like flags by this Makefile
-FLAG_GOALS := asan lsan msan tsan ubsan gcov release
-
-# These are the remaining non-flag goals
-GOALS := $(filter-out $(FLAG_GOALS),$(MAKECMDGOALS))
-
-# Build the default goal if only flag goals are specified
-FLAG_PREREQS :=
-ifndef GOALS
-FLAG_PREREQS += bfs
-endif
-
-# Make sure that "make release" builds everything, but "make release obj/src/main.o" doesn't
-$(FLAG_GOALS): $(FLAG_PREREQS)
-	@:
-.PHONY: $(FLAG_GOALS)
-
-all: bfs tests
-.PHONY: all
-
-$(BIN)/%:
-	@$(MKDIR) $(@D)
-	+$(CC) $(ALL_LDFLAGS) $^ $(ALL_LDLIBS) -o $@
-ifeq ($(OS) $(SANITIZE),FreeBSD y)
-	elfctl -e +noaslr $@
-endif
-
-$(OBJ)/%.o: %.c $(OBJ)/FLAGS
-	@$(MKDIR) $(@D)
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
-
-# Save the full set of flags to rebuild everything when they change
-$(OBJ)/FLAGS.new:
-	@$(MKDIR) $(@D)
-	@echo $(CC) : $(ALL_CFLAGS) : $(ALL_LDFLAGS) : $(ALL_LDLIBS) >$@
-.PHONY: $(OBJ)/FLAGS.new
-
-# Only update obj/FLAGS if obj/FLAGS.new is different
-$(OBJ)/FLAGS: $(OBJ)/FLAGS.new
-	@test -e $@ && cmp -s $@ $< && rm $< || mv $< $@
-
-# All object files except the entry point
-LIBBFS := \
-    $(OBJ)/src/alloc.o \
-    $(OBJ)/src/bar.o \
-    $(OBJ)/src/bfstd.o \
-    $(OBJ)/src/bftw.o \
-    $(OBJ)/src/color.o \
-    $(OBJ)/src/ctx.o \
-    $(OBJ)/src/darray.o \
-    $(OBJ)/src/diag.o \
-    $(OBJ)/src/dir.o \
-    $(OBJ)/src/dstring.o \
-    $(OBJ)/src/eval.o \
-    $(OBJ)/src/exec.o \
-    $(OBJ)/src/fsade.o \
-    $(OBJ)/src/ioq.o \
-    $(OBJ)/src/mtab.o \
-    $(OBJ)/src/opt.o \
-    $(OBJ)/src/parse.o \
-    $(OBJ)/src/printf.o \
-    $(OBJ)/src/pwcache.o \
-    $(OBJ)/src/stat.o \
-    $(OBJ)/src/trie.o \
-    $(OBJ)/src/typo.o \
-    $(OBJ)/src/xregex.o \
-    $(OBJ)/src/xspawn.o \
-    $(OBJ)/src/xtime.o
-
-# The main executable
-$(BIN)/bfs: $(OBJ)/src/main.o $(LIBBFS)
-
-# Standalone unit tests
-UNITS := alloc bfstd bit trie xtimegm
-UNIT_TESTS := $(UNITS:%=$(BIN)/tests/%)
-UNIT_CHECKS := $(UNITS:%=check-%)
-
-# Testing utilities
-TEST_UTILS := $(BIN)/tests/mksock $(BIN)/tests/xtouch
-
-TESTS := $(UNIT_TESTS) $(TEST_UTILS)
-
-tests: $(TESTS)
-.PHONY: tests
-
-$(TESTS): $(BIN)/tests/%: $(OBJ)/tests/%.o $(LIBBFS)
-
-# The different search strategies that we test
-STRATEGIES := bfs dfs ids eds
-STRATEGY_CHECKS := $(STRATEGIES:%=check-%)
-
-# All the different checks we run
-CHECKS := $(UNIT_CHECKS) $(STRATEGY_CHECKS)
-
-check: $(CHECKS)
-.PHONY: check $(CHECKS)
-
-$(UNIT_CHECKS): check-%: $(BIN)/tests/%
-	$<
-
-$(STRATEGY_CHECKS): check-%: $(BIN)/bfs $(TEST_UTILS)
-	./tests/tests.sh --bfs="$(BIN)/bfs -S $*" $(TEST_FLAGS)
-
-# Custom test flags for distcheck
-DISTCHECK_FLAGS := -s TEST_FLAGS="--sudo --verbose=skipped"
-
-distcheck:
-	+$(MAKE) -B asan ubsan check $(DISTCHECK_FLAGS)
-ifneq ($(OS),Darwin)
-	+$(MAKE) -B msan ubsan check CC=clang $(DISTCHECK_FLAGS)
-endif
-	+$(MAKE) -B tsan ubsan check CC=clang $(DISTCHECK_FLAGS)
-ifeq ($(OS) $(ARCH),Linux x86_64)
-	+$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= $(DISTCHECK_FLAGS)
-endif
-	+$(MAKE) -B release check $(DISTCHECK_FLAGS)
-	+$(MAKE) -B check $(DISTCHECK_FLAGS)
-	+$(MAKE) check-install $(DISTCHECK_FLAGS)
-.PHONY: distcheck
-
-clean:
-	$(RM) -r $(BIN) $(OBJ)
-.PHONY: clean
-
-install:
-	$(MKDIR) $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -m755 $(BIN)/bfs $(DESTDIR)$(PREFIX)/bin/bfs
-	$(MKDIR) $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL) -m644 docs/bfs.1 $(DESTDIR)$(MANDIR)/man1/bfs.1
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/bash-completion/completions
-	$(INSTALL) -m644 completions/bfs.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/zsh/site-functions
-	$(INSTALL) -m644 completions/bfs.zsh $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d
-	$(INSTALL) -m644 completions/bfs.fish $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
-.PHONY: install
-
-uninstall:
-	$(RM) $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
-	$(RM) $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
-	$(RM) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
-	$(RM) $(DESTDIR)$(MANDIR)/man1/bfs.1
-	$(RM) $(DESTDIR)$(PREFIX)/bin/bfs
-.PHONY: uninstall
-
-check-install:
-	+$(MAKE) install DESTDIR=$(BUILDDIR)/pkg
-	+$(MAKE) uninstall DESTDIR=$(BUILDDIR)/pkg
-	$(BIN)/bfs $(BUILDDIR)/pkg -not -type d -print -exit 1
-	$(RM) -r $(BUILDDIR)/pkg
-.PHONY: check-install
-
-.SUFFIXES:
-
--include $(wildcard $(OBJ)/*/*.d)
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index d0cb1fc..b19ef00 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -49,7 +49,7 @@ You can combine multiple flags and other targets (e.g. `make asan ubsan check`),
 ### Flags
 
 Other flags are controlled with `make` variables and/or environment variables.
-Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
+Here are some of the common ones; check the [`GNUmakefile`](/GNUmakefile) for more.
 
 | Flag                             | Description                                 |
 |----------------------------------|---------------------------------------------|
@@ -84,7 +84,7 @@ These dependencies are optional, and can be turned off at build time if necessar
 
 ### Dependency tracking
 
-The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in the [`Makefile`](/Makefile)).
+The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in the [`GNUmakefile`](/GNUmakefile)).
 So if you edit a header file, `make` will rebuild the necessary object files ensuring they don't go out of sync.
 
 We go one step further than most build systems by tracking the flags that were used for the previous compilation.
diff --git a/docs/USAGE.md b/docs/USAGE.md
index 0e45b34..86eef87 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -7,8 +7,8 @@ When invoked with no arguments, `bfs` will list everything under the current dir
 ```console
 $ bfs
 .
+./GNUmakefile
 ./LICENSE
-./Makefile
 ./README.md
 ./completions
 ./docs
-- 
cgit v1.2.3


From 7327b361acfbfc97657416c4bffc5aef79b86542 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:19:59 -0400
Subject: docs/bfs.1: Make bold/italic formatting more consistent

---
 docs/bfs.1 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index bc82457..249fcae 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -90,7 +90,7 @@ Follow all symbolic links.
 Never follow symbolic links (the default).
 .TP
 .B \-E
-Use extended regular expressions (same as \fB\-regextype posix-extended\fR).
+Use extended regular expressions (same as \fB\-regextype \fIposix-extended\fR).
 .TP
 .B \-X
 Filter out files with
@@ -432,9 +432,9 @@ Find files the current user can execute/read/write.
 Always false/true.
 .RE
 .TP
-.B \-fstype TYPE
+\fB\-fstype \fITYPE\fR
 Find files on file systems with the given
-.BR TYPE .
+.IR TYPE .
 .PP
 \fB\-gid\fR [\fI\-+\fR]\fIN\fR
 .br
@@ -632,7 +632,9 @@ but run the command in the same directory as the found file(s).
 .RE
 .TP
 \fB\-exit\fR [\fISTATUS\fR]
-Exit immediately with the given status (0 if unspecified).
+Exit immediately with the given status
+.RI ( 0
+if unspecified).
 .PP
 \fB\-fls \fIFILE\fR
 .br
-- 
cgit v1.2.3


From 0651f7d74391e4acce498a9c8f0e071355d5940f Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:21:47 -0400
Subject: docs/bfs.1: Give an example with a space separating date from time

---
 docs/bfs.1 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 249fcae..00005c0 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -512,13 +512,12 @@ to parse
 as an ISO 8601-style timestamp.  For example:
 .PP
 .RS
-1991-12-14
-.br
-1991-12-14T03:00
-.br
-1991-12-14T03:00-07:00
-.br
-1991-12-14T10:00Z
+.nf
+\(bu  \fI1991-12-14\fR
+\(bu  \fI1991-12-14T03:00\fR
+\(bu  \fI1991-12-14T03:00-07:00\fR
+\(bu '\fI1991-12-14 10:00Z\fR'
+.fi
 .RE
 .PP
 .B \-nogroup
-- 
cgit v1.2.3


From 9b767578944283ab858b62d36073853cf942a382 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:25:42 -0400
Subject: docs/bfs.1: Use a bulleted list for -size units

---
 docs/bfs.1 | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 00005c0..6e10f4d 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -554,14 +554,21 @@ See
 for examples of the timestamp format.
 .TP
 \fB\-size\fR [\fI\-+\fR]\fIN\fR[\fIcwbkMGTP\fR]
-Find files with the given size, in 1-byte
-.IR c haracters,
-2-byte
-.IR w ords,
-512-byte
-.IR b locks
-(default), or
-.IR k iB/ M iB/ G iB/ T iB/ P iB.
+Find files with the given size.
+The unit can be one of
+.PP
+.RS
+.nf
+\(bu \fIc\fRhars  (1 byte)
+\(bu \fIw\fRords  (2 bytes)
+\(bu \fIb\fRlocks (512 bytes, the default)
+\(bu \fIk\fRiB    (1024 bytes)
+\(bu \fIM\fRiB    (1024 kiB)
+\(bu \fIG\fRiB    (1024 MiB)
+\(bu \fIT\fRiB    (1024 GiB)
+\(bu \fIP\fRiB    (1024 TiB)
+.fi
+.RE
 .TP
 .B \-sparse
 Find files that occupy fewer disk blocks than expected.
-- 
cgit v1.2.3


From 19f16a31e1a1bd4ccdbbaa59c719f9ba11daf813 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:26:23 -0400
Subject: docs/bfs.1: Document the -type d,f syntax

---
 docs/bfs.1 | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 6e10f4d..f4edd5b 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -575,21 +575,46 @@ Find files that occupy fewer disk blocks than expected.
 .TP
 \fB\-type\fR [\fIbcdlpfswD\fR]
 Find files of the given type.
-Possible types are
+The possible types are
+.PP
+.RS
+\(bu
 .IR b lock
-device,
+device
+.br
+\(bu
 .IR c haracter
-device,
-.IR d irectory,
-symbolic
-.IR l ink,
-.IR p ipe,
-regular
-.IR f ile,
-.IR s ocket,
-.IR w hiteout,
-and
-.IR D oor.
+device
+.br
+\(bu
+.IR d irectory
+.br
+\(bu
+.IR l ink
+(symbolic)
+.br
+\(bu
+.IR p ipe
+.br
+\(bu
+.IR f ile
+(regular)
+.br
+\(bu
+.IR s ocket
+.br
+\(bu
+.IR w hiteout
+.br
+\(bu
+.IR D oor
+.PP
+Multiple types can be given at once, separated by commas.
+For example,
+.B \-type
+.I d,f
+matches both directories and regular files.
+.RE
 .TP
 \fB\-used\fR [\fI\-+\fR]\fIN\fR
 Find files last accessed
-- 
cgit v1.2.3


From d8aa899bd9770296ef63b09c3161bedaf25e5207 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:27:01 -0400
Subject: docs/bfs.1: Document that -prune does not work together with -depth

---
 docs/bfs.1 | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index f4edd5b..7e8a3f3 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -728,6 +728,13 @@ instead.
 .TP
 .B \-prune
 Don't descend into this directory.
+This has no effect if
+.B \-depth
+is enabled (either explicitly, or implicitly by
+.BR \-delete ).
+Use
+.B \-exclude
+instead in that case.
 .TP
 .B \-quit
 Quit immediately.
-- 
cgit v1.2.3


From 83a1fab7371f59df7af4175d731590305fb149a1 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:28:10 -0400
Subject: docs/bfs.1: Document use of $PATH

---
 docs/bfs.1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 7e8a3f3..1ffebf4 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -794,8 +794,18 @@ Specifies the pager used for
 .B \-help
 output.
 Defaults to
+.BR less (1),
+if found on the current
+.BR PATH ,
+otherwise
 .BR more (1).
 .TP
+.B PATH
+Used to resolve executables for
+.BR \-exec [ dir ]
+and
+.BR \-ok [ dir ].
+.TP
 .B POSIXLY_CORRECT
 Makes
 .B bfs
-- 
cgit v1.2.3


From d49e44a5e55d834a609753b113d6055a056c4091 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:30:17 -0400
Subject: docs/bfs.1: Clarify the effects of $POSIXLY_CORRECT

---
 docs/bfs.1 | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 1ffebf4..f817c0a 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -811,10 +811,31 @@ Makes
 .B bfs
 conform more strictly to the POSIX.1-2017 specification for
 .BR find (1).
-Currently this just disables warnings by default.
+Currently this has two effects:
+.RS
+.IP \(bu
+Disables warnings by default, because POSIX prohibits writing to standard error (except for the
+.B \-ok
+prompt), unless the command also fails with a non-zero exit status.
+.IP \(bu
+Makes
+.B \-ls
+and
+.B \-fls
+use 512-byte blocks instead of 1024-byte blocks.
+(POSIX does not specify these actions, but BSD
+.BR find (1)
+implementations use 512-byte blocks, while GNU
+.BR find (1)
+uses 1024-byte blocks by default.)
+.PP
 It does not disable
 .BR bfs 's
 various extensions to the base POSIX functionality.
+.B POSIXLY_CORRECT
+has the same effects on GNU
+.BR find (1).
+.RE
 .SH EXAMPLES
 .TP
 .B bfs
-- 
cgit v1.2.3


From 5ee67902d7c635ac7df4b4e6de3c4af3b93a4b89 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:30:41 -0400
Subject: docs/bfs.1: Don't unnecessarily quote {}

---
 docs/bfs.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index f817c0a..49778bd 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -872,7 +872,7 @@ skipping every
 .B .git
 directory.
 .TP
-.B bfs \-type f \-executable \-exec strip '{}' +
+.B bfs \-type f \-executable \-exec strip {} +
 Runs
 .BR strip (1)
 on all executable files it finds, passing it multiple files at a time.
-- 
cgit v1.2.3


From 97edb42d2b4e5b15e783d0bb43f2024df0f93888 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 14:35:55 -0400
Subject: docs/bfs.1: Document that -help/-version exit immediately

---
 docs/bfs.1 | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index 49778bd..c7a4373 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -251,6 +251,20 @@ or
 .B \-mindepth
 for example.
 Exclusions are always applied before other expressions, so it may be least confusing to put them first on the command line.
+.PP
+.B \-help
+.br
+.B \-\-help
+.RS
+Print usage information, and exit immediately (without parsing the rest of the command line or processing any files).
+.RE
+.PP
+.B \-version
+.br
+.B \-\-version
+.RS
+Print version information, and exit immediately.
+.RE
 .SH OPTIONS
 .PP
 .B \-color
@@ -738,12 +752,6 @@ instead in that case.
 .TP
 .B \-quit
 Quit immediately.
-.TP
-.B \-version
-Print version information.
-.TP
-.B \-help
-Print usage information.
 .SH ENVIRONMENT
 Certain environment variables affect the behavior of
 .BR bfs .
-- 
cgit v1.2.3


From 15ce658253f13f356d51b746938b19c9ffe1f33d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 15 Aug 2023 15:57:02 -0400
Subject: docs/bfs.1: Document each -regextype

---
 docs/bfs.1 | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/bfs.1 b/docs/bfs.1
index c7a4373..2ecb891 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -329,11 +329,40 @@ Ignored; for compatibility with GNU find.
 \fB\-regextype \fITYPE\fR
 Use
 .IR TYPE -flavored
-regexes (default:
-.IR posix-basic ;
-see
-.B \-regextype
-.IR help ).
+regular expressions.
+The possible types are
+.RS
+.TP
+.I posix-basic
+POSIX basic regular expressions (the default).
+.TP
+.I posix-extended
+POSIX extended resular expressions.
+.TP
+.I ed
+Like
+.BR ed (1)
+(same as
+.IR posix-basic ).
+.TP
+.I emacs
+Like
+.BR emacs (1).
+.TP
+.I grep
+Like
+.BR grep (1).
+.TP
+.I sed
+Like
+.BR sed (1)
+(same as
+.IR posix-basic ).
+.PP
+See
+.BR regex (7)
+for a description of regular expression syntax.
+.RE
 .TP
 .B \-status
 Display a status bar while searching.
-- 
cgit v1.2.3


From b8a3b9aaf37fc62079b4e9d921a6007845d3ef03 Mon Sep 17 00:00:00 2001
From: Alejandro Lazaro <virtualroot@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:50:26 +0200
Subject: bfs uses the C17 standard version

`bfs` uses C17 since 3.0
---
 docs/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/HACKING.md b/docs/HACKING.md
index d129a28..0763fda 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -17,7 +17,7 @@ This enables machine processing of license information based on the SPDX License
 Implementation
 --------------
 
-`bfs` is written in [C](https://en.wikipedia.org/wiki/C_(programming_language)), specifically [C11](https://en.wikipedia.org/wiki/C11_(C_standard_revision)).
+`bfs` is written in [C](https://en.wikipedia.org/wiki/C_(programming_language)), specifically [C17](https://en.wikipedia.org/wiki/C17_(C_standard_revision)).
 You can get a feel for the coding style by skimming the source code.
 [`main.c`](/src/main.c) contains an overview of the rest of source files.
 A quick summary:
-- 
cgit v1.2.3


From 0015b79936a58a325e80cf036c10cb1010122703 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 6 Sep 2023 21:15:50 -0400
Subject: Release 3.0.2

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 18 ++++++++++++++++++
 src/config.h      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 069c548..6902979 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.0.1
+VERSION := 3.0.2
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1cc95e9..3dca97c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,24 @@
 3.*
 ===
 
+3.0.2
+-----
+
+**September 6, 2023**
+
+### Changes
+
+- `-files0-from` now allows an empty set of paths to be given, matching GNU findutils 4.9.0
+
+- Reduced memory consumption in multi-threaded searches
+
+- Many man page updates
+
+### Bug fixes
+
+- Fixed an out-of-bounds memory read that could occur when escaping a string containing an incomplete multi-byte character
+
+
 3.0.1
 -----
 
diff --git a/src/config.h b/src/config.h
index fd4961f..14c9305 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,7 +22,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.0.1"
+#  define BFS_VERSION "3.0.2"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From dba692ca0fb44678fdcc7634d821f04eac2f8042 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 11 Jul 2023 14:30:52 -0400
Subject: build: Add liburing on Linux

---
 .github/workflows/ci.yml      |  5 +++--
 .github/workflows/codecov.yml |  3 ++-
 .github/workflows/codeql.yml  |  3 ++-
 GNUmakefile                   |  8 +++++++-
 README.md                     | 12 ++++++------
 docs/BUILDING.md              |  2 ++
 6 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'docs')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca1737c..971a4df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,9 +28,10 @@ jobs:
               libcap-dev \
               libcap2:i386 \
               libonig-dev \
-              libonig5:i386
+              libonig5:i386 \
+              liburing-dev
           # Ubuntu doesn't let you install the -dev packages for both amd64 and
-          # i386 at once, so we make our own symlinks to fix -m32 -lacl -lattr -lcap
+          # i386 at once, so we make our own symlinks to fix -m32 -lacl -l...
           sudo ln -s libacl.so.1 /lib/i386-linux-gnu/libacl.so
           sudo ln -s libattr.so.1 /lib/i386-linux-gnu/libattr.so
           sudo ln -s libcap.so.2 /lib/i386-linux-gnu/libcap.so
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 783cc43..b06ea62 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -20,7 +20,8 @@ jobs:
               libattr1-dev \
               libcap2-bin \
               libcap-dev \
-              libonig-dev
+              libonig-dev \
+              liburing-dev
 
       - name: Generate coverage
         run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 88e9f3f..3a2f81f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -37,7 +37,8 @@ jobs:
               libattr1-dev \
               libcap2-bin \
               libcap-dev \
-              libonig-dev
+              libonig-dev \
+              liburing-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
diff --git a/GNUmakefile b/GNUmakefile
index 6902979..8154240 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -126,6 +126,7 @@ ifndef NOLIBS
 USE_ACL := y
 USE_ATTR := y
 USE_LIBCAP := y
+USE_LIBURING := y
 endif
 
 ifdef USE_ACL
@@ -146,6 +147,11 @@ else
 LOCAL_CPPFLAGS += -DBFS_USE_SYS_CAPABILITY_H=0
 endif
 
+ifdef USE_LIBURING
+LOCAL_CPPFLAGS += -DBFS_USE_LIBURING=1
+LOCAL_LDLIBS += -luring
+endif
+
 LOCAL_LDFLAGS += -Wl,--as-needed
 LOCAL_LDLIBS += -lrt
 endif # Linux
@@ -287,7 +293,7 @@ ifneq ($(OS),Darwin)
 endif
 	+$(MAKE) -B tsan ubsan check CC=clang $(DISTCHECK_FLAGS)
 ifeq ($(OS) $(ARCH),Linux x86_64)
-	+$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= $(DISTCHECK_FLAGS)
+	+$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= USE_LIBURING= $(DISTCHECK_FLAGS)
 endif
 	+$(MAKE) -B release check $(DISTCHECK_FLAGS)
 	+$(MAKE) -B check $(DISTCHECK_FLAGS)
diff --git a/README.md b/README.md
index 18af808..a7ca335 100644
--- a/README.md
+++ b/README.md
@@ -290,22 +290,22 @@ Here's how to install them on some common platforms:
 
 <pre>
 <strong>Alpine Linux</strong>
-# apk add acl{,-dev} attr{,-dev} libcap{,-dev} oniguruma-dev
+# apk add acl{,-dev} attr{,-dev} libcap{,-dev} liburing-dev oniguruma-dev
 
 <strong>Arch Linux</strong>
-# pacman -S acl attr libcap oniguruma
+# pacman -S acl attr libcap liburing oniguruma
 
 <strong>Debian/Ubuntu</strong>
-# apt install acl libacl1-dev attr libattr1-dev libcap2-bin libcap-dev libonig-dev
+# apt install acl libacl1-dev attr libattr1-dev libcap2-bin libcap-dev liburing-dev libonig-dev
 
 <strong>Fedora</strong>
-# dnf install acl libacl-devel libattr-devel libcap-devel oniguruma-devel
+# dnf install acl libacl-devel libattr-devel libcap-devel liburing-devel oniguruma-devel
 
 <strong>NixOS</strong>
-# nix-env -i acl attr libcap oniguruma
+# nix-env -i acl attr libcap liburing oniguruma
 
 <strong>Void Linux</strong>
-# xbps-install -S acl-{devel,progs} attr-{devel,progs} libcap-{devel,progs} oniguruma-devel
+# xbps-install -S acl-{devel,progs} attr-{devel,progs} libcap-{devel,progs} liburing-devel oniguruma-devel
 
 <strong>Homebrew</strong>
 $ brew install oniguruma
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index b19ef00..02f9756 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -75,11 +75,13 @@ These dependencies are optional, and can be turned off at build time if necessar
 | [acl]       | Linux only | `USE_ACL`       |
 | [attr]      | Linux only | `USE_ATTR`      |
 | [libcap]    | Linux only | `USE_LIBCAP`    |
+| [liburing]  | Linux only | `USE_LIBURING`  |
 | [Oniguruma] | All        | `USE_ONIGURUMA` |
 
 [acl]: https://savannah.nongnu.org/projects/acl
 [attr]: https://savannah.nongnu.org/projects/attr
 [libcap]: https://sites.google.com/site/fullycapable/
+[liburing]: https://github.com/axboe/liburing
 [Oniguruma]: https://github.com/kkos/oniguruma
 
 ### Dependency tracking
-- 
cgit v1.2.3


From 8b70270715eb9d58417cc551af413187b7260055 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 12 Oct 2023 18:28:34 -0400
Subject: docs: Start writing the 3.1 changelog

---
 docs/CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'docs')

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3dca97c..8e10caa 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,39 @@
 3.*
 ===
 
+3.1
+---
+
+**Coming soon**
+
+### New features
+
+- `bfs` now uses `io_uring` on Linux ([#106])
+
+- `bfs` now comes with an official benchmark suite ([#126])
+
+### Changes
+
+- Iterative deepening modes (`-S {ids,eds}`) were optimized by delaying teardown until the very end ([`5f16169`])
+
+- Parallel depth-first search (`-S dfs`) was optimized to avoid enqueueing every file separately ([`2572273`])
+
+### Bug Fixes
+
+- Iterative deepening modes (`-S {ids,eds}`) were performing iterative *breadth*-first searches since `bfs` 3.0, negating any advantages they may have had over normal breadth-first search.
+  They now do iterative *depth*-first searches as expected.
+  ([`a029d95`])
+
+- Fixed a linked-list corruption that could lead to an infinite loop on macOS and other non-Linux, non-FreeBSD platforms ([`773f4a4`])
+
+[#106]: https://github.com/tavianator/bfs/pull/106
+[#126]: https://github.com/tavianator/bfs/pull/126
+[`5f16169`]: https://github.com/tavianator/bfs/commit/5f1616912ba3a7a23ce6bce02df3791b73da38ab
+[`2572273`]: https://github.com/tavianator/bfs/commit/257227326fe60fe70e80433fd34d1ebcb2f9f623
+[`a029d95`]: https://github.com/tavianator/bfs/commit/a029d95b5736a74879f32089514a5a6b63d6efbc
+[`773f4a4`]: https://github.com/tavianator/bfs/commit/773f4a446f03da62d88e6d17be49fdc0a3e38465
+
+
 3.0.2
 -----
 
-- 
cgit v1.2.3


From 2acd897857fe301dfc6f5a8648e0124cd8515b4e Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 12 Oct 2023 22:13:49 -0400
Subject: Release 3.0.3

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 14 +++-----------
 src/config.h      |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 69cfe3d..27d6674 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.0.2
+VERSION := 3.0.3
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8e10caa..253dd46 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,16 +1,10 @@
 3.*
 ===
 
-3.1
----
-
-**Coming soon**
-
-### New features
-
-- `bfs` now uses `io_uring` on Linux ([#106])
+3.0.3
+-----
 
-- `bfs` now comes with an official benchmark suite ([#126])
+**October 12, 2023**
 
 ### Changes
 
@@ -26,8 +20,6 @@
 
 - Fixed a linked-list corruption that could lead to an infinite loop on macOS and other non-Linux, non-FreeBSD platforms ([`773f4a4`])
 
-[#106]: https://github.com/tavianator/bfs/pull/106
-[#126]: https://github.com/tavianator/bfs/pull/126
 [`5f16169`]: https://github.com/tavianator/bfs/commit/5f1616912ba3a7a23ce6bce02df3791b73da38ab
 [`2572273`]: https://github.com/tavianator/bfs/commit/257227326fe60fe70e80433fd34d1ebcb2f9f623
 [`a029d95`]: https://github.com/tavianator/bfs/commit/a029d95b5736a74879f32089514a5a6b63d6efbc
diff --git a/src/config.h b/src/config.h
index 862a839..980980a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,7 +22,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.0.2"
+#  define BFS_VERSION "3.0.3"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From c25fa4fb5e58e20ce97c3747c05d26307a70baaa Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 12 Oct 2023 23:50:16 -0400
Subject: Release 3.0.4

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 12 ++++++++++++
 src/config.h      |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 27d6674..011e397 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.0.3
+VERSION := 3.0.4
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 253dd46..3b07f01 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,18 @@
 3.*
 ===
 
+3.0.4
+-----
+
+**October 12, 2023**
+
+### Bug Fixes
+
+- Fixed a segfault when reporting errors under musl ([`d40eb87`])
+
+[`d40eb87`]: https://github.com/tavianator/bfs/commit/d40eb87cc00f50a5debb8899eacb7fcf1065badf
+
+
 3.0.3
 -----
 
diff --git a/src/config.h b/src/config.h
index 980980a..38ca69b 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,7 +22,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.0.3"
+#  define BFS_VERSION "3.0.4"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From 5f707624a109ba72b90405205bd1c2e975bc0e7c Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 13 Oct 2023 17:09:11 -0400
Subject: docs: Add a list of related utilities

---
 docs/RELATED.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 docs/RELATED.md

(limited to 'docs')

diff --git a/docs/RELATED.md b/docs/RELATED.md
new file mode 100644
index 0000000..cf52b70
--- /dev/null
+++ b/docs/RELATED.md
@@ -0,0 +1,42 @@
+# Related utilities
+
+There are many tools that can be used to find files.
+This is a catalogue of some of the most important/interesting ones.
+
+## `find`-compatible
+
+### System `find` implementations
+
+These `find` implementations are commonly installed as the system `find` utility in UNIX-like operating systems:
+
+- [GNU findutils](https://www.gnu.org/software/findutils/) ([manual](https://www.gnu.org/software/findutils/manual/html_node/find_html/index.html), [source](https://git.savannah.gnu.org/cgit/findutils.git))
+- BSD `find`
+  - FreeBSD `find` ([manual](https://www.freebsd.org/cgi/man.cgi?find(1)), [source](https://cgit.freebsd.org/src/tree/usr.bin/find))
+  - OpenBSD `find` ([manual](https://man.openbsd.org/find.1), [source](https://cvsweb.openbsd.org/src/usr.bin/find/))
+  - NetBSD `find` ([manual](https://man.netbsd.org/find.1), [source](http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/find/))
+- macOS `find` ([manual](https://ss64.com/osx/find.html), [source](https://github.com/apple-oss-distributions/shell_cmds/tree/main/find))
+- Solaris `find`
+  - [Illumos](https://illumos.org/) `find` ([manual](https://illumos.org/man/1/find), [source](https://github.com/illumos/illumos-gate/blob/master/usr/src/cmd/find/find.c))
+
+### Alternative `find` implementations
+
+These are not usually installed as the system `find`, but are designed to be `find`-compatible
+
+- [`bfs`](https://tavianator.com/projects/bfs.html) ([manual](https://man.archlinux.org/man/bfs.1), [source](https://github.com/tavianator/bfs))
+- [schilytools](https://codeberg.org/schilytools/schilytools) `sfind` ([source](https://codeberg.org/schilytools/schilytools/src/branch/master/sfind))
+- [BusyBox](https://busybox.net/) `find` ([manual](https://busybox.net/downloads/BusyBox.html#find), [source](https://git.busybox.net/busybox/tree/findutils/find.c))
+- [ToyBox](http://landley.net/toybox/) `find` ([manual](http://landley.net/toybox/help.html#find), [source](https://github.com/landley/toybox/blob/master/toys/posix/find.c))
+- uutils `find` ([source](https://github.com/uutils/findutils))
+
+## `find` alternatives
+
+These utilities are not `find`-compatible, but serve a similar purpose:
+
+- [`fd`](https://github.com/sharkdp/fd): A simple, fast and user-friendly alternative to 'find'
+- `locate`
+  - [GNU `locate`](https://www.gnu.org/software/findutils/locate)
+  - [`mlocate`](https://pagure.io/mlocate) ([manual](), [source](https://pagure.io/mlocate/tree/master))
+  - [`plocate`](https://plocate.sesse.net/) ([manual](https://plocate.sesse.net/plocate.1.html), [source](https://git.sesse.net/?p=plocate))
+- [`walk`](https://github.com/google/walk): Plan 9 style utilities to replace find(1)
+- [fselect](https://github.com/jhspetersson/fselect): Find files with SQL-like queries
+- [rawhide](https://github.com/raforg/rawhide): find files using pretty C expressions
-- 
cgit v1.2.3


From fd91097055f095fdd827ef8751d9534f59a89404 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sat, 16 Dec 2023 12:47:45 -0500
Subject: docs: Rename HACKING to CONTRIBUTING

So that GitHub recognizes it.
---
 README.md            |  4 ++--
 docs/CONTRIBUTING.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/HACKING.md      | 61 ----------------------------------------------------
 docs/USAGE.md        |  8 +++----
 4 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 docs/CONTRIBUTING.md
 delete mode 100644 docs/HACKING.md

(limited to 'docs')

diff --git a/README.md b/README.md
index a7ca335..79ffe65 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@
 <a href="https://codecov.io/gh/tavianator/bfs"><img src="https://img.shields.io/codecov/c/github/tavianator/bfs?token=PpBVuozOVC" alt="Code coverage" align="right"/></a>
 </h1>
 
-**[Features]   •   [Installation]   •   [Usage]   •   [Building]   •   [Hacking]   •   [Changelog]**
+**[Features]   •   [Installation]   •   [Usage]   •   [Building]   •   [Contributing]   •   [Changelog]**
 
 [Features]: #features
 [Installation]: #installation
 [Usage]: /docs/USAGE.md
 [Building]: /docs/BUILDING.md
-[Hacking]: /docs/HACKING.md
+[Contributing]: /docs/CONTRIBUTING.md
 [Changelog]: /docs/CHANGELOG.md
 
 <picture>
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000..099157d
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,61 @@
+Contributing to `bfs`
+=====================
+
+License
+-------
+
+`bfs` is licensed under the [Zero-Clause BSD License](https://opensource.org/licenses/0BSD), a maximally permissive license.
+Contributions must use the same license.
+
+Individual files contain the following tag instead of the full license text:
+
+    SPDX-License-Identifier: 0BSD
+
+This enables machine processing of license information based on the SPDX License Identifiers that are available here: https://spdx.org/licenses/
+
+
+Implementation
+--------------
+
+`bfs` is written in [C](https://en.wikipedia.org/wiki/C_(programming_language)), specifically [C17](https://en.wikipedia.org/wiki/C17_(C_standard_revision)).
+You can get a feel for the coding style by skimming the source code.
+[`main.c`](/src/main.c) contains an overview of the rest of source files.
+A quick summary:
+
+- Tabs for indentation, spaces for alignment.
+- Most types and functions should be namespaced with `bfs_`.
+  Exceptions are made for things that could be generally useful outside of `bfs`.
+- Error handling follows the C standard library conventions: return a nonzero `int` or a `NULL` pointer, with the error code in `errno`.
+  All failure cases should be handled, including `malloc()` failures.
+- `goto` is not considered harmful for cleaning up in error paths.
+
+
+Tests
+-----
+
+`bfs` includes an extensive test suite.
+See the [build documentation](BUILDING.md#testing) for details on running the tests.
+
+Test cases are grouped by the standard or `find` implementation that supports the tested feature(s):
+
+| Group                           | Description                           |
+|---------------------------------|---------------------------------------|
+| [`tests/posix`](/tests/posix)   | POSIX compatibility tests             |
+| [`tests/bsd`](/tests/bsd)       | BSD `find` features                   |
+| [`tests/gnu`](/tests/gnu)       | GNU `find` features                   |
+| [`tests/common`](/tests/common) | Features common to BSD and GNU `find` |
+| [`tests/bfs`](/tests/bfs)       | `bfs`-specific tests                  |
+
+Both new features and bug fixes should have associated tests.
+To add a test, create a new `*.sh` file in the appropriate group.
+Snapshot tests use the `bfs_diff` function to automatically compare the generated and expected outputs.
+For example,
+
+```bash
+# posix/something.sh
+bfs_diff basic -name something
+```
+
+`basic` is one of the directory trees generated for test cases; others include `links`, `loops`, `deep`, and `rainbow`.
+
+Run `./tests/tests.sh posix/something --update` to generate the reference snapshot (and don't forget to `git add` it).
diff --git a/docs/HACKING.md b/docs/HACKING.md
deleted file mode 100644
index 0763fda..0000000
--- a/docs/HACKING.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Hacking on `bfs`
-================
-
-License
--------
-
-`bfs` is licensed under the [Zero-Clause BSD License](https://opensource.org/licenses/0BSD), a maximally permissive license.
-Contributions must use the same license.
-
-Individual files contain the following tag instead of the full license text:
-
-    SPDX-License-Identifier: 0BSD
-
-This enables machine processing of license information based on the SPDX License Identifiers that are available here: https://spdx.org/licenses/
-
-
-Implementation
---------------
-
-`bfs` is written in [C](https://en.wikipedia.org/wiki/C_(programming_language)), specifically [C17](https://en.wikipedia.org/wiki/C17_(C_standard_revision)).
-You can get a feel for the coding style by skimming the source code.
-[`main.c`](/src/main.c) contains an overview of the rest of source files.
-A quick summary:
-
-- Tabs for indentation, spaces for alignment.
-- Most types and functions should be namespaced with `bfs_`.
-  Exceptions are made for things that could be generally useful outside of `bfs`.
-- Error handling follows the C standard library conventions: return a nonzero `int` or a `NULL` pointer, with the error code in `errno`.
-  All failure cases should be handled, including `malloc()` failures.
-- `goto` is not considered harmful for cleaning up in error paths.
-
-
-Tests
------
-
-`bfs` includes an extensive test suite.
-See the [build documentation](BUILDING.md#testing) for details on running the tests.
-
-Test cases are grouped by the standard or `find` implementation that supports the tested feature(s):
-
-| Group                           | Description                           |
-|---------------------------------|---------------------------------------|
-| [`tests/posix`](/tests/posix)   | POSIX compatibility tests             |
-| [`tests/bsd`](/tests/bsd)       | BSD `find` features                   |
-| [`tests/gnu`](/tests/gnu)       | GNU `find` features                   |
-| [`tests/common`](/tests/common) | Features common to BSD and GNU `find` |
-| [`tests/bfs`](/tests/bfs)       | `bfs`-specific tests                  |
-
-Both new features and bug fixes should have associated tests.
-To add a test, create a new `*.sh` file in the appropriate group.
-Snapshot tests use the `bfs_diff` function to automatically compare the generated and expected outputs.
-For example,
-
-```bash
-# posix/something.sh
-bfs_diff basic -name something
-```
-
-`basic` is one of the directory trees generated for test cases; others include `links`, `loops`, `deep`, and `rainbow`.
-
-Run `./tests/tests.sh posix/something --update` to generate the reference snapshot (and don't forget to `git add` it).
diff --git a/docs/USAGE.md b/docs/USAGE.md
index 86eef87..3efdee0 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -18,7 +18,7 @@ $ bfs
 ./completions/bfs.zsh
 ./docs/BUILDING.md
 ./docs/CHANGELOG.md
-./docs/HACKING.md
+./docs/CONTRIBUTING.md
 ./docs/USAGE.md
 ./docs/bfs.1
 ...
@@ -53,7 +53,7 @@ $ bfs -name '*.md'
 ./README.md
 ./docs/BUILDING.md
 ./docs/CHANGELOG.md
-./docs/HACKING.md
+./docs/CONTRIBUTING.md
 ./docs/USAGE.md
 ```
 
@@ -64,7 +64,7 @@ When you put multiple expressions next to each other, both of them must match:
 ```console
 $ bfs -name '*.md' -name '*ING*'
 ./docs/BUILDING.md
-./docs/HACKING.md
+./docs/CONTRIBUTING.md
 ```
 
 This works because the expressions are implicitly combined with *logical and*.
@@ -84,7 +84,7 @@ $ bfs -name '*.md' -or -name 'bfs.*'
 ./completions/bfs.zsh
 ./docs/BUILDING.md
 ./docs/CHANGELOG.md
-./docs/HACKING.md
+./docs/CONTRIBUTING.md
 ./docs/USAGE.md
 ./docs/bfs.1
 ```
-- 
cgit v1.2.3


From 66468fd13ce70d0f6f6388cd31d7f75196ccac31 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 6 Feb 2024 16:06:27 -0500
Subject: Release 3.1

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/config.h      |  2 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 637a63e..8b1f848 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.0.4
+VERSION := 3.1
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3b07f01..b70ed32 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,50 @@
 3.*
 ===
 
+3.1
+---
+
+**February 6, 2024**
+
+### New features
+
+- On Linux, `bfs` now uses [io_uring](https://en.wikipedia.org/wiki/Io_uring) for async I/O
+
+- On all platforms, `bfs` can now perform `stat()` calls in parallel, accelerating queries like `-links`, `-newer`, and `-size`, as well as colorized output
+
+- On FreeBSD, `-type w` now works to find whiteouts like the system `find`
+
+### Changes
+
+- Improved `bfs -j2` performance ([`b2ab7a1`](https://github.com/tavianator/bfs/commit/b2ab7a151fca517f4879e76e626ec85ad3de97c7))
+
+- Optimized `-exec` by using `posix_spawn()` when possible, which can avoid the overhead of `fork()` ([`95fbde1`](https://github.com/tavianator/bfs/commit/95fbde17a66377b6fbe7ff1f014301dbbf09270d))
+
+- `-execdir` and `-okdir` are now rejected if `$PATH` contains a relative path, matching the behaviour of GNU find ([`163baf1`](https://github.com/tavianator/bfs/commit/163baf1c9af13be0ce705b133e41e0c3d6427398))
+
+- Leading whitespace is no longer accepted in integer command line arguments like `-links ' 1'` ([`e0d7dc5`](https://github.com/tavianator/bfs/commit/e0d7dc5dfd7bdaa62b6bc18e9c1cce00bbe08577))
+
+### Bug Fixes
+
+- `-quit` and `-exit` could be ignored in the iterative deepening modes (`-S {ids,eds}`).
+  This is now fixed ([`670ebd9`](https://github.com/tavianator/bfs/commit/670ebd97fb431e830b1500b2e7e8013b121fb2c5)).
+  The bug was introduced in version 3.0.3 (commit [`5f16169`]).
+
+- Fixed two possible errors in sort mode (`-s`):
+  - Too many open files ([`710c083`](https://github.com/tavianator/bfs/commit/710c083ff02eb1cc5b8daa6778784f3d1cd3c08d))
+  - Out of memory ([`76ffc8d`](https://github.com/tavianator/bfs/commit/76ffc8d30cb1160d55d855d8ac630a2b9075fbcf))
+
+- Fixed handling of FreeBSD union mounts ([`3ac3bee`](https://github.com/tavianator/bfs/commit/3ac3bee7b0d9c9be693415206efa664bf4a7d4a7))
+
+- Fixed `NO_COLOR` handling when it's set to the empty string ([`79aee58`](https://github.com/tavianator/bfs/commit/79aee58a4621d01c4b1e98c332775f3b87213ddb))
+
+- Fixed some portability issues:
+  - [OpenBSD](https://github.com/tavianator/bfs/compare/ee200c07643801c8b53e5b80df704ecbf77a884e...79f1521b0e628be72bed3a648f0ae90b62fc69b8)
+  - [NetBSD](https://github.com/tavianator/bfs/compare/683f2c41c72efcb82ce866e3dcc311ac9bd8b66d...6435684a7d515e18247ae1b3dd9ec8681fee22d0)
+  - [DragonFly BSD](https://github.com/tavianator/bfs/compare/08867473e75e8e20ca76c7fb181204839e28b271...45fb1d952c3b262278a3b22e9c7d60cca19a5407)
+  - [Illumos](https://github.com/tavianator/bfs/compare/4010140cb748cc4f7f57b0a3d514485796c665ce...ae94cdc00136685abe61d55e1e357caaa636d785)
+
+
 3.0.4
 -----
 
diff --git a/src/config.h b/src/config.h
index 85ad57e..519a454 100644
--- a/src/config.h
+++ b/src/config.h
@@ -30,7 +30,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.0.4"
+#  define BFS_VERSION "3.1"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From 60fb65a75147a0d703842b412effdf8ca6ae2169 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 16 Feb 2024 08:43:44 -0500
Subject: Release 3.1.1

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 12 ++++++++++++
 src/config.h      |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 8b1f848..b0314d8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.1
+VERSION := 3.1.1
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b70ed32..3255495 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,18 @@
 3.*
 ===
 
+3.1.1
+-----
+
+**February 16, 2024**
+
+### Changes
+
+- Performance and scalability improvements
+
+- The file count in `bfs -status` now has a thousands separator
+
+
 3.1
 ---
 
diff --git a/src/config.h b/src/config.h
index 519a454..41a8d5f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -30,7 +30,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.1"
+#  define BFS_VERSION "3.1.1"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From abcac506d025ebf6f0d003635ee5b156f549d93f Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 29 Feb 2024 11:30:54 -0500
Subject: Release 3.1.2

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 22 +++++++++++++++++++---
 src/config.h      |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 852621e..91baf5c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.1.1
+VERSION := 3.1.2
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3255495..9d03705 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,22 @@
 3.*
 ===
 
+3.1.2
+-----
+
+**February 29, 2024**
+
+### Bug fixes
+
+- On Linux, we now check for supported `io_uring` operations before using them, which should fix `bfs` on 5.X series kernels that support `io_uring` but not all of `openat()`/`close()`/`statx()` ([`8bc72d6`](https://github.com/tavianator/bfs/commit/8bc72d6c20c5e38783c4956c4d9fde9b3ee9140c))
+
+- Fixed a test failure triggered by certain filesystem types for `/tmp` ([#131](https://github.com/tavianator/bfs/issues/131))
+
+- Fixed parsing and interpretation of timezone offsets for explicit reference times used in `-*since` and `-newerXt` ([`a9f3cde`](https://github.com/tavianator/bfs/commit/a9f3cde30426b546ba6e3172e1a7951213a72049))
+
+- Fixed the build on m68k ([`c749c11`](https://github.com/tavianator/bfs/commit/c749c11b04444ca40941dd2ddc5802faed148f6a))
+
+
 3.1.1
 -----
 
@@ -36,7 +52,7 @@
 
 - Leading whitespace is no longer accepted in integer command line arguments like `-links ' 1'` ([`e0d7dc5`](https://github.com/tavianator/bfs/commit/e0d7dc5dfd7bdaa62b6bc18e9c1cce00bbe08577))
 
-### Bug Fixes
+### Bug fixes
 
 - `-quit` and `-exit` could be ignored in the iterative deepening modes (`-S {ids,eds}`).
   This is now fixed ([`670ebd9`](https://github.com/tavianator/bfs/commit/670ebd97fb431e830b1500b2e7e8013b121fb2c5)).
@@ -62,7 +78,7 @@
 
 **October 12, 2023**
 
-### Bug Fixes
+### Bug fixes
 
 - Fixed a segfault when reporting errors under musl ([`d40eb87`])
 
@@ -80,7 +96,7 @@
 
 - Parallel depth-first search (`-S dfs`) was optimized to avoid enqueueing every file separately ([`2572273`])
 
-### Bug Fixes
+### Bug fixes
 
 - Iterative deepening modes (`-S {ids,eds}`) were performing iterative *breadth*-first searches since `bfs` 3.0, negating any advantages they may have had over normal breadth-first search.
   They now do iterative *depth*-first searches as expected.
diff --git a/src/config.h b/src/config.h
index 41a8d5f..4697083 100644
--- a/src/config.h
+++ b/src/config.h
@@ -30,7 +30,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.1.1"
+#  define BFS_VERSION "3.1.2"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From a1e288cb6a2482b7acc1edb92eea9d676da0729f Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 6 Mar 2024 18:55:16 -0500
Subject: Release 3.1.3

---
 GNUmakefile       |  2 +-
 docs/CHANGELOG.md | 12 ++++++++++++
 src/config.h      |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/GNUmakefile b/GNUmakefile
index 91baf5c..7dcd76f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null)
 endif
 
 ifndef VERSION
-VERSION := 3.1.2
+VERSION := 3.1.3
 endif
 
 ifndef OS
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 9d03705..672c2b4 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,18 @@
 3.*
 ===
 
+3.1.3
+-----
+
+**March 6, 2024**
+
+### Bug fixes
+
+- On Linux, the `io_uring` feature probing introduced in `bfs` 3.1.2 only applied to one thread, causing all other threads to avoid using io_uring entirely.
+  The probe results are now copied to all threads correctly.
+  ([`f64f76b`](https://github.com/tavianator/bfs/commit/f64f76b55400b71e8576ed7e4a377eb5ef9576aa))
+
+
 3.1.2
 -----
 
diff --git a/src/config.h b/src/config.h
index 4697083..ad2e481 100644
--- a/src/config.h
+++ b/src/config.h
@@ -30,7 +30,7 @@
 #  define BFS_COMMAND "bfs"
 #endif
 #ifndef BFS_VERSION
-#  define BFS_VERSION "3.1.2"
+#  define BFS_VERSION "3.1.3"
 #endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
-- 
cgit v1.2.3


From 912d2b94cf6ff0871c07325af5ed520a2bc97722 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 20 Mar 2024 10:44:34 -0400
Subject: Implement -limit N

Closes: https://github.com/tavianator/bfs/issues/133
---
 completions/bfs.bash              |  3 +--
 completions/bfs.fish              |  1 +
 completions/bfs.zsh               |  1 +
 docs/USAGE.md                     | 34 ++++++++++++++++++++++++++++++++++
 docs/bfs.1                        |  5 +++++
 src/eval.c                        | 13 +++++++++++++
 src/eval.h                        |  1 +
 src/opt.c                         |  1 +
 src/parse.c                       | 38 +++++++++++++++++++++++++++++++++++++-
 tests/bfs/limit.out               |  4 ++++
 tests/bfs/limit.sh                |  1 +
 tests/bfs/limit_0.sh              |  1 +
 tests/bfs/limit_implicit_print.sh |  1 +
 tests/bfs/limit_incomplete.sh     |  1 +
 tests/bfs/limit_one.sh            |  1 +
 15 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 tests/bfs/limit.out
 create mode 100644 tests/bfs/limit.sh
 create mode 100644 tests/bfs/limit_0.sh
 create mode 100644 tests/bfs/limit_implicit_print.sh
 create mode 100644 tests/bfs/limit_incomplete.sh
 create mode 100644 tests/bfs/limit_one.sh

(limited to 'docs')

diff --git a/completions/bfs.bash b/completions/bfs.bash
index 2f52e8d..db582da 100644
--- a/completions/bfs.bash
+++ b/completions/bfs.bash
@@ -37,6 +37,7 @@ _bfs() {
         -ipath
         -iregex
         -iwholename
+        -limit
         -links
         -lname
         -maxdepth
@@ -94,8 +95,6 @@ _bfs() {
         -depth
         -follow
         -ignore_readdir_race
-        -maxdepth
-        -mindepth
         -mount
         -nocolor
         -noignore_readdir_race
diff --git a/completions/bfs.fish b/completions/bfs.fish
index 3f399e7..1303639 100644
--- a/completions/bfs.fish
+++ b/completions/bfs.fish
@@ -133,6 +133,7 @@ complete -c bfs -o fls -d "Like -ls, but write to specified file" -F
 complete -c bfs -o fprint -d "Like -print, but write to specified file" -F
 complete -c bfs -o fprint0 -d "Like -print0, but write to specified file" -F
 complete -c bfs -o fprintf -d "Like -printf, but write to specified file" -F
+complete -c bfs -o limit -d "Limit the number of results" -x
 complete -c bfs -o ls -d "List files like ls -dils"
 complete -c bfs -o print -d "Print the path to the found file"
 complete -c bfs -o print0 -d "Like -print, but use the null character as a separator rather than newlines"
diff --git a/completions/bfs.zsh b/completions/bfs.zsh
index 3d7dc3a..51b5029 100644
--- a/completions/bfs.zsh
+++ b/completions/bfs.zsh
@@ -133,6 +133,7 @@ args=(
     '*-fprint0[print the path to the found file using null character as separator, but write to FILE instead of standard output]:output file:_files'
     '*-fprintf[print according to format string, but write to FILE instead of standard output]:output file:_files:output format'
 
+    '*-limit[quit after N results]:maximum result count'
     '*-ls[list files like ls -dils]'
     '*-print[print the path to the found file]'
     '*-print0[print the path to the found file using null character as separator]'
diff --git a/docs/USAGE.md b/docs/USAGE.md
index 3efdee0..071c95b 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -130,6 +130,40 @@ Unlike `-prune`, `-exclude` even works in combination with `-depth`/`-delete`.
 
 ---
 
+### `-limit`
+
+The `-limit N` action makes `bfs` quit once it gets evaluated `N` times.
+Placing it after an action like `-print` limits the number of results that get printed, for example:
+
+```console
+$ bfs -s -type f -name '*.txt'
+./1.txt
+./2.txt
+./3.txt
+./4.txt
+$ bfs -s -type f -name '*.txt' -print -limit 2
+./1.txt
+./2.txt
+```
+
+This is similar to
+
+```console
+$ bfs -s -type f -name '*.txt' | head -n2
+```
+
+but more powerful because you can apply separate limits to different expressions:
+
+```console
+$ bfs \( -name '*.txt' -print -limit 3 -o -name '*.log' -print -limit 4 \) -limit 5
+[At most 3 .txt files, at most 4 .log files, and at most 5 in total]
+```
+
+and more efficient because it will quit immediately.
+When piping to `head`, `bfs` will only quit *after* it tries to output too many results.
+
+---
+
 ### `-hidden`/`-nohidden`
 
 `-hidden` matches "hidden" files (dotfiles).
diff --git a/docs/bfs.1 b/docs/bfs.1
index 2ecb891..3a4f15a 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -725,6 +725,11 @@ but write to
 instead of standard output.
 .RE
 .TP
+\fB\-limit \fIN\fR
+Quit once this action is evaluated
+.I N
+times.
+.TP
 .B \-ls
 List files like
 .B ls
diff --git a/src/eval.c b/src/eval.c
index 9e55964..2f06858 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -840,6 +840,19 @@ error:
 	return true;
 }
 
+/**
+ * -limit action.
+ */
+bool eval_limit(const struct bfs_expr *expr, struct bfs_eval *state) {
+	long long evals = expr->evaluations + 1;
+	if (evals >= expr->num) {
+		state->action = BFTW_STOP;
+		state->quit = true;
+	}
+
+	return true;
+}
+
 /**
  * -prune action.
  */
diff --git a/src/eval.h b/src/eval.h
index 98bbc08..f7f6c77 100644
--- a/src/eval.h
+++ b/src/eval.h
@@ -88,6 +88,7 @@ bool eval_fprint(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_fprint0(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_fprintf(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_fprintx(const struct bfs_expr *expr, struct bfs_eval *state);
+bool eval_limit(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_prune(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_quit(const struct bfs_expr *expr, struct bfs_eval *state);
 
diff --git a/src/opt.c b/src/opt.c
index 76965de..a470d25 100644
--- a/src/opt.c
+++ b/src/opt.c
@@ -1181,6 +1181,7 @@ static struct bfs_expr *annotate_visit(struct bfs_opt *opt, struct bfs_expr *exp
 		eval_fprint0,
 		eval_fprintf,
 		eval_fprintx,
+		eval_limit,
 		eval_prune,
 		eval_true,
 		// Non-returning
diff --git a/src/parse.c b/src/parse.c
index 3b7386d..2dfcab2 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -97,6 +97,8 @@ struct bfs_parser {
 	char **last_arg;
 	/** A "-depth"-type argument, if any. */
 	char **depth_arg;
+	/** A "-limit" argument, if any. */
+	char **limit_arg;
 	/** A "-prune" argument, if any. */
 	char **prune_arg;
 	/** A "-mount" argument, if any. */
@@ -733,7 +735,7 @@ static struct bfs_expr *parse_action(struct bfs_parser *parser, bfs_eval_fn *eva
 		return NULL;
 	}
 
-	if (eval_fn != eval_prune && eval_fn != eval_quit) {
+	if (eval_fn != eval_limit && eval_fn != eval_prune && eval_fn != eval_quit) {
 		parser->implicit_print = false;
 	}
 
@@ -1569,6 +1571,29 @@ static struct bfs_expr *parse_jobs(struct bfs_parser *parser, int arg1, int arg2
 	return expr;
 }
 
+/**
+ * Parse -limit N.
+ */
+static struct bfs_expr *parse_limit(struct bfs_parser *parser, int arg1, int arg2) {
+	struct bfs_expr *expr = parse_unary_action(parser, eval_limit);
+	if (!expr) {
+		return NULL;
+	}
+
+	char **arg = &expr->argv[1];
+	if (!parse_int(parser, arg, *arg, &expr->num, IF_LONG_LONG)) {
+		return NULL;
+	}
+
+	if (expr->num <= 0) {
+		parse_expr_error(parser, expr, "The ${blu}%s${rs} must be at least ${bld}1${rs}.\n", expr->argv[0]);
+		return NULL;
+	}
+
+	parser->limit_arg = expr->argv;
+	return expr;
+}
+
 /**
  * Parse -links N.
  */
@@ -2845,6 +2870,8 @@ static struct bfs_expr *parse_help(struct bfs_parser *parser, int arg1, int arg2
 	cfprintf(cout, "  ${blu}-fprintf${rs} ${bld}FILE${rs} ${bld}FORMAT${rs}\n");
 	cfprintf(cout, "      Like ${blu}-ls${rs}/${blu}-print${rs}/${blu}-print0${rs}/${blu}-printf${rs}, but write to ${bld}FILE${rs} instead of standard\n"
 	               "      output\n");
+	cfprintf(cout, "  ${blu}-limit${rs} ${bld}N${rs}\n");
+	cfprintf(cout, "      Quit after this action is evaluated ${bld}N${rs} times\n");
 	cfprintf(cout, "  ${blu}-ls${rs}\n");
 	cfprintf(cout, "      List files like ${ex}ls${rs} ${bld}-dils${rs}\n");
 	cfprintf(cout, "  ${blu}-print${rs}\n");
@@ -2968,6 +2995,7 @@ static const struct table_entry parse_table[] = {
 	{"-iregex", T_TEST, parse_regex, BFS_REGEX_ICASE},
 	{"-iwholename", T_TEST, parse_path, true},
 	{"-j", T_FLAG, parse_jobs, 0, 0, true},
+	{"-limit", T_ACTION, parse_limit},
 	{"-links", T_TEST, parse_links},
 	{"-lname", T_TEST, parse_lname, false},
 	{"-ls", T_ACTION, parse_ls},
@@ -3330,6 +3358,14 @@ static struct bfs_expr *parse_whole_expr(struct bfs_parser *parser) {
 	}
 
 	if (parser->implicit_print) {
+		char **limit = parser->limit_arg;
+		if (limit) {
+			parse_argv_error(parser, parser->limit_arg, 2,
+				"With ${blu}%s${rs}, you must specify an action explicitly; for example, ${blu}-print${rs} ${blu}%s${rs} ${bld}%s${rs}.\n",
+				limit[0], limit[0], limit[1]);
+			return NULL;
+		}
+
 		struct bfs_expr *print = parse_new_expr(parser, eval_fprint, 1, &fake_print_arg);
 		if (!print) {
 			return NULL;
diff --git a/tests/bfs/limit.out b/tests/bfs/limit.out
new file mode 100644
index 0000000..ea94276
--- /dev/null
+++ b/tests/bfs/limit.out
@@ -0,0 +1,4 @@
+basic/a
+basic/b
+basic/c/d
+basic/e/f
diff --git a/tests/bfs/limit.sh b/tests/bfs/limit.sh
new file mode 100644
index 0000000..84b605f
--- /dev/null
+++ b/tests/bfs/limit.sh
@@ -0,0 +1 @@
+bfs_diff -s basic -type f -print -limit 4
diff --git a/tests/bfs/limit_0.sh b/tests/bfs/limit_0.sh
new file mode 100644
index 0000000..3ce26de
--- /dev/null
+++ b/tests/bfs/limit_0.sh
@@ -0,0 +1 @@
+! invoke_bfs basic -print -limit 0
diff --git a/tests/bfs/limit_implicit_print.sh b/tests/bfs/limit_implicit_print.sh
new file mode 100644
index 0000000..cdb059d
--- /dev/null
+++ b/tests/bfs/limit_implicit_print.sh
@@ -0,0 +1 @@
+! invoke_bfs basic -type f -limit 1
diff --git a/tests/bfs/limit_incomplete.sh b/tests/bfs/limit_incomplete.sh
new file mode 100644
index 0000000..2d1e842
--- /dev/null
+++ b/tests/bfs/limit_incomplete.sh
@@ -0,0 +1 @@
+! invoke_bfs basic -print -limit
diff --git a/tests/bfs/limit_one.sh b/tests/bfs/limit_one.sh
new file mode 100644
index 0000000..3f8181c
--- /dev/null
+++ b/tests/bfs/limit_one.sh
@@ -0,0 +1 @@
+! invoke_bfs basic -print -limit one
-- 
cgit v1.2.3


From 1109843d017e0320f0d18bfc398e27ff25592dfb Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 4 Apr 2024 15:17:38 -0400
Subject: build: Don't use libattr

We only rely on interfaces like listxattr() which are provided by the C
library itself.
---
 .github/workflows/ci.yml      | 3 ---
 .github/workflows/codecov.yml | 1 -
 .github/workflows/codeql.yml  | 1 -
 GNUmakefile                   | 7 -------
 README.md                     | 6 +++---
 docs/BUILDING.md              | 4 +---
 6 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'docs')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c1c89c..8e688fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,6 @@ jobs:
               libacl1-dev \
               libacl1:i386 \
               attr \
-              libattr1-dev \
-              libattr1:i386 \
               libcap2-bin \
               libcap-dev \
               libcap2:i386 \
@@ -34,7 +32,6 @@ jobs:
           # Ubuntu doesn't let you install the -dev packages for both amd64 and
           # i386 at once, so we make our own symlinks to fix -m32 -lacl -l...
           sudo ln -s libacl.so.1 /lib/i386-linux-gnu/libacl.so
-          sudo ln -s libattr.so.1 /lib/i386-linux-gnu/libattr.so
           sudo ln -s libcap.so.2 /lib/i386-linux-gnu/libcap.so
           sudo ln -s libonig.so.5 /lib/i386-linux-gnu/libonig.so
           # Work around https://github.com/actions/runner-images/issues/9491
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 9c2119b..d1dc351 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -18,7 +18,6 @@ jobs:
               acl \
               libacl1-dev \
               attr \
-              libattr1-dev \
               libcap2-bin \
               libcap-dev \
               libonig-dev \
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 71073c6..c50b266 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -34,7 +34,6 @@ jobs:
               acl \
               libacl1-dev \
               attr \
-              libattr1-dev \
               libcap2-bin \
               libcap-dev \
               libonig-dev \
diff --git a/GNUmakefile b/GNUmakefile
index 080fb17..8685ca3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -125,7 +125,6 @@ endif # USE_ONIGURUMA
 ifeq ($(OS),Linux)
 ifndef NOLIBS
 USE_ACL := y
-USE_ATTR := y
 USE_LIBCAP := y
 USE_LIBURING := y
 endif
@@ -136,12 +135,6 @@ else
 LOCAL_CPPFLAGS += -DBFS_USE_SYS_ACL_H=0
 endif
 
-ifdef USE_ATTR
-LOCAL_LDLIBS += -lattr
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_XATTR_H=0
-endif
-
 ifdef USE_LIBCAP
 LOCAL_LDLIBS += -lcap
 else
diff --git a/README.md b/README.md
index 9992938..17226fd 100644
--- a/README.md
+++ b/README.md
@@ -293,7 +293,7 @@ Here's how to install them on some common platforms:
 
 <pre>
 <strong>Alpine Linux</strong>
-# apk add acl{,-dev} attr{,-dev} libcap{,-dev} liburing-dev oniguruma-dev
+# apk add acl{,-dev} attr libcap{,-dev} liburing-dev oniguruma-dev
 
 <strong>Arch Linux</strong>
 # pacman -S acl attr libcap liburing oniguruma
@@ -302,13 +302,13 @@ Here's how to install them on some common platforms:
 # apt install acl libacl1-dev attr libattr1-dev libcap2-bin libcap-dev liburing-dev libonig-dev
 
 <strong>Fedora</strong>
-# dnf install acl libacl-devel libattr-devel libcap-devel liburing-devel oniguruma-devel
+# dnf install acl libacl-devel attr libcap-devel liburing-devel oniguruma-devel
 
 <strong>NixOS</strong>
 # nix-env -i acl attr libcap liburing oniguruma
 
 <strong>Void Linux</strong>
-# xbps-install -S acl-{devel,progs} attr-{devel,progs} libcap-{devel,progs} liburing-devel oniguruma-devel
+# xbps-install -S acl-{devel,progs} attr-progs libcap-{devel,progs} liburing-devel oniguruma-devel
 
 <strong>Homebrew</strong>
 $ brew install oniguruma
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 02f9756..7eb3a37 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -56,7 +56,7 @@ Here are some of the common ones; check the [`GNUmakefile`](/GNUmakefile) for mo
 | `CC`                             | The C compiler to use, e.g. `make CC=clang` |
 | `CFLAGS`<br>`EXTRA_CFLAGS`       | Override/add to the default compiler flags  |
 | `LDFLAGS`<br>`EXTRA_LDFLAGS`     | Override/add to the linker flags            |
-| `USE_ACL`<br>`USE_ATTR`<br>...   | Enable/disable [optional dependencies]      |
+| `USE_ACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]      |
 | `TEST_FLAGS`                     | `tests.sh` flags for `make check`           |
 | `BUILDDIR`                       | The build output directory (default: `.`)   |
 | `DESTDIR`                        | The root directory for `make install`       |
@@ -73,13 +73,11 @@ These dependencies are optional, and can be turned off at build time if necessar
 | Dependency  | Platforms  | `make` flag     |
 |-------------|------------|-----------------|
 | [acl]       | Linux only | `USE_ACL`       |
-| [attr]      | Linux only | `USE_ATTR`      |
 | [libcap]    | Linux only | `USE_LIBCAP`    |
 | [liburing]  | Linux only | `USE_LIBURING`  |
 | [Oniguruma] | All        | `USE_ONIGURUMA` |
 
 [acl]: https://savannah.nongnu.org/projects/acl
-[attr]: https://savannah.nongnu.org/projects/attr
 [libcap]: https://sites.google.com/site/fullycapable/
 [liburing]: https://github.com/axboe/liburing
 [Oniguruma]: https://github.com/kkos/oniguruma
-- 
cgit v1.2.3


From c31577d102d87455f3f12086be4c0e2159fa5d35 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 8 Apr 2024 11:27:11 -0400
Subject: build: Add a separate configuration step

---
 .github/workflows/ci.yml      |  23 +-
 .github/workflows/codecov.yml |   3 +-
 .github/workflows/codeql.yml  |   1 +
 .gitignore                    |   2 +
 GNUmakefile                   | 372 ------------------------------
 Makefile                      | 517 ++++++++++++++++++++++++++++++++++++++++++
 README.md                     |   4 +-
 config/cc.sh                  |  12 +
 config/empty.c                |   6 +
 config/libacl.c               |   6 +
 config/libcap.c               |   6 +
 config/liburing.c             |   6 +
 config/oniguruma.c            |   6 +
 config/pkg.sh                 |  44 ++++
 config/pkgconf.sh             |  64 ++++++
 docs/BUILDING.md              |  83 +++----
 docs/USAGE.md                 |   2 +-
 src/config.h                  |  11 +-
 src/main.c                    |   1 +
 src/parse.c                   |   2 +-
 src/version.c                 |   6 +
 tests/run.sh                  |   2 +-
 tests/tests.mk                |  10 +-
 23 files changed, 757 insertions(+), 432 deletions(-)
 delete mode 100644 GNUmakefile
 create mode 100644 Makefile
 create mode 100755 config/cc.sh
 create mode 100644 config/empty.c
 create mode 100644 config/libacl.c
 create mode 100644 config/libcap.c
 create mode 100644 config/liburing.c
 create mode 100644 config/oniguruma.c
 create mode 100755 config/pkg.sh
 create mode 100755 config/pkgconf.sh
 create mode 100644 src/version.c

(limited to 'docs')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51d06fb..78aa196 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,12 +53,13 @@ jobs:
         run: |
           brew install \
               bash \
-              expect
+              expect \
+              make
 
       - name: Run tests
         run: |
           jobs=$(sysctl -n hw.ncpu)
-          make -j$jobs distcheck
+          gmake -j$jobs distcheck
 
   freebsd:
     name: FreeBSD
@@ -79,8 +80,8 @@ jobs:
             pkg install -y \
                 bash \
                 expect \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-wrapper
             pw useradd -n action -m -G wheel -s /usr/local/bin/bash
@@ -89,7 +90,7 @@ jobs:
 
           run: |
             chown -R action:action .
-            sudo -u action gmake -j$(nproc) distcheck
+            sudo -u action make -j$(nproc) distcheck
 
   openbsd:
     name: OpenBSD
@@ -119,6 +120,7 @@ jobs:
           run: |
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
+            doas -u action gmake config
             doas -u action gmake -j$jobs check TEST_FLAGS="--sudo=doas --verbose=skipped"
 
   netbsd:
@@ -141,8 +143,8 @@ jobs:
             pkg_add \
                 bash \
                 clang \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-expect
             useradd -m -G wheel -g =uid action
@@ -152,7 +154,8 @@ jobs:
             PATH="/sbin:/usr/sbin:$PATH"
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            sudo -u action gmake -j$jobs check CC=clang LDFLAGS="-rpath /usr/pkg/lib" TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action make config CC=clang
+            sudo -u action make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   dragonflybsd:
     name: DragonFly BSD
@@ -173,8 +176,8 @@ jobs:
             pkg install -y \
                 bash \
                 expect \
-                gmake \
                 oniguruma \
+                pkgconf \
                 sudo \
                 tcl-wrapper
             pw useradd -n action -m -G wheel -s /usr/local/bin/bash
@@ -183,7 +186,8 @@ jobs:
           run: |
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action make config
+            sudo -u action make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   omnios:
     name: OmniOS
@@ -215,4 +219,5 @@ jobs:
             PATH="/usr/xpg4/bin:$PATH"
             chown -R action:staff .
             jobs=$(getconf NPROCESSORS_ONLN)
-            sudo -u action gmake -j$jobs check LDFLAGS="-Wl,-rpath,/opt/ooce/lib/amd64" TEST_FLAGS="--sudo --verbose=skipped"
+            sudo -u action gmake config
+            sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index d1dc351..2abe531 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -25,7 +25,8 @@ jobs:
 
       - name: Generate coverage
         run: |
-          make -j$(nproc) gcov check TEST_FLAGS="--sudo"
+          make config GCOV=y
+          make -j$(nproc) check TEST_FLAGS="--sudo"
           gcov -abcfpu obj/*/*.o
 
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c50b266..a2c224a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,6 +47,7 @@ jobs:
 
       - name: Build
         run: |
+          make config
           make -j$(nproc) all
 
       - name: Perform CodeQL Analysis
diff --git a/.gitignore b/.gitignore
index 4ded7c4..84e47fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /bin/
+/gen/
 /obj/
+/distcheck-*/
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index 8685ca3..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-ifneq ($(wildcard .git),)
-VERSION := $(shell git describe --always 2>/dev/null)
-endif
-
-ifndef VERSION
-VERSION := 3.1.3
-endif
-
-ifndef OS
-OS := $(shell uname)
-endif
-
-ifndef ARCH
-ARCH := $(shell uname -m)
-endif
-
-CC ?= gcc
-INSTALL ?= install
-MKDIR ?= mkdir -p
-RM ?= rm -f
-
-export BUILDDIR ?= .
-DESTDIR ?=
-PREFIX ?= /usr
-MANDIR ?= $(PREFIX)/share/man
-
-BIN := $(BUILDDIR)/bin
-OBJ := $(BUILDDIR)/obj
-
-DEFAULT_CFLAGS := \
-    -g \
-    -Wall \
-    -Wformat=2 \
-    -Werror=implicit \
-    -Wimplicit-fallthrough \
-    -Wmissing-declarations \
-    -Wshadow \
-    -Wsign-compare \
-    -Wstrict-prototypes
-
-CFLAGS ?= $(DEFAULT_CFLAGS)
-LDFLAGS ?=
-DEPFLAGS ?= -MD -MP -MF $(@:.o=.d)
-
-LOCAL_CPPFLAGS := \
-    -D__EXTENSIONS__ \
-    -D_ATFILE_SOURCE \
-    -D_BSD_SOURCE \
-    -D_DARWIN_C_SOURCE \
-    -D_DEFAULT_SOURCE \
-    -D_GNU_SOURCE \
-    -D_LARGEFILE64_SOURCE \
-    -D_POSIX_PTHREAD_SEMANTICS \
-    -D_FILE_OFFSET_BITS=64 \
-    -D_TIME_BITS=64 \
-    -DBFS_VERSION=\"$(VERSION)\"
-
-LOCAL_CFLAGS := -std=c17 -pthread
-LOCAL_LDFLAGS :=
-LOCAL_LDLIBS :=
-
-ASAN := $(filter asan,$(MAKECMDGOALS))
-LSAN := $(filter lsan,$(MAKECMDGOALS))
-MSAN := $(filter msan,$(MAKECMDGOALS))
-TSAN := $(filter tsan,$(MAKECMDGOALS))
-UBSAN := $(filter ubsan,$(MAKECMDGOALS))
-
-ifdef ASAN
-LOCAL_CFLAGS += -fsanitize=address
-SANITIZE := y
-endif
-
-ifdef LSAN
-LOCAL_CFLAGS += -fsanitize=leak
-SANITIZE := y
-endif
-
-ifdef MSAN
-# msan needs all code instrumented
-NOLIBS := y
-LOCAL_CFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
-SANITIZE := y
-endif
-
-ifdef TSAN
-# tsan needs all code instrumented
-NOLIBS := y
-# https://github.com/google/sanitizers/issues/342
-LOCAL_CPPFLAGS += -DBFS_USE_TARGET_CLONES=0
-LOCAL_CFLAGS += -fsanitize=thread
-SANITIZE := y
-endif
-
-ifdef UBSAN
-LOCAL_CFLAGS += -fsanitize=undefined
-SANITIZE := y
-endif
-
-ifdef SANITIZE
-LOCAL_CFLAGS += -fno-sanitize-recover=all
-endif
-
-ifndef NOLIBS
-USE_ONIGURUMA := y
-endif
-
-ifdef USE_ONIGURUMA
-LOCAL_CPPFLAGS += -DBFS_USE_ONIGURUMA=1
-
-ONIG_CONFIG := $(shell command -v onig-config 2>/dev/null)
-ifdef ONIG_CONFIG
-ONIG_CFLAGS := $(shell $(ONIG_CONFIG) --cflags)
-ONIG_LDLIBS := $(shell $(ONIG_CONFIG) --libs)
-else
-ONIG_LDLIBS := -lonig
-endif
-
-LOCAL_CFLAGS += $(ONIG_CFLAGS)
-LOCAL_LDLIBS += $(ONIG_LDLIBS)
-endif # USE_ONIGURUMA
-
-ifeq ($(OS),Linux)
-ifndef NOLIBS
-USE_ACL := y
-USE_LIBCAP := y
-USE_LIBURING := y
-endif
-
-ifdef USE_ACL
-LOCAL_LDLIBS += -lacl
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_ACL_H=0
-endif
-
-ifdef USE_LIBCAP
-LOCAL_LDLIBS += -lcap
-else
-LOCAL_CPPFLAGS += -DBFS_USE_SYS_CAPABILITY_H=0
-endif
-
-ifdef USE_LIBURING
-LOCAL_CPPFLAGS += -DBFS_USE_LIBURING=1
-LOCAL_LDLIBS += -luring
-endif
-
-LOCAL_LDFLAGS += -Wl,--as-needed
-LOCAL_LDLIBS += -lrt
-endif # Linux
-
-ifeq ($(OS),NetBSD)
-LOCAL_LDLIBS += -lutil
-endif
-
-ifeq ($(OS),DragonFly)
-LOCAL_LDLIBS += -lposix1e
-endif
-
-ifeq ($(OS),SunOS)
-LOCAL_LDLIBS += -lsocket -lnsl
-endif
-
-ifneq ($(filter gcov,$(MAKECMDGOALS)),)
-LOCAL_CFLAGS += --coverage
-# gcov only intercepts fork()/exec() with -std=gnu*
-LOCAL_CFLAGS := $(patsubst -std=c%,-std=gnu%,$(LOCAL_CFLAGS))
-endif
-
-ifneq ($(filter lint,$(MAKECMDGOALS)),)
-LOCAL_CPPFLAGS += \
-    -D_FORTIFY_SOURCE=3 \
-    -DBFS_LINT
-LOCAL_CFLAGS += -Werror -O2
-endif
-
-ifneq ($(filter release,$(MAKECMDGOALS)),)
-LOCAL_CPPFLAGS += -DNDEBUG
-CFLAGS := $(DEFAULT_CFLAGS) -O3 -flto=auto
-endif
-
-ALL_CPPFLAGS = $(LOCAL_CPPFLAGS) $(CPPFLAGS) $(EXTRA_CPPFLAGS)
-ALL_CFLAGS = $(ALL_CPPFLAGS) $(LOCAL_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEPFLAGS)
-ALL_LDFLAGS = $(ALL_CFLAGS) $(LOCAL_LDFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS)
-ALL_LDLIBS = $(LOCAL_LDLIBS) $(LDLIBS) $(EXTRA_LDLIBS)
-
-# Default make target
-bfs: $(BIN)/bfs
-.PHONY: bfs
-
-# Goals that are treated like flags by this makefile
-FLAG_GOALS := asan lsan msan tsan ubsan gcov lint release
-
-# These are the remaining non-flag goals
-GOALS := $(filter-out $(FLAG_GOALS),$(MAKECMDGOALS))
-
-# Build the default goal if only flag goals are specified
-FLAG_PREREQS :=
-ifndef GOALS
-FLAG_PREREQS += bfs
-endif
-
-# Make sure that "make release" builds everything, but "make release obj/src/main.o" doesn't
-$(FLAG_GOALS): $(FLAG_PREREQS)
-	@:
-.PHONY: $(FLAG_GOALS)
-
-all: bfs tests
-.PHONY: all
-
-$(BIN)/%:
-	@$(MKDIR) $(@D)
-	+$(CC) $(ALL_LDFLAGS) $^ $(ALL_LDLIBS) -o $@
-ifeq ($(OS) $(SANITIZE),FreeBSD y)
-	elfctl -e +noaslr $@
-endif
-
-$(OBJ)/%.o: %.c $(OBJ)/FLAGS
-	@$(MKDIR) $(@D)
-	$(CC) $(ALL_CFLAGS) -c $< -o $@
-
-# Save the full set of flags to rebuild everything when they change
-$(OBJ)/FLAGS.new:
-	@$(MKDIR) $(@D)
-	@echo $(CC) : $(ALL_CFLAGS) : $(ALL_LDFLAGS) : $(ALL_LDLIBS) >$@
-.PHONY: $(OBJ)/FLAGS.new
-
-# Only update obj/FLAGS if obj/FLAGS.new is different
-$(OBJ)/FLAGS: $(OBJ)/FLAGS.new
-	@test -e $@ && cmp -s $@ $< && rm $< || mv $< $@
-
-# All object files except the entry point
-LIBBFS := \
-    $(OBJ)/src/alloc.o \
-    $(OBJ)/src/bar.o \
-    $(OBJ)/src/bfstd.o \
-    $(OBJ)/src/bftw.o \
-    $(OBJ)/src/color.o \
-    $(OBJ)/src/ctx.o \
-    $(OBJ)/src/diag.o \
-    $(OBJ)/src/dir.o \
-    $(OBJ)/src/dstring.o \
-    $(OBJ)/src/eval.o \
-    $(OBJ)/src/exec.o \
-    $(OBJ)/src/expr.o \
-    $(OBJ)/src/fsade.o \
-    $(OBJ)/src/ioq.o \
-    $(OBJ)/src/mtab.o \
-    $(OBJ)/src/opt.o \
-    $(OBJ)/src/parse.o \
-    $(OBJ)/src/printf.o \
-    $(OBJ)/src/pwcache.o \
-    $(OBJ)/src/stat.o \
-    $(OBJ)/src/thread.o \
-    $(OBJ)/src/trie.o \
-    $(OBJ)/src/typo.o \
-    $(OBJ)/src/xregex.o \
-    $(OBJ)/src/xspawn.o \
-    $(OBJ)/src/xtime.o
-
-# The main executable
-$(BIN)/bfs: $(OBJ)/src/main.o $(LIBBFS)
-
-# Testing utilities
-TEST_UTILS := \
-    $(BIN)/tests/mksock \
-    $(BIN)/tests/xspawnee \
-    $(BIN)/tests/xtouch
-
-$(BIN)/tests/mksock: $(OBJ)/tests/mksock.o $(LIBBFS)
-
-$(BIN)/tests/xspawnee: $(OBJ)/tests/xspawnee.o
-
-$(BIN)/tests/xtouch: $(OBJ)/tests/xtouch.o $(LIBBFS)
-
-# All test binaries
-TESTS := $(BIN)/tests/units $(TEST_UTILS)
-
-$(BIN)/tests/units: \
-    $(OBJ)/tests/alloc.o \
-    $(OBJ)/tests/bfstd.o \
-    $(OBJ)/tests/bit.o \
-    $(OBJ)/tests/ioq.o \
-    $(OBJ)/tests/main.o \
-    $(OBJ)/tests/trie.o \
-    $(OBJ)/tests/xspawn.o \
-    $(OBJ)/tests/xtime.o \
-    $(LIBBFS)
-
-# Build all the test binaries
-tests: $(TESTS)
-.PHONY: tests
-
-# Run the unit tests
-unit-tests: $(BIN)/tests/units $(BIN)/tests/xspawnee
-	$<
-.PHONY: unit-tests
-
-# The different flag combinations we check
-INTEGRATIONS := default dfs ids eds j1 j2 j3 s
-INTEGRATION_TESTS := $(INTEGRATIONS:%=check-%)
-
-check-default: $(BIN)/bfs $(TEST_UTILS)
-	+./tests/tests.sh --make="$(MAKE)" --bfs="$<" $(TEST_FLAGS)
-
-check-dfs check-ids check-eds: check-%: $(BIN)/bfs $(TEST_UTILS)
-	+./tests/tests.sh --make="$(MAKE)" --bfs="$< -S $*" $(TEST_FLAGS)
-
-check-j1 check-j2 check-j3 check-s: check-%: $(BIN)/bfs $(TEST_UTILS)
-	+./tests/tests.sh --make="$(MAKE)" --bfs="$< -$*" $(TEST_FLAGS)
-
-# Run the integration tests
-integration-tests: $(INTEGRATION_TESTS)
-.PHONY: integration-tests
-
-# Run all the tests
-check: unit-tests integration-tests
-.PHONY: check
-
-# Custom test flags for distcheck
-DISTCHECK_FLAGS := -s TEST_FLAGS="--sudo --verbose=skipped"
-
-distcheck:
-	+$(MAKE) -B asan ubsan check $(DISTCHECK_FLAGS)
-ifneq ($(OS),Darwin)
-	+$(MAKE) -B msan ubsan check CC=clang $(DISTCHECK_FLAGS)
-endif
-	+$(MAKE) -B tsan ubsan check CC=clang $(DISTCHECK_FLAGS)
-ifeq ($(OS) $(ARCH),Linux x86_64)
-	+$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= USE_LIBURING= $(DISTCHECK_FLAGS)
-endif
-	+$(MAKE) -B release check $(DISTCHECK_FLAGS)
-	+$(MAKE) -B check $(DISTCHECK_FLAGS)
-	+$(MAKE) check-install $(DISTCHECK_FLAGS)
-.PHONY: distcheck
-
-clean:
-	$(RM) -r $(BIN) $(OBJ)
-.PHONY: clean
-
-install:
-	$(MKDIR) $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -m755 $(BIN)/bfs $(DESTDIR)$(PREFIX)/bin/bfs
-	$(MKDIR) $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL) -m644 docs/bfs.1 $(DESTDIR)$(MANDIR)/man1/bfs.1
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/bash-completion/completions
-	$(INSTALL) -m644 completions/bfs.bash $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/zsh/site-functions
-	$(INSTALL) -m644 completions/bfs.zsh $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
-	$(MKDIR) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d
-	$(INSTALL) -m644 completions/bfs.fish $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
-.PHONY: install
-
-uninstall:
-	$(RM) $(DESTDIR)$(PREFIX)/share/bash-completion/completions/bfs
-	$(RM) $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_bfs
-	$(RM) $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/bfs.fish
-	$(RM) $(DESTDIR)$(MANDIR)/man1/bfs.1
-	$(RM) $(DESTDIR)$(PREFIX)/bin/bfs
-.PHONY: uninstall
-
-check-install:
-	+$(MAKE) install DESTDIR=$(BUILDDIR)/pkg
-	+$(MAKE) uninstall DESTDIR=$(BUILDDIR)/pkg
-	$(BIN)/bfs $(BUILDDIR)/pkg -not -type d -print -exit 1
-	$(RM) -r $(BUILDDIR)/pkg
-.PHONY: check-install
-
-.SUFFIXES:
-
--include $(wildcard $(OBJ)/*/*.d)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..326ee87
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,517 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# This Makefile implements the configuration and build steps for bfs.  It is
+# portable to both GNU make and the BSD make implementations (how that works
+# is documented below).  To build bfs, run
+#
+#     $ make config
+#     $ make
+
+# The default build target
+default: bfs
+.PHONY: default
+
+# BSD make will chdir into ${.OBJDIR} by default, unless we tell it not to
+.OBJDIR: .
+
+# We don't use any suffix rules
+.SUFFIXES:
+
+# GNU make has $^ for the full list of targets, while BSD make has $> and the
+# long-form ${.ALLSRC}.  We could write $^ $> to get them both, but that would
+# break if one of them implemented support for the other.  So instead, bring
+# BSD's ${.ALLSRC} to GNU.
+.ALLSRC ?= $^
+
+# Platform detection
+OS != uname
+ARCH != uname -m
+
+# For out-of-tree builds, e.g.
+#
+#     $ make config BUILDDIR=/path/to/build/dir
+#     $ make BUILDDIR=/path/to/build/dir
+BUILDDIR ?= .
+
+# Shorthand for build subdirectories
+BIN := ${BUILDDIR}/bin
+GEN := ${BUILDDIR}/gen
+OBJ := ${BUILDDIR}/obj
+
+# GNU make strips a leading ./ from target names, so do the same for BSD make
+BIN := ${BIN:./%=%}
+GEN := ${GEN:./%=%}
+OBJ := ${OBJ:./%=%}
+
+# Installation paths
+DESTDIR ?=
+PREFIX ?= /usr
+MANDIR ?= ${PREFIX}/share/man
+
+# Configurable executables; can be overridden with
+#
+#     $ make config CC=clang
+CC ?= cc
+INSTALL ?= install
+MKDIR ?= mkdir -p
+PKG_CONFIG ?= pkg-config
+RM ?= rm -f
+
+# Configurable flags
+
+CPPFLAGS ?=
+CFLAGS ?= \
+    -g \
+    -Wall \
+    -Wformat=2 \
+    -Werror=implicit \
+    -Wimplicit-fallthrough \
+    -Wmissing-declarations \
+    -Wshadow \
+    -Wsign-compare \
+    -Wstrict-prototypes
+LDFLAGS ?=
+LDLIBS ?=
+
+EXTRA_CPPFLAGS ?=
+EXTRA_CFLAGS ?=
+EXTRA_LDFLAGS ?=
+EXTRA_LDLIBS ?=
+
+GIT_VERSION != test -d .git && command -v git >/dev/null 2>&1 && git describe --always --dirty || echo 3.1.3
+VERSION ?= ${GIT_VERSION}
+
+# Immutable flags
+export BFS_CPPFLAGS= \
+    -D__EXTENSIONS__ \
+    -D_ATFILE_SOURCE \
+    -D_BSD_SOURCE \
+    -D_DARWIN_C_SOURCE \
+    -D_DEFAULT_SOURCE \
+    -D_GNU_SOURCE \
+    -D_LARGEFILE64_SOURCE \
+    -D_POSIX_PTHREAD_SEMANTICS \
+    -D_FILE_OFFSET_BITS=64 \
+    -D_TIME_BITS=64
+export BFS_CFLAGS= -std=c17 -pthread
+
+# Platform-specific system libraries
+LDLIBS,DragonFly := -lposix1e
+LDLIBS,Linux := -lrt
+LDLIBS,NetBSD := -lutil
+LDLIBS,SunOS := -lsocket -lnsl
+_BFS_LDLIBS := ${LDLIBS,${OS}}
+export BFS_LDLIBS=${_BFS_LDLIBS}
+
+# Build profiles
+ASAN ?= n
+LSAN ?= n
+MSAN ?= n
+TSAN ?= n
+UBSAN ?= n
+GCOV ?= n
+LINT ?= n
+RELEASE ?= n
+
+export ASAN_CFLAGS= -fsanitize=address
+export LSAN_CFLAGS= -fsanitize=leak
+export MSAN_CFLAGS= -fsanitize=memory -fsanitize-memory-track-origins
+export UBSAN_CFLAGS= -fsanitize=undefined
+
+# https://github.com/google/sanitizers/issues/342
+export TSAN_CPPFLAGS= -DBFS_USE_TARGET_CLONES=0
+export TSAN_CFLAGS= -fsanitize=thread
+
+SAN := ${ASAN}${LSAN}${MSAN}${TSAN}${UBSAN}
+export SAN_CFLAGS= -fno-sanitize-recover=all
+
+# MSAN and TSAN both need all code to be instrumented
+export NOLIBS= ${MSAN}${TSAN}
+
+# gcov only intercepts fork()/exec() with -std=gnu*
+export GCOV_CFLAGS= --coverage -std=gnu17
+
+export LINT_CPPFLAGS= -D_FORTIFY_SOURCE=3 -DBFS_LINT
+export LINT_CFLAGS= -Werror -O2
+
+export RELEASE_CPPFLAGS= -DNDEBUG
+export RELEASE_CFLAGS= -O3 -flto=auto
+
+# Auto-detected library dependencies.  Can be set manually with
+#
+#     $ make config USE_LIBURING=n USE_ONIGURUMA=y
+USE_LIBACL ?=
+USE_LIBCAP ?=
+USE_LIBURING ?=
+USE_ONIGURUMA ?=
+
+# Save the new value of these variables, before they potentially get overridden
+# by `-include ${CONFIG}` below
+
+_XPREFIX := ${PREFIX}
+_XMANDIR := ${MANDIR}
+
+_XOS := ${OS}
+_XARCH := ${ARCH}
+
+_XCC := ${CC}
+_XINSTALL := ${INSTALL}
+_XMKDIR := ${MKDIR}
+_XRM := ${RM}
+
+_XCPPFLAGS := ${CPPFLAGS}
+_XCFLAGS := ${CFLAGS}
+_XLDFLAGS := ${LDFLAGS}
+_XLDLIBS := ${LDLIBS}
+
+_XUSE_LIBACL := ${USE_LIBACL}
+_XUSE_LIBCAP := ${USE_LIBCAP}
+_XUSE_LIBURING := ${USE_LIBURING}
+_XUSE_ONIGURUMA := ${USE_ONIGURUMA}
+
+# GNU make supports `export VAR`, but BSD make requires `export VAR=value`.
+# Sadly, GNU make gives a recursion error on `export VAR=${VAR}`.
+
+_BUILDDIR := ${BUILDDIR}
+_PKG_CONFIG := ${PKG_CONFIG}
+
+export BUILDDIR=${_BUILDDIR}
+export PKG_CONFIG=${_PKG_CONFIG}
+
+export XPREFIX=${_XPREFIX}
+export XMANDIR=${_XMANDIR}
+
+export XOS=${_XOS}
+export XARCH=${_XARCH}
+
+export XCC=${_XCC}
+export XINSTALL=${_XINSTALL}
+export XMKDIR=${_XMKDIR}
+export XRM=${_XRM}
+
+export XCPPFLAGS=${_XCPPFLAGS}
+export XCFLAGS=${_XCFLAGS}
+export XLDFLAGS=${_XLDFLAGS}
+export XLDLIBS=${_XLDLIBS}
+
+export XUSE_LIBACL=${_XUSE_LIBACL}
+export XUSE_LIBCAP=${_XUSE_LIBCAP}
+export XUSE_LIBURING=${_XUSE_LIBURING}
+export XUSE_ONIGURUMA=${_XUSE_ONIGURUMA}
+
+# The configuration file generated by `make config`
+CONFIG := ${GEN}/config.mk
+-include ${CONFIG}
+
+## Configuration phase (`make config`)
+
+# External dependencies
+PKGS := \
+    ${GEN}/libacl.mk \
+    ${GEN}/libcap.mk \
+    ${GEN}/liburing.mk \
+    ${GEN}/oniguruma.mk
+
+# Makefile fragments generated by `make config`
+MKS := \
+    ${GEN}/vars.mk \
+    ${GEN}/deps.mk \
+    ${GEN}/objs.mk \
+    ${PKGS}
+
+# The configuration goal itself
+config: ${MKS}
+	@printf 'include $${GEN}/%s\n' ${MKS:${GEN}/%=%} >${CONFIG}
+.PHONY: config
+
+# Saves the configurable variables
+${GEN}/vars.mk::
+	@${XMKDIR} ${@D}
+	@printf 'PREFIX := %s\n' "$$XPREFIX" >$@
+	@printf 'MANDIR := %s\n' "$$XMANDIR" >>$@
+	@printf 'OS := %s\n' "$$XOS" >>$@
+	@printf 'ARCH := %s\n' "$$XARCH" >>$@
+	@printf 'CC := %s\n' "$$XCC" >>$@
+	@printf 'INSTALL := %s\n' "$$XINSTALL" >>$@
+	@printf 'MKDIR := %s\n' "$$XMKDIR" >>$@
+	@printf 'RM := %s\n' "$$XRM" >>$@
+	@printf 'CPPFLAGS := %s\n' "$$BFS_CPPFLAGS" >>$@
+	@test "${TSAN}" != y || printf 'CPPFLAGS += %s\n' "$$TSAN_CPPFLAGS" >>$@
+	@test "${LINT}" != y || printf 'CPPFLAGS += %s\n' "$$LINT_CPPFLAGS" >>$@
+	@test "${RELEASE}" != y || printf 'CPPFLAGS += %s\n' "$$RELEASE_CPPFLAGS" >>$@
+	@test -z "$$XCPPFLAGS" || printf 'CPPFLAGS += %s\n' "$$XCPPFLAGS" >>$@
+	@test -z "$$EXTRA_CPPFLAGS" || printf 'CPPFLAGS += %s\n' "$$EXTRA_CPPFLAGS" >>$@
+	@printf 'CFLAGS := %s\n' "$$BFS_CFLAGS" >>$@
+	@test "${ASAN}" != y || printf 'CFLAGS += %s\n' "$$ASAN_CFLAGS" >>$@
+	@test "${LSAN}" != y || printf 'CFLAGS += %s\n' "$$LSAN_CFLAGS" >>$@
+	@test "${MSAN}" != y || printf 'CFLAGS += %s\n' "$$MSAN_CFLAGS" >>$@
+	@test "${TSAN}" != y || printf 'CFLAGS += %s\n' "$$TSAN_CFLAGS" >>$@
+	@test "${UBSAN}" != y || printf 'CFLAGS += %s\n' "$$UBSAN_CFLAGS" >>$@
+	@case "${SAN}" in *y*) printf 'CFLAGS += %s\n' "$$SAN_CFLAGS" >>$@ ;; esac
+	@test "${GCOV}" != y || printf 'CFLAGS += %s\n' "$$GCOV_CFLAGS" >>$@
+	@test "${LINT}" != y || printf 'CFLAGS += %s\n' "$$LINT_CFLAGS" >>$@
+	@test "${RELEASE}" != y || printf 'CFLAGS += %s\n' "$$RELEASE_CFLAGS" >>$@
+	@test -z "$$XCFLAGS" || printf 'CFLAGS += %s\n' "$$XCFLAGS" >>$@
+	@test -z "$$EXTRA_CFLAGS" || printf 'CFLAGS += %s\n' "$$EXTRA_CFLAGS" >>$@
+	@printf 'LDFLAGS := %s\n' "$$XLDFLAGS" >>$@
+	@test -z "$$EXTRA_LDFLAGS" || printf 'LDFLAGS += %s\n' "$$EXTRA_LDFLAGS" >>$@
+	@printf 'LDLIBS := %s\n' "$$XLDLIBS" >>$@
+	@test -z "$$EXTRA_LDLIBS" || printf 'LDLIBS += %s\n' "$$EXTRA_LDLIBS" >>$@
+	@test -z "$$BFS_LDLIBS" || printf 'LDLIBS += %s\n' "$$BFS_LDLIBS" >>$@
+	@case "${OS}-${SAN}" in FreeBSD-*y*) printf 'POSTLINK = elfctl -e +noaslr $$@\n' >>$@ ;; esac
+	@cat $@
+
+# Check for dependency generation support
+${GEN}/deps.mk::
+	@${MKDIR} ${@D}
+	@if config/cc.sh -MD -MP -MF /dev/null config/empty.c; then \
+	    echo 'DEPFLAGS = -MD -MP -MF $${@:.o=.d}'; \
+	fi 2>$@.log | tee $@
+	@printf -- '-include %s\n' ${OBJS:.o=.d} >>$@
+
+# Lists file.o: file.c dependencies
+${GEN}/objs.mk::
+	@${MKDIR} ${@D}
+	@for obj in ${OBJS:${OBJ}/%.o=%}; do printf '$${OBJ}/%s.o: %s.c\n' "$$obj" "$$obj"; done >$@
+
+# Auto-detect dependencies and their build flags
+${PKGS}::
+	@${MKDIR} ${@D}
+	@config/pkg.sh ${@:${GEN}/%.mk=%} >$@ 2>$@.log
+	@cat $@
+
+# bfs used to have flag-like targets (`make release`, `make asan ubsan`, etc.).
+# Direct users to the new configuration system.
+asan lsan msan tsan ubsan gcov lint release::
+	@printf 'error: `make %s` is no longer supported. ' $@ >&2
+	@printf 'Use `make config %s=y` instead.\n' $$(echo $@ | tr '[a-z]' '[A-Z]') >&2
+	@false
+
+## Build phase (`make`)
+
+# The main binary
+bfs: ${BIN}/bfs
+.PHONY: bfs
+
+# All binaries
+BINS := \
+    ${BIN}/bfs \
+    ${BIN}/tests/mksock \
+    ${BIN}/tests/units \
+    ${BIN}/tests/xspawnee \
+    ${BIN}/tests/xtouch
+
+all: ${BINS}
+.PHONY: all
+
+# All object files except the entry point
+LIBBFS := \
+    ${OBJ}/src/alloc.o \
+    ${OBJ}/src/bar.o \
+    ${OBJ}/src/bfstd.o \
+    ${OBJ}/src/bftw.o \
+    ${OBJ}/src/color.o \
+    ${OBJ}/src/ctx.o \
+    ${OBJ}/src/diag.o \
+    ${OBJ}/src/dir.o \
+    ${OBJ}/src/dstring.o \
+    ${OBJ}/src/eval.o \
+    ${OBJ}/src/exec.o \
+    ${OBJ}/src/expr.o \
+    ${OBJ}/src/fsade.o \
+    ${OBJ}/src/ioq.o \
+    ${OBJ}/src/mtab.o \
+    ${OBJ}/src/opt.o \
+    ${OBJ}/src/parse.o \
+    ${OBJ}/src/printf.o \
+    ${OBJ}/src/pwcache.o \
+    ${OBJ}/src/stat.o \
+    ${OBJ}/src/thread.o \
+    ${OBJ}/src/trie.o \
+    ${OBJ}/src/typo.o \
+    ${OBJ}/src/version.o \
+    ${OBJ}/src/xregex.o \
+    ${OBJ}/src/xspawn.o \
+    ${OBJ}/src/xtime.o
+
+# Group relevant flags together
+ALL_CFLAGS = ${CPPFLAGS} ${CFLAGS} ${DEPFLAGS}
+ALL_LDFLAGS = ${CFLAGS} ${LDFLAGS}
+
+# The main binary
+${BIN}/bfs: ${LIBBFS} ${OBJ}/src/main.o
+
+${BINS}:
+	@${MKDIR} ${@D}
+	+${CC} ${ALL_LDFLAGS} ${.ALLSRC} ${LDLIBS} -o $@
+	${POSTLINK}
+
+# All object files
+OBJS := \
+    ${OBJ}/src/main.o \
+    ${OBJ}/tests/alloc.o \
+    ${OBJ}/tests/bfstd.o \
+    ${OBJ}/tests/bit.o \
+    ${OBJ}/tests/ioq.o \
+    ${OBJ}/tests/main.o \
+    ${OBJ}/tests/mksock.o \
+    ${OBJ}/tests/trie.o \
+    ${OBJ}/tests/xspawn.o \
+    ${OBJ}/tests/xspawnee.o \
+    ${OBJ}/tests/xtime.o \
+    ${OBJ}/tests/xtouch.o \
+    ${LIBBFS}
+
+# Depend on ${CONFIG} to make sure `make config` runs first, and to rebuild when
+# the configuration changes
+${OBJS}: ${CONFIG}
+	@${MKDIR} ${@D}
+	${CC} ${ALL_CFLAGS} -c ${@:${OBJ}/%.o=%.c} -o $@
+
+# Save the version number to this file, but only update VERSION if it changes
+${GEN}/NEWVERSION::
+	@${MKDIR} ${@D}
+	@printf '%s\n' '${VERSION}' >$@
+
+${GEN}/VERSION: ${GEN}/NEWVERSION
+	@test -e $@ && cmp -s $@ ${.ALLSRC} && rm ${.ALLSRC} || mv ${.ALLSRC} $@
+
+# Rebuild version.c whenever the version number changes
+${OBJ}/src/version.o: ${GEN}/VERSION
+${OBJ}/src/version.o: CPPFLAGS := ${CPPFLAGS} -DBFS_VERSION='"${VERSION}"'
+
+# Clean all build products
+clean::
+	${RM} -r ${BIN} ${OBJ}
+
+# Clean everything, including generated files
+distclean: clean
+	${RM} -r ${GEN}
+.PHONY: distclean
+
+## Test phase (`make check`)
+
+# Unit test binaries
+UTEST_BINS := \
+    ${BIN}/tests/units \
+    ${BIN}/tests/xspawnee
+
+# Integration test binaries
+ITEST_BINS := \
+    ${BIN}/tests/mksock \
+    ${BIN}/tests/xtouch
+
+# Build (but don't run) test binaries
+tests: ${UTEST_BINS} ${ITEST_BINS}
+.PHONY: tests
+
+# Run all the tests
+check: unit-tests integration-tests
+.PHONY: check
+
+# Run the unit tests
+unit-tests: ${UTEST_BINS}
+	${BIN}/tests/units
+.PHONY: unit-tests
+
+${BIN}/tests/units: \
+    ${OBJ}/tests/alloc.o \
+    ${OBJ}/tests/bfstd.o \
+    ${OBJ}/tests/bit.o \
+    ${OBJ}/tests/ioq.o \
+    ${OBJ}/tests/main.o \
+    ${OBJ}/tests/trie.o \
+    ${OBJ}/tests/xspawn.o \
+    ${OBJ}/tests/xtime.o \
+    ${LIBBFS}
+
+${BIN}/tests/xspawnee: \
+    ${OBJ}/tests/xspawnee.o
+
+# The different flag combinations we check
+INTEGRATIONS := default dfs ids eds j1 j2 j3 s
+INTEGRATION_TESTS := ${INTEGRATIONS:%=check-%}
+
+# Check just `bfs`
+check-default: ${BIN}/bfs ${ITEST_BINS}
+	+./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs" ${TEST_FLAGS}
+
+# Check the different search strategies
+check-dfs check-ids check-eds: ${BIN}/bfs ${ITEST_BINS}
+	+./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs -S ${@:check-%=%}" ${TEST_FLAGS}
+
+# Check various flags
+check-j1 check-j2 check-j3 check-s: ${BIN}/bfs ${ITEST_BINS}
+	+./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs -${@:check-%=%}" ${TEST_FLAGS}
+
+# Run the integration tests
+integration-tests: ${INTEGRATION_TESTS}
+.PHONY: integration-tests
+
+${BIN}/tests/mksock: \
+    ${OBJ}/tests/mksock.o \
+    ${LIBBFS}
+
+${BIN}/tests/xtouch: \
+    ${OBJ}/tests/xtouch.o \
+    ${LIBBFS}
+
+# `make distcheck` configurations
+DISTCHECKS := distcheck-asan distcheck-tsan distcheck-release
+
+# Don't use msan on macOS
+IS_DARWIN,Darwin := y
+IS_DARWIN := ${IS_DARWIN,${OS}}
+DISTCHECK_MSAN, := distcheck-msan
+DISTCHECKS += ${DISTCHECK_MSAN,${IS_DARWIN}}
+
+# Only add a 32-bit build on 64-bit Linux
+DISTCHECK_M32,Linux,x86_64 := distcheck-m32
+DISTCHECKS += ${DISTCHECK_M32,${OS},${ARCH}}
+
+# Test multiple configurations
+distcheck: ${DISTCHECKS}
+.PHONY: distcheck
+
+# Per-distcheck configuration
+DISTCHECK_CONFIG_asan := ASAN=y UBSAN=y
+DISTCHECK_CONFIG_msan := MSAN=y UBSAN=y CC=clang
+DISTCHECK_CONFIG_tsan := TSAN=y UBSAN=y CC=clang
+DISTCHECK_CONFIG_m32 := EXTRA_CFLAGS="-m32" PKG_CONFIG_PATH=/usr/lib32/pkgconfig USE_LIBURING=n
+DISTCHECK_CONFIG_release := RELEASE=y
+
+${DISTCHECKS}::
+	+${MAKE} -rs BUILDDIR=${BUILDDIR}/$@ config ${DISTCHECK_CONFIG_${@:distcheck-%=%}}
+	+${MAKE} -s BUILDDIR=${BUILDDIR}/$@ check TEST_FLAGS="--sudo --verbose=skipped"
+
+## Packaging (`make install`)
+
+DEST_PREFIX := ${DESTDIR}${PREFIX}
+DEST_MANDIR := ${DESTDIR}${MANDIR}
+
+install::
+	${MKDIR} ${DEST_PREFIX}/bin
+	${INSTALL} -m755 ${BIN}/bfs ${DEST_PREFIX}/bin/bfs
+	${MKDIR} ${DEST_MANDIR}/man1
+	${INSTALL} -m644 docs/bfs.1 ${DEST_MANDIR}/man1/bfs.1
+	${MKDIR} ${DEST_PREFIX}/share/bash-completion/completions
+	${INSTALL} -m644 completions/bfs.bash ${DEST_PREFIX}/share/bash-completion/completions/bfs
+	${MKDIR} ${DEST_PREFIX}/share/zsh/site-functions
+	${INSTALL} -m644 completions/bfs.zsh ${DEST_PREFIX}/share/zsh/site-functions/_bfs
+	${MKDIR} ${DEST_PREFIX}/share/fish/vendor_completions.d
+	${INSTALL} -m644 completions/bfs.fish ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
+
+uninstall::
+	${RM} ${DEST_PREFIX}/share/bash-completion/completions/bfs
+	${RM} ${DEST_PREFIX}/share/zsh/site-functions/_bfs
+	${RM} ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
+	${RM} ${DEST_MANDIR}/man1/bfs.1
+	${RM} ${DEST_PREFIX}/bin/bfs
+
+# Check that `make install` works and `make uninstall` removes everything
+check-install::
+	+${MAKE} install DESTDIR=${BUILDDIR}/pkg
+	+${MAKE} uninstall DESTDIR=${BUILDDIR}/pkg
+	${BIN}/bfs ${BUILDDIR}/pkg -not -type d -print -exit 1
+	${RM} -r ${BUILDDIR}/pkg
diff --git a/README.md b/README.md
index 17226fd..b95c16b 100644
--- a/README.md
+++ b/README.md
@@ -333,6 +333,7 @@ Once you have the dependencies, you can build <code>bfs</code>.
 Download one of the [releases](https://github.com/tavianator/bfs/releases) or clone the [git repo](https://github.com/tavianator/bfs).
 Then run
 
+    $ make config
     $ make
 
 This will build the `./bin/bfs` binary.
@@ -342,7 +343,8 @@ Run the test suite to make sure it works correctly:
 
 If you're interested in speed, you may want to build the release version instead:
 
-    $ make release
+    $ make config RELEASE=y
+    $ make
 
 Finally, if you want to install it globally, run
 
diff --git a/config/cc.sh b/config/cc.sh
new file mode 100755
index 0000000..04b142a
--- /dev/null
+++ b/config/cc.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Run the compiler and check if it succeeded
+
+printf '$ %s' "$XCC" >&2
+printf ' %q' "$@" >&2
+printf ' -o /dev/null\n' >&2
+
+$XCC "$@" -o /dev/null
diff --git a/config/empty.c b/config/empty.c
new file mode 100644
index 0000000..4fa9a5b
--- /dev/null
+++ b/config/empty.c
@@ -0,0 +1,6 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+int main(void) {
+	return 0;
+}
diff --git a/config/libacl.c b/config/libacl.c
new file mode 100644
index 0000000..877cb69
--- /dev/null
+++ b/config/libacl.c
@@ -0,0 +1,6 @@
+#include <sys/acl.h>
+
+int main(void) {
+	acl_free(0);
+	return 0;
+}
diff --git a/config/libcap.c b/config/libcap.c
new file mode 100644
index 0000000..64188ac
--- /dev/null
+++ b/config/libcap.c
@@ -0,0 +1,6 @@
+#include <sys/capability.h>
+
+int main(void) {
+	cap_free(0);
+	return 0;
+}
diff --git a/config/liburing.c b/config/liburing.c
new file mode 100644
index 0000000..456059c
--- /dev/null
+++ b/config/liburing.c
@@ -0,0 +1,6 @@
+#include <liburing.h>
+
+int main(void) {
+	io_uring_free_probe(0);
+	return 0;
+}
diff --git a/config/oniguruma.c b/config/oniguruma.c
new file mode 100644
index 0000000..b834fac
--- /dev/null
+++ b/config/oniguruma.c
@@ -0,0 +1,6 @@
+#include <oniguruma.h>
+
+int main(void) {
+	onig_free(0);
+	return 0;
+}
diff --git a/config/pkg.sh b/config/pkg.sh
new file mode 100755
index 0000000..6335b4b
--- /dev/null
+++ b/config/pkg.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# pkg-config wrapper that outputs a makefile fragment
+
+set -eu
+
+NAME="${1^^}"
+declare -n XUSE="XUSE_$NAME"
+
+if [ "$XUSE" ]; then
+    USE="$XUSE"
+elif [[ "$NOLIBS" == *y* ]]; then
+    USE=n
+elif config/pkgconf.sh "$1"; then
+    USE=y
+else
+    USE=n
+fi
+
+printf '%s := %s\n' "USE_$NAME" "$USE"
+
+if [ "$USE" = y ]; then
+    printf 'CPPFLAGS += -DBFS_USE_%s=1\n' "$NAME"
+
+    CFLAGS=$(config/pkgconf.sh --cflags "$1")
+    if [ "$CFLAGS" ]; then
+        printf 'CFLAGS += %s\n' "$CFLAGS"
+    fi
+
+    LDFLAGS=$(config/pkgconf.sh --ldflags "$1")
+    if [ "$LDFLAGS" ]; then
+        printf 'LDFLAGS += %s\n' "$LDFLAGS"
+    fi
+
+    LDLIBS=$(config/pkgconf.sh --ldlibs "$1")
+    if [ "$LDLIBS" ]; then
+        printf 'LDLIBS += %s\n' "$LDLIBS"
+    fi
+else
+    printf 'CPPFLAGS += -DBFS_USE_%s=0\n' "$NAME"
+fi
diff --git a/config/pkgconf.sh b/config/pkgconf.sh
new file mode 100755
index 0000000..070fad6
--- /dev/null
+++ b/config/pkgconf.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# pkg-config wrapper with hardcoded fallbacks
+
+set -eu
+
+MODE=
+if [[ "$1" == --* ]]; then
+    MODE="$1"
+    shift
+fi
+
+if command -v "${PKG_CONFIG:-}" &>/dev/null; then
+    case "$MODE" in
+        --cflags)
+            "$PKG_CONFIG" --cflags "$@"
+            ;;
+        --ldflags)
+            "$PKG_CONFIG" --libs-only-L --libs-only-other "$@"
+            ;;
+        --ldlibs)
+            "$PKG_CONFIG" --libs-only-l "$@"
+            ;;
+        "")
+            "$PKG_CONFIG" "$@"
+            ;;
+    esac
+else
+    for lib; do
+        case "$lib" in
+            libacl)
+                LDLIB=-lacl
+                ;;
+            libcap)
+                LDLIB=-lcap
+                ;;
+            liburing)
+                LDLIB=-luring
+                ;;
+            oniguruma)
+                LDLIB=-lonig
+                ;;
+            *)
+                printf 'error: Unknown package %s\n' "$lib" >&2
+                exit 1
+        esac
+
+        case "$MODE" in
+            --ldlibs)
+                printf ' %s' "$LDLIB"
+                ;;
+            "")
+                config/cc.sh "config/$lib.c" "$LDLIB" || exit $?
+                ;;
+        esac
+    done
+
+    if [ "$MODE" = "--ldlibs" ]; then
+        printf '\n'
+    fi
+fi
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 7eb3a37..abf6185 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -7,9 +7,10 @@ Compiling
 `bfs` uses [GNU Make](https://www.gnu.org/software/make/) as its build system.
 A simple invocation of
 
+    $ make config
     $ make
 
-should build `bfs` successfully, with no additional steps necessary.
+should build `bfs` successfully.
 As usual with `make`, you can run a [parallel build](https://www.gnu.org/software/make/manual/html_node/Parallel.html) with `-j`.
 For example, to use all your cores, run `make -j$(nproc)`.
 
@@ -17,25 +18,28 @@ For example, to use all your cores, run `make -j$(nproc)`.
 
 | Command          | Description                                                   |
 |------------------|---------------------------------------------------------------|
+| `make config`    | Configures the build system                                   |
 | `make`           | Builds just the `bfs` binary                                  |
 | `make all`       | Builds everything, including the tests (but doesn't run them) |
 | `make check`     | Builds everything, and runs the tests                         |
 | `make install`   | Installs `bfs` (with man page, shell completions, etc.)       |
 | `make uninstall` | Uninstalls `bfs`                                              |
+| `make clean`     | Delete the build products                                     |
+| `make mrclean`   | Delete all generated files, including the build configuration |
 
-### Flag-like targets
+### Build profiles
 
-The build system provides a few shorthand targets for handy configurations:
+The configuration system provides a few shorthand flags for handy configurations:
 
-| Command        | Description                                                 |
-|----------------|-------------------------------------------------------------|
-| `make release` | Build `bfs` with optimizations, LTO, and without assertions |
-| `make asan`    | Enable [AddressSanitizer]                                   |
-| `make lsan`    | Enable [LeakSanitizer]                                      |
-| `make msan`    | Enable [MemorySanitizer]                                    |
-| `make tsan`    | Enable [ThreadSanitizer]                                    |
-| `make ubsan`   | Enable [UndefinedBehaviorSanitizer]                         |
-| `make gcov`    | Enable [code coverage]                                      |
+| Command                 | Description                                                 |
+|-------------------------|-------------------------------------------------------------|
+| `make config RELEASE=y` | Build `bfs` with optimizations, LTO, and without assertions |
+| `make config ASAN=y`    | Enable [AddressSanitizer]                                   |
+| `make config LSAN=y`    | Enable [LeakSanitizer]                                      |
+| `make config MSAN=y`    | Enable [MemorySanitizer]                                    |
+| `make config TSAN=y`    | Enable [ThreadSanitizer]                                    |
+| `make config UBSAN=y`   | Enable [UndefinedBehaviorSanitizer]                         |
+| `make config GCOV=y`    | Enable [code coverage]                                      |
 
 [AddressSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizer
 [LeakSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer#stand-alone-mode
@@ -44,38 +48,38 @@ The build system provides a few shorthand targets for handy configurations:
 [UndefinedBehaviorSanitizer]: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
 [code coverage]: https://gcc.gnu.org/onlinedocs/gcc/Gcov.html
 
-You can combine multiple flags and other targets (e.g. `make asan ubsan check`), but not all of them will work together.
+You can combine multiple profiles (e.g. `make config ASAN=y UBSAN=y`), but not all of them will work together.
 
 ### Flags
 
-Other flags are controlled with `make` variables and/or environment variables.
-Here are some of the common ones; check the [`GNUmakefile`](/GNUmakefile) for more.
-
-| Flag                             | Description                                 |
-|----------------------------------|---------------------------------------------|
-| `CC`                             | The C compiler to use, e.g. `make CC=clang` |
-| `CFLAGS`<br>`EXTRA_CFLAGS`       | Override/add to the default compiler flags  |
-| `LDFLAGS`<br>`EXTRA_LDFLAGS`     | Override/add to the linker flags            |
-| `USE_ACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]      |
-| `TEST_FLAGS`                     | `tests.sh` flags for `make check`           |
-| `BUILDDIR`                       | The build output directory (default: `.`)   |
-| `DESTDIR`                        | The root directory for `make install`       |
-| `PREFIX`                         | The installation prefix (default: `/usr`)   |
-| `MANDIR`                         | The man page installation directory         |
+Other flags can be specified on the `make config` command line or in the environment.
+Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
+
+| Flag                             | Description                                        |
+|----------------------------------|----------------------------------------------------|
+| `CC`                             | The C compiler to use, e.g. `make config CC=clang` |
+| `CFLAGS`<br>`EXTRA_CFLAGS`       | Override/add to the default compiler flags         |
+| `LDFLAGS`<br>`EXTRA_LDFLAGS`     | Override/add to the linker flags                   |
+| `USE_ACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]             |
+| `TEST_FLAGS`                     | `tests.sh` flags for `make check`                  |
+| `BUILDDIR`                       | The build output directory (default: `.`)          |
+| `DESTDIR`                        | The root directory for `make install`              |
+| `PREFIX`                         | The installation prefix (default: `/usr`)          |
+| `MANDIR`                         | The man page installation directory                |
 
 [optional dependencies]: #dependencies
 
 ### Dependencies
 
 `bfs` depends on some system libraries for some of its features.
-These dependencies are optional, and can be turned off at build time if necessary by setting the appropriate variable to the empty string (e.g. `make USE_ONIGURUMA=`).
+These dependencies are optional, and can be turned off in `make config` if necessary by setting the appropriate variable to `n` (e.g. `make config USE_ONIGURUMA=n`).
 
-| Dependency  | Platforms  | `make` flag     |
-|-------------|------------|-----------------|
-| [acl]       | Linux only | `USE_ACL`       |
-| [libcap]    | Linux only | `USE_LIBCAP`    |
-| [liburing]  | Linux only | `USE_LIBURING`  |
-| [Oniguruma] | All        | `USE_ONIGURUMA` |
+| Dependency  | Platforms  | `make config` flag |
+|-------------|------------|--------------------|
+| [acl]       | Linux only | `USE_ACL`          |
+| [libcap]    | Linux only | `USE_LIBCAP`       |
+| [liburing]  | Linux only | `USE_LIBURING`     |
+| [Oniguruma] | All        | `USE_ONIGURUMA`    |
 
 [acl]: https://savannah.nongnu.org/projects/acl
 [libcap]: https://sites.google.com/site/fullycapable/
@@ -84,21 +88,22 @@ These dependencies are optional, and can be turned off at build time if necessar
 
 ### Dependency tracking
 
-The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in the [`GNUmakefile`](/GNUmakefile)).
+The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in the [`Makefile`](/Makefile)).
 So if you edit a header file, `make` will rebuild the necessary object files ensuring they don't go out of sync.
 
+We also add a dependency on the current configuration, so you can change configurations and rebuild without having to `make clean`.
+
 We go one step further than most build systems by tracking the flags that were used for the previous compilation.
 That means you can change configurations without having to `make clean`.
 For example,
 
+    $ make config
+    $ make
+    $ make config RELEASE=y
     $ make
-    $ make release
 
 will build the project in debug mode and then rebuild it in release mode.
 
-A side effect of this may be surprising: `make check` by itself will rebuild the project in the default configuration.
-To test a different configuration, you'll have to repeat it (e.g. `make release check`).
-
 
 Testing
 -------
diff --git a/docs/USAGE.md b/docs/USAGE.md
index 071c95b..70f8475 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -7,8 +7,8 @@ When invoked with no arguments, `bfs` will list everything under the current dir
 ```console
 $ bfs
 .
-./GNUmakefile
 ./LICENSE
+./Makefile
 ./README.md
 ./completions
 ./docs
diff --git a/src/config.h b/src/config.h
index 506ad3e..2eff1fc 100644
--- a/src/config.h
+++ b/src/config.h
@@ -29,13 +29,14 @@
 #ifndef BFS_COMMAND
 #  define BFS_COMMAND "bfs"
 #endif
-#ifndef BFS_VERSION
-#  define BFS_VERSION "3.1.3"
-#endif
 #ifndef BFS_HOMEPAGE
 #  define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html"
 #endif
 
+// This is a symbol instead of a literal so we don't have to rebuild everything
+// when the version number changes
+extern const char bfs_version[];
+
 // Check for system headers
 
 #ifdef __has_include
@@ -97,10 +98,10 @@
 #  define BFS_USE_PATHS_H BFS_HAS_PATHS_H
 #endif
 #ifndef BFS_USE_SYS_ACL_H
-#  define BFS_USE_SYS_ACL_H (BFS_HAS_SYS_ACL_H && !__illumos__)
+#  define BFS_USE_SYS_ACL_H (BFS_HAS_SYS_ACL_H && !__illumos__ && (!__linux__ || BFS_USE_LIBACL))
 #endif
 #ifndef BFS_USE_SYS_CAPABILITY_H
-#  define BFS_USE_SYS_CAPABILITY_H (BFS_HAS_SYS_CAPABILITY_H && !__FreeBSD__)
+#  define BFS_USE_SYS_CAPABILITY_H (BFS_HAS_SYS_CAPABILITY_H && !__FreeBSD__ && (!__linux__ || BFS_USE_LIBCAP))
 #endif
 #ifndef BFS_USE_SYS_EXTATTR_H
 #  define BFS_USE_SYS_EXTATTR_H (BFS_HAS_SYS_EXTATTR_H && !__DragonFly__)
diff --git a/src/main.c b/src/main.c
index e120f03..b4d65ce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,7 @@
  *     - thread.h      (multi-threading)
  *     - trie.[ch]     (a trie set/map implementation)
  *     - typo.[ch]     (fuzzy matching for typos)
+ *     - version.c     (defines the version number)
  *     - xregex.[ch]   (regular expression support)
  *     - xspawn.[ch]   (spawns processes)
  *     - xtime.[ch]    (date/time handling utilities)
diff --git a/src/parse.c b/src/parse.c
index 2dfcab2..38ebf3f 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -2909,7 +2909,7 @@ static struct bfs_expr *parse_help(struct bfs_parser *parser, int arg1, int arg2
  * "Parse" -version.
  */
 static struct bfs_expr *parse_version(struct bfs_parser *parser, int arg1, int arg2) {
-	cfprintf(parser->ctx->cout, "${ex}%s${rs} ${bld}%s${rs}\n\n", BFS_COMMAND, BFS_VERSION);
+	cfprintf(parser->ctx->cout, "${ex}%s${rs} ${bld}%s${rs}\n\n", BFS_COMMAND, bfs_version);
 
 	printf("%s\n", BFS_HOMEPAGE);
 
diff --git a/src/version.c b/src/version.c
new file mode 100644
index 0000000..736f3d5
--- /dev/null
+++ b/src/version.c
@@ -0,0 +1,6 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include "config.h"
+
+const char bfs_version[] = BFS_VERSION;
diff --git a/tests/run.sh b/tests/run.sh
index 720515d..ab1ed6d 100644
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -156,7 +156,7 @@ comake() {
              -f "$TESTS/tests.mk" \
              DONE=$DONE_PIPE \
              READY=$READY_PIPE \
-             "${TEST_CASES[@]/#/tests/}" \
+             "${!TEST_CASES[@]}" \
              </dev/null >/dev/null
     }
 
diff --git a/tests/tests.mk b/tests/tests.mk
index 5bf4f6c..035ca79 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,7 +1,13 @@
 # Copyright © Tavian Barnes <tavianator@tavianator.com>
 # SPDX-License-Identifier: 0BSD
 
-# GNU makefile that exposes make's job control to tests.sh
+# Makefile that exposes make's job control to tests.sh
 
-tests/%:
+# BSD make will chdir into ${.OBJDIR} by default, unless we tell it not to
+.OBJDIR: .
+
+# Turn off implicit rules
+.SUFFIXES:
+
+.DEFAULT::
 	bash -c 'printf . >&$(READY) && read -r -N1 -u$(DONE)'
-- 
cgit v1.2.3


From 170fd017a1e7d87d0d53502b8f407c9163aa2957 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 10 Apr 2024 10:02:00 -0400
Subject: docs/BUILDING: Fixes for new build system

---
 docs/BUILDING.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'docs')

diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index abf6185..072da92 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -25,7 +25,7 @@ For example, to use all your cores, run `make -j$(nproc)`.
 | `make install`   | Installs `bfs` (with man page, shell completions, etc.)       |
 | `make uninstall` | Uninstalls `bfs`                                              |
 | `make clean`     | Delete the build products                                     |
-| `make mrclean`   | Delete all generated files, including the build configuration |
+| `make distclean` | Delete all generated files, including the build configuration |
 
 ### Build profiles
 
@@ -55,17 +55,17 @@ You can combine multiple profiles (e.g. `make config ASAN=y UBSAN=y`), but not a
 Other flags can be specified on the `make config` command line or in the environment.
 Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 
-| Flag                             | Description                                        |
-|----------------------------------|----------------------------------------------------|
-| `CC`                             | The C compiler to use, e.g. `make config CC=clang` |
-| `CFLAGS`<br>`EXTRA_CFLAGS`       | Override/add to the default compiler flags         |
-| `LDFLAGS`<br>`EXTRA_LDFLAGS`     | Override/add to the linker flags                   |
-| `USE_ACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]             |
-| `TEST_FLAGS`                     | `tests.sh` flags for `make check`                  |
-| `BUILDDIR`                       | The build output directory (default: `.`)          |
-| `DESTDIR`                        | The root directory for `make install`              |
-| `PREFIX`                         | The installation prefix (default: `/usr`)          |
-| `MANDIR`                         | The man page installation directory                |
+| Flag                                | Description                                        |
+|-------------------------------------|----------------------------------------------------|
+| `CC`                                | The C compiler to use, e.g. `make config CC=clang` |
+| `CFLAGS`<br>`EXTRA_CFLAGS`          | Override/add to the default compiler flags         |
+| `LDFLAGS`<br>`EXTRA_LDFLAGS`        | Override/add to the linker flags                   |
+| `USE_LIBACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]             |
+| `TEST_FLAGS`                        | `tests.sh` flags for `make check`                  |
+| `BUILDDIR`                          | The build output directory (default: `.`)          |
+| `DESTDIR`                           | The root directory for `make install`              |
+| `PREFIX`                            | The installation prefix (default: `/usr`)          |
+| `MANDIR`                            | The man page installation directory                |
 
 [optional dependencies]: #dependencies
 
@@ -76,12 +76,12 @@ These dependencies are optional, and can be turned off in `make config` if neces
 
 | Dependency  | Platforms  | `make config` flag |
 |-------------|------------|--------------------|
-| [acl]       | Linux only | `USE_ACL`          |
+| [libacl]    | Linux only | `USE_LIBACL`       |
 | [libcap]    | Linux only | `USE_LIBCAP`       |
 | [liburing]  | Linux only | `USE_LIBURING`     |
 | [Oniguruma] | All        | `USE_ONIGURUMA`    |
 
-[acl]: https://savannah.nongnu.org/projects/acl
+[libacl]: https://savannah.nongnu.org/projects/acl
 [libcap]: https://sites.google.com/site/fullycapable/
 [liburing]: https://github.com/axboe/liburing
 [Oniguruma]: https://github.com/kkos/oniguruma
-- 
cgit v1.2.3


From 9f90d09fcf58269dc09bad90b360d46c374e56e9 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 10 Apr 2024 10:03:15 -0400
Subject: build: Add optional libselinux dependency

---
 Makefile            |  6 +++++-
 config/libselinux.c |  6 ++++++
 config/pkgconf.sh   |  3 +++
 docs/BUILDING.md    | 14 ++++++++------
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 config/libselinux.c

(limited to 'docs')

diff --git a/Makefile b/Makefile
index 326ee87..ed59126 100644
--- a/Makefile
+++ b/Makefile
@@ -143,6 +143,7 @@ export RELEASE_CFLAGS= -O3 -flto=auto
 #     $ make config USE_LIBURING=n USE_ONIGURUMA=y
 USE_LIBACL ?=
 USE_LIBCAP ?=
+USE_LIBSELINUX ?=
 USE_LIBURING ?=
 USE_ONIGURUMA ?=
 
@@ -167,6 +168,7 @@ _XLDLIBS := ${LDLIBS}
 
 _XUSE_LIBACL := ${USE_LIBACL}
 _XUSE_LIBCAP := ${USE_LIBCAP}
+_XUSE_LIBSELINUX := ${USE_LIBSELINUX}
 _XUSE_LIBURING := ${USE_LIBURING}
 _XUSE_ONIGURUMA := ${USE_ONIGURUMA}
 
@@ -197,6 +199,7 @@ export XLDLIBS=${_XLDLIBS}
 
 export XUSE_LIBACL=${_XUSE_LIBACL}
 export XUSE_LIBCAP=${_XUSE_LIBCAP}
+export XUSE_LIBSELINUX=${_XUSE_LIBSELINUX}
 export XUSE_LIBURING=${_XUSE_LIBURING}
 export XUSE_ONIGURUMA=${_XUSE_ONIGURUMA}
 
@@ -210,6 +213,7 @@ CONFIG := ${GEN}/config.mk
 PKGS := \
     ${GEN}/libacl.mk \
     ${GEN}/libcap.mk \
+    ${GEN}/libselinux.mk \
     ${GEN}/liburing.mk \
     ${GEN}/oniguruma.mk
 
@@ -478,7 +482,7 @@ distcheck: ${DISTCHECKS}
 DISTCHECK_CONFIG_asan := ASAN=y UBSAN=y
 DISTCHECK_CONFIG_msan := MSAN=y UBSAN=y CC=clang
 DISTCHECK_CONFIG_tsan := TSAN=y UBSAN=y CC=clang
-DISTCHECK_CONFIG_m32 := EXTRA_CFLAGS="-m32" PKG_CONFIG_PATH=/usr/lib32/pkgconfig USE_LIBURING=n
+DISTCHECK_CONFIG_m32 := EXTRA_CFLAGS="-m32" PKG_CONFIG_LIBDIR=/usr/lib32/pkgconfig USE_LIBURING=n
 DISTCHECK_CONFIG_release := RELEASE=y
 
 ${DISTCHECKS}::
diff --git a/config/libselinux.c b/config/libselinux.c
new file mode 100644
index 0000000..72f5d33
--- /dev/null
+++ b/config/libselinux.c
@@ -0,0 +1,6 @@
+#include <selinux/selinux.h>
+
+int main(void) {
+	freecon(0);
+	return 0;
+}
diff --git a/config/pkgconf.sh b/config/pkgconf.sh
index 070fad6..286c19c 100755
--- a/config/pkgconf.sh
+++ b/config/pkgconf.sh
@@ -37,6 +37,9 @@ else
             libcap)
                 LDLIB=-lcap
                 ;;
+            libselinux)
+                LDLIB=-lselinux
+                ;;
             liburing)
                 LDLIB=-luring
                 ;;
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 072da92..4ed139c 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -74,15 +74,17 @@ Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 `bfs` depends on some system libraries for some of its features.
 These dependencies are optional, and can be turned off in `make config` if necessary by setting the appropriate variable to `n` (e.g. `make config USE_ONIGURUMA=n`).
 
-| Dependency  | Platforms  | `make config` flag |
-|-------------|------------|--------------------|
-| [libacl]    | Linux only | `USE_LIBACL`       |
-| [libcap]    | Linux only | `USE_LIBCAP`       |
-| [liburing]  | Linux only | `USE_LIBURING`     |
-| [Oniguruma] | All        | `USE_ONIGURUMA`    |
+| Dependency   | Platforms  | `make config` flag |
+|--------------|------------|--------------------|
+| [libacl]     | Linux only | `USE_LIBACL`       |
+| [libcap]     | Linux only | `USE_LIBCAP`       |
+| [liburing]   | Linux only | `USE_LIBURING`     |
+| [libselinux] | Linux only | `USE_LIBSELINUX`   |
+| [Oniguruma]  | All        | `USE_ONIGURUMA`    |
 
 [libacl]: https://savannah.nongnu.org/projects/acl
 [libcap]: https://sites.google.com/site/fullycapable/
+[libselinux]: https://github.com/SELinuxProject/selinux
 [liburing]: https://github.com/axboe/liburing
 [Oniguruma]: https://github.com/kkos/oniguruma
 
-- 
cgit v1.2.3


From 8f6b0c1b360f2fea3f7f6563808513cbdd51df80 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 10 Apr 2024 10:10:51 -0400
Subject: Implement -context

Closes: https://github.com/tavianator/bfs/issues/27
---
 completions/bfs.bash |   1 +
 completions/bfs.fish |   1 +
 completions/bfs.zsh  |   1 +
 docs/bfs.1           |   4 ++
 src/eval.c           |  43 ++++++++++++-------
 src/eval.h           |   1 +
 src/parse.c          | 114 +++++++++++++++++++++++++++++----------------------
 7 files changed, 103 insertions(+), 62 deletions(-)

(limited to 'docs')

diff --git a/completions/bfs.bash b/completions/bfs.bash
index 816f1ec..6fd82c8 100644
--- a/completions/bfs.bash
+++ b/completions/bfs.bash
@@ -32,6 +32,7 @@ _bfs() {
     # (e.g. because they are numeric, glob, regexp, time, etc.)
     local nocomp=(
         -{a,B,c,m}{min,since,time}
+        -context
         -ilname
         -iname
         -inum
diff --git a/completions/bfs.fish b/completions/bfs.fish
index 0c58ef4..24b0ad9 100644
--- a/completions/bfs.fish
+++ b/completions/bfs.fish
@@ -71,6 +71,7 @@ complete -c bfs -o Btime -d "Find files birthed specified number of days ago" -x
 complete -c bfs -o ctime -d "Find files changed specified number of days ago" -x
 complete -c bfs -o mtime -d "Find files modified specified number of days ago" -x
 complete -c bfs -o capable -d "Find files with capabilities set"
+complete -c bfs -o context -d "Find files by SELinux context" -x
 complete -c bfs -o depth -d "Find files with specified number of depth" -x
 complete -c bfs -o empty -d "Find empty files/directories"
 complete -c bfs -o executable -d "Find files the current user can execute"
diff --git a/completions/bfs.zsh b/completions/bfs.zsh
index 07db456..432ab8c 100644
--- a/completions/bfs.zsh
+++ b/completions/bfs.zsh
@@ -74,6 +74,7 @@ args=(
     '*-mtime[find files modified N days ago]:modification time (days):->times'
 
     '*-capable[find files with POSIX.1e capabilities set]'
+    '*-context[find files by SELinux context]:pattern'
     # -depth without parameters exist above. I don't know how to handle this gracefully
     '*-empty[find empty files/directories]'
     '*-executable[find files the current user can execute]'
diff --git a/docs/bfs.1 b/docs/bfs.1
index 3a4f15a..54166ab 100644
--- a/docs/bfs.1
+++ b/docs/bfs.1
@@ -452,6 +452,10 @@ Find files with POSIX.1e
 .BR capabilities (7)
 set.
 .TP
+\fB\-context \fIGLOB\fR
+Find files whose SELinux context matches the
+.IR GLOB .
+.TP
 \fB\-depth\fR [\fI\-+\fR]\fIN\fR
 Find files with depth
 .IR N .
diff --git a/src/eval.c b/src/eval.c
index 2f06858..d0112c2 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -145,6 +145,20 @@ bool bfs_expr_cmp(const struct bfs_expr *expr, long long n) {
 	return false;
 }
 
+/** Common code for fnmatch() tests. */
+static bool eval_fnmatch(const struct bfs_expr *expr, const char *str) {
+	if (expr->literal) {
+#ifdef FNM_CASEFOLD
+		if (expr->fnm_flags & FNM_CASEFOLD) {
+			return strcasecmp(expr->pattern, str) == 0;
+		}
+#endif
+		return strcmp(expr->pattern, str) == 0;
+	} else {
+		return fnmatch(expr->pattern, str, expr->fnm_flags) == 0;
+	}
+}
+
 /**
  * -true test.
  */
@@ -193,6 +207,21 @@ bool eval_capable(const struct bfs_expr *expr, struct bfs_eval *state) {
 	}
 }
 
+/**
+ * -context test.
+ */
+bool eval_context(const struct bfs_expr *expr, struct bfs_eval *state) {
+	char *con = bfs_getfilecon(state->ftwbuf);
+	if (!con) {
+		eval_report_error(state);
+		return false;
+	}
+
+	bool ret = eval_fnmatch(expr, con);
+	bfs_freecon(con);
+	return ret;
+}
+
 /**
  * Get the given timespec field out of a stat buffer.
  */
@@ -546,20 +575,6 @@ bool eval_links(const struct bfs_expr *expr, struct bfs_eval *state) {
 	return bfs_expr_cmp(expr, statbuf->nlink);
 }
 
-/** Common code for fnmatch() tests. */
-static bool eval_fnmatch(const struct bfs_expr *expr, const char *str) {
-	if (expr->literal) {
-#ifdef FNM_CASEFOLD
-		if (expr->fnm_flags & FNM_CASEFOLD) {
-			return strcasecmp(expr->pattern, str) == 0;
-		}
-#endif
-		return strcmp(expr->pattern, str) == 0;
-	} else {
-		return fnmatch(expr->pattern, str, expr->fnm_flags) == 0;
-	}
-}
-
 /**
  * -i?lname test.
  */
diff --git a/src/eval.h b/src/eval.h
index f7f6c77..ae43628 100644
--- a/src/eval.h
+++ b/src/eval.h
@@ -49,6 +49,7 @@ bool eval_false(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_access(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_acl(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_capable(const struct bfs_expr *expr, struct bfs_eval *state);
+bool eval_context(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_perm(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_xattr(const struct bfs_expr *expr, struct bfs_eval *state);
 bool eval_xattrname(const struct bfs_expr *expr, struct bfs_eval *state);
diff --git a/src/parse.c b/src/parse.c
index 38ebf3f..a3e32fe 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1075,6 +1075,67 @@ static struct bfs_expr *parse_color(struct bfs_parser *parser, int color, int ar
 	return expr;
 }
 
+/**
+ * Common code for fnmatch() tests.
+ */
+static struct bfs_expr *parse_fnmatch(const struct bfs_parser *parser, struct bfs_expr *expr, bool casefold) {
+	if (!expr) {
+		return NULL;
+	}
+
+	expr->pattern = expr->argv[1];
+
+	if (casefold) {
+#ifdef FNM_CASEFOLD
+		expr->fnm_flags = FNM_CASEFOLD;
+#else
+		parse_expr_error(parser, expr, "Missing platform support.\n");
+		return NULL;
+#endif
+	} else {
+		expr->fnm_flags = 0;
+	}
+
+	// POSIX says, about fnmatch():
+	//
+	//     If pattern ends with an unescaped <backslash>, fnmatch() shall
+	//     return a non-zero value (indicating either no match or an error).
+	//
+	// But not all implementations obey this, so check for it ourselves.
+	size_t i, len = strlen(expr->pattern);
+	for (i = 0; i < len; ++i) {
+		if (expr->pattern[len - i - 1] != '\\') {
+			break;
+		}
+	}
+	if (i % 2 != 0) {
+		parse_expr_warning(parser, expr, "Unescaped trailing backslash.\n\n");
+		expr->eval_fn = eval_false;
+		return expr;
+	}
+
+	// strcmp() can be much faster than fnmatch() since it doesn't have to
+	// parse the pattern, so special-case patterns with no wildcards.
+	//
+	//     https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13_01
+	expr->literal = strcspn(expr->pattern, "?*\\[") == len;
+
+	return expr;
+}
+
+/**
+ * Parse -context.
+ */
+static struct bfs_expr *parse_context(struct bfs_parser *parser, int flag, int arg2) {
+#if BFS_CAN_CHECK_CONTEXT
+	struct bfs_expr *expr = parse_unary_test(parser, eval_context);
+	return parse_fnmatch(parser, expr, false);
+#else
+	parse_error(parser, "Missing platform support.\n");
+	return NULL;
+#endif
+}
+
 /**
  * Parse -{false,true}.
  */
@@ -1631,54 +1692,6 @@ static struct bfs_expr *parse_mount(struct bfs_parser *parser, int arg1, int arg
 	return expr;
 }
 
-/**
- * Common code for fnmatch() tests.
- */
-static struct bfs_expr *parse_fnmatch(const struct bfs_parser *parser, struct bfs_expr *expr, bool casefold) {
-	if (!expr) {
-		return NULL;
-	}
-
-	expr->pattern = expr->argv[1];
-
-	if (casefold) {
-#ifdef FNM_CASEFOLD
-		expr->fnm_flags = FNM_CASEFOLD;
-#else
-		parse_expr_error(parser, expr, "Missing platform support.\n");
-		return NULL;
-#endif
-	} else {
-		expr->fnm_flags = 0;
-	}
-
-	// POSIX says, about fnmatch():
-	//
-	//     If pattern ends with an unescaped <backslash>, fnmatch() shall
-	//     return a non-zero value (indicating either no match or an error).
-	//
-	// But not all implementations obey this, so check for it ourselves.
-	size_t i, len = strlen(expr->pattern);
-	for (i = 0; i < len; ++i) {
-		if (expr->pattern[len - i - 1] != '\\') {
-			break;
-		}
-	}
-	if (i % 2 != 0) {
-		parse_expr_warning(parser, expr, "Unescaped trailing backslash.\n\n");
-		expr->eval_fn = eval_false;
-		return expr;
-	}
-
-	// strcmp() can be much faster than fnmatch() since it doesn't have to
-	// parse the pattern, so special-case patterns with no wildcards.
-	//
-	//     https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13_01
-	expr->literal = strcspn(expr->pattern, "?*\\[") == len;
-
-	return expr;
-}
-
 /**
  * Parse -i?name.
  */
@@ -2767,6 +2780,10 @@ static struct bfs_expr *parse_help(struct bfs_parser *parser, int arg1, int arg2
 #if BFS_CAN_CHECK_CAPABILITIES
 	cfprintf(cout, "  ${blu}-capable${rs}\n");
 	cfprintf(cout, "      Find files with POSIX.1e capabilities set\n");
+#endif
+#if BFS_CAN_CHECK_CONTEXT
+	cfprintf(cout, "  ${blu}-context${rs} ${bld}GLOB${rs}\n");
+	cfprintf(cout, "      Find files with SELinux context matching a glob pattern\n");
 #endif
 	cfprintf(cout, "  ${blu}-depth${rs} ${bld}[-+]N${rs}\n");
 	cfprintf(cout, "      Find files with depth ${bld}N${rs}\n");
@@ -2961,6 +2978,7 @@ static const struct table_entry parse_table[] = {
 	{"-cmin", T_TEST, parse_min, BFS_STAT_CTIME},
 	{"-cnewer", T_TEST, parse_newer, BFS_STAT_CTIME},
 	{"-color", T_OPTION, parse_color, true},
+	{"-context", T_TEST, parse_context, true},
 	{"-csince", T_TEST, parse_since, BFS_STAT_CTIME},
 	{"-ctime", T_TEST, parse_time, BFS_STAT_CTIME},
 	{"-d", T_FLAG, parse_depth},
-- 
cgit v1.2.3


From 37caa3d71fd8bb4d0d9204e4a2f5cac234fa25fd Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 29 Apr 2024 15:30:39 -0400
Subject: build: Replace `make config` with a `./configure` script

This lets us do more traditional out-of-tree builds like

    $ ../path/to/bfs/configure
    $ make

The .mk files are moved from ./config to ./build, mostly so that
./configure will auto-complete easily.
---
 .github/workflows/ci.yml              |   8 +-
 .github/workflows/codecov.yml         |   2 +-
 .github/workflows/codeql.yml          |   2 +-
 Makefile                              | 143 +++++++++++++++---------------
 README.md                             |   4 +-
 bench/bench.sh                        |   6 +-
 build/cc.sh                           |  16 ++++
 build/config.mk                       |  62 +++++++++++++
 build/define-if.sh                    |  20 +++++
 build/deps.mk                         |  18 ++++
 build/empty.c                         |   6 ++
 build/exports.mk                      |  20 +++++
 build/flags.mk                        | 136 ++++++++++++++++++++++++++++
 build/has/acl-get-entry.c             |   8 ++
 build/has/acl-get-file.c              |   8 ++
 build/has/acl-get-tag-type.c          |  10 +++
 build/has/acl-is-trivial-np.c         |  12 +++
 build/has/acl-trivial.c               |   8 ++
 build/has/aligned-alloc.c             |   8 ++
 build/has/confstr.c                   |   9 ++
 build/has/extattr-get-file.c          |  10 +++
 build/has/extattr-get-link.c          |  10 +++
 build/has/extattr-list-file.c         |  10 +++
 build/has/extattr-list-link.c         |  10 +++
 build/has/fdclosedir.c                |   8 ++
 build/has/getdents.c                  |  10 +++
 build/has/getdents64-syscall.c        |  12 +++
 build/has/getdents64.c                |  10 +++
 build/has/getprogname-gnu.c           |   9 ++
 build/has/getprogname.c               |   9 ++
 build/has/max-align-t.c               |   8 ++
 build/has/pipe2.c                     |  10 +++
 build/has/posix-spawn-addfchdir-np.c  |  11 +++
 build/has/posix-spawn-addfchdir.c     |  11 +++
 build/has/st-acmtim.c                 |  12 +++
 build/has/st-acmtimespec.c            |  12 +++
 build/has/st-birthtim.c               |   9 ++
 build/has/st-birthtimespec.c          |   9 ++
 build/has/st-flags.c                  |   9 ++
 build/has/statx-syscall.c             |  13 +++
 build/has/statx.c                     |  11 +++
 build/has/strerror-l.c                |  11 +++
 build/has/strerror-r-gnu.c            |  11 +++
 build/has/strerror-r-posix.c          |  11 +++
 build/has/tm-gmtoff.c                 |   9 ++
 build/has/uselocale.c                 |   9 ++
 build/header.mk                       |  69 +++++++++++++++
 build/pkgconf.sh                      | 100 +++++++++++++++++++++
 build/pkgs.mk                         |  36 ++++++++
 build/prelude.mk                      | 133 ++++++++++++++++++++++++++++
 build/use/libacl.c                    |   9 ++
 build/use/libcap.c                    |   9 ++
 build/use/libselinux.c                |   9 ++
 build/use/liburing.c                  |   9 ++
 build/use/oniguruma.c                 |   9 ++
 config/cc.sh                          |  16 ----
 config/config.mk                      |  63 -------------
 config/define-if.sh                   |  20 -----
 config/deps.mk                        |  18 ----
 config/empty.c                        |   6 --
 config/exports.mk                     |  20 -----
 config/flags.mk                       | 136 ----------------------------
 config/has/acl-get-entry.c            |   8 --
 config/has/acl-get-file.c             |   8 --
 config/has/acl-get-tag-type.c         |  10 ---
 config/has/acl-is-trivial-np.c        |  12 ---
 config/has/acl-trivial.c              |   8 --
 config/has/aligned-alloc.c            |   8 --
 config/has/confstr.c                  |   9 --
 config/has/extattr-get-file.c         |  10 ---
 config/has/extattr-get-link.c         |  10 ---
 config/has/extattr-list-file.c        |  10 ---
 config/has/extattr-list-link.c        |  10 ---
 config/has/fdclosedir.c               |   8 --
 config/has/getdents.c                 |  10 ---
 config/has/getdents64-syscall.c       |  12 ---
 config/has/getdents64.c               |  10 ---
 config/has/getprogname-gnu.c          |   9 --
 config/has/getprogname.c              |   9 --
 config/has/max-align-t.c              |   8 --
 config/has/pipe2.c                    |  10 ---
 config/has/posix-spawn-addfchdir-np.c |  11 ---
 config/has/posix-spawn-addfchdir.c    |  11 ---
 config/has/st-acmtim.c                |  12 ---
 config/has/st-acmtimespec.c           |  12 ---
 config/has/st-birthtim.c              |   9 --
 config/has/st-birthtimespec.c         |   9 --
 config/has/st-flags.c                 |   9 --
 config/has/statx-syscall.c            |  13 ---
 config/has/statx.c                    |  11 ---
 config/has/strerror-l.c               |  11 ---
 config/has/strerror-r-gnu.c           |  11 ---
 config/has/strerror-r-posix.c         |  11 ---
 config/has/tm-gmtoff.c                |   9 --
 config/has/uselocale.c                |   9 --
 config/header.mk                      |  69 ---------------
 config/pkgconf.sh                     | 100 ---------------------
 config/pkgs.mk                        |  36 --------
 config/prelude.mk                     | 162 ----------------------------------
 config/use/libacl.c                   |   9 --
 config/use/libcap.c                   |   9 --
 config/use/libselinux.c               |   9 --
 config/use/liburing.c                 |   9 --
 config/use/oniguruma.c                |   9 --
 configure                             |  98 ++++++++++++++++++++
 docs/BUILDING.md                      |  47 +++++-----
 tests/util.sh                         |   9 +-
 tests/xspawn.c                        |  15 +---
 108 files changed, 1199 insertions(+), 1141 deletions(-)
 create mode 100755 build/cc.sh
 create mode 100644 build/config.mk
 create mode 100755 build/define-if.sh
 create mode 100644 build/deps.mk
 create mode 100644 build/empty.c
 create mode 100644 build/exports.mk
 create mode 100644 build/flags.mk
 create mode 100644 build/has/acl-get-entry.c
 create mode 100644 build/has/acl-get-file.c
 create mode 100644 build/has/acl-get-tag-type.c
 create mode 100644 build/has/acl-is-trivial-np.c
 create mode 100644 build/has/acl-trivial.c
 create mode 100644 build/has/aligned-alloc.c
 create mode 100644 build/has/confstr.c
 create mode 100644 build/has/extattr-get-file.c
 create mode 100644 build/has/extattr-get-link.c
 create mode 100644 build/has/extattr-list-file.c
 create mode 100644 build/has/extattr-list-link.c
 create mode 100644 build/has/fdclosedir.c
 create mode 100644 build/has/getdents.c
 create mode 100644 build/has/getdents64-syscall.c
 create mode 100644 build/has/getdents64.c
 create mode 100644 build/has/getprogname-gnu.c
 create mode 100644 build/has/getprogname.c
 create mode 100644 build/has/max-align-t.c
 create mode 100644 build/has/pipe2.c
 create mode 100644 build/has/posix-spawn-addfchdir-np.c
 create mode 100644 build/has/posix-spawn-addfchdir.c
 create mode 100644 build/has/st-acmtim.c
 create mode 100644 build/has/st-acmtimespec.c
 create mode 100644 build/has/st-birthtim.c
 create mode 100644 build/has/st-birthtimespec.c
 create mode 100644 build/has/st-flags.c
 create mode 100644 build/has/statx-syscall.c
 create mode 100644 build/has/statx.c
 create mode 100644 build/has/strerror-l.c
 create mode 100644 build/has/strerror-r-gnu.c
 create mode 100644 build/has/strerror-r-posix.c
 create mode 100644 build/has/tm-gmtoff.c
 create mode 100644 build/has/uselocale.c
 create mode 100644 build/header.mk
 create mode 100755 build/pkgconf.sh
 create mode 100644 build/pkgs.mk
 create mode 100644 build/prelude.mk
 create mode 100644 build/use/libacl.c
 create mode 100644 build/use/libcap.c
 create mode 100644 build/use/libselinux.c
 create mode 100644 build/use/liburing.c
 create mode 100644 build/use/oniguruma.c
 delete mode 100755 config/cc.sh
 delete mode 100644 config/config.mk
 delete mode 100755 config/define-if.sh
 delete mode 100644 config/deps.mk
 delete mode 100644 config/empty.c
 delete mode 100644 config/exports.mk
 delete mode 100644 config/flags.mk
 delete mode 100644 config/has/acl-get-entry.c
 delete mode 100644 config/has/acl-get-file.c
 delete mode 100644 config/has/acl-get-tag-type.c
 delete mode 100644 config/has/acl-is-trivial-np.c
 delete mode 100644 config/has/acl-trivial.c
 delete mode 100644 config/has/aligned-alloc.c
 delete mode 100644 config/has/confstr.c
 delete mode 100644 config/has/extattr-get-file.c
 delete mode 100644 config/has/extattr-get-link.c
 delete mode 100644 config/has/extattr-list-file.c
 delete mode 100644 config/has/extattr-list-link.c
 delete mode 100644 config/has/fdclosedir.c
 delete mode 100644 config/has/getdents.c
 delete mode 100644 config/has/getdents64-syscall.c
 delete mode 100644 config/has/getdents64.c
 delete mode 100644 config/has/getprogname-gnu.c
 delete mode 100644 config/has/getprogname.c
 delete mode 100644 config/has/max-align-t.c
 delete mode 100644 config/has/pipe2.c
 delete mode 100644 config/has/posix-spawn-addfchdir-np.c
 delete mode 100644 config/has/posix-spawn-addfchdir.c
 delete mode 100644 config/has/st-acmtim.c
 delete mode 100644 config/has/st-acmtimespec.c
 delete mode 100644 config/has/st-birthtim.c
 delete mode 100644 config/has/st-birthtimespec.c
 delete mode 100644 config/has/st-flags.c
 delete mode 100644 config/has/statx-syscall.c
 delete mode 100644 config/has/statx.c
 delete mode 100644 config/has/strerror-l.c
 delete mode 100644 config/has/strerror-r-gnu.c
 delete mode 100644 config/has/strerror-r-posix.c
 delete mode 100644 config/has/tm-gmtoff.c
 delete mode 100644 config/has/uselocale.c
 delete mode 100644 config/header.mk
 delete mode 100755 config/pkgconf.sh
 delete mode 100644 config/pkgs.mk
 delete mode 100644 config/prelude.mk
 delete mode 100644 config/use/libacl.c
 delete mode 100644 config/use/libcap.c
 delete mode 100644 config/use/libselinux.c
 delete mode 100644 config/use/liburing.c
 delete mode 100644 config/use/oniguruma.c
 create mode 100755 configure

(limited to 'docs')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3890bb0..57f59f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,7 +107,7 @@ jobs:
                 gmake \
                 oniguruma
             jobs=$(sysctl -n hw.ncpu)
-            gmake -j$jobs config
+            MAKE=gmake ./configure
             gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   netbsd:
@@ -133,7 +133,7 @@ jobs:
                 pkgconf \
                 tcl-expect
             jobs=$(sysctl -n hw.ncpu)
-            make -j$jobs config
+            ./configure
             make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   dragonflybsd:
@@ -165,7 +165,7 @@ jobs:
           run: |
             chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            sudo -u action make config
+            sudo -u action ./configure
             sudo -u action make -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   omnios:
@@ -198,5 +198,5 @@ jobs:
             PATH="/usr/xpg4/bin:$PATH"
             chown -R action:staff .
             jobs=$(getconf NPROCESSORS_ONLN)
-            sudo -u action gmake config
+            sudo -u action MAKE=gmake ./configure
             sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 2245f40..bb68927 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Generate coverage
         run: |
-          make config GCOV=y
+          ./configure GCOV=y
           make -j$(nproc) check TEST_FLAGS="--sudo"
           gcov -abcfpu obj/*/*.o
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c21fda5..a0b8fe3 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Configure
         run: |
-          make -j$(nproc) config
+          ./configure
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
diff --git a/Makefile b/Makefile
index 981c322..2fb35fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,50 @@
 # Copyright © Tavian Barnes <tavianator@tavianator.com>
 # SPDX-License-Identifier: 0BSD
 
-# This Makefile implements the configuration and build steps for bfs.  It is
-# portable to both GNU make and most BSD make implementations.  To build bfs,
-# run
+# To build bfs, run
 #
-#     $ make config
+#     $ ./configure
 #     $ make
 
 # Utilities and GNU/BSD portability
-include config/prelude.mk
+include build/prelude.mk
 
 # The default build target
 default: bfs
 .PHONY: default
 
 # Include the generated build config, if it exists
--include ${CONFIG}
+-include gen/config.mk
 
-## Configuration phase (`make config`)
-
-# The configuration goal itself
-config::
-	@+${MAKE} -sf config/config.mk
+## Configuration phase (`./configure`)
 
 # bfs used to have flag-like targets (`make release`, `make asan ubsan`, etc.).
 # Direct users to the new configuration system.
 asan lsan msan tsan ubsan gcov lint release::
-	@printf 'error: `%s %s` is no longer supported. ' "${MAKE}" $@ >&2
-	@printf 'Use `%s config %s=y` instead.\n' "${MAKE}" $$(echo $@ | tr 'a-z' 'A-Z') >&2
+	@printf 'error: `%s %s` is no longer supported. Use `./configure %s=y` instead.\n' \
+	    "${MAKE}" $@ $$(echo $@ | tr 'a-z' 'A-Z') >&2
 	@false
 
-# Print an error if `make` is run before `make config`
-${CONFIG}::
+# Print an error if `make` is run before `./configure`
+gen/config.mk::
 	@if ! [ -e $@ ]; then \
-	    printf 'error: You must run `%s config` before `%s`.\n' "${MAKE}" "${MAKE}" >&2; \
+	    printf 'error: You must run `./configure` before `%s`.\n' "${MAKE}" >&2; \
 	    false; \
 	fi
 
 ## Build phase (`make`)
 
 # The main binary
-bfs: ${BIN}/bfs
+bfs: bin/bfs
 .PHONY: bfs
 
 # All binaries
 BINS := \
-    ${BIN}/bfs \
-    ${BIN}/tests/mksock \
-    ${BIN}/tests/units \
-    ${BIN}/tests/xspawnee \
-    ${BIN}/tests/xtouch
+    bin/bfs \
+    bin/tests/mksock \
+    bin/tests/units \
+    bin/tests/xspawnee \
+    bin/tests/xtouch
 
 all: ${BINS}
 .PHONY: all
@@ -60,52 +54,50 @@ ALL_CFLAGS = ${CPPFLAGS} ${CFLAGS} ${DEPFLAGS}
 ALL_LDFLAGS = ${CFLAGS} ${LDFLAGS}
 
 # The main binary
-${BIN}/bfs: ${LIBBFS} ${OBJ}/src/main.o
+bin/bfs: ${LIBBFS} obj/src/main.o
 
 ${BINS}:
 	@${MKDIR} ${@D}
-	+${MSG} "[ LD ] ${TGT}" ${CC} ${ALL_LDFLAGS} ${.ALLSRC} ${LDLIBS} -o $@
+	+${MSG} "[ LD ] $@" ${CC} ${ALL_LDFLAGS} ${.ALLSRC} ${LDLIBS} -o $@
 	${POSTLINK}
 
 # Get the .c file for a .o file
-_CSRC = ${@:${OBJ}/%.o=%.c}
-CSRC = ${_CSRC:gen/%=${GEN}/%}
+CSRC = ${@:obj/%.o=%.c}
 
-# Depend on ${CONFIG} to make sure `make config` runs first, and to rebuild when
-# the configuration changes
-${OBJS}: ${CONFIG}
+# Rebuild when the configuration changes
+${OBJS}: gen/config.mk
 	@${MKDIR} ${@D}
-	${MSG} "[ CC ] ${_CSRC}" ${CC} ${ALL_CFLAGS} -c ${CSRC} -o $@
+	${MSG} "[ CC ] ${CSRC}" ${CC} ${ALL_CFLAGS} -c ${CSRC} -o $@
 
 # Save the version number to this file, but only update version.c if it changes
-${GEN}/version.c.new::
+gen/version.c.new::
 	@${MKDIR} ${@D}
 	@printf 'const char bfs_version[] = "' >$@
 	@if [ "$$VERSION" ]; then \
 	    printf '%s' "$$VERSION"; \
-	elif test -d .git && command -v git >/dev/null 2>&1; then \
-	    git describe --always --dirty; \
+	elif test -e src/../.git && command -v git >/dev/null 2>&1; then \
+	    git -C src/.. describe --always --dirty; \
 	else \
 	    echo "3.1.3"; \
 	fi | tr -d '\n' >>$@
 	@printf '";\n' >>$@
 
-${GEN}/version.c: ${GEN}/version.c.new
+gen/version.c: gen/version.c.new
 	@test -e $@ && cmp -s $@ ${.ALLSRC} && rm ${.ALLSRC} || mv ${.ALLSRC} $@
 
-${OBJ}/gen/version.o: ${GEN}/version.c
+obj/gen/version.o: gen/version.c
 
 ## Test phase (`make check`)
 
 # Unit test binaries
 UTEST_BINS := \
-    ${BIN}/tests/units \
-    ${BIN}/tests/xspawnee
+    bin/tests/units \
+    bin/tests/xspawnee
 
 # Integration test binaries
 ITEST_BINS := \
-    ${BIN}/tests/mksock \
-    ${BIN}/tests/xtouch
+    bin/tests/mksock \
+    bin/tests/xtouch
 
 # Build (but don't run) test binaries
 tests: ${UTEST_BINS} ${ITEST_BINS}
@@ -117,45 +109,45 @@ check: unit-tests integration-tests
 
 # Run the unit tests
 unit-tests: ${UTEST_BINS}
-	${MSG} "[TEST] tests/units" ${BIN}/tests/units
+	${MSG} "[TEST] tests/units" bin/tests/units
 .PHONY: unit-tests
 
-${BIN}/tests/units: \
+bin/tests/units: \
     ${UNIT_OBJS} \
     ${LIBBFS}
 
-${BIN}/tests/xspawnee: \
-    ${OBJ}/tests/xspawnee.o
+bin/tests/xspawnee: \
+    obj/tests/xspawnee.o
 
 # The different flag combinations we check
 INTEGRATIONS := default dfs ids eds j1 j2 j3 s
 INTEGRATION_TESTS := ${INTEGRATIONS:%=check-%}
 
 # Check just `bfs`
-check-default: ${BIN}/bfs ${ITEST_BINS}
+check-default: bin/bfs ${ITEST_BINS}
 	+${MSG} "[TEST] bfs" \
-	    ./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs" ${TEST_FLAGS}
+	    ./tests/tests.sh --make="${MAKE}" --bfs="bin/bfs" ${TEST_FLAGS}
 
 # Check the different search strategies
-check-dfs check-ids check-eds: ${BIN}/bfs ${ITEST_BINS}
+check-dfs check-ids check-eds: bin/bfs ${ITEST_BINS}
 	+${MSG} "[TEST] bfs -S ${@:check-%=%}" \
-	    ./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs -S ${@:check-%=%}" ${TEST_FLAGS}
+	    ./tests/tests.sh --make="${MAKE}" --bfs="bin/bfs -S ${@:check-%=%}" ${TEST_FLAGS}
 
 # Check various flags
-check-j1 check-j2 check-j3 check-s: ${BIN}/bfs ${ITEST_BINS}
+check-j1 check-j2 check-j3 check-s: bin/bfs ${ITEST_BINS}
 	+${MSG} "[TEST] bfs -${@:check-%=%}" \
-	    ./tests/tests.sh --make="${MAKE}" --bfs="${BIN}/bfs -${@:check-%=%}" ${TEST_FLAGS}
+	    ./tests/tests.sh --make="${MAKE}" --bfs="bin/bfs -${@:check-%=%}" ${TEST_FLAGS}
 
 # Run the integration tests
 integration-tests: ${INTEGRATION_TESTS}
 .PHONY: integration-tests
 
-${BIN}/tests/mksock: \
-    ${OBJ}/tests/mksock.o \
+bin/tests/mksock: \
+    obj/tests/mksock.o \
     ${LIBBFS}
 
-${BIN}/tests/xtouch: \
-    ${OBJ}/tests/xtouch.o \
+bin/tests/xtouch: \
+    obj/tests/xtouch.o \
     ${LIBBFS}
 
 # `make distcheck` configurations
@@ -183,8 +175,10 @@ DISTCHECK_CONFIG_m32 := EXTRA_CFLAGS="-m32" PKG_CONFIG_LIBDIR=/usr/lib32/pkgconf
 DISTCHECK_CONFIG_release := RELEASE=y
 
 ${DISTCHECKS}::
-	+${MAKE} -rs BUILDDIR=${BUILDDIR}/$@ config ${DISTCHECK_CONFIG_${@:distcheck-%=%}}
-	+${MAKE} -s BUILDDIR=${BUILDDIR}/$@ check TEST_FLAGS="--sudo --verbose=skipped"
+	@${MKDIR} $@
+	@+cd $@ \
+	    && ../configure ${DISTCHECK_CONFIG_${@:distcheck-%=%}} \
+	    && ${MAKE} -s check TEST_FLAGS="--sudo --verbose=skipped"
 
 ## Packaging (`make install`)
 
@@ -193,44 +187,49 @@ DEST_MANDIR := ${DESTDIR}${MANDIR}
 
 install::
 	${Q}${MKDIR} ${DEST_PREFIX}/bin
-	${MSG} "[INSTALL] bin/bfs" \
-	    ${INSTALL} -m755 ${BIN}/bfs ${DEST_PREFIX}/bin/bfs
+	${MSG} "[INST] bin/bfs" \
+	    ${INSTALL} -m755 bin/bfs ${DEST_PREFIX}/bin/bfs
 	${Q}${MKDIR} ${DEST_MANDIR}/man1
-	${MSG} "[INSTALL] man/man1/bfs.1" \
+	${MSG} "[INST] man/man1/bfs.1" \
 	    ${INSTALL} -m644 docs/bfs.1 ${DEST_MANDIR}/man1/bfs.1
 	${Q}${MKDIR} ${DEST_PREFIX}/share/bash-completion/completions
-	${MSG} "[INSTALL] completions/bfs.bash" \
+	${MSG} "[INST] completions/bfs.bash" \
 	    ${INSTALL} -m644 completions/bfs.bash ${DEST_PREFIX}/share/bash-completion/completions/bfs
 	${Q}${MKDIR} ${DEST_PREFIX}/share/zsh/site-functions
-	${MSG} "[INSTALL] completions/bfs.zsh" \
+	${MSG} "[INST] completions/bfs.zsh" \
 	    ${INSTALL} -m644 completions/bfs.zsh ${DEST_PREFIX}/share/zsh/site-functions/_bfs
 	${Q}${MKDIR} ${DEST_PREFIX}/share/fish/vendor_completions.d
-	${MSG} "[INSTALL] completions/bfs.fish" \
+		${MSG} "[INST] completions/bfs.fish" \
 	    ${INSTALL} -m644 completions/bfs.fish ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
 
 uninstall::
-	${RM} ${DEST_PREFIX}/share/bash-completion/completions/bfs
-	${RM} ${DEST_PREFIX}/share/zsh/site-functions/_bfs
-	${RM} ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
-	${RM} ${DEST_MANDIR}/man1/bfs.1
-	${RM} ${DEST_PREFIX}/bin/bfs
+	${MSG} "[ RM ] completions/bfs.bash" \
+	    ${RM} ${DEST_PREFIX}/share/bash-completion/completions/bfs
+	${MSG} "[ RM ] completions/bfs.zsh" \
+	    ${RM} ${DEST_PREFIX}/share/zsh/site-functions/_bfs
+	${MSG} "[ RM ] completions/bfs.fish" \
+	    ${RM} ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
+	${MSG} "[ RM ] man/man1/bfs.1" \
+	    ${RM} ${DEST_MANDIR}/man1/bfs.1
+	${MSG} "[ RM ] bin/bfs" \
+	    ${RM} ${DEST_PREFIX}/bin/bfs
 
 # Check that `make install` works and `make uninstall` removes everything
 check-install::
-	+${MAKE} install DESTDIR=${BUILDDIR}/pkg
-	+${MAKE} uninstall DESTDIR=${BUILDDIR}/pkg
-	${BIN}/bfs ${BUILDDIR}/pkg -not -type d -print -exit 1
-	${RM} -r ${BUILDDIR}/pkg
+	+${MAKE} install DESTDIR=pkg
+	+${MAKE} uninstall DESTDIR=pkg
+	bin/bfs pkg -not -type d -print -exit 1
+	${RM} -r pkg
 
 ## Cleanup (`make clean`)
 
 # Clean all build products
 clean::
 	${MSG} "[ RM ] bin obj" \
-	    ${RM} -r ${BIN} ${OBJ}
+	    ${RM} -r bin obj
 
 # Clean everything, including generated files
 distclean: clean
 	${MSG} "[ RM ] gen" \
-	    ${RM} -r ${GEN} ${DISTCHECKS}
+	    ${RM} -r gen ${DISTCHECKS}
 .PHONY: distclean
diff --git a/README.md b/README.md
index b95c16b..922ebdc 100644
--- a/README.md
+++ b/README.md
@@ -333,7 +333,7 @@ Once you have the dependencies, you can build <code>bfs</code>.
 Download one of the [releases](https://github.com/tavianator/bfs/releases) or clone the [git repo](https://github.com/tavianator/bfs).
 Then run
 
-    $ make config
+    $ ./configure
     $ make
 
 This will build the `./bin/bfs` binary.
@@ -343,7 +343,7 @@ Run the test suite to make sure it works correctly:
 
 If you're interested in speed, you may want to build the release version instead:
 
-    $ make config RELEASE=y
+    $ ./configure RELEASE=y
     $ make
 
 Finally, if you want to install it globally, run
diff --git a/bench/bench.sh b/bench/bench.sh
index 1526fe5..ba46599 100644
--- a/bench/bench.sh
+++ b/bench/bench.sh
@@ -221,7 +221,7 @@ setup() {
     fi
 
     echo "Building bfs ..."
-    as-user make -s -j"$nproc" RELEASE=y
+    as-user ./configure RELEASE=y
     as-user make -s -j"$nproc" all
 
     as-user mkdir -p bench/corpus
@@ -254,8 +254,8 @@ setup() {
                 echo "Building bfs $commit ..."
                 cd "$worktree"
                 as-user git checkout -qd "$commit" --
-                if [ -e config ]; then
-                    as-user make -s -j"$nproc" config RELEASE=1
+                if [ -e configure ]; then
+                    as-user ./configure RELEASE=1
                     as-user make -s -j"$nproc"
                 else
                     as-user make -s -j"$nproc" release
diff --git a/build/cc.sh b/build/cc.sh
new file mode 100755
index 0000000..45d51ca
--- /dev/null
+++ b/build/cc.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Run the compiler and check if it succeeded
+
+set -eu
+
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+
+(
+    set -x
+    $XCC $XCPPFLAGS $XCFLAGS $XLDFLAGS "$@" $XLDLIBS -o "$TMP"
+)
diff --git a/build/config.mk b/build/config.mk
new file mode 100644
index 0000000..153838d
--- /dev/null
+++ b/build/config.mk
@@ -0,0 +1,62 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile that implements `./configure`
+
+include build/prelude.mk
+include build/exports.mk
+
+# All configuration steps
+config: gen/config.mk gen/config.h
+.PHONY: config
+
+# Makefile fragments generated by `./configure`
+MKS := \
+    gen/vars.mk \
+    gen/flags.mk \
+    gen/deps.mk \
+    gen/pkgs.mk
+
+# The main configuration file, which includes the others
+gen/config.mk: ${MKS}
+	${MSG} "[ GEN] $@"
+	@printf '# %s\n' "$@" >$@
+	@printf 'include %s\n' ${.ALLSRC} >>$@
+	${VCAT} gen/config.mk
+.PHONY: gen/config.mk
+
+# Saves the configurable variables
+gen/vars.mk::
+	@${MKDIR} ${@D}
+	${MSG} "[ GEN] $@"
+	@printf '# %s\n' "$@" >$@
+	@printf 'PREFIX := %s\n' "$$XPREFIX" >>$@
+	@printf 'MANDIR := %s\n' "$$XMANDIR" >>$@
+	@printf 'OS := %s\n' "$${OS:-$$(uname)}" >>$@
+	@printf 'CC := %s\n' "$$XCC" >>$@
+	@printf 'INSTALL := %s\n' "$$XINSTALL" >>$@
+	@printf 'MKDIR := %s\n' "$$XMKDIR" >>$@
+	@printf 'PKG_CONFIG := %s\n' "$$XPKG_CONFIG" >>$@
+	@printf 'RM := %s\n' "$$XRM" >>$@
+	${VCAT} $@
+
+# Sets the build flags.  This depends on vars.mk and uses a recursive make so
+# that the default flags can depend on variables like ${OS}.
+gen/flags.mk: gen/vars.mk
+	@+${MAKE} -sf build/flags.mk $@
+.PHONY: gen/flags.mk
+
+# Check for dependency generation support
+gen/deps.mk: gen/flags.mk
+	@+${MAKE} -sf build/deps.mk $@
+.PHONY: gen/deps.mk
+
+# Auto-detect dependencies and their build flags
+gen/pkgs.mk: gen/flags.mk
+	@+${MAKE} -sf build/pkgs.mk $@
+.PHONY: gen/pkgs.mk
+
+# Compile-time feature detection
+gen/config.h: gen/config.mk
+	@+${MAKE} -sf build/header.mk $@
+.PHONY: gen/config.h
diff --git a/build/define-if.sh b/build/define-if.sh
new file mode 100755
index 0000000..295ead8
--- /dev/null
+++ b/build/define-if.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Output a C preprocessor definition based on whether a command succeeds
+
+set -eu
+
+SLUG="${1#build/}"
+SLUG="${SLUG%.c}"
+MACRO="BFS_$(printf '%s' "$SLUG" | tr '/a-z-' '_A-Z_')"
+shift
+
+if "$@"; then
+    printf '#define %s true\n' "$MACRO"
+else
+    printf '#define %s false\n' "$MACRO"
+    exit 1
+fi
diff --git a/build/deps.mk b/build/deps.mk
new file mode 100644
index 0000000..e8dd9fb
--- /dev/null
+++ b/build/deps.mk
@@ -0,0 +1,18 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile that generates gen/deps.mk
+
+include build/prelude.mk
+include gen/vars.mk
+include gen/flags.mk
+include build/exports.mk
+
+gen/deps.mk::
+	${MSG} "[ GEN] $@"
+	printf '# %s\n' "$@" >$@
+	if build/cc.sh -MD -MP -MF /dev/null build/empty.c; then \
+	    printf 'DEPFLAGS := -MD -MP\n'; \
+	fi >>$@ 2>$@.log
+	${VCAT} $@
+	printf -- '-include %s\n' ${OBJS:.o=.d} >>$@
diff --git a/build/empty.c b/build/empty.c
new file mode 100644
index 0000000..4fa9a5b
--- /dev/null
+++ b/build/empty.c
@@ -0,0 +1,6 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+int main(void) {
+	return 0;
+}
diff --git a/build/exports.mk b/build/exports.mk
new file mode 100644
index 0000000..ed19134
--- /dev/null
+++ b/build/exports.mk
@@ -0,0 +1,20 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile fragment that exports variables used by configuration scripts
+
+export XPREFIX=${PREFIX}
+export XMANDIR=${MANDIR}
+
+export XCC=${CC}
+export XINSTALL=${INSTALL}
+export XMKDIR=${MKDIR}
+export XPKG_CONFIG=${PKG_CONFIG}
+export XRM=${RM}
+
+export XCPPFLAGS=${CPPFLAGS}
+export XCFLAGS=${CFLAGS}
+export XLDFLAGS=${LDFLAGS}
+export XLDLIBS=${LDLIBS}
+
+export XNOLIBS=${NOLIBS}
diff --git a/build/flags.mk b/build/flags.mk
new file mode 100644
index 0000000..0a44e94
--- /dev/null
+++ b/build/flags.mk
@@ -0,0 +1,136 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile that generates gen/flags.mk
+
+include build/prelude.mk
+include gen/vars.mk
+
+# Configurable flags
+CPPFLAGS ?=
+CFLAGS ?= \
+    -g \
+    -Wall \
+    -Wformat=2 \
+    -Werror=implicit \
+    -Wimplicit-fallthrough \
+    -Wmissing-declarations \
+    -Wshadow \
+    -Wsign-compare \
+    -Wstrict-prototypes
+LDFLAGS ?=
+LDLIBS ?=
+
+export XCPPFLAGS=${CPPFLAGS}
+export XCFLAGS=${CFLAGS}
+export XLDFLAGS=${LDFLAGS}
+export XLDLIBS=${LDLIBS}
+
+# Immutable flags
+export BFS_CPPFLAGS= \
+    -Isrc \
+    -Igen \
+    -D__EXTENSIONS__ \
+    -D_ATFILE_SOURCE \
+    -D_BSD_SOURCE \
+    -D_DARWIN_C_SOURCE \
+    -D_DEFAULT_SOURCE \
+    -D_GNU_SOURCE \
+    -D_POSIX_PTHREAD_SEMANTICS \
+    -D_FILE_OFFSET_BITS=64 \
+    -D_TIME_BITS=64
+export BFS_CFLAGS= -std=c17 -pthread
+
+# Platform-specific system libraries
+LDLIBS,DragonFly := -lposix1e
+LDLIBS,Linux := -lrt
+LDLIBS,NetBSD := -lutil
+LDLIBS,SunOS := -lsec -lsocket -lnsl
+export BFS_LDLIBS=${LDLIBS,${OS}}
+
+# Build profiles
+_ASAN := ${TRUTHY,${ASAN}}
+_LSAN := ${TRUTHY,${LSAN}}
+_MSAN := ${TRUTHY,${MSAN}}
+_TSAN := ${TRUTHY,${TSAN}}
+_UBSAN := ${TRUTHY,${UBSAN}}
+_GCOV := ${TRUTHY,${GCOV}}
+_LINT := ${TRUTHY,${LINT}}
+_RELEASE := ${TRUTHY,${RELEASE}}
+
+# https://github.com/google/sanitizers/issues/342
+TSAN_CPPFLAGS,y := -DBFS_USE_TARGET_CLONES=0
+export TSAN_CPPFLAGS=${TSAN_CPPFLAGS,${_TSAN}}
+
+ASAN_CFLAGS,y := -fsanitize=address
+LSAN_CFLAGS,y := -fsanitize=leak
+MSAN_CFLAGS,y := -fsanitize=memory -fsanitize-memory-track-origins
+TSAN_CFLAGS,y := -fsanitize=thread
+UBSAN_CFLAGS.y := -fsanitize=undefined
+
+export ASAN_CFLAGS=${ASAN_CFLAGS,${_ASAN}}
+export LSAN_CFLAGS=${LSAN_CFLAGS,${_LSAN}}
+export MSAN_CFLAGS=${MSAN_CFLAGS,${_MSAN}}
+export TSAN_CFLAGS=${TSAN_CFLAGS,${_TSAN}}
+export UBSAN_CFLAGS=${UBSAN_CFLAGS,${_UBSAN}}
+
+SAN_CFLAGS,y := -fno-sanitize-recover=all
+INSANE := ${NOT,${_ASAN}${_LSAN}${_MSAN}${_TSAN}${_UBSAN}}
+SAN := ${NOT,${INSANE}}
+export SAN_CFLAGS=${SAN_CFLAGS,${SAN}}
+
+# MSAN and TSAN both need all code to be instrumented
+YESLIBS := ${NOT,${_MSAN}${_TSAN}}
+NOLIBS ?= ${NOT,${YESLIBS}}
+export XNOLIBS=${NOLIBS}
+
+# gcov only intercepts fork()/exec() with -std=gnu*
+GCOV_CFLAGS,y := -std=gnu17 --coverage
+export GCOV_CFLAGS=${GCOV_CFLAGS,${_GCOV}}
+
+LINT_CPPFLAGS,y := -D_FORTIFY_SOURCE=3 -DBFS_LINT
+LINT_CFLAGS,y := -Werror -O2
+
+export LINT_CPPFLAGS=${LINT_CPPFLAGS,${_LINT}}
+export LINT_CFLAGS=${LINT_CFLAGS,${_LINT}}
+
+RELEASE_CPPFLAGS,y := -DNDEBUG
+RELEASE_CFLAGS,y := -O3 -flto=auto
+
+export RELEASE_CPPFLAGS=${RELEASE_CPPFLAGS,${_RELEASE}}
+export RELEASE_CFLAGS=${RELEASE_CFLAGS,${_RELEASE}}
+
+# Set a variable
+SETVAR = printf '%s := %s\n' >>$@
+
+# Append to a variable, if non-empty
+APPEND = append() { test -z "$$2" || printf '%s += %s\n' "$$1" "$$2" >>$@; }; append
+
+gen/flags.mk::
+	${MSG} "[ GEN] $@"
+	printf '# %s\n' "$@" >$@
+	${SETVAR} CPPFLAGS "$$BFS_CPPFLAGS"
+	${APPEND} CPPFLAGS "$$TSAN_CPPFLAGS"
+	${APPEND} CPPFLAGS "$$LINT_CPPFLAGS"
+	${APPEND} CPPFLAGS "$$RELEASE_CPPFLAGS"
+	${APPEND} CPPFLAGS "$$XCPPFLAGS"
+	${APPEND} CPPFLAGS "$$EXTRA_CPPFLAGS"
+	${SETVAR} CFLAGS "$$BFS_CFLAGS"
+	${APPEND} CFLAGS "$$ASAN_CFLAGS"
+	${APPEND} CFLAGS "$$LSAN_CFLAGS"
+	${APPEND} CFLAGS "$$MSAN_CFLAGS"
+	${APPEND} CFLAGS "$$TSAN_CFLAGS"
+	${APPEND} CFLAGS "$$UBSAN_CFLAGS"
+	${APPEND} CFLAGS "$$SAN_CFLAGS"
+	${APPEND} CFLAGS "$$GCOV_CFLAGS"
+	${APPEND} CFLAGS "$$LINT_CFLAGS"
+	${APPEND} CFLAGS "$$RELEASE_CFLAGS"
+	${APPEND} CFLAGS "$$XCFLAGS"
+	${APPEND} CFLAGS "$$EXTRA_CFLAGS"
+	${SETVAR} LDFLAGS "$$XLDFLAGS"
+	${SETVAR} LDLIBS "$$XLDLIBS"
+	${APPEND} LDLIBS "$$EXTRA_LDLIBS"
+	${APPEND} LDLIBS "$$BFS_LDLIBS"
+	${SETVAR} NOLIBS "$$XNOLIBS"
+	test "${OS}-${SAN}" != FreeBSD-y || printf 'POSTLINK = elfctl -e +noaslr $$@\n' >>$@
+	${VCAT} $@
diff --git a/build/has/acl-get-entry.c b/build/has/acl-get-entry.c
new file mode 100644
index 0000000..3cce771
--- /dev/null
+++ b/build/has/acl-get-entry.c
@@ -0,0 +1,8 @@
+#include <sys/types.h>
+#include <sys/acl.h>
+
+int main(void) {
+	acl_t acl = acl_get_file(".", ACL_TYPE_DEFAULT);
+	acl_entry_t entry;
+	return acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
+}
diff --git a/build/has/acl-get-file.c b/build/has/acl-get-file.c
new file mode 100644
index 0000000..89fbf23
--- /dev/null
+++ b/build/has/acl-get-file.c
@@ -0,0 +1,8 @@
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/acl.h>
+
+int main(void) {
+	acl_t acl = acl_get_file(".", ACL_TYPE_DEFAULT);
+	return acl == (acl_t)NULL;
+}
diff --git a/build/has/acl-get-tag-type.c b/build/has/acl-get-tag-type.c
new file mode 100644
index 0000000..2901956
--- /dev/null
+++ b/build/has/acl-get-tag-type.c
@@ -0,0 +1,10 @@
+#include <string.h>
+#include <sys/types.h>
+#include <sys/acl.h>
+
+int main(void) {
+	acl_entry_t entry;
+	memset(&entry, 0, sizeof(entry));
+	acl_tag_t tag;
+	return acl_get_tag_type(entry, &tag);
+}
diff --git a/build/has/acl-is-trivial-np.c b/build/has/acl-is-trivial-np.c
new file mode 100644
index 0000000..9ca9fc7
--- /dev/null
+++ b/build/has/acl-is-trivial-np.c
@@ -0,0 +1,12 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/types.h>
+#include <sys/acl.h>
+
+int main(void) {
+	acl_t acl = acl_get_fd(3);
+	int trivial;
+	acl_is_trivial_np(acl, &trivial);
+	return 0;
+}
diff --git a/build/has/acl-trivial.c b/build/has/acl-trivial.c
new file mode 100644
index 0000000..7efc838
--- /dev/null
+++ b/build/has/acl-trivial.c
@@ -0,0 +1,8 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/acl.h>
+
+int main(void) {
+	return acl_trivial(".");
+}
diff --git a/build/has/aligned-alloc.c b/build/has/aligned-alloc.c
new file mode 100644
index 0000000..4460038
--- /dev/null
+++ b/build/has/aligned-alloc.c
@@ -0,0 +1,8 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stdlib.h>
+
+int main(void) {
+	return !aligned_alloc(_Alignof(void *), sizeof(void *));
+}
diff --git a/build/has/confstr.c b/build/has/confstr.c
new file mode 100644
index 0000000..58280b4
--- /dev/null
+++ b/build/has/confstr.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <unistd.h>
+
+int main(void) {
+	confstr(_CS_PATH, NULL, 0);
+	return 0;
+}
diff --git a/build/has/extattr-get-file.c b/build/has/extattr-get-file.c
new file mode 100644
index 0000000..ac9cf96
--- /dev/null
+++ b/build/has/extattr-get-file.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/extattr.h>
+
+int main(void) {
+	return extattr_get_file("file", EXTATTR_NAMESPACE_USER, "xattr", NULL, 0);
+}
diff --git a/build/has/extattr-get-link.c b/build/has/extattr-get-link.c
new file mode 100644
index 0000000..c35be5b
--- /dev/null
+++ b/build/has/extattr-get-link.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/extattr.h>
+
+int main(void) {
+	return extattr_get_link("link", EXTATTR_NAMESPACE_USER, "xattr", NULL, 0);
+}
diff --git a/build/has/extattr-list-file.c b/build/has/extattr-list-file.c
new file mode 100644
index 0000000..e68a8bb
--- /dev/null
+++ b/build/has/extattr-list-file.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/extattr.h>
+
+int main(void) {
+	return extattr_list_file("file", EXTATTR_NAMESPACE_USER, NULL, 0);
+}
diff --git a/build/has/extattr-list-link.c b/build/has/extattr-list-link.c
new file mode 100644
index 0000000..49f0ec2
--- /dev/null
+++ b/build/has/extattr-list-link.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/extattr.h>
+
+int main(void) {
+	return extattr_list_link("link", EXTATTR_NAMESPACE_USER, NULL, 0);
+}
diff --git a/build/has/fdclosedir.c b/build/has/fdclosedir.c
new file mode 100644
index 0000000..f4ad1f5
--- /dev/null
+++ b/build/has/fdclosedir.c
@@ -0,0 +1,8 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <dirent.h>
+
+int main(void) {
+	return fdclosedir(opendir("."));
+}
diff --git a/build/has/getdents.c b/build/has/getdents.c
new file mode 100644
index 0000000..d0d4228
--- /dev/null
+++ b/build/has/getdents.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <dirent.h>
+
+int main(void) {
+	struct dirent de;
+	getdents(3, &de, 1024);
+	return 0;
+}
diff --git a/build/has/getdents64-syscall.c b/build/has/getdents64-syscall.c
new file mode 100644
index 0000000..4838c14
--- /dev/null
+++ b/build/has/getdents64-syscall.c
@@ -0,0 +1,12 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <dirent.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+int main(void) {
+	struct dirent64 de;
+	syscall(SYS_getdents64, 3, &de, 1024);
+	return 0;
+}
diff --git a/build/has/getdents64.c b/build/has/getdents64.c
new file mode 100644
index 0000000..1abf36d
--- /dev/null
+++ b/build/has/getdents64.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <dirent.h>
+
+int main(void) {
+	struct dirent64 de;
+	getdents64(3, &de, 1024);
+	return 0;
+}
diff --git a/build/has/getprogname-gnu.c b/build/has/getprogname-gnu.c
new file mode 100644
index 0000000..6b97c5e
--- /dev/null
+++ b/build/has/getprogname-gnu.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <errno.h>
+
+int main(void) {
+	const char *str = program_invocation_short_name;
+	return str[0];
+}
diff --git a/build/has/getprogname.c b/build/has/getprogname.c
new file mode 100644
index 0000000..83dc8e8
--- /dev/null
+++ b/build/has/getprogname.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stdlib.h>
+
+int main(void) {
+	const char *str = getprogname();
+	return str[0];
+}
diff --git a/build/has/max-align-t.c b/build/has/max-align-t.c
new file mode 100644
index 0000000..96165ce
--- /dev/null
+++ b/build/has/max-align-t.c
@@ -0,0 +1,8 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <stddef.h>
+
+int main(void) {
+	return _Alignof(max_align_t);
+}
diff --git a/build/has/pipe2.c b/build/has/pipe2.c
new file mode 100644
index 0000000..4cb43b5
--- /dev/null
+++ b/build/has/pipe2.c
@@ -0,0 +1,10 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <fcntl.h>
+#include <unistd.h>
+
+int main(void) {
+	int fds[2];
+	return pipe2(fds, O_CLOEXEC);
+}
diff --git a/build/has/posix-spawn-addfchdir-np.c b/build/has/posix-spawn-addfchdir-np.c
new file mode 100644
index 0000000..b870a53
--- /dev/null
+++ b/build/has/posix-spawn-addfchdir-np.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <spawn.h>
+
+int main(void) {
+	posix_spawn_file_actions_t actions;
+	posix_spawn_file_actions_init(&actions);
+	posix_spawn_file_actions_addfchdir_np(&actions, 3);
+	return 0;
+}
diff --git a/build/has/posix-spawn-addfchdir.c b/build/has/posix-spawn-addfchdir.c
new file mode 100644
index 0000000..c52ff81
--- /dev/null
+++ b/build/has/posix-spawn-addfchdir.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <spawn.h>
+
+int main(void) {
+	posix_spawn_file_actions_t actions;
+	posix_spawn_file_actions_init(&actions);
+	posix_spawn_file_actions_addfchdir(&actions, 3);
+	return 0;
+}
diff --git a/build/has/st-acmtim.c b/build/has/st-acmtim.c
new file mode 100644
index 0000000..d687ab0
--- /dev/null
+++ b/build/has/st-acmtim.c
@@ -0,0 +1,12 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/stat.h>
+
+int main(void) {
+	struct stat sb = {0};
+	unsigned int a = sb.st_atim.tv_sec;
+	unsigned int c = sb.st_ctim.tv_sec;
+	unsigned int m = sb.st_mtim.tv_sec;
+	return a + c + m;
+}
diff --git a/build/has/st-acmtimespec.c b/build/has/st-acmtimespec.c
new file mode 100644
index 0000000..f747bc0
--- /dev/null
+++ b/build/has/st-acmtimespec.c
@@ -0,0 +1,12 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/stat.h>
+
+int main(void) {
+	struct stat sb = {0};
+	unsigned int a = sb.st_atimespec.tv_sec;
+	unsigned int c = sb.st_ctimespec.tv_sec;
+	unsigned int m = sb.st_mtimespec.tv_sec;
+	return a + c + m;
+}
diff --git a/build/has/st-birthtim.c b/build/has/st-birthtim.c
new file mode 100644
index 0000000..4964571
--- /dev/null
+++ b/build/has/st-birthtim.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/stat.h>
+
+int main(void) {
+	struct stat sb = {0};
+	return sb.st_birthtim.tv_sec;
+}
diff --git a/build/has/st-birthtimespec.c b/build/has/st-birthtimespec.c
new file mode 100644
index 0000000..91a613f
--- /dev/null
+++ b/build/has/st-birthtimespec.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/stat.h>
+
+int main(void) {
+	struct stat sb = {0};
+	return sb.st_birthtimespec.tv_sec;
+}
diff --git a/build/has/st-flags.c b/build/has/st-flags.c
new file mode 100644
index 0000000..b1d0c32
--- /dev/null
+++ b/build/has/st-flags.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/stat.h>
+
+int main(void) {
+	struct stat sb = {0};
+	return sb.st_flags;
+}
diff --git a/build/has/statx-syscall.c b/build/has/statx-syscall.c
new file mode 100644
index 0000000..87ec869
--- /dev/null
+++ b/build/has/statx-syscall.c
@@ -0,0 +1,13 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <fcntl.h>
+#include <linux/stat.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+int main(void) {
+	struct statx sb;
+	syscall(SYS_statx, AT_FDCWD, ".", 0, STATX_BASIC_STATS, &sb);
+	return 0;
+}
diff --git a/build/has/statx.c b/build/has/statx.c
new file mode 100644
index 0000000..65f1674
--- /dev/null
+++ b/build/has/statx.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+int main(void) {
+	struct statx sb;
+	statx(AT_FDCWD, ".", 0, STATX_BASIC_STATS, &sb);
+	return 0;
+}
diff --git a/build/has/strerror-l.c b/build/has/strerror-l.c
new file mode 100644
index 0000000..3dcc4d7
--- /dev/null
+++ b/build/has/strerror-l.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <errno.h>
+#include <locale.h>
+#include <string.h>
+
+int main(void) {
+	locale_t locale = duplocale(LC_GLOBAL_LOCALE);
+	return !strerror_l(ENOMEM, locale);
+}
diff --git a/build/has/strerror-r-gnu.c b/build/has/strerror-r-gnu.c
new file mode 100644
index 0000000..26ca0ee
--- /dev/null
+++ b/build/has/strerror-r-gnu.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <errno.h>
+#include <string.h>
+
+int main(void) {
+	char buf[256];
+	// Check that strerror_r() returns a pointer
+	return *strerror_r(ENOMEM, buf, sizeof(buf));
+}
diff --git a/build/has/strerror-r-posix.c b/build/has/strerror-r-posix.c
new file mode 100644
index 0000000..41b2d30
--- /dev/null
+++ b/build/has/strerror-r-posix.c
@@ -0,0 +1,11 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <errno.h>
+#include <string.h>
+
+int main(void) {
+	char buf[256];
+	// Check that strerror_r() returns an integer
+	return 2 * strerror_r(ENOMEM, buf, sizeof(buf));
+}
diff --git a/build/has/tm-gmtoff.c b/build/has/tm-gmtoff.c
new file mode 100644
index 0000000..543df48
--- /dev/null
+++ b/build/has/tm-gmtoff.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <time.h>
+
+int main(void) {
+	struct tm tm = {0};
+	return tm.tm_gmtoff;
+}
diff --git a/build/has/uselocale.c b/build/has/uselocale.c
new file mode 100644
index 0000000..a712ff8
--- /dev/null
+++ b/build/has/uselocale.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <locale.h>
+
+int main(void) {
+	locale_t locale = uselocale((locale_t)0);
+	return locale == LC_GLOBAL_LOCALE;
+}
diff --git a/build/header.mk b/build/header.mk
new file mode 100644
index 0000000..3f77ca5
--- /dev/null
+++ b/build/header.mk
@@ -0,0 +1,69 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile that generates gen/config.h
+
+include build/prelude.mk
+include gen/config.mk
+include build/exports.mk
+
+# All header fragments we generate
+HEADERS := \
+    gen/has/acl-get-entry.h \
+    gen/has/acl-get-file.h \
+    gen/has/acl-get-tag-type.h \
+    gen/has/acl-is-trivial-np.h \
+    gen/has/acl-trivial.h \
+    gen/has/aligned-alloc.h \
+    gen/has/confstr.h \
+    gen/has/extattr-get-file.h \
+    gen/has/extattr-get-link.h \
+    gen/has/extattr-list-file.h \
+    gen/has/extattr-list-link.h \
+    gen/has/fdclosedir.h \
+    gen/has/getdents.h \
+    gen/has/getdents64.h \
+    gen/has/getdents64-syscall.h \
+    gen/has/getprogname.h \
+    gen/has/getprogname-gnu.h \
+    gen/has/max-align-t.h \
+    gen/has/pipe2.h \
+    gen/has/posix-spawn-addfchdir.h \
+    gen/has/posix-spawn-addfchdir-np.h \
+    gen/has/st-acmtim.h \
+    gen/has/st-acmtimespec.h \
+    gen/has/st-birthtim.h \
+    gen/has/st-birthtimespec.h \
+    gen/has/st-flags.h \
+    gen/has/statx.h \
+    gen/has/statx-syscall.h \
+    gen/has/strerror-l.h \
+    gen/has/strerror-r-gnu.h \
+    gen/has/strerror-r-posix.h \
+    gen/has/tm-gmtoff.h \
+    gen/has/uselocale.h
+
+# Previously generated by pkgs.mk
+PKG_HEADERS := ${ALL_PKGS:%=gen/use/%.h}
+
+gen/config.h: ${PKG_HEADERS} ${HEADERS}
+	${MSG} "[ GEN] $@"
+	printf '// %s\n' "$@" >$@
+	printf '#ifndef BFS_CONFIG_H\n' >>$@
+	printf '#define BFS_CONFIG_H\n' >>$@
+	cat ${.ALLSRC} >>$@
+	printf '#endif // BFS_CONFIG_H\n' >>$@
+	cat ${.ALLSRC:%=%.log} >$@.log
+	${VCAT} $@
+.PHONY: gen/config.h
+
+# The short name of the config test
+SLUG = ${@:gen/%.h=%}
+
+${HEADERS}::
+	${MKDIR} ${@D}
+	if build/define-if.sh ${SLUG} build/cc.sh build/${SLUG}.c >$@ 2>$@.log; then \
+	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✔\n' ${SLUG}.c; \
+	else \
+	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✘\n' ${SLUG}.c; \
+	fi
diff --git a/build/pkgconf.sh b/build/pkgconf.sh
new file mode 100755
index 0000000..96e4bf1
--- /dev/null
+++ b/build/pkgconf.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# pkg-config wrapper with hardcoded fallbacks
+
+set -eu
+
+MODE=
+case "${1:-}" in
+    --*)
+        MODE="$1"
+        shift
+esac
+
+if [ $# -lt 1 ]; then
+    exit
+fi
+
+case "$XNOLIBS" in
+    y|1)
+        exit 1
+esac
+
+if [ -z "$MODE" ]; then
+    # Check whether the libraries exist at all
+    for LIB; do
+        # Check ${USE_$LIB}
+        USE_LIB="USE_$(printf '%s' "$LIB" | tr 'a-z-' 'A-Z_')"
+        eval "USE=\"\${$USE_LIB:-}\""
+        case "$USE" in
+            y|1)
+                continue
+                ;;
+            n|0)
+                exit 1
+                ;;
+        esac
+
+        CFLAGS=$("$0" --cflags "$LIB") || exit 1
+        LDFLAGS=$("$0" --ldflags "$LIB") || exit 1
+        LDLIBS=$("$0" --ldlibs "$LIB") || exit 1
+        build/cc.sh $CFLAGS $LDFLAGS build/use/$LIB.c $LDLIBS || exit 1
+    done
+fi
+
+# Defer to pkg-config if possible
+if command -v "${XPKG_CONFIG:-}" >/dev/null 2>&1; then
+    case "$MODE" in
+        --cflags)
+            "$XPKG_CONFIG" --cflags "$@"
+            ;;
+        --ldflags)
+            "$XPKG_CONFIG" --libs-only-L --libs-only-other "$@"
+            ;;
+        --ldlibs)
+            "$XPKG_CONFIG" --libs-only-l "$@"
+            ;;
+    esac
+
+    exit
+fi
+
+# pkg-config unavailable, emulate it ourselves
+CFLAGS=""
+LDFLAGS=""
+LDLIBS=""
+
+for LIB; do
+    case "$LIB" in
+        libacl)
+            LDLIB=-lacl
+            ;;
+        libcap)
+            LDLIB=-lcap
+            ;;
+        libselinux)
+            LDLIB=-lselinux
+            ;;
+        liburing)
+            LDLIB=-luring
+            ;;
+        oniguruma)
+            LDLIB=-lonig
+            ;;
+        *)
+            printf 'error: Unknown package %s\n' "$LIB" >&2
+            exit 1
+            ;;
+    esac
+
+    LDLIBS="$LDLIBS$LDLIB "
+done
+
+case "$MODE" in
+    --ldlibs)
+        printf '%s\n' "$LDLIBS"
+    ;;
+esac
diff --git a/build/pkgs.mk b/build/pkgs.mk
new file mode 100644
index 0000000..51ca664
--- /dev/null
+++ b/build/pkgs.mk
@@ -0,0 +1,36 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Makefile that generates gen/pkgs.mk
+
+include build/prelude.mk
+include gen/vars.mk
+include gen/flags.mk
+include build/exports.mk
+
+HEADERS := ${ALL_PKGS:%=gen/use/%.h}
+
+gen/pkgs.mk: ${HEADERS}
+	${MSG} "[ GEN] $@"
+	printf '# %s\n' "$@" >$@
+	gen() { \
+	    printf 'PKGS := %s\n' "$$*"; \
+	    printf 'CFLAGS += %s\n' "$$(build/pkgconf.sh --cflags "$$@")"; \
+	    printf 'LDFLAGS += %s\n' "$$(build/pkgconf.sh --ldflags "$$@")"; \
+	    printf 'LDLIBS := %s $${LDLIBS}\n' "$$(build/pkgconf.sh --ldlibs "$$@")"; \
+	}; \
+	gen $$(grep -l ' true$$' ${.ALLSRC} | sed 's|.*/\(.*\)\.h|\1|') >>$@
+	${VCAT} $@
+
+.PHONY: gen/pkgs.mk
+
+# Convert gen/use/foo.h to foo
+PKG = ${@:gen/use/%.h=%}
+
+${HEADERS}::
+	${MKDIR} ${@D}
+	if build/define-if.sh use/${PKG} build/pkgconf.sh ${PKG} >$@ 2>$@.log; then \
+	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✔\n' use/${PKG}.c; \
+	else \
+	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✘\n' use/${PKG}.c; \
+	fi
diff --git a/build/prelude.mk b/build/prelude.mk
new file mode 100644
index 0000000..b235fa9
--- /dev/null
+++ b/build/prelude.mk
@@ -0,0 +1,133 @@
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# Common makefile utilities.  Compatible with both GNU make and most BSD makes.
+
+# BSD make will chdir into ${.OBJDIR} by default, unless we tell it not to
+.OBJDIR: .
+
+# We don't use any suffix rules
+.SUFFIXES:
+
+# GNU make has $^ for the full list of targets, while BSD make has $> and the
+# long-form ${.ALLSRC}.  We could write $^ $> to get them both, but that would
+# break if one of them implemented support for the other.  So instead, bring
+# BSD's ${.ALLSRC} to GNU.
+.ALLSRC ?= $^
+
+# Installation paths
+DESTDIR ?=
+PREFIX ?= /usr
+MANDIR ?= ${PREFIX}/share/man
+
+# Configurable executables
+CC ?= cc
+INSTALL ?= install
+MKDIR ?= mkdir -p
+PKG_CONFIG ?= pkg-config
+RM ?= rm -f
+
+# GNU and BSD make have incompatible syntax for conditionals, but we can do a
+# lot with just nested variable expansion.  We use "y" as the canonical
+# truthy value, and "" (the empty string) as the canonical falsey value.
+#
+# To normalize a boolean, use ${TRUTHY,${VAR}}, which expands like this:
+#
+#     VAR=y      ${TRUTHY,${VAR}} => ${TRUTHY,y}     => y
+#     VAR=1      ${TRUTHY,${VAR}} => ${TRUTHY,1}     => y
+#     VAR=n      ${TRUTHY,${VAR}} => ${TRUTHY,n}     =>   [empty]
+#     VAR=other  ${TRUTHY,${VAR}} => ${TRUTHY,other} =>   [empty]
+#     VAR=       ${TRUTHY,${VAR}} => ${TRUTHY,}      =>   [emtpy]
+#
+# Inspired by https://github.com/wahern/autoguess
+TRUTHY,y := y
+TRUTHY,1 := y
+
+# Boolean operators are also implemented with nested expansion
+NOT,  := y
+
+# Normalize ${V} to either "y" or ""
+IS_V := ${TRUTHY,${V}}
+
+# Suppress output unless V=1
+Q, := @
+Q  := ${Q,${IS_V}}
+
+# Show full commands with `make V=1`, otherwise short summaries
+MSG = @msg() { \
+          MSG="$$1"; \
+          shift; \
+          test "${IS_V}" || printf '%s\n' "$$MSG"; \
+          test "$${1:-}" || return 0; \
+          test "${IS_V}" && printf '%s\n' "$$*"; \
+          "$$@"; \
+      }; \
+      msg
+
+# Maximum width of a short message, to align the ✔/✘
+MSG_WIDTH := 30
+
+# cat a file if V=1
+VCAT,y := @cat
+VCAT,  := @:
+VCAT   := ${VCAT,${IS_V}}
+
+# All external dependencies
+ALL_PKGS := \
+    libacl \
+    libcap \
+    libselinux \
+    liburing \
+    oniguruma
+
+# List all object files here, as they're needed by both `./configure` and `make`
+
+# All object files except the entry point
+LIBBFS := \
+    obj/src/alloc.o \
+    obj/src/bar.o \
+    obj/src/bfstd.o \
+    obj/src/bftw.o \
+    obj/src/color.o \
+    obj/src/ctx.o \
+    obj/src/diag.o \
+    obj/src/dir.o \
+    obj/src/dstring.o \
+    obj/src/eval.o \
+    obj/src/exec.o \
+    obj/src/expr.o \
+    obj/src/fsade.o \
+    obj/src/ioq.o \
+    obj/src/mtab.o \
+    obj/src/opt.o \
+    obj/src/parse.o \
+    obj/src/printf.o \
+    obj/src/pwcache.o \
+    obj/src/stat.o \
+    obj/src/thread.o \
+    obj/src/trie.o \
+    obj/src/typo.o \
+    obj/src/xregex.o \
+    obj/src/xspawn.o \
+    obj/src/xtime.o \
+    obj/gen/version.o
+
+# Unit test objects
+UNIT_OBJS := \
+    obj/tests/alloc.o \
+    obj/tests/bfstd.o \
+    obj/tests/bit.o \
+    obj/tests/ioq.o \
+    obj/tests/main.o \
+    obj/tests/trie.o \
+    obj/tests/xspawn.o \
+    obj/tests/xtime.o
+
+# All object files
+OBJS := \
+    obj/src/main.o \
+    obj/tests/mksock.o \
+    obj/tests/xspawnee.o \
+    obj/tests/xtouch.o \
+    ${LIBBFS} \
+    ${UNIT_OBJS}
diff --git a/build/use/libacl.c b/build/use/libacl.c
new file mode 100644
index 0000000..de1fe50
--- /dev/null
+++ b/build/use/libacl.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/acl.h>
+
+int main(void) {
+	acl_free(0);
+	return 0;
+}
diff --git a/build/use/libcap.c b/build/use/libcap.c
new file mode 100644
index 0000000..58e832c
--- /dev/null
+++ b/build/use/libcap.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <sys/capability.h>
+
+int main(void) {
+	cap_free(0);
+	return 0;
+}
diff --git a/build/use/libselinux.c b/build/use/libselinux.c
new file mode 100644
index 0000000..bca409d
--- /dev/null
+++ b/build/use/libselinux.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <selinux/selinux.h>
+
+int main(void) {
+	freecon(0);
+	return 0;
+}
diff --git a/build/use/liburing.c b/build/use/liburing.c
new file mode 100644
index 0000000..bea499a
--- /dev/null
+++ b/build/use/liburing.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <liburing.h>
+
+int main(void) {
+	io_uring_free_probe(0);
+	return 0;
+}
diff --git a/build/use/oniguruma.c b/build/use/oniguruma.c
new file mode 100644
index 0000000..cb17596
--- /dev/null
+++ b/build/use/oniguruma.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <tavianator@tavianator.com>
+// SPDX-License-Identifier: 0BSD
+
+#include <oniguruma.h>
+
+int main(void) {
+	onig_free(0);
+	return 0;
+}
diff --git a/config/cc.sh b/config/cc.sh
deleted file mode 100755
index 45d51ca..0000000
--- a/config/cc.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Run the compiler and check if it succeeded
-
-set -eu
-
-TMP=$(mktemp)
-trap 'rm -f "$TMP"' EXIT
-
-(
-    set -x
-    $XCC $XCPPFLAGS $XCFLAGS $XLDFLAGS "$@" $XLDLIBS -o "$TMP"
-)
diff --git a/config/config.mk b/config/config.mk
deleted file mode 100644
index 280c6ac..0000000
--- a/config/config.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile fragment that implements `make config`
-
-include config/prelude.mk
-include config/exports.mk
-
-# All configuration steps
-config: ${CONFIG} ${GEN}/config.h
-.PHONY: config
-
-# Makefile fragments generated by `make config`
-MKS := \
-    ${GEN}/vars.mk \
-    ${GEN}/flags.mk \
-    ${GEN}/deps.mk \
-    ${GEN}/pkgs.mk
-
-# The main configuration file, which includes the others
-${CONFIG}: ${MKS}
-	${MSG} "[ GEN] ${TGT}"
-	@printf '# %s\n' "${TGT}" >$@
-	@printf 'include $${GEN}/%s\n' ${MKS:${GEN}/%=%} >>$@
-	${VCAT} ${CONFIG}
-.PHONY: ${CONFIG}
-
-# Saves the configurable variables
-${GEN}/vars.mk::
-	@${MKDIR} ${@D}
-	${MSG} "[ GEN] ${TGT}"
-	@printf '# %s\n' "${TGT}" >$@
-	@printf 'PREFIX := %s\n' "$$XPREFIX" >>$@
-	@printf 'MANDIR := %s\n' "$$XMANDIR" >>$@
-	@printf 'OS := %s\n' "$${OS:-$$(uname)}" >>$@
-	@printf 'CC := %s\n' "$$XCC" >>$@
-	@printf 'INSTALL := %s\n' "$$XINSTALL" >>$@
-	@printf 'MKDIR := %s\n' "$$XMKDIR" >>$@
-	@printf 'PKG_CONFIG := %s\n' "$$XPKG_CONFIG" >>$@
-	@printf 'RM := %s\n' "$$XRM" >>$@
-	@printf 'PKGS :=\n' >>$@
-	${VCAT} $@
-
-# Sets the build flags.  This depends on vars.mk and uses a recursive make so
-# that the default flags can depend on variables like ${OS}.
-${GEN}/flags.mk: ${GEN}/vars.mk
-	@+${MAKE} -sf config/flags.mk $@
-.PHONY: ${GEN}/flags.mk
-
-# Check for dependency generation support
-${GEN}/deps.mk: ${GEN}/flags.mk
-	@+${MAKE} -sf config/deps.mk $@
-.PHONY: ${GEN}/deps.mk
-
-# Auto-detect dependencies and their build flags
-${GEN}/pkgs.mk: ${GEN}/flags.mk
-	@+${MAKE} -sf config/pkgs.mk $@
-.PHONY: ${GEN}/pkgs.mk
-
-# Compile-time feature detection
-${GEN}/config.h: ${CONFIG}
-	@+${MAKE} -sf config/header.mk $@
-.PHONY: ${GEN}/config.h
diff --git a/config/define-if.sh b/config/define-if.sh
deleted file mode 100755
index 059c1ac..0000000
--- a/config/define-if.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Output a C preprocessor definition based on whether a command succeeds
-
-set -eu
-
-SLUG="${1#config/}"
-SLUG="${SLUG%.c}"
-MACRO="BFS_$(printf '%s' "$SLUG" | tr '/a-z-' '_A-Z_')"
-shift
-
-if "$@"; then
-    printf '#define %s true\n' "$MACRO"
-else
-    printf '#define %s false\n' "$MACRO"
-    exit 1
-fi
diff --git a/config/deps.mk b/config/deps.mk
deleted file mode 100644
index ac394a5..0000000
--- a/config/deps.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile that generates gen/deps.mk
-
-include config/prelude.mk
-include ${GEN}/vars.mk
-include ${GEN}/flags.mk
-include config/exports.mk
-
-${GEN}/deps.mk::
-	${MSG} "[ GEN] ${TGT}"
-	printf '# %s\n' "${TGT}" >$@
-	if config/cc.sh -MD -MP -MF /dev/null config/empty.c; then \
-	    printf 'DEPFLAGS = -MD -MP\n'; \
-	fi >>$@ 2>$@.log
-	${VCAT} $@
-	printf -- '-include %s\n' ${OBJS:.o=.d} >>$@
diff --git a/config/empty.c b/config/empty.c
deleted file mode 100644
index 4fa9a5b..0000000
--- a/config/empty.c
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-int main(void) {
-	return 0;
-}
diff --git a/config/exports.mk b/config/exports.mk
deleted file mode 100644
index ed19134..0000000
--- a/config/exports.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile fragment that exports variables used by configuration scripts
-
-export XPREFIX=${PREFIX}
-export XMANDIR=${MANDIR}
-
-export XCC=${CC}
-export XINSTALL=${INSTALL}
-export XMKDIR=${MKDIR}
-export XPKG_CONFIG=${PKG_CONFIG}
-export XRM=${RM}
-
-export XCPPFLAGS=${CPPFLAGS}
-export XCFLAGS=${CFLAGS}
-export XLDFLAGS=${LDFLAGS}
-export XLDLIBS=${LDLIBS}
-
-export XNOLIBS=${NOLIBS}
diff --git a/config/flags.mk b/config/flags.mk
deleted file mode 100644
index 837c30f..0000000
--- a/config/flags.mk
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile that generates gen/flags.mk
-
-include config/prelude.mk
-include ${GEN}/vars.mk
-
-# Configurable flags
-CPPFLAGS ?=
-CFLAGS ?= \
-    -g \
-    -Wall \
-    -Wformat=2 \
-    -Werror=implicit \
-    -Wimplicit-fallthrough \
-    -Wmissing-declarations \
-    -Wshadow \
-    -Wsign-compare \
-    -Wstrict-prototypes
-LDFLAGS ?=
-LDLIBS ?=
-
-export XCPPFLAGS=${CPPFLAGS}
-export XCFLAGS=${CFLAGS}
-export XLDFLAGS=${LDFLAGS}
-export XLDLIBS=${LDLIBS}
-
-# Immutable flags
-export BFS_CPPFLAGS= \
-    -Isrc \
-    -I${GEN} \
-    -D__EXTENSIONS__ \
-    -D_ATFILE_SOURCE \
-    -D_BSD_SOURCE \
-    -D_DARWIN_C_SOURCE \
-    -D_DEFAULT_SOURCE \
-    -D_GNU_SOURCE \
-    -D_POSIX_PTHREAD_SEMANTICS \
-    -D_FILE_OFFSET_BITS=64 \
-    -D_TIME_BITS=64
-export BFS_CFLAGS= -std=c17 -pthread
-
-# Platform-specific system libraries
-LDLIBS,DragonFly := -lposix1e
-LDLIBS,Linux := -lrt
-LDLIBS,NetBSD := -lutil
-LDLIBS,SunOS := -lsec -lsocket -lnsl
-export BFS_LDLIBS=${LDLIBS,${OS}}
-
-# Build profiles
-_ASAN := ${TRUTHY,${ASAN}}
-_LSAN := ${TRUTHY,${LSAN}}
-_MSAN := ${TRUTHY,${MSAN}}
-_TSAN := ${TRUTHY,${TSAN}}
-_UBSAN := ${TRUTHY,${UBSAN}}
-_GCOV := ${TRUTHY,${GCOV}}
-_LINT := ${TRUTHY,${LINT}}
-_RELEASE := ${TRUTHY,${RELEASE}}
-
-# https://github.com/google/sanitizers/issues/342
-TSAN_CPPFLAGS,y := -DBFS_USE_TARGET_CLONES=0
-export TSAN_CPPFLAGS=${TSAN_CPPFLAGS,${_TSAN}}
-
-ASAN_CFLAGS,y := -fsanitize=address
-LSAN_CFLAGS,y := -fsanitize=leak
-MSAN_CFLAGS,y := -fsanitize=memory -fsanitize-memory-track-origins
-TSAN_CFLAGS,y := -fsanitize=thread
-UBSAN_CFLAGS.y := -fsanitize=undefined
-
-export ASAN_CFLAGS=${ASAN_CFLAGS,${_ASAN}}
-export LSAN_CFLAGS=${LSAN_CFLAGS,${_LSAN}}
-export MSAN_CFLAGS=${MSAN_CFLAGS,${_MSAN}}
-export TSAN_CFLAGS=${TSAN_CFLAGS,${_TSAN}}
-export UBSAN_CFLAGS=${UBSAN_CFLAGS,${_UBSAN}}
-
-SAN_CFLAGS,y := -fno-sanitize-recover=all
-INSANE := ${NOT,${_ASAN}${_LSAN}${_MSAN}${_TSAN}${_UBSAN}}
-SAN := ${NOT,${INSANE}}
-export SAN_CFLAGS=${SAN_CFLAGS,${SAN}}
-
-# MSAN and TSAN both need all code to be instrumented
-YESLIBS := ${NOT,${_MSAN}${_TSAN}}
-NOLIBS ?= ${NOT,${YESLIBS}}
-export XNOLIBS=${NOLIBS}
-
-# gcov only intercepts fork()/exec() with -std=gnu*
-GCOV_CFLAGS,y := -std=gnu17 --coverage
-export GCOV_CFLAGS=${GCOV_CFLAGS,${_GCOV}}
-
-LINT_CPPFLAGS,y := -D_FORTIFY_SOURCE=3 -DBFS_LINT
-LINT_CFLAGS,y := -Werror -O2
-
-export LINT_CPPFLAGS=${LINT_CPPFLAGS,${_LINT}}
-export LINT_CFLAGS=${LINT_CFLAGS,${_LINT}}
-
-RELEASE_CPPFLAGS,y := -DNDEBUG
-RELEASE_CFLAGS,y := -O3 -flto=auto
-
-export RELEASE_CPPFLAGS=${RELEASE_CPPFLAGS,${_RELEASE}}
-export RELEASE_CFLAGS=${RELEASE_CFLAGS,${_RELEASE}}
-
-# Set a variable
-SETVAR = printf '%s := %s\n' >>$@
-
-# Append to a variable, if non-empty
-APPEND = append() { test -z "$$2" || printf '%s += %s\n' "$$1" "$$2" >>$@; }; append
-
-${GEN}/flags.mk::
-	${MSG} "[ GEN] ${TGT}"
-	printf '# %s\n' "${TGT}" >$@
-	${SETVAR} CPPFLAGS "$$BFS_CPPFLAGS"
-	${APPEND} CPPFLAGS "$$TSAN_CPPFLAGS"
-	${APPEND} CPPFLAGS "$$LINT_CPPFLAGS"
-	${APPEND} CPPFLAGS "$$RELEASE_CPPFLAGS"
-	${APPEND} CPPFLAGS "$$XCPPFLAGS"
-	${APPEND} CPPFLAGS "$$EXTRA_CPPFLAGS"
-	${SETVAR} CFLAGS "$$BFS_CFLAGS"
-	${APPEND} CFLAGS "$$ASAN_CFLAGS"
-	${APPEND} CFLAGS "$$LSAN_CFLAGS"
-	${APPEND} CFLAGS "$$MSAN_CFLAGS"
-	${APPEND} CFLAGS "$$TSAN_CFLAGS"
-	${APPEND} CFLAGS "$$UBSAN_CFLAGS"
-	${APPEND} CFLAGS "$$SAN_CFLAGS"
-	${APPEND} CFLAGS "$$GCOV_CFLAGS"
-	${APPEND} CFLAGS "$$LINT_CFLAGS"
-	${APPEND} CFLAGS "$$RELEASE_CFLAGS"
-	${APPEND} CFLAGS "$$XCFLAGS"
-	${APPEND} CFLAGS "$$EXTRA_CFLAGS"
-	${SETVAR} LDFLAGS "$$XLDFLAGS"
-	${SETVAR} LDLIBS "$$XLDLIBS"
-	${APPEND} LDLIBS "$$EXTRA_LDLIBS"
-	${APPEND} LDLIBS "$$BFS_LDLIBS"
-	${SETVAR} NOLIBS "$$XNOLIBS"
-	test "${OS}-${SAN}" != FreeBSD-y || printf 'POSTLINK = elfctl -e +noaslr $$@\n' >>$@
-	${VCAT} $@
diff --git a/config/has/acl-get-entry.c b/config/has/acl-get-entry.c
deleted file mode 100644
index 3cce771..0000000
--- a/config/has/acl-get-entry.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <sys/types.h>
-#include <sys/acl.h>
-
-int main(void) {
-	acl_t acl = acl_get_file(".", ACL_TYPE_DEFAULT);
-	acl_entry_t entry;
-	return acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
-}
diff --git a/config/has/acl-get-file.c b/config/has/acl-get-file.c
deleted file mode 100644
index 89fbf23..0000000
--- a/config/has/acl-get-file.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-int main(void) {
-	acl_t acl = acl_get_file(".", ACL_TYPE_DEFAULT);
-	return acl == (acl_t)NULL;
-}
diff --git a/config/has/acl-get-tag-type.c b/config/has/acl-get-tag-type.c
deleted file mode 100644
index 2901956..0000000
--- a/config/has/acl-get-tag-type.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <string.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-int main(void) {
-	acl_entry_t entry;
-	memset(&entry, 0, sizeof(entry));
-	acl_tag_t tag;
-	return acl_get_tag_type(entry, &tag);
-}
diff --git a/config/has/acl-is-trivial-np.c b/config/has/acl-is-trivial-np.c
deleted file mode 100644
index 9ca9fc7..0000000
--- a/config/has/acl-is-trivial-np.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/types.h>
-#include <sys/acl.h>
-
-int main(void) {
-	acl_t acl = acl_get_fd(3);
-	int trivial;
-	acl_is_trivial_np(acl, &trivial);
-	return 0;
-}
diff --git a/config/has/acl-trivial.c b/config/has/acl-trivial.c
deleted file mode 100644
index 7efc838..0000000
--- a/config/has/acl-trivial.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/acl.h>
-
-int main(void) {
-	return acl_trivial(".");
-}
diff --git a/config/has/aligned-alloc.c b/config/has/aligned-alloc.c
deleted file mode 100644
index 4460038..0000000
--- a/config/has/aligned-alloc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stdlib.h>
-
-int main(void) {
-	return !aligned_alloc(_Alignof(void *), sizeof(void *));
-}
diff --git a/config/has/confstr.c b/config/has/confstr.c
deleted file mode 100644
index 58280b4..0000000
--- a/config/has/confstr.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <unistd.h>
-
-int main(void) {
-	confstr(_CS_PATH, NULL, 0);
-	return 0;
-}
diff --git a/config/has/extattr-get-file.c b/config/has/extattr-get-file.c
deleted file mode 100644
index ac9cf96..0000000
--- a/config/has/extattr-get-file.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-int main(void) {
-	return extattr_get_file("file", EXTATTR_NAMESPACE_USER, "xattr", NULL, 0);
-}
diff --git a/config/has/extattr-get-link.c b/config/has/extattr-get-link.c
deleted file mode 100644
index c35be5b..0000000
--- a/config/has/extattr-get-link.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-int main(void) {
-	return extattr_get_link("link", EXTATTR_NAMESPACE_USER, "xattr", NULL, 0);
-}
diff --git a/config/has/extattr-list-file.c b/config/has/extattr-list-file.c
deleted file mode 100644
index e68a8bb..0000000
--- a/config/has/extattr-list-file.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-int main(void) {
-	return extattr_list_file("file", EXTATTR_NAMESPACE_USER, NULL, 0);
-}
diff --git a/config/has/extattr-list-link.c b/config/has/extattr-list-link.c
deleted file mode 100644
index 49f0ec2..0000000
--- a/config/has/extattr-list-link.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-int main(void) {
-	return extattr_list_link("link", EXTATTR_NAMESPACE_USER, NULL, 0);
-}
diff --git a/config/has/fdclosedir.c b/config/has/fdclosedir.c
deleted file mode 100644
index f4ad1f5..0000000
--- a/config/has/fdclosedir.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <dirent.h>
-
-int main(void) {
-	return fdclosedir(opendir("."));
-}
diff --git a/config/has/getdents.c b/config/has/getdents.c
deleted file mode 100644
index d0d4228..0000000
--- a/config/has/getdents.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <dirent.h>
-
-int main(void) {
-	struct dirent de;
-	getdents(3, &de, 1024);
-	return 0;
-}
diff --git a/config/has/getdents64-syscall.c b/config/has/getdents64-syscall.c
deleted file mode 100644
index 4838c14..0000000
--- a/config/has/getdents64-syscall.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <dirent.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int main(void) {
-	struct dirent64 de;
-	syscall(SYS_getdents64, 3, &de, 1024);
-	return 0;
-}
diff --git a/config/has/getdents64.c b/config/has/getdents64.c
deleted file mode 100644
index 1abf36d..0000000
--- a/config/has/getdents64.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <dirent.h>
-
-int main(void) {
-	struct dirent64 de;
-	getdents64(3, &de, 1024);
-	return 0;
-}
diff --git a/config/has/getprogname-gnu.c b/config/has/getprogname-gnu.c
deleted file mode 100644
index 6b97c5e..0000000
--- a/config/has/getprogname-gnu.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <errno.h>
-
-int main(void) {
-	const char *str = program_invocation_short_name;
-	return str[0];
-}
diff --git a/config/has/getprogname.c b/config/has/getprogname.c
deleted file mode 100644
index 83dc8e8..0000000
--- a/config/has/getprogname.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stdlib.h>
-
-int main(void) {
-	const char *str = getprogname();
-	return str[0];
-}
diff --git a/config/has/max-align-t.c b/config/has/max-align-t.c
deleted file mode 100644
index 96165ce..0000000
--- a/config/has/max-align-t.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <stddef.h>
-
-int main(void) {
-	return _Alignof(max_align_t);
-}
diff --git a/config/has/pipe2.c b/config/has/pipe2.c
deleted file mode 100644
index 4cb43b5..0000000
--- a/config/has/pipe2.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <fcntl.h>
-#include <unistd.h>
-
-int main(void) {
-	int fds[2];
-	return pipe2(fds, O_CLOEXEC);
-}
diff --git a/config/has/posix-spawn-addfchdir-np.c b/config/has/posix-spawn-addfchdir-np.c
deleted file mode 100644
index b870a53..0000000
--- a/config/has/posix-spawn-addfchdir-np.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <spawn.h>
-
-int main(void) {
-	posix_spawn_file_actions_t actions;
-	posix_spawn_file_actions_init(&actions);
-	posix_spawn_file_actions_addfchdir_np(&actions, 3);
-	return 0;
-}
diff --git a/config/has/posix-spawn-addfchdir.c b/config/has/posix-spawn-addfchdir.c
deleted file mode 100644
index c52ff81..0000000
--- a/config/has/posix-spawn-addfchdir.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <spawn.h>
-
-int main(void) {
-	posix_spawn_file_actions_t actions;
-	posix_spawn_file_actions_init(&actions);
-	posix_spawn_file_actions_addfchdir(&actions, 3);
-	return 0;
-}
diff --git a/config/has/st-acmtim.c b/config/has/st-acmtim.c
deleted file mode 100644
index d687ab0..0000000
--- a/config/has/st-acmtim.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/stat.h>
-
-int main(void) {
-	struct stat sb = {0};
-	unsigned int a = sb.st_atim.tv_sec;
-	unsigned int c = sb.st_ctim.tv_sec;
-	unsigned int m = sb.st_mtim.tv_sec;
-	return a + c + m;
-}
diff --git a/config/has/st-acmtimespec.c b/config/has/st-acmtimespec.c
deleted file mode 100644
index f747bc0..0000000
--- a/config/has/st-acmtimespec.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/stat.h>
-
-int main(void) {
-	struct stat sb = {0};
-	unsigned int a = sb.st_atimespec.tv_sec;
-	unsigned int c = sb.st_ctimespec.tv_sec;
-	unsigned int m = sb.st_mtimespec.tv_sec;
-	return a + c + m;
-}
diff --git a/config/has/st-birthtim.c b/config/has/st-birthtim.c
deleted file mode 100644
index 4964571..0000000
--- a/config/has/st-birthtim.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/stat.h>
-
-int main(void) {
-	struct stat sb = {0};
-	return sb.st_birthtim.tv_sec;
-}
diff --git a/config/has/st-birthtimespec.c b/config/has/st-birthtimespec.c
deleted file mode 100644
index 91a613f..0000000
--- a/config/has/st-birthtimespec.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/stat.h>
-
-int main(void) {
-	struct stat sb = {0};
-	return sb.st_birthtimespec.tv_sec;
-}
diff --git a/config/has/st-flags.c b/config/has/st-flags.c
deleted file mode 100644
index b1d0c32..0000000
--- a/config/has/st-flags.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/stat.h>
-
-int main(void) {
-	struct stat sb = {0};
-	return sb.st_flags;
-}
diff --git a/config/has/statx-syscall.c b/config/has/statx-syscall.c
deleted file mode 100644
index 87ec869..0000000
--- a/config/has/statx-syscall.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <fcntl.h>
-#include <linux/stat.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int main(void) {
-	struct statx sb;
-	syscall(SYS_statx, AT_FDCWD, ".", 0, STATX_BASIC_STATS, &sb);
-	return 0;
-}
diff --git a/config/has/statx.c b/config/has/statx.c
deleted file mode 100644
index 65f1674..0000000
--- a/config/has/statx.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <fcntl.h>
-#include <sys/stat.h>
-
-int main(void) {
-	struct statx sb;
-	statx(AT_FDCWD, ".", 0, STATX_BASIC_STATS, &sb);
-	return 0;
-}
diff --git a/config/has/strerror-l.c b/config/has/strerror-l.c
deleted file mode 100644
index 3dcc4d7..0000000
--- a/config/has/strerror-l.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <errno.h>
-#include <locale.h>
-#include <string.h>
-
-int main(void) {
-	locale_t locale = duplocale(LC_GLOBAL_LOCALE);
-	return !strerror_l(ENOMEM, locale);
-}
diff --git a/config/has/strerror-r-gnu.c b/config/has/strerror-r-gnu.c
deleted file mode 100644
index 26ca0ee..0000000
--- a/config/has/strerror-r-gnu.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <errno.h>
-#include <string.h>
-
-int main(void) {
-	char buf[256];
-	// Check that strerror_r() returns a pointer
-	return *strerror_r(ENOMEM, buf, sizeof(buf));
-}
diff --git a/config/has/strerror-r-posix.c b/config/has/strerror-r-posix.c
deleted file mode 100644
index 41b2d30..0000000
--- a/config/has/strerror-r-posix.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <errno.h>
-#include <string.h>
-
-int main(void) {
-	char buf[256];
-	// Check that strerror_r() returns an integer
-	return 2 * strerror_r(ENOMEM, buf, sizeof(buf));
-}
diff --git a/config/has/tm-gmtoff.c b/config/has/tm-gmtoff.c
deleted file mode 100644
index 543df48..0000000
--- a/config/has/tm-gmtoff.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <time.h>
-
-int main(void) {
-	struct tm tm = {0};
-	return tm.tm_gmtoff;
-}
diff --git a/config/has/uselocale.c b/config/has/uselocale.c
deleted file mode 100644
index a712ff8..0000000
--- a/config/has/uselocale.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <locale.h>
-
-int main(void) {
-	locale_t locale = uselocale((locale_t)0);
-	return locale == LC_GLOBAL_LOCALE;
-}
diff --git a/config/header.mk b/config/header.mk
deleted file mode 100644
index 50ad5e8..0000000
--- a/config/header.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile that generates gen/config.h
-
-include config/prelude.mk
-include ${GEN}/config.mk
-include config/exports.mk
-
-# All header fragments we generate
-HEADERS := \
-    ${GEN}/has/acl-get-entry.h \
-    ${GEN}/has/acl-get-file.h \
-    ${GEN}/has/acl-get-tag-type.h \
-    ${GEN}/has/acl-is-trivial-np.h \
-    ${GEN}/has/acl-trivial.h \
-    ${GEN}/has/aligned-alloc.h \
-    ${GEN}/has/confstr.h \
-    ${GEN}/has/extattr-get-file.h \
-    ${GEN}/has/extattr-get-link.h \
-    ${GEN}/has/extattr-list-file.h \
-    ${GEN}/has/extattr-list-link.h \
-    ${GEN}/has/fdclosedir.h \
-    ${GEN}/has/getdents.h \
-    ${GEN}/has/getdents64.h \
-    ${GEN}/has/getdents64-syscall.h \
-    ${GEN}/has/getprogname.h \
-    ${GEN}/has/getprogname-gnu.h \
-    ${GEN}/has/max-align-t.h \
-    ${GEN}/has/pipe2.h \
-    ${GEN}/has/posix-spawn-addfchdir.h \
-    ${GEN}/has/posix-spawn-addfchdir-np.h \
-    ${GEN}/has/st-acmtim.h \
-    ${GEN}/has/st-acmtimespec.h \
-    ${GEN}/has/st-birthtim.h \
-    ${GEN}/has/st-birthtimespec.h \
-    ${GEN}/has/st-flags.h \
-    ${GEN}/has/statx.h \
-    ${GEN}/has/statx-syscall.h \
-    ${GEN}/has/strerror-l.h \
-    ${GEN}/has/strerror-r-gnu.h \
-    ${GEN}/has/strerror-r-posix.h \
-    ${GEN}/has/tm-gmtoff.h \
-    ${GEN}/has/uselocale.h
-
-# Previously generated by pkgs.mk
-PKG_HEADERS := ${ALL_PKGS:%=${GEN}/use/%.h}
-
-${GEN}/config.h: ${PKG_HEADERS} ${HEADERS}
-	${MSG} "[ GEN] ${TGT}"
-	printf '// %s\n' "${TGT}" >$@
-	printf '#ifndef BFS_CONFIG_H\n' >>$@
-	printf '#define BFS_CONFIG_H\n' >>$@
-	cat ${.ALLSRC} >>$@
-	printf '#endif // BFS_CONFIG_H\n' >>$@
-	cat ${.ALLSRC:%=%.log} >$@.log
-	${VCAT} $@
-.PHONY: ${GEN}/config.h
-
-# The short name of the config test
-SLUG = ${@:${GEN}/%.h=%}
-
-${HEADERS}::
-	${MKDIR} ${@D}
-	if config/define-if.sh ${SLUG} config/cc.sh config/${SLUG}.c >$@ 2>$@.log; then \
-	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✔\n' ${SLUG}.c; \
-	else \
-	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✘\n' ${SLUG}.c; \
-	fi
diff --git a/config/pkgconf.sh b/config/pkgconf.sh
deleted file mode 100755
index 365ed61..0000000
--- a/config/pkgconf.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# pkg-config wrapper with hardcoded fallbacks
-
-set -eu
-
-MODE=
-case "${1:-}" in
-    --*)
-        MODE="$1"
-        shift
-esac
-
-if [ $# -lt 1 ]; then
-    exit
-fi
-
-case "$XNOLIBS" in
-    y|1)
-        exit 1
-esac
-
-if [ -z "$MODE" ]; then
-    # Check whether the libraries exist at all
-    for LIB; do
-        # Check ${USE_$LIB}
-        USE_LIB="USE_$(printf '%s' "$LIB" | tr 'a-z-' 'A-Z_')"
-        eval "USE=\"\${$USE_LIB:-}\""
-        case "$USE" in
-            y|1)
-                continue
-                ;;
-            n|0)
-                exit 1
-                ;;
-        esac
-
-        CFLAGS=$("$0" --cflags "$LIB") || exit 1
-        LDFLAGS=$("$0" --ldflags "$LIB") || exit 1
-        LDLIBS=$("$0" --ldlibs "$LIB") || exit 1
-        config/cc.sh $CFLAGS $LDFLAGS config/use/$LIB.c $LDLIBS || exit 1
-    done
-fi
-
-# Defer to pkg-config if possible
-if command -v "${XPKG_CONFIG:-}" >/dev/null 2>&1; then
-    case "$MODE" in
-        --cflags)
-            "$XPKG_CONFIG" --cflags "$@"
-            ;;
-        --ldflags)
-            "$XPKG_CONFIG" --libs-only-L --libs-only-other "$@"
-            ;;
-        --ldlibs)
-            "$XPKG_CONFIG" --libs-only-l "$@"
-            ;;
-    esac
-
-    exit
-fi
-
-# pkg-config unavailable, emulate it ourselves
-CFLAGS=""
-LDFLAGS=""
-LDLIBS=""
-
-for LIB; do
-    case "$LIB" in
-        libacl)
-            LDLIB=-lacl
-            ;;
-        libcap)
-            LDLIB=-lcap
-            ;;
-        libselinux)
-            LDLIB=-lselinux
-            ;;
-        liburing)
-            LDLIB=-luring
-            ;;
-        oniguruma)
-            LDLIB=-lonig
-            ;;
-        *)
-            printf 'error: Unknown package %s\n' "$LIB" >&2
-            exit 1
-            ;;
-    esac
-
-    LDLIBS="$LDLIBS$LDLIB "
-done
-
-case "$MODE" in
-    --ldlibs)
-        printf '%s\n' "$LDLIBS"
-    ;;
-esac
diff --git a/config/pkgs.mk b/config/pkgs.mk
deleted file mode 100644
index 898f262..0000000
--- a/config/pkgs.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Makefile that generates gen/pkgs.mk
-
-include config/prelude.mk
-include ${GEN}/vars.mk
-include ${GEN}/flags.mk
-include config/exports.mk
-
-HEADERS := ${ALL_PKGS:%=${GEN}/use/%.h}
-
-${GEN}/pkgs.mk: ${HEADERS}
-	${MSG} "[ GEN] ${TGT}"
-	printf '# %s\n' "${TGT}" >$@
-	gen() { \
-	    printf 'PKGS := %s\n' "$$*"; \
-	    printf 'CFLAGS += %s\n' "$$(config/pkgconf.sh --cflags "$$@")"; \
-	    printf 'LDFLAGS += %s\n' "$$(config/pkgconf.sh --ldflags "$$@")"; \
-	    printf 'LDLIBS := %s $${LDLIBS}\n' "$$(config/pkgconf.sh --ldlibs "$$@")"; \
-	}; \
-	gen $$(grep -l ' true$$' ${.ALLSRC} | sed 's|.*/\(.*\)\.h|\1|') >>$@
-	${VCAT} $@
-
-.PHONY: ${GEN}/pkgs.mk
-
-# Convert ${GEN}/use/foo.h to foo
-PKG = ${@:${GEN}/use/%.h=%}
-
-${HEADERS}::
-	${MKDIR} ${@D}
-	if config/define-if.sh use/${PKG} config/pkgconf.sh ${PKG} >$@ 2>$@.log; then \
-	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✔\n' use/${PKG}.c; \
-	else \
-	    test "${IS_V}" || printf '[ CC ] %-${MSG_WIDTH}s  ✘\n' use/${PKG}.c; \
-	fi
diff --git a/config/prelude.mk b/config/prelude.mk
deleted file mode 100644
index 109e60c..0000000
--- a/config/prelude.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright © Tavian Barnes <tavianator@tavianator.com>
-# SPDX-License-Identifier: 0BSD
-
-# Common makefile utilities.  Compatible with both GNU make and most BSD makes.
-
-# BSD make will chdir into ${.OBJDIR} by default, unless we tell it not to
-.OBJDIR: .
-
-# We don't use any suffix rules
-.SUFFIXES:
-
-# GNU make has $^ for the full list of targets, while BSD make has $> and the
-# long-form ${.ALLSRC}.  We could write $^ $> to get them both, but that would
-# break if one of them implemented support for the other.  So instead, bring
-# BSD's ${.ALLSRC} to GNU.
-.ALLSRC ?= $^
-
-# For out-of-tree builds, e.g.
-#
-#     $ make config BUILDDIR=/path/to/build/dir
-#     $ make BUILDDIR=/path/to/build/dir
-BUILDDIR ?= .
-
-# Shorthand for build subdirectories
-BIN := ${BUILDDIR}/bin
-GEN := ${BUILDDIR}/gen
-OBJ := ${BUILDDIR}/obj
-
-# GNU make strips a leading ./ from target names, so do the same for BSD make
-BIN := ${BIN:./%=%}
-GEN := ${GEN:./%=%}
-OBJ := ${OBJ:./%=%}
-
-# The configuration file generated by `make config`
-CONFIG := ${GEN}/config.mk
-
-# Installation paths
-DESTDIR ?=
-PREFIX ?= /usr
-MANDIR ?= ${PREFIX}/share/man
-
-# GNU make supports `export VAR`, but BSD make requires `export VAR=value`.
-# Sadly, GNU make gives a recursion error on `export VAR=${VAR}`.
-_BUILDDIR := ${BUILDDIR}
-export BUILDDIR=${_BUILDDIR}
-
-# Configurable executables; can be overridden with
-#
-#     $ make config CC=clang
-CC ?= cc
-INSTALL ?= install
-MKDIR ?= mkdir -p
-PKG_CONFIG ?= pkg-config
-RM ?= rm -f
-
-# GNU and BSD make have incompatible syntax for conditionals, but we can do a
-# lot with just nested variable expansion.  We use "y" as the canonical
-# truthy value, and "" (the empty string) as the canonical falsey value.
-#
-# To normalize a boolean, use ${TRUTHY,${VAR}}, which expands like this:
-#
-#     VAR=y      ${TRUTHY,${VAR}} => ${TRUTHY,y}     => y
-#     VAR=1      ${TRUTHY,${VAR}} => ${TRUTHY,1}     => y
-#     VAR=n      ${TRUTHY,${VAR}} => ${TRUTHY,n}     =>   [empty]
-#     VAR=other  ${TRUTHY,${VAR}} => ${TRUTHY,other} =>   [empty]
-#     VAR=       ${TRUTHY,${VAR}} => ${TRUTHY,}      =>   [emtpy]
-#
-# Inspired by https://github.com/wahern/autoguess
-TRUTHY,y := y
-TRUTHY,1 := y
-
-# Boolean operators are also implemented with nested expansion
-NOT,  := y
-
-# Normalize ${V} to either "y" or ""
-IS_V := ${TRUTHY,${V}}
-
-# Suppress output unless V=1
-Q, := @
-Q  := ${Q,${IS_V}}
-
-# The current target, with ${BUILDDIR} stripped for shorter messages
-TGT = ${@:${BUILDDIR}/%=%}
-
-# Show full commands with `make V=1`, otherwise short summaries
-MSG = @msg() { \
-          MSG="$$1"; \
-          shift; \
-          test "${IS_V}" || printf '%s\n' "$$MSG"; \
-          test "$${1:-}" || return 0; \
-          test "${IS_V}" && printf '%s\n' "$$*"; \
-          "$$@"; \
-      }; \
-      msg
-
-# Maximum width of a short message, to align the ✔/✘
-MSG_WIDTH := 30
-
-# cat a file if V=1
-VCAT,y := @cat
-VCAT,  := @:
-VCAT   := ${VCAT,${IS_V}}
-
-# All external dependencies
-ALL_PKGS := \
-    libacl \
-    libcap \
-    libselinux \
-    liburing \
-    oniguruma
-
-# List all object files here, as they're needed by both `make config` and `make`
-
-# All object files except the entry point
-LIBBFS := \
-    ${OBJ}/src/alloc.o \
-    ${OBJ}/src/bar.o \
-    ${OBJ}/src/bfstd.o \
-    ${OBJ}/src/bftw.o \
-    ${OBJ}/src/color.o \
-    ${OBJ}/src/ctx.o \
-    ${OBJ}/src/diag.o \
-    ${OBJ}/src/dir.o \
-    ${OBJ}/src/dstring.o \
-    ${OBJ}/src/eval.o \
-    ${OBJ}/src/exec.o \
-    ${OBJ}/src/expr.o \
-    ${OBJ}/src/fsade.o \
-    ${OBJ}/src/ioq.o \
-    ${OBJ}/src/mtab.o \
-    ${OBJ}/src/opt.o \
-    ${OBJ}/src/parse.o \
-    ${OBJ}/src/printf.o \
-    ${OBJ}/src/pwcache.o \
-    ${OBJ}/src/stat.o \
-    ${OBJ}/src/thread.o \
-    ${OBJ}/src/trie.o \
-    ${OBJ}/src/typo.o \
-    ${OBJ}/src/xregex.o \
-    ${OBJ}/src/xspawn.o \
-    ${OBJ}/src/xtime.o \
-    ${OBJ}/gen/version.o
-
-# Unit test objects
-UNIT_OBJS := \
-    ${OBJ}/tests/alloc.o \
-    ${OBJ}/tests/bfstd.o \
-    ${OBJ}/tests/bit.o \
-    ${OBJ}/tests/ioq.o \
-    ${OBJ}/tests/main.o \
-    ${OBJ}/tests/trie.o \
-    ${OBJ}/tests/xspawn.o \
-    ${OBJ}/tests/xtime.o
-
-# All object files
-OBJS := \
-    ${OBJ}/src/main.o \
-    ${OBJ}/tests/mksock.o \
-    ${OBJ}/tests/xspawnee.o \
-    ${OBJ}/tests/xtouch.o \
-    ${LIBBFS} \
-    ${UNIT_OBJS}
diff --git a/config/use/libacl.c b/config/use/libacl.c
deleted file mode 100644
index de1fe50..0000000
--- a/config/use/libacl.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/acl.h>
-
-int main(void) {
-	acl_free(0);
-	return 0;
-}
diff --git a/config/use/libcap.c b/config/use/libcap.c
deleted file mode 100644
index 58e832c..0000000
--- a/config/use/libcap.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <sys/capability.h>
-
-int main(void) {
-	cap_free(0);
-	return 0;
-}
diff --git a/config/use/libselinux.c b/config/use/libselinux.c
deleted file mode 100644
index bca409d..0000000
--- a/config/use/libselinux.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <selinux/selinux.h>
-
-int main(void) {
-	freecon(0);
-	return 0;
-}
diff --git a/config/use/liburing.c b/config/use/liburing.c
deleted file mode 100644
index bea499a..0000000
--- a/config/use/liburing.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <liburing.h>
-
-int main(void) {
-	io_uring_free_probe(0);
-	return 0;
-}
diff --git a/config/use/oniguruma.c b/config/use/oniguruma.c
deleted file mode 100644
index cb17596..0000000
--- a/config/use/oniguruma.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © Tavian Barnes <tavianator@tavianator.com>
-// SPDX-License-Identifier: 0BSD
-
-#include <oniguruma.h>
-
-int main(void) {
-	onig_free(0);
-	return 0;
-}
diff --git a/configure b/configure
new file mode 100755
index 0000000..6920212
--- /dev/null
+++ b/configure
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
+
+# bfs build configuration script
+
+set -eu
+
+help() {
+    cat <<EOF
+Usage: $0 [-j<N>] [CC=...] [CFLAGS=...] [...]
+
+Compiler configuration:
+
+  CC
+      The C compiler to use
+  CPPFLAGS
+      C preprocessor flags
+  CFLAGS
+      C compiler flags
+  LDFLAGS
+      Linker flags
+  LDLIBS
+      Dynamic libraries to link
+
+  EXTRA_CPPFLAGS
+  EXTRA_CFLAGS
+  EXTRA_LDFLAGS
+  EXTRA_LDLIBS
+      Adds to the default flags, instead of replacing them
+
+Build profiles:
+
+  RELEASE=y
+      Enable optimizations, disable assertions
+  ASAN=y
+  LSAN=y
+  MSAN=y
+  TSAN=y
+  UBSAN=y
+      Enable sanitizers
+  GCOV=y
+      Enable code coverage instrumentation
+
+External dependencies:
+
+  PKG_CONFIG
+      The pkg-config binary to use
+
+  USE_LIBACL=[y|n]
+  USE_LIBCAP=[y|n]
+  USE_LIBSELINUX=[y|n]
+  USE_LIBURIG=[y|n]
+  USE_ONIGURUMA=[y|n]
+      Enable or disable external dependencies
+
+Packaging configuration:
+
+  PREFIX
+      Set the installation prefix (default: /usr)
+  MANDIR
+      Set the man page directory (default: \$PREFIX/share/man)
+EOF
+}
+
+for arg; do
+    case "$arg" in
+        --help)
+            help
+            exit 0
+            ;;
+        -*|*=*)
+            continue # make flag (-j2) or variable (CC=clang)
+            ;;
+        *)
+            printf 'error: Unrecognized option "%s"\n\n' "$arg" >&2
+            help >&2
+            exit 1
+            ;;
+    esac
+done
+
+# Get the relative path to the source tree based on how the script was run
+DIR=$(dirname -- "$0")
+
+# Set up symbolic links for out-of-tree builds
+for f in Makefile build completions docs src tests; do
+    test -e "$f" || ln -s "$DIR/$f" "$f"
+done
+
+# Infer -jN unless MAKEFLAGS is set
+j=
+if ! [ "${MAKEFLAGS+y}" ]; then
+    j="-j$({ nproc || sysctl -n hw.ncpu || getconf _NPROCESSORS_ONLN || echo 1; } 2>/dev/null)"
+fi
+
+${MAKE:-make} $j -rsf build/config.mk "$@"
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 4ed139c..db5d721 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -4,10 +4,9 @@ Building `bfs`
 Compiling
 ---------
 
-`bfs` uses [GNU Make](https://www.gnu.org/software/make/) as its build system.
 A simple invocation of
 
-    $ make config
+    $ ./configure
     $ make
 
 should build `bfs` successfully.
@@ -18,7 +17,6 @@ For example, to use all your cores, run `make -j$(nproc)`.
 
 | Command          | Description                                                   |
 |------------------|---------------------------------------------------------------|
-| `make config`    | Configures the build system                                   |
 | `make`           | Builds just the `bfs` binary                                  |
 | `make all`       | Builds everything, including the tests (but doesn't run them) |
 | `make check`     | Builds everything, and runs the tests                         |
@@ -33,13 +31,13 @@ The configuration system provides a few shorthand flags for handy configurations
 
 | Command                 | Description                                                 |
 |-------------------------|-------------------------------------------------------------|
-| `make config RELEASE=y` | Build `bfs` with optimizations, LTO, and without assertions |
-| `make config ASAN=y`    | Enable [AddressSanitizer]                                   |
-| `make config LSAN=y`    | Enable [LeakSanitizer]                                      |
-| `make config MSAN=y`    | Enable [MemorySanitizer]                                    |
-| `make config TSAN=y`    | Enable [ThreadSanitizer]                                    |
-| `make config UBSAN=y`   | Enable [UndefinedBehaviorSanitizer]                         |
-| `make config GCOV=y`    | Enable [code coverage]                                      |
+| `./configure RELEASE=y` | Build `bfs` with optimizations, LTO, and without assertions |
+| `./configure ASAN=y`    | Enable [AddressSanitizer]                                   |
+| `./configure LSAN=y`    | Enable [LeakSanitizer]                                      |
+| `./configure MSAN=y`    | Enable [MemorySanitizer]                                    |
+| `./configure TSAN=y`    | Enable [ThreadSanitizer]                                    |
+| `./configure UBSAN=y`   | Enable [UndefinedBehaviorSanitizer]                         |
+| `./configure GCOV=y`    | Enable [code coverage]                                      |
 
 [AddressSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizer
 [LeakSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer#stand-alone-mode
@@ -48,21 +46,20 @@ The configuration system provides a few shorthand flags for handy configurations
 [UndefinedBehaviorSanitizer]: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
 [code coverage]: https://gcc.gnu.org/onlinedocs/gcc/Gcov.html
 
-You can combine multiple profiles (e.g. `make config ASAN=y UBSAN=y`), but not all of them will work together.
+You can combine multiple profiles (e.g. `./configure ASAN=y UBSAN=y`), but not all of them will work together.
 
 ### Flags
 
-Other flags can be specified on the `make config` command line or in the environment.
+Other flags can be specified on the `./configure` command line or in the environment.
 Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 
 | Flag                                | Description                                        |
 |-------------------------------------|----------------------------------------------------|
-| `CC`                                | The C compiler to use, e.g. `make config CC=clang` |
+| `CC`                                | The C compiler to use, e.g. `./configure CC=clang` |
 | `CFLAGS`<br>`EXTRA_CFLAGS`          | Override/add to the default compiler flags         |
 | `LDFLAGS`<br>`EXTRA_LDFLAGS`        | Override/add to the linker flags                   |
 | `USE_LIBACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]             |
 | `TEST_FLAGS`                        | `tests.sh` flags for `make check`                  |
-| `BUILDDIR`                          | The build output directory (default: `.`)          |
 | `DESTDIR`                           | The root directory for `make install`              |
 | `PREFIX`                            | The installation prefix (default: `/usr`)          |
 | `MANDIR`                            | The man page installation directory                |
@@ -72,9 +69,9 @@ Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
 ### Dependencies
 
 `bfs` depends on some system libraries for some of its features.
-These dependencies are optional, and can be turned off in `make config` if necessary by setting the appropriate variable to `n` (e.g. `make config USE_ONIGURUMA=n`).
+These dependencies are optional, and can be turned off in `./configure` if necessary by setting the appropriate variable to `n` (e.g. `./configure USE_ONIGURUMA=n`).
 
-| Dependency   | Platforms  | `make config` flag |
+| Dependency   | Platforms  | `./configure` flag |
 |--------------|------------|--------------------|
 | [libacl]     | Linux only | `USE_LIBACL`       |
 | [libcap]     | Linux only | `USE_LIBCAP`       |
@@ -90,22 +87,28 @@ These dependencies are optional, and can be turned off in `make config` if neces
 
 ### Dependency tracking
 
-The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in the [`Makefile`](/Makefile)).
+The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in [`build/deps.mk`](/build/deps.mk)).
 So if you edit a header file, `make` will rebuild the necessary object files ensuring they don't go out of sync.
 
 We also add a dependency on the current configuration, so you can change configurations and rebuild without having to `make clean`.
-
-We go one step further than most build systems by tracking the flags that were used for the previous compilation.
-That means you can change configurations without having to `make clean`.
 For example,
 
-    $ make config
+    $ ./configure
     $ make
-    $ make config RELEASE=y
+    $ ./configure RELEASE=y
     $ make
 
 will build the project in debug mode and then rebuild it in release mode.
 
+### Out-of-tree builds
+
+You can set up an out-of-tree build by running the `configure` script from another directory, for example:
+
+    $ mkdir out
+    $ cd out
+    $ ../configure
+    $ make
+
 
 Testing
 -------
diff --git a/tests/util.sh b/tests/util.sh
index 7dba9fb..3969db5 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -12,12 +12,9 @@ _realpath() (
 )
 
 # Globals
-TESTS=$(_realpath "$TESTS")
-if [ "${BUILDDIR-}" ]; then
-    BIN=$(_realpath "$BUILDDIR/bin")
-else
-    BIN=$(_realpath "$TESTS/../bin")
-fi
+ROOT=$(_realpath "$(dirname -- "$TESTS")")
+TESTS="$ROOT/tests"
+BIN="$ROOT/bin"
 MKSOCK="$BIN/tests/mksock"
 XTOUCH="$BIN/tests/xtouch"
 UNAME=$(uname)
diff --git a/tests/xspawn.c b/tests/xspawn.c
index 7362aa5..785ea48 100644
--- a/tests/xspawn.c
+++ b/tests/xspawn.c
@@ -64,27 +64,20 @@ static bool check_use_path(bool use_posix) {
 		spawn.flags &= ~BFS_SPAWN_USE_POSIX;
 	}
 
-	const char *builddir = getenv("BUILDDIR");
-	dchar *bin = dstrprintf("%s/bin", builddir ? builddir : ".");
-	ret &= bfs_pcheck(bin, "dstrprintf()");
-	if (!ret) {
-		goto destroy;
-	}
-
-	ret &= bfs_pcheck(bfs_spawn_addopen(&spawn, 10, bin, O_RDONLY | O_DIRECTORY, 0) == 0);
+	ret &= bfs_pcheck(bfs_spawn_addopen(&spawn, 10, "bin", O_RDONLY | O_DIRECTORY, 0) == 0);
 	ret &= bfs_pcheck(bfs_spawn_adddup2(&spawn, 10, 11) == 0);
 	ret &= bfs_pcheck(bfs_spawn_addclose(&spawn, 10) == 0);
 	ret &= bfs_pcheck(bfs_spawn_addfchdir(&spawn, 11) == 0);
 	ret &= bfs_pcheck(bfs_spawn_addclose(&spawn, 11) == 0);
 	if (!ret) {
-		goto bin;
+		goto destroy;
 	}
 
 	// Check that $PATH is resolved in the parent's environment
 	char **envp;
 	ret &= bfs_pcheck(envp = envdup());
 	if (!ret) {
-		goto bin;
+		goto destroy;
 	}
 
 	// Check that $PATH is resolved after the file actions
@@ -138,8 +131,6 @@ env:
 		free(*var);
 	}
 	free(envp);
-bin:
-	dstrfree(bin);
 destroy:
 	ret &= bfs_pcheck(bfs_spawn_destroy(&spawn) == 0);
 out:
-- 
cgit v1.2.3


From 99260d347b91f9f7ede335b7f582cee34ead2b0c Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Wed, 1 May 2024 14:23:20 -0400
Subject: build: Add some nice aliases to ./configure

---
 .github/workflows/ci.yml      |   4 +-
 .github/workflows/codecov.yml |   2 +-
 Makefile                      |  10 +--
 build/header.mk               |   2 +-
 configure                     | 141 ++++++++++++++++++-----------
 docs/BUILDING.md              | 200 ++++++++++++++++++++++++++----------------
 6 files changed, 221 insertions(+), 138 deletions(-)

(limited to 'docs')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57f59f4..e47600b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,7 +107,7 @@ jobs:
                 gmake \
                 oniguruma
             jobs=$(sysctl -n hw.ncpu)
-            MAKE=gmake ./configure
+            ./configure MAKE=gmake
             gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   netbsd:
@@ -198,5 +198,5 @@ jobs:
             PATH="/usr/xpg4/bin:$PATH"
             chown -R action:staff .
             jobs=$(getconf NPROCESSORS_ONLN)
-            sudo -u action MAKE=gmake ./configure
+            sudo -u action ./configure MAKE=gmake
             sudo -u action gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index bb68927..6aaace6 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Generate coverage
         run: |
-          ./configure GCOV=y
+          ./configure --enable-gcov
           make -j$(nproc) check TEST_FLAGS="--sudo"
           gcov -abcfpu obj/*/*.o
 
diff --git a/Makefile b/Makefile
index cd8bb55..8a8ec6b 100644
--- a/Makefile
+++ b/Makefile
@@ -164,11 +164,11 @@ distcheck:
 .PHONY: distcheck
 
 # Per-distcheck configuration
-DISTCHECK_CONFIG_asan := ASAN=y UBSAN=y
-DISTCHECK_CONFIG_msan := MSAN=y UBSAN=y CC=clang
-DISTCHECK_CONFIG_tsan := TSAN=y UBSAN=y CC=clang
+DISTCHECK_CONFIG_asan := --enable-asan --enable-ubsan
+DISTCHECK_CONFIG_msan := --enable-msan --enable-ubsan CC=clang
+DISTCHECK_CONFIG_tsan := --enable-tsan --enable-ubsan CC=clang
 DISTCHECK_CONFIG_m32 := EXTRA_CFLAGS="-m32" PKG_CONFIG_LIBDIR=/usr/lib32/pkgconfig
-DISTCHECK_CONFIG_release := RELEASE=y
+DISTCHECK_CONFIG_release := --enable-release
 
 ${DISTCHECKS}::
 	@${MKDIR} $@
@@ -195,7 +195,7 @@ install::
 	${MSG} "[INST] completions/bfs.zsh" \
 	    ${INSTALL} -m644 completions/bfs.zsh ${DEST_PREFIX}/share/zsh/site-functions/_bfs
 	${Q}${MKDIR} ${DEST_PREFIX}/share/fish/vendor_completions.d
-		${MSG} "[INST] completions/bfs.fish" \
+	${MSG} "[INST] completions/bfs.fish" \
 	    ${INSTALL} -m644 completions/bfs.fish ${DEST_PREFIX}/share/fish/vendor_completions.d/bfs.fish
 
 uninstall::
diff --git a/build/header.mk b/build/header.mk
index 951f09b..a9157ad 100644
--- a/build/header.mk
+++ b/build/header.mk
@@ -53,7 +53,7 @@ gen/config.h: ${PKG_HEADERS} ${HEADERS}
 	@printf '#define BFS_CONFIG_H\n' >>$@
 	@cat ${.ALLSRC} >>$@
 	@printf '#endif // BFS_CONFIG_H\n' >>$@
-	@cat ${.ALLSRC:%=%.log} >$@.log
+	@cat ${.ALLSRC:%=%.log} >gen/config.log
 	${VCAT} $@
 .PHONY: gen/config.h
 
diff --git a/configure b/configure
index 830628a..d42dec3 100755
--- a/configure
+++ b/configure
@@ -7,75 +7,117 @@
 
 set -eu
 
-help() {
-    cat <<EOF
-Usage: $0 [-j<N>] [CC=...] [CFLAGS=...] [...]
+# Default to `make`
+MAKE="${MAKE:-make}"
 
-Compiler configuration:
+# Pass -j$(nproc) unless MAKEFLAGS is set
+if [ "${MAKEFLAGS+y}" ]; then
+    j=""
+else
+    j="-j$({ nproc || sysctl -n hw.ncpu || getconf _NPROCESSORS_ONLN || echo 1; } 2>/dev/null)"
+fi
+
+for arg; do
+    case "$arg" in
+        -h|--help)
+            cat <<EOF
+Usage:
+
+  \$ $0 [--enable-*|--disable-*] [CC=...] [CFLAGS=...] [...]
+  \$ $MAKE $j
+
+Variables set in the environment or on the command line will be picked up:
 
+  MAKE
+      The make implementation to use
   CC
       The C compiler to use
-  CPPFLAGS
-      C preprocessor flags
-  CFLAGS
-      C compiler flags
-  LDFLAGS
-      Linker flags
-  LDLIBS
+
+  CPPFLAGS="-I... -D..."
+  CFLAGS="-W... -f..."
+  LDFLAGS="-L... -Wl,..."
+      Preprocessor/compiler/linker flags
+
+  LDLIBS="-l... -l..."
       Dynamic libraries to link
 
-  EXTRA_CPPFLAGS
-  EXTRA_CFLAGS
-  EXTRA_LDFLAGS
-  EXTRA_LDLIBS
+  EXTRA_{CPPFLAGS,CFLAGS,LDFLAGS,LDLIBS}
       Adds to the default flags, instead of replacing them
 
-Build profiles:
+The default flags result in a plain debug build.  Other build profiles include:
 
-  RELEASE=y
+  --enable-release
       Enable optimizations, disable assertions
-  ASAN=y
-  LSAN=y
-  MSAN=y
-  TSAN=y
-  UBSAN=y
+  --enable-{asan,lsan,msan,tsan,ubsan}
       Enable sanitizers
-  GCOV=y
+  --enable-gcov
       Enable code coverage instrumentation
 
-External dependencies:
-
-  PKG_CONFIG
-      The pkg-config binary to use
+External dependencies are auto-detected by default, but you can --enable or
+--disable them manually:
 
-  USE_LIBACL=[y|n]
-  USE_LIBCAP=[y|n]
-  USE_LIBSELINUX=[y|n]
-  USE_LIBURIG=[y|n]
-  USE_ONIGURUMA=[y|n]
-      Enable or disable external dependencies
+  --enable-libacl      --disable-libacl
+  --enable-libcap      --disable-libcap
+  --enable-libselinux  --disable-libselinux
+  --enable-liburing    --disable-liburing
+  --enable-oniguruma   --disable-oniguruma
 
-Packaging configuration:
+Packaging:
 
-  PREFIX
+  --prefix=/path
       Set the installation prefix (default: /usr)
-  MANDIR
-      Set the man page directory (default: \$PREFIX/share/man)
-EOF
-}
 
-for arg; do
-    case "$arg" in
-        --help)
-            help
+This script is a thin wrapper around a makefile-based configuration system.
+Any other arguments will be passed directly to the $MAKE invocation, e.g.
+
+  \$ $0 $j V=1
+EOF
             exit 0
             ;;
+
+        --enable-*|--disable-*)
+            case "$arg" in
+                --enable-*) yn=y ;;
+                --disable-*) yn=n ;;
+            esac
+
+            name="${arg#--*able-}"
+            NAME=$(printf '%s' "$name" | tr 'a-z-' 'A-Z_')
+            case "$name" in
+                libacl|libcap|libselinux|liburing|oniguruma)
+                    shift
+                    set -- "$@" "USE_$NAME=$yn"
+                    ;;
+                release|asan|lsan|msan|tsan|ubsan|lint|gcov)
+                    shift
+                    set -- "$@" "$NAME=$yn"
+                    ;;
+                *)
+                    printf 'error: Unrecognized option "%s"\n\n' "$arg" >&2
+                    printf 'Run %s --help for more information.\n' "$0" >&2
+                    exit 1
+                    ;;
+            esac
+            ;;
+
+        --prefix=*)
+            shift
+            set -- "$@" "PREFIX=${arg#*=}"
+            ;;
+
+        MAKE=*)
+            MAKE="${arg#*=}"
+            shift
+            ;;
+
+        # make flag (-j2) or variable (CC=clang)
         -*|*=*)
-            continue # make flag (-j2) or variable (CC=clang)
+            continue
             ;;
+
         *)
             printf 'error: Unrecognized option "%s"\n\n' "$arg" >&2
-            help >&2
+            printf 'Run %s --help for more information.\n' "$0" >&2
             exit 1
             ;;
     esac
@@ -89,10 +131,7 @@ for f in Makefile build completions docs src tests; do
     test -e "$f" || ln -s "$DIR/$f" "$f"
 done
 
-# Infer -jN unless MAKEFLAGS is set
-j=
-if ! [ "${MAKEFLAGS+y}" ]; then
-    j="-j$({ nproc || sysctl -n hw.ncpu || getconf _NPROCESSORS_ONLN || echo 1; } 2>/dev/null)"
-fi
+# Set MAKEFLAGS to -j$(nproc) if it's unset
+export MAKEFLAGS="${MAKEFLAGS-$j}"
 
-${MAKE:-make} $j -rf build/config.mk "$@"
+$MAKE -rf build/config.mk "$@"
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index db5d721..cb33c51 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -1,104 +1,101 @@
 Building `bfs`
 ==============
 
-Compiling
----------
-
 A simple invocation of
 
     $ ./configure
     $ make
 
 should build `bfs` successfully.
-As usual with `make`, you can run a [parallel build](https://www.gnu.org/software/make/manual/html_node/Parallel.html) with `-j`.
-For example, to use all your cores, run `make -j$(nproc)`.
 
-### Targets
 
-| Command          | Description                                                   |
-|------------------|---------------------------------------------------------------|
-| `make`           | Builds just the `bfs` binary                                  |
-| `make all`       | Builds everything, including the tests (but doesn't run them) |
-| `make check`     | Builds everything, and runs the tests                         |
-| `make install`   | Installs `bfs` (with man page, shell completions, etc.)       |
-| `make uninstall` | Uninstalls `bfs`                                              |
-| `make clean`     | Delete the build products                                     |
-| `make distclean` | Delete all generated files, including the build configuration |
+Configuration
+-------------
+
+```console
+$ ./configure --help
+Usage:
+
+  $ ./configure [--enable-*|--disable-*] [CC=...] [CFLAGS=...] [...]
+  $ make
+
+...
+```
+
+### Variables
+
+Variables set in the environment or on the command line will be picked up:
+These variables specify binaries to run during the configuration and build process:
+
+<pre>
+<b>MAKE</b>=<i>make</i>
+    <a href="https://en.wikipedia.org/wiki/Make_(software)">make</a> implementation
+<b>CC</b>=<i>cc</i>
+    C compiler
+<b>INSTALL</b>=<i>install</i>
+    Copy files during <i>make install</i>
+<b>MKDIR</b>="<i>mkdir -p</i>"
+    Create directories
+<b>PKG_CONFIG</b>=<i>pkg-config</i>
+    Detect external libraries and required build flags
+<b>RM</b>="<i>rm -f</i>"
+    Delete files
+</pre>
+
+These flags will be used by the build process:
+
+<pre>
+<b>CPPFLAGS</b>="<i>-I... -D...</i>"
+<b>CFLAGS</b>="<i>-W... -f...</i>"
+<b>LDFLAGS</b>="<i>-L... -Wl,...</i>"
+    Preprocessor/compiler/linker flags
+
+<b>LDLIBS</b>="<i>-l... -l...</i>"
+    Dynamic libraries to link
+
+<b>EXTRA_</b>{<b>CPPFLAGS</b>,<b>CFLAGS</b>,<b>LDFLAGS</b>,<b>LDLIBS</b>}="<i>...</i>"
+    Adds to the default flags, instead of replacing them
+</pre>
 
 ### Build profiles
 
-The configuration system provides a few shorthand flags for handy configurations:
-
-| Command                 | Description                                                 |
-|-------------------------|-------------------------------------------------------------|
-| `./configure RELEASE=y` | Build `bfs` with optimizations, LTO, and without assertions |
-| `./configure ASAN=y`    | Enable [AddressSanitizer]                                   |
-| `./configure LSAN=y`    | Enable [LeakSanitizer]                                      |
-| `./configure MSAN=y`    | Enable [MemorySanitizer]                                    |
-| `./configure TSAN=y`    | Enable [ThreadSanitizer]                                    |
-| `./configure UBSAN=y`   | Enable [UndefinedBehaviorSanitizer]                         |
-| `./configure GCOV=y`    | Enable [code coverage]                                      |
-
-[AddressSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizer
-[LeakSanitizer]: https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer#stand-alone-mode
-[MemorySanitizer]: https://github.com/google/sanitizers/wiki/MemorySanitizer
-[ThreadSanitizer]: https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual
-[UndefinedBehaviorSanitizer]: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
-[code coverage]: https://gcc.gnu.org/onlinedocs/gcc/Gcov.html
-
-You can combine multiple profiles (e.g. `./configure ASAN=y UBSAN=y`), but not all of them will work together.
-
-### Flags
-
-Other flags can be specified on the `./configure` command line or in the environment.
-Here are some of the common ones; check the [`Makefile`](/Makefile) for more.
-
-| Flag                                | Description                                        |
-|-------------------------------------|----------------------------------------------------|
-| `CC`                                | The C compiler to use, e.g. `./configure CC=clang` |
-| `CFLAGS`<br>`EXTRA_CFLAGS`          | Override/add to the default compiler flags         |
-| `LDFLAGS`<br>`EXTRA_LDFLAGS`        | Override/add to the linker flags                   |
-| `USE_LIBACL`<br>`USE_LIBCAP`<br>... | Enable/disable [optional dependencies]             |
-| `TEST_FLAGS`                        | `tests.sh` flags for `make check`                  |
-| `DESTDIR`                           | The root directory for `make install`              |
-| `PREFIX`                            | The installation prefix (default: `/usr`)          |
-| `MANDIR`                            | The man page installation directory                |
-
-[optional dependencies]: #dependencies
+The default flags result in a plain debug build.
+Other build profiles can be enabled:
 
-### Dependencies
+<pre>
+--enable-release
+    Enable optimizations, disable assertions
 
-`bfs` depends on some system libraries for some of its features.
-These dependencies are optional, and can be turned off in `./configure` if necessary by setting the appropriate variable to `n` (e.g. `./configure USE_ONIGURUMA=n`).
+--enable-<a href="https://github.com/google/sanitizers/wiki/AddressSanitizer">asan</a>
+--enable-<a href="https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer#stand-alone-mode">lsan</a>
+--enable-<a href="https://github.com/google/sanitizers/wiki/MemorySanitizer">msan</a>
+--enable-<a href="https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual">tsan</a>
+--enable-<a href="https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html">ubsan</a>
+    Enable sanitizers
 
-| Dependency   | Platforms  | `./configure` flag |
-|--------------|------------|--------------------|
-| [libacl]     | Linux only | `USE_LIBACL`       |
-| [libcap]     | Linux only | `USE_LIBCAP`       |
-| [liburing]   | Linux only | `USE_LIBURING`     |
-| [libselinux] | Linux only | `USE_LIBSELINUX`   |
-| [Oniguruma]  | All        | `USE_ONIGURUMA`    |
+--enable-<a href="https://gcc.gnu.org/onlinedocs/gcc/gcov/introduction-to-gcov.html">gcov</a>
+    Enable code coverage instrumentation
+</pre>
 
-[libacl]: https://savannah.nongnu.org/projects/acl
-[libcap]: https://sites.google.com/site/fullycapable/
-[libselinux]: https://github.com/SELinuxProject/selinux
-[liburing]: https://github.com/axboe/liburing
-[Oniguruma]: https://github.com/kkos/oniguruma
+You can combine multiple profiles (e.g. `./configure --enable-asan --enable-ubsan`), but not all of them will work together.
 
-### Dependency tracking
+### Dependencies
 
-The build system automatically tracks header dependencies with the `-M` family of compiler options (see `DEPFLAGS` in [`build/deps.mk`](/build/deps.mk)).
-So if you edit a header file, `make` will rebuild the necessary object files ensuring they don't go out of sync.
+`bfs` depends on some system libraries for some of its features.
+External dependencies are auto-detected by default, but you can `--enable` or `--disable` them manually:
 
-We also add a dependency on the current configuration, so you can change configurations and rebuild without having to `make clean`.
-For example,
+<pre>
+--enable-<a href="https://savannah.nongnu.org/projects/acl">libacl</a>      --disable-libacl
+--enable-<a href="https://sites.google.com/site/fullycapable/">libcap</a>      --disable-libcap
+--enable-<a href="https://github.com/SELinuxProject/selinux">libselinux</a>  --disable-libselinux
+--enable-<a href="https://github.com/axboe/liburing">liburing</a>    --disable-liburing
+--enable-<a href="https://github.com/kkos/oniguruma">oniguruma</a>   --disable-oniguruma
+</pre>
 
-    $ ./configure
-    $ make
-    $ ./configure RELEASE=y
-    $ make
+[`pkg-config`] is used, if available, to detect these libraries and any additional build flags they may require.
+If this is undesireable, disable it by setting `PKG_CONFIG` to the empty string (`./configure PKG_CONFIG=""`).
 
-will build the project in debug mode and then rebuild it in release mode.
+[`pkg-config`]: https://www.freedesktop.org/wiki/Software/pkg-config/
 
 ### Out-of-tree builds
 
@@ -110,6 +107,53 @@ You can set up an out-of-tree build by running the `configure` script from anoth
     $ make
 
 
+Building
+--------
+
+### Targets
+
+The [`Makefile`](/Makefile) supports several different build targets:
+
+<pre>
+make
+    The default target; builds just the <i>bfs</i> binary
+make <b>all</b>
+    Builds everything, including the tests (but doesn't run them)
+
+make <b>check</b>
+    Builds everything, and runs all tests
+make <b>unit-tests</b>
+    Builds and runs the unit tests
+make <b>integration-tests</b>
+    Builds and runs the integration tests
+make <b>distcheck</b>
+    Builds and runs the tests in multiple different configurations
+
+make <b>install</b>
+    Installs bfs globally
+make <b>uninstall</b>
+    Uninstalls bfs
+
+make <b>clean</b>
+    Deletes all built files
+make <b>distclean</b>
+    Also deletes files generated by ./configure
+</pre>
+
+
+Troubleshooting
+---------------
+
+If the build fails or behaves unexpectedly, start by enabling verbose mode:
+
+    $ ./configure V=1
+    $ make V=1
+
+This will print the generated configuration and the exact commands that are executed.
+
+You can also check the file `gen/config.log`, which contains any errors from commands run during the configuration phase.
+
+
 Testing
 -------
 
-- 
cgit v1.2.3


From aab0cdfef0df2e0a478ad062899c044fae0aec76 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 2 May 2024 11:17:29 -0400
Subject: Release 3.2

---
 Makefile          |  2 +-
 docs/CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/Makefile b/Makefile
index 8a8ec6b..2d68f20 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ gen/version.c.new::
 	elif test -e src/../.git && command -v git >/dev/null 2>&1; then \
 	    git -C src/.. describe --always --dirty; \
 	else \
-	    echo "3.1.3"; \
+	    echo "3.2"; \
 	fi | tr -d '\n' >>$@
 	@printf '";\n' >>$@
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 672c2b4..62b6480 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,36 @@
 3.*
 ===
 
+3.2
+---
+
+**May 2, 2024**
+
+### New features
+
+- New `-limit N` action that quits immediately after `N` results
+
+- Implemented `-context` (from GNU find) for matching SELinux contexts ([#27](https://github.com/tavianator/bfs/issues/27))
+
+- Implemented `-printf %Z` for printing SELinux contexts
+
+### Changes
+
+- The build system has been rewritten, and there is now a configure step:
+
+      $ ./configure
+      $ make
+
+  See `./configure --help` or [docs/BUILDING.md](/docs/BUILDING.md) for more details.
+
+- Improved platform support
+  - Implemented `-acl` on Solaris/Illumos
+  - Implemented `-xattr` on DragonFly BSD
+
+### Bug fixes
+
+- Fixed some rarely-used code paths that clean up after allocation failures
+
 3.1.3
 -----
 
-- 
cgit v1.2.3