diff options
Diffstat (limited to 'libc/stdlib/bsd_getpt.c')
| -rw-r--r-- | libc/stdlib/bsd_getpt.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c index f219afd29..aec0ca4bc 100644 --- a/libc/stdlib/bsd_getpt.c +++ b/libc/stdlib/bsd_getpt.c @@ -1,21 +1,21 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 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. */ #include <errno.h> #include <fcntl.h> @@ -31,13 +31,13 @@ #ifndef PTYNAME1 #define PTYNAME1 "pqrsPQRS" #endif -const char _ptyname1[] = PTYNAME1; +const char __libc_ptyname1[] attribute_hidden = PTYNAME1; /* Letters indicating the position within a series. */ #ifndef PTYNAME2 #define PTYNAME2 "0123456789abcdefghijklmnopqrstuv"; #endif -const char _ptyname2[] = PTYNAME2; +const char __libc_ptyname2[] attribute_hidden = PTYNAME2; /* Open a master pseudo terminal and return its file descriptor. */ @@ -48,17 +48,15 @@ __getpt (void) const char *p, *q; char *s; - __memcpy (buf, _PATH_PTY, sizeof (_PATH_PTY)); - s = buf + __strlen (buf); - + s = __mempcpy (buf, _PATH_PTY, sizeof (_PATH_PTY) - 1); /* s[0] and s[1] will be filled in the loop. */ s[2] = '\0'; - for (p = _ptyname1; *p != '\0'; ++p) + for (p = __libc_ptyname1; *p != '\0'; ++p) { s[0] = *p; - for (q = _ptyname2; *q != '\0'; ++q) + for (q = __libc_ptyname2; *q != '\0'; ++q) { int fd; @@ -73,6 +71,6 @@ __getpt (void) } } - errno = ENOENT; + __set_errno (ENOENT); return -1; } |