From 955516759cfed29122439938632964fed4f8a347 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sat, 20 Jun 2020 11:30:56 -0700 Subject: feat: file globbing in shell. added dynamic.mk --- sys/libn/fs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sys/libn') diff --git a/sys/libn/fs.c b/sys/libn/fs.c index 5d06997..10cd93e 100644 --- a/sys/libn/fs.c +++ b/sys/libn/fs.c @@ -6,7 +6,6 @@ /* * path history */ - struct Key { ino_t ino; @@ -151,9 +150,14 @@ fs·walk(fs·Walker *fs) return; } - /* operate on directory if preorder traversal */ - if (fs->flags & fs·preorder) - fs->func(fs->data, fs->base, fs->path, &cwd); + /* + * operate on directory first if preorder traversal + * truncate recursion if callback returns an error code + */ + if (fs->flags & fs·preorder) { + if (fs->func(fs->data, fs->base, fs->path, &cwd)) + return; + } /* open directory */ if(!fs->max || fs->lev + 1 < fs->max) { -- cgit v1.2.1