mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
update from main archive 961203
Tue Dec 3 08:38:15 1996 Richard Henderson <rth@tamu.edu> * sysdeps/unix/alpha/sysdep.S: Remove definition of __errno_location. Reformat copyright. * elf/rtld.c (_dl_start): Don't dereference the value returned by elf_machine_got to get _DYNAMIC, instead call new function elf_machine_dynamic. * sysdeps/alpha/dl-machine.h: Permute elf_machine_got to elf_machine_dynamic. Reformat copyright. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/sparc/dl-machine.h: Likewise. * sysdeps/stub/dl-machine.h: Likewise. Tue Oct 15 23:46:00 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (sysdep_dirs): Include add-on sysdep directories. Tue Dec 3 02:06:18 1996 Ulrich Drepper <drepper@cygnus.com> * Makerules ($(libdir)/libc.so): Make first line of generated link script contain `/* GNU ld script'. This will be used in ldconfig to check for linker scripts. * sysdeps/mach/hurd/libc-ldscript: Likewise. * sysdeps/mach/hurd/libc_p-ldscript: Likewise. * stdlib/getsubopt.c: Update copyright. Correct typo in comment.
This commit is contained in:
@ -36,6 +36,7 @@ static char sccsid[] = "@(#)ttyslot.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <ttyent.h>
|
||||
#include <alloca.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@ -47,12 +48,19 @@ ttyslot()
|
||||
register int slot;
|
||||
register char *p;
|
||||
int cnt;
|
||||
size_t buflen = __sysconf (_SC_TTY_NAME_MAX) + 1;
|
||||
char *name;
|
||||
|
||||
if (buflen == 0)
|
||||
/* This should be enough if no fixed value is given. */
|
||||
buflen = 32;
|
||||
|
||||
name = __alloca (buflen);
|
||||
|
||||
setttyent();
|
||||
for (cnt = 0; cnt < 3; ++cnt)
|
||||
if (name = ttyname(cnt)) {
|
||||
if (p = rindex(name, '/'))
|
||||
for (cnt = 0; cnt < 3; ++cnt)
|
||||
if (__ttyname_r (cnt, name, buflen) >= 0) {
|
||||
if (p = rindex(name, '/'))
|
||||
++p;
|
||||
else
|
||||
p = name;
|
||||
|
Reference in New Issue
Block a user