diff options
| author | Denys Vlasenko | 2009-11-11 21:05:42 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2009-11-11 21:05:42 +0100 |
| commit | ab19ede65595f6c0daba1e9b6c7c0a2ede341fec (patch) | |
| tree | 144f7f397a4c193e5af9b445d14fee7d471107d2 /libbb/read.c | |
| parent | c096a6c2084b6d920182714beb842ebb40087182 (diff) | |
| download | busybox-ab19ede65595f6c0daba1e9b6c7c0a2ede341fec.zip busybox-ab19ede65595f6c0daba1e9b6c7c0a2ede341fec.tar.gz | |
tidy up O_NONBLOCK usage. use libbb functions in stty.
Added O_RDONLY where improves readability. Note: O_RDONLY == 0,
so it is there even if not specified.
function old new delta
stty_main 1289 1235 -54
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/read.c')
| -rw-r--r-- | libbb/read.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/read.c b/libbb/read.c index b93a695..06ce297 100644 --- a/libbb/read.c +++ b/libbb/read.c @@ -39,18 +39,18 @@ ssize_t FAST_FUNC safe_read(int fd, void *buf, size_t count) * *** BIG SURPRISE! It stays even after child exits! *** * * This is a design bug in UNIX API. - * fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) | O_NONBLOCK); + * fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK); * will set nonblocking mode not only on _your_ stdin, but * also on stdin of your parent, etc. * * In general, * fd2 = dup(fd1); - * fcntl(fd2, F_SETFL, fcntl(fd2, F_GETFL, 0) | O_NONBLOCK); + * fcntl(fd2, F_SETFL, fcntl(fd2, F_GETFL) | O_NONBLOCK); * sets both fd1 and fd2 to O_NONBLOCK. This includes cases * where duping is done implicitly by fork() etc. * * We need - * fcntl(fd2, F_SETFD, fcntl(fd2, F_GETFD, 0) | O_NONBLOCK); + * fcntl(fd2, F_SETFD, fcntl(fd2, F_GETFD) | O_NONBLOCK); * (note SETFD, not SETFL!) but such thing doesn't exist. * * Alternatively, we need nonblocking_read(fd, ...) which doesn't |