This is an automated email from the ASF dual-hosted git repository.
linguini1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 5ead824ff apps: Fix O_ACCMODE bitmask checks after Linux flag alignment
5ead824ff is described below
commit 5ead824fff5acf8ab57891b3b7c1054842514a4a
Author: Xiang Xiao <[email protected]>
AuthorDate: Sun Jun 28 02:21:28 2026 +0800
apps: Fix O_ACCMODE bitmask checks after Linux flag alignment
After aligning NuttX open() flag constants with Linux (O_RDONLY=0,
O_WRONLY=1, O_RDWR=2), code that used '(flags & O_RDONLY)' or
'(flags & O_WRONLY)' as a bitmask check is broken because O_RDONLY
is now 0. Fix by using '(flags & O_ACCMODE)' comparisons instead.
- usrsocktest: replace 'flags & O_RDWR' with 'flags & O_ACCMODE'
in fcntl F_GETFL assertions
- dd: verify mode used '(oflags & O_RDONLY)' to detect verify;
replace with '(oflags & O_ACCMODE) == O_RDWR'
- dpopen: replace '(oflag & O_RDWR) == O_RDWR' with
'(oflag & O_ACCMODE) == O_RDWR'
- usbmsc: replace 'flags & O_WRONLY' with
'(flags & O_ACCMODE) == O_RDONLY'
- fcntl_test: replace '(flags & O_WRONLY) == 0' with
'(flags & O_ACCMODE) == O_RDONLY'
Signed-off-by: Xiang Xiao <[email protected]>
---
examples/usrsocktest/usrsocktest_noblock_connect.c | 44 +++++++++++-----------
examples/usrsocktest/usrsocktest_noblock_recv.c | 8 ++--
examples/usrsocktest/usrsocktest_noblock_send.c | 8 ++--
examples/usrsocktest/usrsocktest_poll.c | 12 +++---
.../usrsocktest/usrsocktest_remote_disconnect.c | 12 +++---
system/dd/dd_main.c | 7 ++--
system/popen/dpopen.c | 4 +-
system/usbmsc/usbmsc_main.c | 2 +-
.../testsuites/kernel/syscall/cases/fcntl_test.c | 11 +++---
9 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/examples/usrsocktest/usrsocktest_noblock_connect.c
b/examples/usrsocktest/usrsocktest_noblock_connect.c
index bc7264bfe..32906e2a2 100644
--- a/examples/usrsocktest/usrsocktest_noblock_connect.c
+++ b/examples/usrsocktest/usrsocktest_noblock_connect.c
@@ -120,13 +120,13 @@ TEST(no_block_connect, instant_connect)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Do connect, should succeed instantly. */
@@ -188,13 +188,13 @@ TEST(no_block_connect, delayed_connect)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
@@ -290,13 +290,13 @@ TEST(no_block_connect, close_not_connected)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
@@ -363,13 +363,13 @@ TEST(no_block_connect, early_drop)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
@@ -443,24 +443,24 @@ TEST(no_block_connect, multiple)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempts, daemon delays actual connection until
@@ -552,24 +552,24 @@ TEST(no_block_connect, multiple)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempts, daemon delays actual connection until
@@ -637,24 +637,24 @@ TEST(no_block_connect, multiple)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd2, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd2, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
@@ -758,13 +758,13 @@ TEST(no_block_connect, basic_daemon_dup2)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c
b/examples/usrsocktest/usrsocktest_noblock_recv.c
index 146471d6f..ffacefde3 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -114,13 +114,13 @@ static void receive(struct usrsocktest_daemon_conf_s
*dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Do connect, should succeed instantly. */
@@ -310,13 +310,13 @@ static void delayed_connect(struct
usrsocktest_daemon_conf_s *dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_noblock_send.c
b/examples/usrsocktest/usrsocktest_noblock_send.c
index 7b039f3ae..8526c29b2 100644
--- a/examples/usrsocktest/usrsocktest_noblock_send.c
+++ b/examples/usrsocktest/usrsocktest_noblock_send.c
@@ -110,13 +110,13 @@ static void _send(struct usrsocktest_daemon_conf_s *dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Do connect, should succeed instantly. */
@@ -231,13 +231,13 @@ static void connect_send(struct usrsocktest_daemon_conf_s
*dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Launch connect attempt, daemon delays actual connection until
diff --git a/examples/usrsocktest/usrsocktest_poll.c
b/examples/usrsocktest/usrsocktest_poll.c
index 8ab7f6ce0..66cda8aa6 100644
--- a/examples/usrsocktest/usrsocktest_poll.c
+++ b/examples/usrsocktest/usrsocktest_poll.c
@@ -115,13 +115,13 @@ static void connectreceive(struct
usrsocktest_daemon_conf_s *dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* poll for input (instant timeout). */
@@ -321,13 +321,13 @@ static void connectsend(struct usrsocktest_daemon_conf_s
*dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* poll for input (instant timeout). */
@@ -454,13 +454,13 @@ static void daemonabort(struct usrsocktest_daemon_conf_s
*dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* poll for input (instant timeout). */
diff --git a/examples/usrsocktest/usrsocktest_remote_disconnect.c
b/examples/usrsocktest/usrsocktest_remote_disconnect.c
index 79ccbfefb..a49acc03f 100644
--- a/examples/usrsocktest/usrsocktest_remote_disconnect.c
+++ b/examples/usrsocktest/usrsocktest_remote_disconnect.c
@@ -151,13 +151,13 @@ static void unreachable(struct usrsocktest_daemon_conf_s
*dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Try connect, connection in progress. */
@@ -670,13 +670,13 @@ static void remote_disconnect_poll(struct
usrsocktest_daemon_conf_s *dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Poll for input (instant timeout). */
@@ -797,13 +797,13 @@ static void remote_disconnect_poll2(struct
usrsocktest_daemon_conf_s *dconf)
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(0, flags & O_NONBLOCK);
ret = fcntl(sd, F_SETFL, flags | O_NONBLOCK);
TEST_ASSERT_EQUAL(0, ret);
flags = fcntl(sd, F_GETFL, 0);
TEST_ASSERT_TRUE(flags >= 0);
- TEST_ASSERT_EQUAL(O_RDWR, flags & O_RDWR);
+ TEST_ASSERT_EQUAL(O_RDWR, flags & O_ACCMODE);
TEST_ASSERT_EQUAL(O_NONBLOCK, flags & O_NONBLOCK);
/* Poll for input (instant timeout). */
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index 17138371b..be9aba342 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -356,7 +356,7 @@ int main(int argc, FAR char **argv)
}
else if (strncmp(argv[i], "verify", 6) == 0)
{
- dd.oflags |= O_RDONLY;
+ dd.oflags = (dd.oflags & ~O_ACCMODE) | O_RDWR;
}
else if (strncmp(argv[i], "conv=", 5) == 0)
{
@@ -409,7 +409,8 @@ int main(int argc, FAR char **argv)
/* If verify enabled, infile and outfile are mandatory */
- if ((dd.oflags & O_RDONLY) && (infile == NULL || outfile == NULL))
+ if ((dd.oflags & O_ACCMODE) == O_RDWR &&
+ (infile == NULL || outfile == NULL))
{
fprintf(stderr, "%s: invalid parameters: %s\n", g_dd,
strerror(EINVAL));
@@ -519,7 +520,7 @@ int main(int argc, FAR char **argv)
/ ((double)elapsed / USEC_PER_SEC)));
#endif
- if (ret == 0 && (dd.oflags & O_RDONLY) != 0)
+ if (ret == 0 && (dd.oflags & O_ACCMODE) == O_RDWR)
{
ret = dd_verify(&dd);
}
diff --git a/system/popen/dpopen.c b/system/popen/dpopen.c
index 785fcc202..8e57371b7 100644
--- a/system/popen/dpopen.c
+++ b/system/popen/dpopen.c
@@ -112,7 +112,7 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t
*pid)
* pipe; fd[1] refers to the write end of the pipe.
*/
- if ((oflag & O_RDWR) == O_RDWR)
+ if ((oflag & O_ACCMODE) == O_RDWR)
{
#if defined(CONFIG_NET_LOCAL) && defined(CONFIG_NET_LOCAL_STREAM)
/* Create a socketpair for bidirectional communication */
@@ -215,7 +215,7 @@ int dpopen(FAR const char *command, int oflag, FAR pid_t
*pid)
/* Redirect child's stdin or stdout to the pipe */
- if ((oflag & O_RDWR) == O_RDWR)
+ if ((oflag & O_ACCMODE) == O_RDWR)
{
errcode = posix_spawn_file_actions_adddup2(&file_actions, childfd,
STDIN_FILENO);
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index e625e003b..97f2ca495 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -581,7 +581,7 @@ int main(int argc, FAR char *argv[])
num_luns, luns[num_luns].path);
ret = usbmsc_bindlun(handle, luns[num_luns].path, 0, 0, 0,
- luns[num_luns].flags & O_WRONLY ? false : true);
+ (luns[num_luns].flags & O_ACCMODE) == O_RDONLY);
if (ret < 0)
{
printf("mcsonn_main: usbmsc_bindlun failed for LUN %d using %s: "
diff --git a/testing/testsuites/kernel/syscall/cases/fcntl_test.c
b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
index 2737621ce..d86e612d7 100644
--- a/testing/testsuites/kernel/syscall/cases/fcntl_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fcntl_test.c
@@ -90,35 +90,36 @@ void test_nuttx_syscall_fcntl01(FAR void **state)
/* //block1: */
flags = fcntl(fd[2], F_GETFL, 0);
- assert_false((flags & O_WRONLY) == 0);
+ assert_false((flags & O_ACCMODE) == O_RDONLY);
/* Check setting of no_delay flag */
assert_false(fcntl(fd[2], F_SETFL, O_NDELAY) == -1);
flags = fcntl(fd[2], F_GETFL, 0);
- assert_false((flags & (O_NDELAY | O_WRONLY)) == 0);
+ assert_false((flags & O_NDELAY) == 0 && (flags & O_ACCMODE) == O_RDONLY);
/* Check of setting append flag */
assert_false(fcntl(fd[2], F_SETFL, O_APPEND) == -1);
flags = fcntl(fd[2], F_GETFL, 0);
- assert_false((flags & (O_APPEND | O_WRONLY)) == 0);
+ assert_false((flags & O_APPEND) == 0 && (flags & O_ACCMODE) == O_RDONLY);
/* Check setting flags together */
assert_false(fcntl(fd[2], F_SETFL, O_NDELAY | O_APPEND) < 0);
flags = fcntl(fd[2], F_GETFL, 0);
- assert_false((flags & (O_NDELAY | O_APPEND | O_WRONLY)) == 0);
+ assert_false((flags & (O_NDELAY | O_APPEND)) == 0 &&
+ (flags & O_ACCMODE) == O_RDONLY);
/* Check that flags are not cumulative */
assert_false(fcntl(fd[2], F_SETFL, 0) == -1);
flags = fcntl(fd[2], F_GETFL, 0);
- assert_false((flags & O_WRONLY) == 0);
+ assert_false((flags & O_ACCMODE) == O_RDONLY);
assert_false((flags = fcntl(fd[2], F_GETFD, 0)) < 0);
assert_false(flags != 0);
assert_false((flags = fcntl(fd[2], F_SETFD, 1)) == -1);
