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

klibc-bot for Rink Springer rink at rink.nu
Sat Mar 28 14:48:55 PDT 2020


Commit-ID:  be47d99b3d05ea898412536d717a15d80cd8b68f
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=be47d99b3d05ea898412536d717a15d80cd8b68f
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: Sat, 28 Mar 2020 21:42:54 +0000

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

[ dash commit 556e2f03cc9e6e92ba361171226cd890db53589e ]

[ 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