diff options
Diffstat (limited to 'libc/stdlib/ptsname.c')
| -rw-r--r-- | libc/stdlib/ptsname.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c index c79325ea3..769944ba2 100644 --- a/libc/stdlib/ptsname.c +++ b/libc/stdlib/ptsname.c @@ -1,21 +1,21 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #define isatty __isatty @@ -41,7 +41,7 @@ || (major ((Dev)) == 4 && minor ((Dev)) >= 128 && minor ((Dev)) < 192) \ || (major ((Dev)) >= 128 && major ((Dev)) < 136)) -/* Check if DEV corresponds to a master pseudo terminal device. */ +/* Check if DEV corresponds to a slave pseudo terminal device. */ #define SLAVE_P(Dev) \ (major ((Dev)) == 3 \ || (major ((Dev)) == 4 && minor ((Dev)) >= 192 && minor ((Dev)) < 256) \ @@ -53,8 +53,8 @@ and 3 (slaves). */ /* The are declared in getpt.c. */ -extern const char _ptyname1[]; -extern const char _ptyname2[]; +extern const char __libc_ptyname1[] attribute_hidden; +extern const char __libc_ptyname2[] attribute_hidden; #endif @@ -97,7 +97,7 @@ int attribute_hidden __ptsname_r (int fd, char *buf, size_t buflen) p = _int10tostr(&numbuf[sizeof numbuf - 1], ptyno); - if (buflen < sizeof devpts + &numbuf[sizeof numbuf - 1] - p) + if (buflen < sizeof(devpts) + (size_t)(&numbuf[sizeof(numbuf) - 1] - p)) { errno = ERANGE; return ERANGE; |