From 80e1f0e4190fa3697f421c55810a86a38e428ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 5 Apr 2009 07:34:37 +0000 Subject: [PATCH] Fix error reporting to conform to the POSIX ttyname_r and ttyname. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29917 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/libroot/posix/unistd/ttyname.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/system/libroot/posix/unistd/ttyname.c b/src/system/libroot/posix/unistd/ttyname.c index ba158e7935..9365201147 100644 --- a/src/system/libroot/posix/unistd/ttyname.c +++ b/src/system/libroot/posix/unistd/ttyname.c @@ -29,15 +29,15 @@ ttyname_r(int fd, char *buffer, size_t bufferSize) // first, some sanity checks: if (fstat(fd, &fdStat) < 0) - return -1; - - if (!S_ISCHR(fdStat.st_mode) || !isatty(fd)) { - errno = ENOTTY; return ENOTTY; - } + + if (!S_ISCHR(fdStat.st_mode) || !isatty(fd)) + return ENOTTY; // just ask devfs - return ioctl(fd, B_GET_PATH_FOR_DEVICE, buffer, bufferSize); + if (ioctl(fd, B_GET_PATH_FOR_DEVICE, buffer, bufferSize) < 0) + return errno; + return 0; } @@ -52,7 +52,9 @@ ttyname(int fd) static char pathname[MAXPATHLEN]; int err = ttyname_r(fd, pathname, sizeof(pathname)); - if (err < 0) + if (err != 0) { + errno = err; return NULL; + } return pathname; }