From 59e17afe291f9df52d2334b92e88a889c2fe8f6a Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Tue, 11 Jul 2023 13:08:06 +0200 Subject: cftw: Allow user callback to stop recursive search So far, cftw would search through all directories and files recursively, until all objects are processed. However, it is interesting for the user callback to be able to stop this process under specific circumstances. Now, cftw will pass a pointer to a bool, initialised to false by default, that can be optionally assigned to true by the user callback. Future commits will make use of this feature. For example, this will be used to limit the number of search results when a user enters a search term that is too generic and would otherwise generate a large amount of search results. --- cftw.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'cftw.c') diff --git a/cftw.c b/cftw.c index 8fb1d67..4b8b013 100644 --- a/cftw.c +++ b/cftw.c @@ -9,8 +9,8 @@ #include #include -int cftw(const char *const dirpath, int (*const fn)(const char *, - const struct stat *, void *), void *const user) +static int do_cftw(const char *const dirpath, int (*const fn)(const char *, + const struct stat *, bool *, void *), bool *const done, void *const user) { int ret = -1; DIR *const d = opendir(dirpath); @@ -58,20 +58,20 @@ int cftw(const char *const dirpath, int (*const fn)(const char *, __func__, path, strerror(errno)); else if (S_ISDIR(sb.st_mode)) { - if ((ret = cftw(d.str, fn, user))) + if ((ret = do_cftw(d.str, fn, done, user))) ; - else if ((ret = fn(d.str, &sb, user))) + else if ((ret = fn(d.str, &sb, done, user))) ; } else if (S_ISREG(sb.st_mode)) - ret = fn(d.str, &sb, user); + ret = fn(d.str, &sb, done, user); else fprintf(stderr, "%s: unexpected st_mode %ju\n", __func__, (uintmax_t)sb.st_mode); dynstr_free(&d); - if (ret) + if (ret || *done) goto end; } @@ -87,3 +87,11 @@ end: return ret; } + +int cftw(const char *const dirpath, int (*const fn)(const char *, + const struct stat *, bool *, void *), void *const user) +{ + bool done = false; + + return do_cftw(dirpath, fn, &done, user); +} -- cgit v1.2.3