[4/5] restorecond: Musl compatibility for GLOB_BRACE and GLOB_TILDE
diff mbox

Message ID 20180517051117.48454-5-jason@perfinion.com
State Not Applicable
Headers show

Commit Message

Jason Zaman May 17, 2018, 5:11 a.m. UTC
musl doesn't implement GLOB_BRACE and GLOB_TILDE, so simply don't use
them there. This affects restorecond -u but braces are not used in the
example configs. GLOB_TILDE is on the roadmap[1] for musl 1.1.21 so
restorecond -u should be fine soon.

[1]: https://wiki.musl-libc.org/roadmap.html

Signed-off-by: Jason Zaman <jason@perfinion.com>
---
 restorecond/restore.c | 13 ++++++++-----
 restorecond/watch.c   |  8 ++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

Patch
diff mbox

diff --git a/restorecond/restore.c b/restorecond/restore.c
index cf04e962..f6e30001 100644
--- a/restorecond/restore.c
+++ b/restorecond/restore.c
@@ -1,11 +1,14 @@ 
-/*
- * Note that the restorecond(8) service build links with these functions.
- * Therefore any changes here should also be tested against that utility.
- */
-
 #include "restore.h"
 #include <glob.h>
 
+#ifndef GLOB_TILDE
+#define GLOB_TILDE 0
+#endif
+
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 char **exclude_list;
 int exclude_count;
 
diff --git a/restorecond/watch.c b/restorecond/watch.c
index 691df824..98ff797b 100644
--- a/restorecond/watch.c
+++ b/restorecond/watch.c
@@ -20,6 +20,14 @@ 
 #include "stringslist.h"
 #include "utmpwatcher.h"
 
+#ifndef GLOB_TILDE
+#define GLOB_TILDE 0
+#endif
+
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
 /* size of the event structure, not counting name */
 #define EVENT_SIZE  (sizeof (struct inotify_event))
 /* reasonable guess as to size of 1024 events */