* [hurd, commited] Rearrange bsd_getpt vs bsd_openpt and implement posix_openpt on BSD
@ 2020-11-08 14:11 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2020-11-08 14:11 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
* sysdeps/unix/bsd/getpt.c (__getpt): Add oflag parameter, pass
it to the _open call and rename to...
(__bsd_openpt): ... new function.
(__getpt): Reimplement on top of __bsd_openpt.
(__posix_openpt): Replace stub with implementation on top of __bsd_openpt.
(posix_openpt): Remove stub warning.
---
sysdeps/unix/bsd/getpt.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index 75489aef28..cdc3518fd7 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -41,7 +41,7 @@ const char __libc_ptyname2[] attribute_hidden = PTYNAME2;
/* Open a master pseudo terminal and return its file descriptor. */
int
-__getpt (void)
+__bsd_openpt (int oflag)
{
char buf[sizeof (_PATH_PTY) + 2];
const char *p, *q;
@@ -61,7 +61,7 @@ __getpt (void)
s[1] = *q;
- fd = __open (buf, O_RDWR);
+ fd = __open (buf, oflag);
if (fd != -1)
return fd;
@@ -74,18 +74,16 @@ __getpt (void)
return -1;
}
-#undef __getpt
+int
+__getpt (void)
+{
+ return __bsd_openpt (O_RDWR);
+}
weak_alias (__getpt, getpt)
-#ifndef HAVE_POSIX_OPENPT
-/* We cannot define posix_openpt in general for BSD systems. */
int
__posix_openpt (int oflag)
{
- __set_errno (ENOSYS);
- return -1;
+ return __bsd_openpt (oflag);
}
weak_alias (__posix_openpt, posix_openpt)
-
-stub_warning (posix_openpt)
-#endif
--
2.28.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-08 14:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-08 14:11 [hurd, commited] Rearrange bsd_getpt vs bsd_openpt and implement posix_openpt on BSD Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).