summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-24 07:15:50 +0000
committerDenis Vlasenko2006-12-24 07:15:50 +0000
commita5b3e76c38371c2c5781c11cfe5980aeb041e034 (patch)
tree8d71b29b19c05aa96220da4d14552d83a66f9b09
parentf4dff773553da8b4a5a66205e920a82732156851 (diff)
downloadbusybox-a5b3e76c38371c2c5781c11cfe5980aeb041e034.zip
busybox-a5b3e76c38371c2c5781c11cfe5980aeb041e034.tar.gz
missing piece of prev commit: ndelay_off
-rw-r--r--include/libbb.h1
-rw-r--r--libbb/xfuncs.c11
-rw-r--r--runit/runit_lib.h6
3 files changed, 6 insertions, 12 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2bfeba4..d94dd59 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 136dd1c..827cbe8 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 1f91191..f4beb56 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 *);