diff options
| author | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
| commit | bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b (patch) | |
| tree | 334c4a5d9b11045021021f5f0db53ce4f4fa3ff3 /sysdeps/mach/hurd/ttyname_r.c | |
| parent | 2e76ab2332a7fb9e73a4047625b915bff93bd427 (diff) | |
| parent | c4ccff16e2ff92f84102988bd3a32cd1d2719f3a (diff) | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/mach/hurd/ttyname_r.c')
| -rw-r--r-- | sysdeps/mach/hurd/ttyname_r.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c index 7313b9afcb..8896252246 100644 --- a/sysdeps/mach/hurd/ttyname_r.c +++ b/sysdeps/mach/hurd/ttyname_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 95, 96, 98 Free Software Foundation, Inc. +/* Copyright (C) 1994,1995,1996,1998,2010 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 @@ -34,13 +34,13 @@ __ttyname_r (int fd, char *buf, size_t buflen) nodename[0] = '\0'; if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename))) - return __hurd_dfail (fd, err), -1; + return __hurd_dfail (fd, err), errno; len = strlen (nodename) + 1; if (len > buflen) { errno = EINVAL; - return -1; + return errno; } memcpy (buf, nodename, len); |