From 14f2aeac2ca72df478bc9ddd33070f7ec850baa3 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 18 Aug 2024 02:45:11 -0500
Subject: [PATCH 11/34] Handle musl lack of GLOB_BRACE
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Based on OE patch.  This cannot be upstreamed.

Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
---
 src/basic/glob-util.c     | 12 ++++++++++++
 src/test/test-glob-util.c | 39 +++++++--------------------------------
 src/tmpfiles/tmpfiles.c   | 10 ++++++++++
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index 802ca8c655fc..23818a67c680 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -12,6 +12,12 @@
 #include "path-util.h"
 #include "strv.h"
 
+/* Don't fail if the standard library
+ * doesn't provide brace expansion */
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 static void closedir_wrapper(void* v) {
         (void) closedir(v);
 }
@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) {
 int safe_glob(const char *path, int flags, glob_t *pglob) {
         int k;
 
+#ifdef GLOB_ALTDIRFUNC
         /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
         assert(!(flags & GLOB_ALTDIRFUNC));
 
@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
                 pglob->gl_lstat = lstat;
         if (!pglob->gl_stat)
                 pglob->gl_stat = stat;
+#endif
 
         errno = 0;
+#ifdef GLOB_ALTDIRFUNC
         k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob);
+#else
+        k = glob(path, flags, NULL, pglob);
+#endif
         if (k == GLOB_NOMATCH)
                 return -ENOENT;
         if (k == GLOB_NOSPACE)
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index 49d71f15c714..65ae0b230dd5 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -34,6 +34,12 @@ TEST(glob_first) {
         ASSERT_NULL(first);
 }
 
+/* Don't fail if the standard library
+ * doesn't provide brace expansion */
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 TEST(glob_exists) {
         char name[] = "/tmp/test-glob_exists.XXXXXX";
         int fd = -EBADF;
@@ -52,37 +58,6 @@ TEST(glob_exists) {
         assert_se(r == 0);
 }
 
-static void closedir_wrapper(void* v) {
-        (void) closedir(v);
-}
-
-TEST(glob_no_dot) {
-        char template[] = "/tmp/test-glob-util.XXXXXXX";
-        const char *fn;
-
-        _cleanup_globfree_ glob_t g = {
-                .gl_closedir = closedir_wrapper,
-                .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot,
-                .gl_opendir = (void *(*)(const char *)) opendir,
-                .gl_lstat = lstat,
-                .gl_stat = stat,
-        };
-
-        int r;
-
-        assert_se(mkdtemp(template));
-
-        fn = strjoina(template, "/*");
-        r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
-        assert_se(r == GLOB_NOMATCH);
-
-        fn = strjoina(template, "/.*");
-        r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
-        assert_se(r == GLOB_NOMATCH);
-
-        (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
-}
-
 TEST(safe_glob) {
         char template[] = "/tmp/test-glob-util.XXXXXXX";
         const char *fn, *fn2, *fname;
@@ -96,7 +71,7 @@ TEST(safe_glob) {
         r = safe_glob(fn, 0, &g);
         assert_se(r == -ENOENT);
 
-        fn2 = strjoina(template, "/.*");
+        fn2 = strjoina(template, "/.f*");
         r = safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &g);
         assert_se(r == -ENOENT);
 
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 8cc8c1ccd61f..96111b512b14 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -73,6 +73,12 @@
 #include "user-util.h"
 #include "virt.h"
 
+/* Don't fail if the standard library
+ * doesn't provide brace expansion */
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
  * them in the file system. This is intended to be used to create
  * properly owned directories beneath /tmp, /var/tmp, /run, which are
@@ -2570,7 +2576,9 @@ finish:
 
 static int glob_item(Context *c, Item *i, action_t action) {
         _cleanup_globfree_ glob_t g = {
+#ifdef GLOB_ALTDIRFUNC
                 .gl_opendir = (void *(*)(const char *)) opendir_nomod,
+#endif
         };
         int r;
 
@@ -2598,7 +2606,9 @@ static int glob_item_recursively(
                 fdaction_t action) {
 
         _cleanup_globfree_ glob_t g = {
+#ifdef GLOB_ALTDIRFUNC
                 .gl_opendir = (void *(*)(const char *)) opendir_nomod,
+#endif
         };
         int r;
 
-- 
2.41.0