diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/Kbuild | 1 | ||||
| -rw-r--r-- | libbb/safe_poll.c | 34 | ||||
| -rw-r--r-- | libbb/safe_strncpy.c | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild index 1800bde8f..55b3658b4 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -71,6 +71,7 @@ lib-y += recursive_action.o lib-y += remove_file.o lib-y += restricted_shell.o lib-y += run_shell.o +lib-y += safe_poll.o lib-y += safe_strncpy.o lib-y += safe_write.o lib-y += setup_environment.o diff --git a/libbb/safe_poll.c b/libbb/safe_poll.c new file mode 100644 index 000000000..d2b773c36 --- /dev/null +++ b/libbb/safe_poll.c @@ -0,0 +1,34 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) 2007 by Denys Vlasenko <vda.linux@googlemail.com> + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ + +#include "libbb.h" + +/* Wrapper which restarts poll on EINTR or ENOMEM. + * On other errors does perror("poll") and returns. + * Warning! May take longer than timeout_ms to return! */ +int safe_poll(struct pollfd *ufds, nfds_t nfds, int timeout) +{ + while (1) { + int n = poll(ufds, nfds, timeout); + if (n >= 0) + return n; + /* Make sure we inch towards completion */ + if (timeout > 0) + timeout--; + /* E.g. strace causes poll to return this */ + if (errno == EINTR) + continue; + /* Kernel is very low on memory. Retry. */ + /* I doubt many callers would handle this correctly! */ + if (errno == ENOMEM) + continue; + bb_perror_msg("poll"); + return n; + } +} diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c index ebc7e28f3..cc425839f 100644 --- a/libbb/safe_strncpy.c +++ b/libbb/safe_strncpy.c @@ -10,7 +10,7 @@ #include "libbb.h" /* Like strncpy but make sure the resulting string is always 0 terminated. */ -char * safe_strncpy(char *dst, const char *src, size_t size) +char *safe_strncpy(char *dst, const char *src, size_t size) { if (!size) return dst; dst[--size] = '\0'; |