diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/assuan-io.c | 34 |
2 files changed, 26 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ada7d46..f41e2c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-09-01 Werner Koch <[email protected]> + + * assuan-io.c: Include time.h. Fixes bug#951. + (_assuan_usleep): Use nanosleep only is available. + 2008-03-25 Marcus Brinkmann <[email protected]> * assuan-inquire.c (assuan_inquire): Loop over _assuan_read_line diff --git a/src/assuan-io.c b/src/assuan-io.c index 17e8b46..647237d 100644 --- a/src/assuan-io.c +++ b/src/assuan-io.c @@ -21,6 +21,7 @@ #include <config.h> #endif +#include <time.h> #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -218,20 +219,27 @@ _assuan_simple_recvmsg (assuan_context_t ctx, struct msghdr *msg) void _assuan_usleep (unsigned int usec) { -#ifdef HAVE_W32_SYSTEM - /* FIXME. */ - Sleep (usec / 1000); + if (usec) + { +#ifdef HAVE_NANOSLEEP + struct timespec req; + struct timespec rem; + + req.tv_sec = 0; + req.tv_nsec = usec * 1000; + + while (nanosleep (&req, &rem) < 0 && errno == EINTR) + req = rem; + +#elif defined(HAVE_W32_SYSTEM) + Sleep (usec / 1000); #else - struct timespec req; - struct timespec rem; - - if (usec == 0) - return; + struct timeval tv; - req.tv_sec = 0; - req.tv_nsec = usec * 1000; - - while (nanosleep (&req, &rem) < 0 && errno == EINTR) - req = rem; + tv.tv_sec = usec / 1000000; + tv.tv_usec = usec % 1000000; + select (0, NULL, NULL, NULL, &tv); #endif + } } + |