Skip to content

apps: Fix O_ACCMODE bitmask checks after Linux flag alignment #3572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiaoxiang781216 wants to merge 1 commit into
base: master
Choose a base branch
from
+55 −53
Open

apps: Fix O_ACCMODE bitmask checks after Linux flag alignment #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions examples/usrsocktest/usrsocktest_noblock_connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/usrsocktest/usrsocktest_noblock_recv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/usrsocktest/usrsocktest_noblock_send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions examples/usrsocktest/usrsocktest_poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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). */
Expand Down Expand Up @@ -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). */
Expand Down Expand Up @@ -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). */
Expand Down
12 changes: 6 additions & 6 deletions examples/usrsocktest/usrsocktest_remote_disconnect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down Expand Up @@ -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). */
Expand Down Expand Up @@ -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). */
Expand Down
7 changes: 4 additions & 3 deletions system/dd/dd_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions system/popen/dpopen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion system/usbmsc/usbmsc_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
Loading
Loading