lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Update.

Browse Source 
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:
Ulrich Drepper
1998-09-17 19:51:33 +00:00
parent d8f2b9ea8c
commit 9b3c7c3c71
15 changed files with 857 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sysdeps/unix/sysv/linux/getpt.c
View File

@ -17,33 +17,26 @@
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 <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include "pty-internal.h"
/* Path to the master pseudo terminal cloning device. */
#define _PATH_DEVPTMX "/dev/ptmx"
/* Per Documentation/devices.txt: pty masters are /dev/pty[p-za-e][0-9a-f].
These strings are used also in ptsname.c. */
const char __ptyname1[] = "pqrstuvwxyzabcde";
const char __ptyname2[] = "0123456789abcdef";
/* Prototype for function that opens BSD-style master pseudo-terminals. */
int __bsd_getpt (void);
/* Open the master side of a pseudoterminal and return its file
descriptor, or -1 on error. Linux version. */
/* Open a master pseudo terminal and return its file descriptor. */
int
__getpt ()
__getpt (void)
{
int fd;
const char *i, *j;
static int have_dev_ptmx = 1;
char namebuf[PTYNAMELEN];
int fd;
/* The new way: */
if (have_dev_ptmx)
{
fd = __open ("/dev/ptmx", O_RDWR);
fd = __open (_PATH_DEVPTMX, O_RDWR);
if (fd != -1)
return fd;
else
@ -55,23 +48,11 @@ __getpt ()
}
}
/* The old way: */
strcpy (namebuf, "/dev/pty");
namebuf[10] = '\0';
for (i = __ptyname1; *i; ++i)
{
namebuf[8] = *i;
for (j = __ptyname2; *j; ++j)
{
namebuf[9] = *j;
fd = __open (namebuf, O_RDWR);
if (fd != -1)
return fd;
if (errno != EIO)
return -1;
}
}
__set_errno (ENFILE);
return -1;
return __bsd_getpt ();
}
weak_alias (__getpt, getpt)
#define PTYNAME1 "pqrstuvwxyzabcde";
#define PTYNAME2 "0123456789abcdef";
#define __getpt __bsd_getpt
#include <sysdeps/unix/bsd/getpt.c>