From 4023f4a23c2b341b35fa0f25186122cfbe28cf57 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 18 Nov 2026 11:17:21 +0100 Subject: [PATCH 4/7] util: let a final '*' in GNUNET_DISK_glob patterns match glob_match gave up once the '*' would have to swallow the last character, so "test*" matched nothing, and it then looked one byte past the name, which made "a*c" match "a" if a longer name had been scanned before. Fixes #8889 Assisted by LLM --- src/lib/util/disk.c | 5 ++- src/lib/util/test_disk.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/src/lib/util/disk.c b/src/lib/util/disk.c index ca924ff6c..4a6ce84bc 100644 --- a/src/lib/util/disk.c +++ b/src/lib/util/disk.c @@ -994,13 +994,12 @@ glob_match (const char *pattern, const char *str) } else { - if (NULL == str_bt) + if ( (NULL == str_bt) || + ('\0' == *str_bt) ) return false; /* Backtrack to match one more character as part of the asterisk. */ str_pos = str_bt + 1; - if ('\0' == *str_pos) - return false; pat_pos = pat_bt; } } diff --git a/src/lib/util/test_disk.c b/src/lib/util/test_disk.c index 61932d27a..ae5abae9e 100644 --- a/src/lib/util/test_disk.c +++ b/src/lib/util/test_disk.c @@ -276,6 +276,75 @@ testDirMani () } +/** + * Check how many files in "test-glob" match a pattern. + */ +static int +check_glob (const char *pattern, + int want) +{ + int found = 0; + int ret; + + ret = GNUNET_DISK_glob (pattern, + &iter_callback, + &found); + if ( (want != ret) || + (want != found) ) + { + fprintf (stderr, + "Glob `%s' matched %d files (%d callbacks), wanted %d\n", + pattern, + ret, + found, + want); + return 1; + } + return 0; +} + + +static int +testGlob () +{ + static const char *files[] = { + "test0", "test1", "a", "abc", "a.conf", NULL + }; + int ret = 0; + + if (GNUNET_OK != GNUNET_DISK_directory_create ("test-glob")) + { + GNUNET_break (0); + return 1; + } + for (unsigned int i = 0; NULL != files[i]; i++) + { + char *fn; + + GNUNET_asprintf (&fn, + "test-glob" DIR_SEPARATOR_STR "%s", + files[i]); + GNUNET_assert (GNUNET_OK == + GNUNET_DISK_fn_write (fn, + "x", + 1, + GNUNET_DISK_PERM_USER_READ + | GNUNET_DISK_PERM_USER_WRITE)); + GNUNET_free (fn); + } + ret += check_glob ("test-glob/test*", 2); + ret += check_glob ("test-glob/*", 5); + ret += check_glob ("test-glob/*.conf", 1); + ret += check_glob ("test-glob/a*", 3); + ret += check_glob ("test-glob/abc*", 1); + ret += check_glob ("test-glob/a*c", 1); + ret += check_glob ("test-glob/*b*", 1); + ret += check_glob ("test-glob/x*", 0); + GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove ("test-glob")); + return ret; +} + + int main (int argc, char *argv[]) { @@ -289,6 +358,7 @@ main (int argc, char *argv[]) failureCount += testCanonicalize (); failureCount += testChangeOwner (); failureCount += testDirMani (); + failureCount += testGlob (); if (0 != failureCount) { fprintf (stderr, -- 2.47.3