diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-19 13:42:08 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-19 13:42:08 +0000 |
commit | d37f22225b4d10b84bbc4f6cee2e26d9f9b80fac (patch) | |
tree | 732f39f3a15dcb56986ffd3900ab2fe3c46d0338 /shell | |
parent | b9c02dd791041a4c3b87cb38354268893d739bd0 (diff) | |
download | busybox-w32-d37f22225b4d10b84bbc4f6cee2e26d9f9b80fac.tar.gz busybox-w32-d37f22225b4d10b84bbc4f6cee2e26d9f9b80fac.tar.bz2 busybox-w32-d37f22225b4d10b84bbc4f6cee2e26d9f9b80fac.zip |
libbb,crond,lash: fix getopt32 (don't know how it managed to slip through)
*: fcntl(fd, F_GETFL) doesn't require third parameter at all.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 4 | ||||
-rw-r--r-- | shell/lash.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 9aec8ee0a..46f00dd3d 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -726,7 +726,7 @@ opentrace(void) | |||
726 | } | 726 | } |
727 | } | 727 | } |
728 | #ifdef O_APPEND | 728 | #ifdef O_APPEND |
729 | flags = fcntl(fileno(tracefile), F_GETFL, 0); | 729 | flags = fcntl(fileno(tracefile), F_GETFL); |
730 | if (flags >= 0) | 730 | if (flags >= 0) |
731 | fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND); | 731 | fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND); |
732 | #endif | 732 | #endif |
@@ -8565,7 +8565,7 @@ preadfd(void) | |||
8565 | 8565 | ||
8566 | if (nr < 0) { | 8566 | if (nr < 0) { |
8567 | if (parsefile->fd == 0 && errno == EWOULDBLOCK) { | 8567 | if (parsefile->fd == 0 && errno == EWOULDBLOCK) { |
8568 | int flags = fcntl(0, F_GETFL, 0); | 8568 | int flags = fcntl(0, F_GETFL); |
8569 | if (flags >= 0 && flags & O_NONBLOCK) { | 8569 | if (flags >= 0 && flags & O_NONBLOCK) { |
8570 | flags &=~ O_NONBLOCK; | 8570 | flags &=~ O_NONBLOCK; |
8571 | if (fcntl(0, F_SETFL, flags) >= 0) { | 8571 | if (fcntl(0, F_SETFL, flags) >= 0) { |
diff --git a/shell/lash.c b/shell/lash.c index c28a1034a..d4dba8e63 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
@@ -1524,7 +1524,7 @@ int lash_main(int argc_l, char **argv_l) | |||
1524 | } | 1524 | } |
1525 | } | 1525 | } |
1526 | 1526 | ||
1527 | opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command); | 1527 | opt = getopt32(argv_l, "+ic:", &local_pending_command); |
1528 | #define LASH_OPT_i (1<<0) | 1528 | #define LASH_OPT_i (1<<0) |
1529 | #define LASH_OPT_c (1<<1) | 1529 | #define LASH_OPT_c (1<<1) |
1530 | if (opt & LASH_OPT_c) { | 1530 | if (opt & LASH_OPT_c) { |