mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
1998-09-21 10:00 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h: Add mempcpy optimization. * sysdeps/generic/mempcpy.c: Undefined __mempcpy. * intl/localealias.c: Define mempcpy only if not already defined. * sysdeps/i386/i486/bits/string.h: Define ffsl only if not already defined. 1998-09-20 10:48 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * csu/abi-note.S: Emit the note directly instead of defining a preprocessor macro that's only used once. Don't include sysdep.h. * abi-tags: Generalize Solaris entry. 1998-09-18 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/bsd/getpt.c (__libc_ptyname1, __libc_ptyname2): Change to array to avoid runtime relocation. * sysdeps/unix/sysv/linux/ptsname.c: Update declarations. 1998-09-21 12:22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/Makefile ($(objpfx)libmcheck.a): Fix use of $(LN_S). * math/Makefile ($(objpfx)libieee.a): Likewise. 1998-09-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/getpt.c: Fix order of argument to weak_alias. Patch by John Tobey <jtobey@banta-im.com>.
This commit is contained in:
@ -33,8 +33,8 @@
|
||||
#define _PATH_DEVPTS "/dev/pts/"
|
||||
|
||||
/* The are declared in getpt.c. */
|
||||
extern const char *__libc_ptyname1;
|
||||
extern const char *__libc_ptyname2;
|
||||
extern const char __libc_ptyname1[];
|
||||
extern const char __libc_ptyname2[];
|
||||
|
||||
/* Static buffer for `ptsname'. */
|
||||
static char buffer[sizeof (_PATH_DEVPTS) + 20];
|
||||
@ -59,7 +59,7 @@ __ptsname_r (int fd, char *buf, size_t buflen)
|
||||
int save_errno = errno;
|
||||
struct stat st;
|
||||
int ptyno;
|
||||
|
||||
|
||||
if (buf == NULL)
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
@ -97,7 +97,7 @@ __ptsname_r (int fd, char *buf, size_t buflen)
|
||||
#endif
|
||||
{
|
||||
char *p;
|
||||
|
||||
|
||||
if (buflen < strlen (_PATH_TTY) + 3)
|
||||
{
|
||||
__set_errno (ERANGE);
|
||||
@ -116,13 +116,13 @@ __ptsname_r (int fd, char *buf, size_t buflen)
|
||||
__set_errno (ENOTTY);
|
||||
return ENOTTY;
|
||||
}
|
||||
|
||||
|
||||
p = __stpcpy (buf, _PATH_TTY);
|
||||
p[0] = __libc_ptyname1[ptyno / 16];
|
||||
p[1] = __libc_ptyname2[ptyno % 16];
|
||||
p[2] = '\0';
|
||||
}
|
||||
|
||||
|
||||
if (__stat (buf, &st) < 0)
|
||||
return errno;
|
||||
|
||||
|
Reference in New Issue
Block a user