diff options
| author | Bernhard Reutner-Fischer | 2014-04-13 16:37:57 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2014-04-13 16:37:57 +0200 |
| commit | ad16741ccd8a8587644d88fb8fdfc41ada1928a6 (patch) | |
| tree | aa6461272aa3b71bb2f2f8da4b91a31d8b35eb59 | |
| parent | 69b114fb8a2566e14ce125f7736add9dacf6e18d (diff) | |
| download | busybox-ad16741ccd8a8587644d88fb8fdfc41ada1928a6.zip busybox-ad16741ccd8a8587644d88fb8fdfc41ada1928a6.tar.gz | |
libbb: provide usleep() fallback implementation
POSIX.1-2008 removed the usleep function, provide a fallback
implementaion using the recommended nanosleep().
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/platform.h | 16 | ||||
| -rw-r--r-- | libbb/platform.c | 18 |
2 files changed, 32 insertions, 2 deletions
diff --git a/include/platform.h b/include/platform.h index bd11ad6..92f7755 100644 --- a/include/platform.h +++ b/include/platform.h @@ -373,6 +373,7 @@ typedef unsigned smalluint; #define HAVE_STRSIGNAL 1 #define HAVE_STRVERSCMP 1 #define HAVE_VASPRINTF 1 +#define HAVE_USLEEP 1 #define HAVE_UNLOCKED_STDIO 1 #define HAVE_UNLOCKED_LINE_OPS 1 #define HAVE_GETLINE 1 @@ -381,8 +382,15 @@ typedef unsigned smalluint; #define HAVE_NET_ETHERNET_H 1 #define HAVE_SYS_STATFS_H 1 -#if defined(__UCLIBC__) && UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32) -# undef HAVE_STRVERSCMP +#if defined(__UCLIBC__) +# if UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32) +# undef HAVE_STRVERSCMP +# endif +# if UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 30) +# ifndef __UCLIBC_SUSV3_LEGACY__ +# undef HAVE_USLEEP +# endif +# endif #endif #if defined(__WATCOMC__) @@ -519,6 +527,10 @@ extern char *strsep(char **stringp, const char *delim) FAST_FUNC; # define strsignal(sig) get_signame(sig) #endif +#ifndef HAVE_USLEEP +extern int usleep(unsigned) FAST_FUNC; +#endif + #ifndef HAVE_VASPRINTF extern int vasprintf(char **string_ptr, const char *format, va_list p) FAST_FUNC; #endif diff --git a/libbb/platform.c b/libbb/platform.c index 1973451..8d90ca4 100644 --- a/libbb/platform.c +++ b/libbb/platform.c @@ -17,6 +17,24 @@ char* FAST_FUNC strchrnul(const char *s, int c) } #endif +#ifndef HAVE_USLEEP +int FAST_FUNC usleep(unsigned usec) +{ + struct timespec ts; + ts.tv_sec = usec / 1000000u; + ts.tv_nsec = (usec % 1000000u) * 1000u; + /* + * If a signal has non-default handler, nanosleep returns early. + * Our version of usleep doesn't return early + * if interrupted by such signals: + * + */ + while (nanosleep(&ts, &ts) != 0) + continue; + return 0; +} +#endif + #ifndef HAVE_VASPRINTF int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p) { |