diff options
| -rw-r--r-- | include/libbb.h | 1 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 11 | ||||
| -rw-r--r-- | runit/runit_lib.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2bfeba4e1..d94dd598e 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -213,6 +213,7 @@ extern void complain_copyfd_and_die(off_t sz) ATTRIBUTE_NORETURN; extern char bb_process_escape_sequence(const char **ptr); extern char *bb_get_last_path_component(char *path); extern int ndelay_on(int fd); +extern int ndelay_off(int fd); extern DIR *xopendir(const char *path); diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 136dd1cca..827cbe870 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -121,18 +121,17 @@ int xopen3(const char *pathname, int flags, int mode) return ret; } -/* -int ndelay_off(int fd) -{ - return fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0) & ~O_NONBLOCK); -} -*/ // Turn on nonblocking I/O on a fd int ndelay_on(int fd) { return fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0) | O_NONBLOCK); } +int ndelay_off(int fd) +{ + return fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0) & ~O_NONBLOCK); +} + // Die with an error message if we can't write the entire buffer. void xwrite(int fd, const void *buf, size_t count) { diff --git a/runit/runit_lib.h b/runit/runit_lib.h index 1f911919d..f4beb560e 100644 --- a/runit/runit_lib.h +++ b/runit/runit_lib.h @@ -274,12 +274,6 @@ extern int lock_un(int); extern int lock_exnb(int); -/*** ndelay.h ***/ - -extern int ndelay_on(int); -extern int ndelay_off(int); - - /*** open.h ***/ extern int open_read(const char *); |