mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
1998-09-17 19:34 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/bits/utsname.h: Fix typo. Patch by John Tobey <jtobey@banta-im.com>. 1998-09-17 Mark Kettenis <kettenis@phys.uva.nl> * login/pty-internal.h: Removed. Moved constants related to the `grantpt' helper program protocol to ... * login/pty-private.h: ... here. New file. * sysdeps/unix/sysv/linux/ptsname.c (ptsname): Reimplementation to make the function work with kernels >= 2.1.115. * sysdeps/unix/sysv/linux/getpt.c (getpt): Reimplement to call BSD version if using the cloning device fails. * sysdeps/unix/sysv/linux/grantpt.c: New file. * sysdeps/unix/sysv/linux/unlockpt.c: General cleanup. * sysdeps/unix/bsd/getpt.c (__getpt): Largely rewritten to allow use by Linux specific code. * sysdeps/unix/bsd/unlockpt.c: General cleanup. * sysdeps/unix/grantpt.c: Largely rewritten. (pts_name): New function. (grantpt): Use pts_name, check group and permission mode in addition to owner. Try to set the owner, group and permission mode first without invoking the helper program. * login/programs/pt_chown.c: Largely rewritten. Add argp and internationalization support. Use symbolic constants instead of hardwired numbers for permission mode. * sysdeps/unix/bsd/ptsname.c: New file. 1998-09-17 22:04 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp-test.c: Undo last change. * posix/wordexp.c: Undo last change.
This commit is contained in:
@ -17,43 +17,67 @@
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "pty-internal.h"
|
||||
|
||||
/* Per the FreeBSD-3.0 manpages: pty masters are named
|
||||
/dev/pty[p-sP-S][0-9a-v]. I hope EIO is the right
|
||||
errno in the "already open" case; it doesn't say. */
|
||||
static const char pn1[] = "pqrsPQRS";
|
||||
static const char pn2[] = "0123456789abcdefghijklmnopqrstuv";
|
||||
/* Prefix for master pseudo terminal nodes. */
|
||||
#define _PATH_PTY "/dev/pty"
|
||||
|
||||
/* Open the master side of a pseudoterminal and return its file
|
||||
descriptor, or -1 on error. BSD version. */
|
||||
|
||||
/* Letters indicating a series of pseudo terminals. */
|
||||
#ifndef PTYNAME1
|
||||
#define PTYNAME1 "pqrsPQRS"
|
||||
#endif
|
||||
const char *__libc_ptyname1 = PTYNAME1;
|
||||
|
||||
/* Letters indicating the position within a series. */
|
||||
#ifndef PTYNAME2
|
||||
#define PTYNAME2 "0123456789abcdefghijklmnopqrstuv";
|
||||
#endif
|
||||
const char *__libc_ptyname2 = PTYNAME2;
|
||||
|
||||
|
||||
/* Open a master pseudo terminal and return its file descriptor. */
|
||||
int
|
||||
__getpt ()
|
||||
__getpt (void)
|
||||
{
|
||||
int fd;
|
||||
const char *i, *j;
|
||||
char namebuf[PTYNAMELEN];
|
||||
char buf[sizeof (_PATH_PTY) + 2];
|
||||
const char *p, *q;
|
||||
char *s;
|
||||
|
||||
s = __stpcpy (buf, _PATH_PTY);
|
||||
s[0] = '?';
|
||||
s[1] = '?';
|
||||
s[2] = 0;
|
||||
|
||||
strcpy (namebuf, "/dev/pty");
|
||||
namebuf[10] = '\0';
|
||||
for (i = pn1; *i; ++i)
|
||||
for (p = __libc_ptyname1; *p; p++)
|
||||
{
|
||||
namebuf[8] = *i;
|
||||
for (j = pn2; *j; ++j)
|
||||
{
|
||||
namebuf[9] = *j;
|
||||
fd = open (namebuf, O_RDWR);
|
||||
s[0] = *p;
|
||||
|
||||
for (q = __libc_ptyname2; *q; q++)
|
||||
{
|
||||
int fd;
|
||||
|
||||
s[1] = *q;
|
||||
|
||||
fd = __open (buf, O_RDWR);
|
||||
if (fd != -1)
|
||||
return fd;
|
||||
{
|
||||
if (__isatty (fd))
|
||||
return fd;
|
||||
|
||||
__close (fd);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (errno != EIO)
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
__set_errno (ENFILE);
|
||||
return -1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user