i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation with local changes (to be commited later).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5263 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-11-06 00:10:03 +00:00
parent b86315d90a
commit ea2aba5dc9
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/libroot/posix/unistd/ttyname.c
+6 -8
View File
@@ -3,6 +3,9 @@
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the OpenBeOS License.
*/ */
#include <SupportDefs.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@@ -15,23 +18,20 @@
#define DEV_TTY "/dev/tt/" #define DEV_TTY "/dev/tt/"
/* /** return the full pathname of the tty device
* ttyname - return the full pathname of the tty device
* (NULL if not a tty or an error occurs) * (NULL if not a tty or an error occurs)
*/ */
char * char *
ttyname (int fd) ttyname(int fd)
{ {
static char pathname[MAXPATHLEN]; static char pathname[MAXPATHLEN];
char *stub = pathname + sizeof(DEV_TTY) - 1; char *stub = pathname + sizeof(DEV_TTY) - 1;
int stubLen = sizeof(pathname) - sizeof(DEV_TTY); int stubLen = sizeof(pathname) - sizeof(DEV_TTY);
struct stat fdStat; struct stat fdStat;
DIR *dir; DIR *dir;
bool found = false; bool found = false;
// first, some sanity checks: // first, some sanity checks:
if (!isatty(fd)) if (!isatty(fd))
return NULL; return NULL;
@@ -42,7 +42,6 @@ ttyname (int fd)
if (!S_ISCHR(fdStat.st_mode)) if (!S_ISCHR(fdStat.st_mode))
return NULL; return NULL;
// start with the root tty directory at /dev // start with the root tty directory at /dev
strcpy(pathname, DEV_TTY); strcpy(pathname, DEV_TTY);
@@ -50,7 +49,6 @@ ttyname (int fd)
// find a matching entry in the directory: // find a matching entry in the directory:
// we must match both the inode for the file // we must match both the inode for the file
// and the device that the file resides on // and the device that the file resides on
struct dirent *e; struct dirent *e;
struct stat entryStat; struct stat entryStat;