[klibc] [klibc:update-dash] expand: Remove dependency on fmatch.h if it does not exit

klibc-bot for Rink Springer rink at rink.nu
Thu Jan 24 19:15:47 PST 2019


Commit-ID:  b3726254f4b33e08b7e3ffd21a8bca857758aabf
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=b3726254f4b33e08b7e3ffd21a8bca857758aabf
Author:     Rink Springer <rink at rink.nu>
AuthorDate: Fri, 2 Feb 2018 08:44:55 +0100
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:57:21 +0000

[klibc] expand: Remove dependency on fmatch.h if it does not exit

[ Ugh; forgot to attach patch - apologies, I need more coffee ]

Dear all,

Attached is a trivial patch that removes the assumption that fnmatch.h
is available - the configure script already checks for fnmatch(3) and
supplies its own implementation if necessary, but fnmatch.h is always
included.

Let me know what you think.

Regards,
Rink

Do not assume we can include fnmatch.h

Signed-off-by: Rink Springer <rink at rink.nu>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 usr/dash/expand.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/dash/expand.c b/usr/dash/expand.c
index e2d563fe..153f6b7a 100644
--- a/usr/dash/expand.c
+++ b/usr/dash/expand.c
@@ -45,7 +45,9 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <string.h>
+#ifdef HAVE_FNMATCH
 #include <fnmatch.h>
+#endif
 #ifdef HAVE_GLOB
 #include <glob.h>
 #endif


More information about the klibc mailing list