aboutsummaryrefslogtreecommitdiff
path: root/login
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-10-07 10:48:10 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-10-07 10:56:00 +0200
commit0f9793a556675d67d7c1897553f92e7152d1e598 (patch)
tree4f938bc2e03c843f8651a7b3afb0022fdd268ced /login
parentc42b7058a2f8dea5c0b95e64aa82ee1d62a2ba14 (diff)
downloadglibc-0f9793a556675d67d7c1897553f92e7152d1e598.tar
glibc-0f9793a556675d67d7c1897553f92e7152d1e598.tar.gz
glibc-0f9793a556675d67d7c1897553f92e7152d1e598.tar.bz2
glibc-0f9793a556675d67d7c1897553f92e7152d1e598.zip
Linux: unlockpt needs to fail with EINVAL, not ENOTTY (bug 26053)
The EINVAL error code is mandated by POSIX and documented in the manual. Also clean up the unlockpt implementation a bit, assuming that TIOCSPTLCK is always defined. Enhance login/tst-grantpt to cover unlockpt corner cases. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'login')
-rw-r--r--login/tst-grantpt.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/login/tst-grantpt.c b/login/tst-grantpt.c
index 1d7a220fcf..8ca901ef94 100644
--- a/login/tst-grantpt.c
+++ b/login/tst-grantpt.c
@@ -1,4 +1,4 @@
-/* Test for grantpt error corner cases.
+/* Test for grantpt, unlockpt error corner cases.
Copyright (C) 2001-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -28,7 +28,7 @@
#include <support/temp_file.h>
#include <support/xunistd.h>
-/* Test grantpt with a closed descriptor. */
+/* Test grantpt, unlockpt with a closed descriptor. */
static void
test_ebadf (void)
{
@@ -48,9 +48,12 @@ test_ebadf (void)
printf ("grantpt(): expected: return = %d, errno = %d\n", -1, EBADF);
printf (" got: return = %d, errno = %d\n", ret, err);
}
+
+ TEST_COMPARE (unlockpt (fd), -1);
+ TEST_COMPARE (errno, EBADF);
}
-/* Test grantpt on a regular file. */
+/* Test grantpt, unlockpt on a regular file. */
static void
test_einval (void)
{
@@ -68,10 +71,13 @@ test_einval (void)
printf (" got: return = %d, errno = %d\n", ret, err);
}
+ TEST_COMPARE (unlockpt (fd), -1);
+ TEST_COMPARE (errno, EINVAL);
+
xclose (fd);
}
-/* Test grantpt on a non-ptmx pseudo-terminal. */
+/* Test grantpt, unlockpt on a non-ptmx pseudo-terminal. */
static void
test_not_ptmx (void)
{
@@ -80,6 +86,9 @@ test_not_ptmx (void)
TEST_COMPARE (grantpt (ptmx), 0);
TEST_COMPARE (unlockpt (ptmx), 0);
+ /* A second unlock succeeds as well. */
+ TEST_COMPARE (unlockpt (ptmx), 0);
+
const char *name = ptsname (ptmx);
TEST_VERIFY_EXIT (name != NULL);
int pts = open (name, O_RDWR | O_NOCTTY);
@@ -88,6 +97,9 @@ test_not_ptmx (void)
TEST_COMPARE (grantpt (pts), -1);
TEST_COMPARE (errno, EINVAL);
+ TEST_COMPARE (unlockpt (pts), -1);
+ TEST_COMPARE (errno, EINVAL);
+
xclose (pts);
xclose (ptmx);
}