missing piece of prev commit: ndelay_off

diff --git a/include/libbb.h b/include/libbb.h
index 2bfeba4e184701e7356cfb5dcdea6d4cd59bd274..d94dd598eaa45719c65b23ee5a99f776a11f8fca 100644 (file)
--- 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 136dd1ccae01b95d0bfb159ff666e05694fdf8fe..827cbe870845c107437c05c93df0fe07d6ddbbdb 100644 (file)
--- 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 1f911919d25c6aee731e8803937b53b4d3620dfa..f4beb560e180a6a60968c2278ea622b6618896e5 100644 (file)
--- 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 *);