diff options
author | Ron Yorston <rmy@pobox.com> | 2018-03-05 14:33:51 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-03-05 14:33:51 +0000 |
commit | ce1d1546e17a5f613aad2bdf327a1abb77a32bdb (patch) | |
tree | b9d0c034afe68c01c420d9a3d1f7f69772216f1b | |
parent | 31997b1796bdaf5734f5fff1a20a637d8872419d (diff) | |
download | busybox-w32-ce1d1546e17a5f613aad2bdf327a1abb77a32bdb.tar.gz busybox-w32-ce1d1546e17a5f613aad2bdf327a1abb77a32bdb.tar.bz2 busybox-w32-ce1d1546e17a5f613aad2bdf327a1abb77a32bdb.zip |
win32: use strchrnul from BusyBox in fnmatch
BusyBox ensures that strchrnul is always available, either from the
target platform or by including its own version. Therefore it isn't
necessary for fnmatch to use its equivalent.
-rw-r--r-- | win32/fnmatch.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win32/fnmatch.c b/win32/fnmatch.c index add516fb3..de456e526 100644 --- a/win32/fnmatch.c +++ b/win32/fnmatch.c | |||
@@ -16,6 +16,8 @@ | |||
16 | write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | Boston, MA 02111-1307, USA. */ | 17 | Boston, MA 02111-1307, USA. */ |
18 | 18 | ||
19 | #include <platform.h> | ||
20 | |||
19 | #if HAVE_CONFIG_H | 21 | #if HAVE_CONFIG_H |
20 | # include <config.h> | 22 | # include <config.h> |
21 | #endif | 23 | #endif |
@@ -129,7 +131,7 @@ extern int errno; | |||
129 | 131 | ||
130 | /* This function doesn't exist on most systems. */ | 132 | /* This function doesn't exist on most systems. */ |
131 | 133 | ||
132 | # if !defined HAVE___STRCHRNUL && !defined _LIBC | 134 | # if !defined HAVE___STRCHRNUL && !defined _LIBC && 0 |
133 | static char * | 135 | static char * |
134 | __strchrnul (const char *s, int c) | 136 | __strchrnul (const char *s, int c) |
135 | { | 137 | { |
@@ -138,6 +140,8 @@ __strchrnul (const char *s, int c) | |||
138 | result = strchr (s, '\0'); | 140 | result = strchr (s, '\0'); |
139 | return result; | 141 | return result; |
140 | } | 142 | } |
143 | # else | ||
144 | # define __strchrnul strchrnul | ||
141 | # endif | 145 | # endif |
142 | 146 | ||
143 | # ifndef internal_function | 147 | # ifndef internal_function |