commit b4e22199878209822a2f73bfd468df8b3d2208e9
author Elliott Hughes <enh@google.com> Thu Oct 12 17:51:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 12 17:51:20 2023 +0000
tree b53bb2dd55aa1481bb324eb944d20a0ac36496ca
parent 713dfe3e166dec2523fee8289d5534e2dd4963d1
parent 25af17c5873292cff4b26eda9f17f6a6870f9a92

Merge "Clarify the fcntl() "that's not how F_SETFD works" error." into main

libc/bionic/fcntl.cpp

diff --git a/libc/bionic/fcntl.cpp b/libc/bionic/fcntl.cpp
index 754277b..7730a15 100644
--- a/libc/bionic/fcntl.cpp
+++ b/libc/bionic/fcntl.cpp
@@ -44,7 +44,7 @@
   va_end(args);
 
   if (cmd == F_SETFD && (reinterpret_cast<uintptr_t>(arg) & ~FD_CLOEXEC) != 0) {
-    __fortify_fatal("fcntl(F_SETFD) passed non-FD_CLOEXEC flag: %p", arg);
+    __fortify_fatal("fcntl(F_SETFD) only supports FD_CLOEXEC but was passed %p", arg);
   }
 
 #if defined(__LP64__)

tests/fcntl_test.cpp

diff --git a/tests/fcntl_test.cpp b/tests/fcntl_test.cpp
index b3be18e..47f3d91 100644
--- a/tests/fcntl_test.cpp
+++ b/tests/fcntl_test.cpp
@@ -363,5 +363,5 @@
 }
 
 TEST_F(fcntl_DeathTest, fcntl_F_SETFD) {
-  EXPECT_DEATH(fcntl(0, F_SETFD, O_NONBLOCK), "non-FD_CLOEXEC");
+  EXPECT_DEATH(fcntl(0, F_SETFD, O_NONBLOCK), "only supports FD_CLOEXEC");
 }