From 4bca4c174852bfc348f99e85684fc8f65631d125 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Apr 1998 09:21:28 +0000 Subject: Update. 1998-04-07 08:51 Ulrich Drepper * iconv/gconv.c: Take care for NULL arguments. * iconv/gconv_dl.c: Make find_func function global. * iconv/gconv_int.h: Add prototype for __gconv_find_func. Add prototypes for ASCII conversion functions. * iconv/gconv_simple.c: Add ASCII conversion functions. * locale/C-ctype.c: Correct charset name. * wcsmbs/Makefile (distribute): Add wcsmbsload.h. (routines): Remove wmemrtowcs and wmemrtombs, add wcsnlen and wcsmbsload. * wcsmbs/btowc.c: Rewrite to use iconv functionality. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * wcsmbs/wchar.h: Add prototype for __wcslen, wcsnlen. Remove prototypes for wmemr*. * wcsmbs/wcslen.c: Rename to __wcslen and make wcslen weak alias. * wcsmbs/wcsnlen.c: New file. * wcsmbs/wcsmbsload.c: New file. * wcsmbs/wcsmbsload.h: New file. * manual/filesys.texi: Mention risks of tmpnam and mktemp. * manual/install.texi: Describe some more critical points. * string/string.h: Add prototype for __strnlen. * string/strnlen.c: Rename to __strnlen and make strnlen weak alias. * sysdeps/posix/mktemp.c: Rewrite to allow many more files and much less predictable names. * sysdeps/posix/mkstemp.c: Likewise. 1998-04-05 Andreas Jaeger * manual/libc.texinfo (Top): Change "file namespace" to "local namespace". * manual/socket.texi: Change file namespace to local namespace. (Out-of-Band Data): Remove unneeded variable link. (Host Address Functions): Use uint32_t consequently and add a number of clarifications for IPv4/IPv6, classless addresses. (Internet Namespace): Added some paragraphs about IPv6. Based on suggestions by Francesco Potorti` . 1998-04-05 Philip Blundell Update for draft-ietf-ipngwg-bsd-api-new-01.txt: * resolv/netdb.h (getnameinfo): Use `socklen_t' not `size_t'. (NI_NUMERICHOST, et al.): Tidy up and add comments. (AI_NUMERICHOST): Define. (getnodebyname): New prototype. (AI_V4MAPPED, et al.): New constants. * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro.< * sysdeps/generic/bits/sockaddr.h (SA_LEN): Likewise. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add sa_len for socket. * sysdeps/unix/sysv/linux/sa_len.c: New file. * sysdeps/unix/sysv/linux/Dist: Add sa_len.c. * sysdeps/unix/sysv/linux/bits/socket.h: Make multiple #inclusion safe. * sysdeps/generic/bits/sockunion.h: New file, defining sockaddr_union. * sysdeps/unix/sysv/linux/bits/sockunion.h: Likewise. * socket/Makefile (headers): Add bits/sockunion.h. * socket/sys/socket.h: Include * inet/netinet/in.h: Include rather than , to avoid getting sockaddr_union defined. * sysdeps/generic/bits/socket.h: Allow inclusion from netinet.in.h. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Remove use of SIOCGIFCOUNT (2.2.x kernels won't have it). 1998-04-06 21:21 Ulrich Drepper * sysdeps/mach/hurd/bits/ioctls.h: Allow inclusion from hurd/ioctl.h. * sysdeps/mach/hurd/dl-sysdep.c: Use __ptr_t not caddr_t. * iconv/gconv_conf.c: Define MAXPATHLEN if not available before. Patches by UCHIYAMA Yasushi . 1998-04-05 Philip Blundell * manual/socket.texi (Socket Addresses): Fix a typo. (Interface Naming): New section. 1998-04-05 23:29 Zack Weinberg * configure.in: Check for CC using $ac_tool_prefix, to handle cross-compilation. Use AC_CHECK_TOOL to find MiG. * config.make.in: Add MIG to be substituted. * mach/Machrules: Don't define MIG variable. Patch by Gordon Matzigkeit . 1998-04-05 Mark Kettenis * elf/dl-load.c (decompose_rpath): Use local_strdup instead of strdupa to copy rpath. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-03-31 Mark Kettenis * sysdeps/unix/bsd/unlockpt.c (unlockpt): Call __ptsname_r instead of ptsname_r. * stdlib/stdlib.h: Change prototype of ptsname_r to make it more like ttyname_r. * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Likewise. * sysdeps/generic/ptsname.c (__ptsname_r): Likewise. * sysdeps/unix/grantpt.c (grantpt): Change check of return value of __ptsname_r accordingly. * login/openpty.c (openpty): Likewise. 1998-06-04 18:47 H.J. Lu * libio/fileops.c (_IO_file_xsgetn): Adjust pointers. 1998-04-06 13:58 Andreas Schwab * Makeconfig (libtypes): Redo H.J. Lu's change of 1998-03-27. * Makerules: Readd missing rule for $(objpfx)stamp.oS. 1998-04-06 Thorsten Kukuk * nis/ypclnt.c: Don't give YPERR_RPC back, use the do_ypcall return value for better error checking. --- sysdeps/unix/sysv/linux/ptsname.c | 84 +++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 29 deletions(-) (limited to 'sysdeps/unix/sysv/linux/ptsname.c') diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index 77b6d80ac8..c81f23504c 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "pty-internal.h" @@ -40,21 +41,38 @@ char * ptsname (fd) int fd; { - return __ptsname_r (fd, namebuf, PTYNAMELEN); + return __ptsname_r (fd, namebuf, PTYNAMELEN) != 0 ? NULL : namebuf; } -char * -__ptsname_r (fd, buf, len) +int +__ptsname_r (fd, buf, buflen) int fd; char *buf; - unsigned int len; + size_t buflen; { - char nbuf[PTYNAMELEN], idbuf[6]; - int ptyno; struct stat st; + int save = errno; + int ptyno; + char nbuf[PTYNAMELEN], idbuf[6]; + char *cp; #ifdef TIOCGPTN static int tiocgptn_works = 1; +#endif + + if (!buf) + { + __set_errno (EINVAL); + return EINVAL; + } + + if (!__isatty (fd)) + { + __set_errno (ENOTTY); + return ENOTTY; + } + +#ifdef TIOCGPTN if (tiocgptn_works) { if (ioctl (fd, TIOCGPTN, &ptyno) == 0) @@ -62,23 +80,21 @@ __ptsname_r (fd, buf, len) else { if(errno != EINVAL) - return 0; + return errno; else tiocgptn_works = 0; } } #endif - /* /dev/ptmx will make it into the kernel before 32 bit dev_t, so - this should be safe. */ - if (__fxstat (_STAT_VER, fd, &st)) - return 0; + if (__fxstat (_STAT_VER, fd, &st) < 0) + return errno; ptyno = minor (st.st_rdev); if (major (st.st_rdev) == 4) ptyno -= 128; #ifdef TIOCGPTN -gotit: + gotit: #endif /* Two different possible naming schemes for pty slaves: the SVr4 way. */ @@ -86,22 +102,32 @@ gotit: idbuf[5] = '\0'; __stpcpy (__stpcpy (nbuf, "/dev/pts/"), _itoa_word (ptyno, &idbuf[4], 10, 0)); - if (!__xstat (_STAT_VER, nbuf, &st)) - return strncpy (buf, nbuf, len); - else - if (errno != ENOENT) - return NULL; - - /* ...and the BSD way. */ - nbuf[5] = 't'; - nbuf[7] = 'y'; - nbuf[8] = __ptyname1[ptyno / 16]; - nbuf[9] = __ptyname2[ptyno % 16]; - nbuf[10] = '\0'; - - if (__xstat (_STAT_VER, nbuf, &st)) - return NULL; - - return strncpy (buf, nbuf, len); + if (__xstat (_STAT_VER, nbuf, &st) < 0) + { + if (errno != ENOENT) + return errno; + + /* ...and the BSD way. */ + nbuf[5] = 't'; + nbuf[7] = 'y'; + nbuf[8] = __ptyname1[ptyno / 16]; + nbuf[9] = __ptyname2[ptyno % 16]; + nbuf[10] = '\0'; + + if (__xstat (_STAT_VER, nbuf, &st) < 0) + return errno; + } + + if (buflen < strlen (nbuf) + 1) + { + __set_errno (ERANGE); + return ERANGE; + } + + cp = __stpncpy (buf, nbuf, buflen); + cp[0] = '\0'; + + __set_errno (save); + return 0; } weak_alias (__ptsname_r, ptsname_r) -- cgit v1.2.1