diff options
| author | Denys Vlasenko | 2011-01-24 00:29:55 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2011-01-24 00:29:55 +0100 |
| commit | e9a40e3b91f699c08053d7307bf50b0764811b8e (patch) | |
| tree | 790f2cae8fbca16cfa2b5c1f5ed98d4c4afdf198 | |
| parent | dc6cd12569e6ac3775b11f6285ccc1bb81b13af0 (diff) | |
| download | busybox-e9a40e3b91f699c08053d7307bf50b0764811b8e.zip busybox-e9a40e3b91f699c08053d7307bf50b0764811b8e.tar.gz | |
libbb: make ndelay_no/off a bit more clever. +14 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 6 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/include/libbb.h b/include/libbb.h index 5551031..6e37b8d 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -348,9 +348,9 @@ extern char *bb_get_last_path_component_strip(char *path) FAST_FUNC; /* "abc/def/" -> "" and it never modifies 'path' */ extern char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC; -int ndelay_on(int fd) FAST_FUNC; -int ndelay_off(int fd) FAST_FUNC; -int close_on_exec_on(int fd) FAST_FUNC; +void ndelay_on(int fd) FAST_FUNC; +void ndelay_off(int fd) FAST_FUNC; +void close_on_exec_on(int fd) FAST_FUNC; void xdup2(int, int) FAST_FUNC; void xmove_fd(int, int) FAST_FUNC; diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index a02a504..23f2751 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -25,19 +25,25 @@ #include "libbb.h" /* Turn on nonblocking I/O on a fd */ -int FAST_FUNC ndelay_on(int fd) +void FAST_FUNC ndelay_on(int fd) { - return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK); + int flags = fcntl(fd, F_GETFL); + if (flags & O_NONBLOCK) + return; + fcntl(fd, F_SETFL, flags | O_NONBLOCK); } -int FAST_FUNC ndelay_off(int fd) +void FAST_FUNC ndelay_off(int fd) { - return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NONBLOCK); + int flags = fcntl(fd, F_GETFL); + if (!(flags & O_NONBLOCK)) + return; + fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); } -int FAST_FUNC close_on_exec_on(int fd) +void FAST_FUNC close_on_exec_on(int fd) { - return fcntl(fd, F_SETFD, FD_CLOEXEC); + fcntl(fd, F_SETFD, FD_CLOEXEC); } char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src) |