diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/_strerror.c | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/ttyname_r.c | 49 |
2 files changed, 52 insertions, 3 deletions
diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c index eeebb9e360..f2411122ea 100644 --- a/sysdeps/mach/_strerror.c +++ b/sysdeps/mach/_strerror.c @@ -24,7 +24,7 @@ Cambridge, MA 02139, USA. */ /* Return a string describing the errno code in ERRNUM. */ char * -_strerror_internal (int errnum, char buf[1024]) +_strerror_internal (int errnum, char *buf, size_t buflen) { int system; int sub; @@ -41,7 +41,7 @@ _strerror_internal (int errnum, char buf[1024]) if (system > err_max_system || ! __mach_error_systems[system].bad_sub) { static const char unk[] = "Error in unknown error system: "; - char *p = buf + sizeof buf; + char *p = buf + buflen; *p-- = '\0'; p = _itoa (errnum, p, 16, 1); p -= sizeof unk - 1; @@ -56,7 +56,7 @@ _strerror_internal (int errnum, char buf[1024]) if (code >= es->subsystem[sub].max_code) { static const char unk[] = "Unknown error "; - char *p = buf + sizeof buf; + char *p = buf + buflen; size_t len = strlen (es->subsystem[sub].subsys_name); *p-- = '\0'; p = _itoa (errnum, p, 16, 1); diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c new file mode 100644 index 0000000000..67ff37d61c --- /dev/null +++ b/sysdeps/mach/hurd/ttyname_r.c @@ -0,0 +1,49 @@ +/* Copyright (C) 1994, 1995 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +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. + +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. + +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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <errno.h> +#include <string.h> +#include <unistd.h> +#include <hurd.h> +#include <hurd/term.h> +#include <hurd/fd.h> + +/* Store at most BUFLEN characters of the pathname of the terminal FD is + open on in BUF. Return 0 on success, -1 otherwise. */ +int +ttyname_r (int fd, char *buf, int buflen) +{ + error_t err; + char nodename[1024]; /* XXX */ + char *cp; + int len; + + nodename[0] = '\0'; + if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename))) + return __hurd_dfail (fd, err), -1; + + len = (int) strlen (nodename) + 1; + if (len > buflen) + { + errno = EINVAL; + return -1; + } + + memcpy (buf, nodename, len); + return 0; +} |