154 lines
4.6 KiB
Diff
154 lines
4.6 KiB
Diff
From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Mon, 25 Feb 2019 14:56:21 +0800
|
|
Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
|
|
|
|
If the standard library doesn't provide brace
|
|
expansion users just won't get it.
|
|
|
|
Dont use GNU GLOB extentions on non-glibc systems
|
|
|
|
Conditionalize use of GLOB_ALTDIRFUNC
|
|
|
|
Upstream-Status: Inappropriate [musl specific]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
[rebased for systemd 243]
|
|
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
|
|
|
---
|
|
src/basic/glob-util.c | 12 ++++++++++++
|
|
src/test/test-glob-util.c | 16 ++++++++++++++++
|
|
src/tmpfiles/tmpfiles.c | 10 ++++++++++
|
|
3 files changed, 38 insertions(+)
|
|
|
|
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
|
|
index e3aa6c2e152b..38070b79c83a 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 667d15335fbf..76a84443aacf 100644
|
|
--- a/src/test/test-glob-util.c
|
|
+++ b/src/test/test-glob-util.c
|
|
@@ -12,6 +12,12 @@
|
|
#include "rm-rf.h"
|
|
#include "tmpfile-util.h"
|
|
|
|
+/* Don't fail if the standard library
|
|
+ * doesn't provide brace expansion */
|
|
+#ifndef GLOB_BRACE
|
|
+#define GLOB_BRACE 0
|
|
+#endif
|
|
+
|
|
static void test_glob_exists(void) {
|
|
char name[] = "/tmp/test-glob_exists.XXXXXX";
|
|
int fd = -1;
|
|
@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) {
|
|
const char *fn;
|
|
|
|
_cleanup_globfree_ glob_t g = {
|
|
+#ifdef GLOB_ALTDIRFUNC
|
|
.gl_closedir = closedir_wrapper,
|
|
.gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot,
|
|
.gl_opendir = (void *(*)(const char *)) opendir,
|
|
.gl_lstat = lstat,
|
|
.gl_stat = stat,
|
|
+#endif
|
|
};
|
|
|
|
int r;
|
|
@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) {
|
|
assert_se(mkdtemp(template));
|
|
|
|
fn = strjoina(template, "/*");
|
|
+#ifdef GLOB_ALTDIRFUNC
|
|
r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
|
|
+#else
|
|
+ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
+#endif
|
|
assert_se(r == GLOB_NOMATCH);
|
|
|
|
fn = strjoina(template, "/.*");
|
|
+#ifdef GLOB_ALTDIRFUNC
|
|
r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
|
|
+#else
|
|
+ r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
+#endif
|
|
assert_se(r == GLOB_NOMATCH);
|
|
|
|
(void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
|
|
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
|
index 193ed0bc781b..2f94fd2efd8f 100644
|
|
--- a/src/tmpfiles/tmpfiles.c
|
|
+++ b/src/tmpfiles/tmpfiles.c
|
|
@@ -58,6 +58,12 @@
|
|
#include "umask-util.h"
|
|
#include "user-util.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
|
|
@@ -1850,7 +1856,9 @@ finish:
|
|
|
|
static int glob_item(Item *i, action_t action) {
|
|
_cleanup_globfree_ glob_t g = {
|
|
+#ifdef GLOB_ALTDIRFUNC
|
|
.gl_opendir = (void *(*)(const char *)) opendir_nomod,
|
|
+#endif
|
|
};
|
|
int r = 0, k;
|
|
char **fn;
|
|
@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) {
|
|
|
|
static int glob_item_recursively(Item *i, fdaction_t action) {
|
|
_cleanup_globfree_ glob_t g = {
|
|
+#ifdef GLOB_ALTDIRFUNC
|
|
.gl_opendir = (void *(*)(const char *)) opendir_nomod,
|
|
+#endif
|
|
};
|
|
int r = 0, k;
|
|
char **fn;
|