diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-04-18 13:26:02 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-04-18 13:26:02 +0100 |
| commit | da543a71fddbee8db89a11d6266a7d0bddcaef6d (patch) | |
| tree | 165221d3053284613b1520b1aa1e003b2f251c2f | |
| parent | 2f57f008a2f7aaa0193b432f8d0c0ec4f42648c3 (diff) | |
| download | busybox-w32-merge_1_19.tar.gz busybox-w32-merge_1_19.tar.bz2 busybox-w32-merge_1_19.zip | |
strsep is in upstream BusyBox: no need for MINGW32 versionmerge_1_19
| -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 33f83e3ab..0b64c52ec 100644 --- a/include/mingw.h +++ b/include/mingw.h | |||
| @@ -157,10 +157,6 @@ int setenv(const char *name, const char *value, int replace); | |||
| 157 | void unsetenv(const char *env); | 157 | void unsetenv(const char *env); |
| 158 | 158 | ||
| 159 | #define getenv mingw_getenv | 159 | #define getenv mingw_getenv |
| 160 | /* | ||
| 161 | * string.h | ||
| 162 | */ | ||
| 163 | char *strsep(char **stringp, const char *delim); | ||
| 164 | 160 | ||
| 165 | /* | 161 | /* |
| 166 | * sys/ioctl.h | 162 | * sys/ioctl.h |
diff --git a/include/platform.h b/include/platform.h index 713e76d04..88e8acb7a 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 df413d18e..ae166000e 100644 --- a/win32/mingw.c +++ b/win32/mingw.c | |||
| @@ -641,24 +641,6 @@ int link(const char *oldpath, const char *newpath) | |||
| 641 | return 0; | 641 | return 0; |
| 642 | } | 642 | } |
| 643 | 643 | ||
| 644 | char *strsep(char **stringp, const char *delim) | ||
| 645 | { | ||
| 646 | char *s, *old_stringp; | ||
| 647 | if (!*stringp) | ||
| 648 | return NULL; | ||
| 649 | old_stringp = s = *stringp; | ||
| 650 | while (*s) { | ||
| 651 | if (strchr(delim, *s)) { | ||
| 652 | *s = '\0'; | ||
| 653 | *stringp = s+1; | ||
| 654 | return old_stringp; | ||
| 655 | } | ||
| 656 | s++; | ||
| 657 | } | ||
| 658 | *stringp = NULL; | ||
| 659 | return old_stringp; | ||
| 660 | } | ||
| 661 | |||
| 662 | char *realpath(const char *path, char *resolved_path) | 644 | char *realpath(const char *path, char *resolved_path) |
| 663 | { | 645 | { |
| 664 | /* FIXME: need normalization */ | 646 | /* FIXME: need normalization */ |