diff options
author | Ron Yorston <rmy@pobox.com> | 2012-04-18 12:53:17 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-04-18 12:53:17 +0100 |
commit | e976c5d081b35b5ee60ed755ec5ddca7c326d9c1 (patch) | |
tree | e95cd41bbff995be3ee70f292756f791e975e8be | |
parent | 8a1fde26fa09f25b1c52913ed1155d34a41f17e3 (diff) | |
download | busybox-w32-e976c5d081b35b5ee60ed755ec5ddca7c326d9c1.tar.gz busybox-w32-e976c5d081b35b5ee60ed755ec5ddca7c326d9c1.tar.bz2 busybox-w32-e976c5d081b35b5ee60ed755ec5ddca7c326d9c1.zip |
strsep is in upstream BusyBox: no need for MINGW32 version
-rw-r--r-- | include/mingw.h | 4 | ||||
-rw-r--r-- | include/platform.h | 1 | ||||
-rw-r--r-- | win32/mingw.c | 18 |
3 files changed, 1 insertions, 22 deletions
diff --git a/include/mingw.h b/include/mingw.h index 9c9767b3e..910eff412 100644 --- a/include/mingw.h +++ b/include/mingw.h | |||
@@ -171,10 +171,6 @@ int setenv(const char *name, const char *value, int replace); | |||
171 | void unsetenv(const char *env); | 171 | void unsetenv(const char *env); |
172 | 172 | ||
173 | #define getenv mingw_getenv | 173 | #define getenv mingw_getenv |
174 | /* | ||
175 | * string.h | ||
176 | */ | ||
177 | char *strsep(char **stringp, const char *delim); | ||
178 | 174 | ||
179 | /* | 175 | /* |
180 | * sys/ioctl.h | 176 | * sys/ioctl.h |
diff --git a/include/platform.h b/include/platform.h index 96c603c1f..b3c4eaf5d 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -401,6 +401,7 @@ typedef unsigned smalluint; | |||
401 | # undef HAVE_STPCPY | 401 | # undef HAVE_STPCPY |
402 | # undef HAVE_STRCASESTR | 402 | # undef HAVE_STRCASESTR |
403 | # undef HAVE_STRCHRNUL | 403 | # undef HAVE_STRCHRNUL |
404 | # undef HAVE_STRSEP | ||
404 | # undef HAVE_STRSIGNAL | 405 | # undef HAVE_STRSIGNAL |
405 | # undef HAVE_STRVERSCMP | 406 | # undef HAVE_STRVERSCMP |
406 | # undef HAVE_VASPRINTF | 407 | # undef HAVE_VASPRINTF |
diff --git a/win32/mingw.c b/win32/mingw.c index c9b00bbcd..b99c88444 100644 --- a/win32/mingw.c +++ b/win32/mingw.c | |||
@@ -654,24 +654,6 @@ int link(const char *oldpath, const char *newpath) | |||
654 | return 0; | 654 | return 0; |
655 | } | 655 | } |
656 | 656 | ||
657 | char *strsep(char **stringp, const char *delim) | ||
658 | { | ||
659 | char *s, *old_stringp; | ||
660 | if (!*stringp) | ||
661 | return NULL; | ||
662 | old_stringp = s = *stringp; | ||
663 | while (*s) { | ||
664 | if (strchr(delim, *s)) { | ||
665 | *s = '\0'; | ||
666 | *stringp = s+1; | ||
667 | return old_stringp; | ||
668 | } | ||
669 | s++; | ||
670 | } | ||
671 | *stringp = NULL; | ||
672 | return old_stringp; | ||
673 | } | ||
674 | |||
675 | char *realpath(const char *path, char *resolved_path) | 657 | char *realpath(const char *path, char *resolved_path) |
676 | { | 658 | { |
677 | /* FIXME: need normalization */ | 659 | /* FIXME: need normalization */ |