diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ptsname.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname.c | 152 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname_r.c | 182 |
5 files changed, 342 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 9a509384d6..6f13dfe62b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -82,10 +82,6 @@ sysdep_headers += netinet/in_systm.h netinet/udp.h \ netrom/netrom.h netpacket/packet.h netrose/rose.h endif -ifeq ($(subdir),posix) -sysdep_routines += s_pread64 s_pwrite64 -endif - # Don't compile the ctype glue code, since there is no old non-GNU C library. inhibit-glue = yes diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index c81f23504c..2db8f8d08a 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -101,7 +101,7 @@ __ptsname_r (fd, buf, buflen) idbuf[5] = '\0'; __stpcpy (__stpcpy (nbuf, "/dev/pts/"), - _itoa_word (ptyno, &idbuf[4], 10, 0)); + _itoa_word (ptyno, &idbuf[5], 10, 0)); if (__xstat (_STAT_VER, nbuf, &st) < 0) { if (errno != ENOENT) diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 3fcb9a6aef..507fbc35fc 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -40,19 +40,19 @@ rt_sigprocmask - rt_sigprocmask 4 __syscall_rt_sigprocmask rt_sigqueueinfo - rt_sigqueueinfo 3 __syscall_rt_sigqueueinfo rt_sigsuspend - rt_sigsuspend 2 __syscall_rt_sigsuspend rt_sigtimedwait - rt_sigtimedwait 4 __syscall_rt_sigtimedwait -s_getcwd EXTRA getcwd 2 __syscall_getcwd -s_getdents EXTRA getdents 3 __getdents +s_getcwd getcwd getcwd 2 __syscall_getcwd +s_getdents getdents getdents 3 __getdents s_getpriority getpriority getpriority 2 __syscall_getpriority s_getresgid getresgid getresgid 3 __syscall_getresgid s_getresuid getresuid getresuid 3 __syscall_getresuid s_poll poll poll 3 __syscall_poll -s_pread64 EXTRA pread 5 __syscall_pread64 +s_pread64 pread64 pread 5 __syscall_pread64 s_ptrace ptrace ptrace 4 __syscall_ptrace -s_pwrite64 EXTRA pwrite 5 __syscall_pwrite64 -s_reboot EXTRA reboot 3 __syscall_reboot +s_pwrite64 pwrite64 pwrite 5 __syscall_pwrite64 +s_reboot reboot reboot 3 __syscall_reboot s_sigaction sigaction sigaction 3 __syscall_sigaction -s_sigpending EXTRA sigpending 1 __syscall_sigpending -s_sigprocmask EXTRA sigprocmask 3 __syscall_sigprocmask +s_sigpending sigpending sigpending 1 __syscall_sigpending +s_sigprocmask sigprocmask sigprocmask 3 __syscall_sigprocmask s_sigsuspend sigsuspend sigsuspend 3 __syscall_sigsuspend s_sysctl sysctl _sysctl 1 __syscall__sysctl s_ustat ustat ustat 2 __syscall_ustat diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c new file mode 100644 index 0000000000..7f276b6130 --- /dev/null +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -0,0 +1,152 @@ +/* Copyright (C) 1991, 92, 93, 96, 97, 98 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <limits.h> +#include <stddef.h> +#include <dirent.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <string.h> +#include <stdlib.h> + +char *__ttyname = NULL; + +static char * getttyname __P ((const char *dev, int fd, dev_t mydev, + ino_t myino, int save, int *dostat)) + internal_function; + +static char * +internal_function +getttyname (dev, fd, mydev, myino, save, dostat) + const char *dev; + int fd; + dev_t mydev; + ino_t myino; + int save; + int *dostat; +{ + static char *name; + static size_t namelen = 0; + struct stat st; + DIR *dirstream; + struct dirent *d; + size_t devlen = strlen (dev) + 1; + + dirstream = opendir (dev); + if (dirstream == NULL) + { + *dostat = -1; + return NULL; + } + + while ((d = readdir (dirstream)) != NULL) + if (((ino_t) d->d_fileno == myino || *dostat) + && strcmp (d->d_name, "stdin") + && strcmp (d->d_name, "stdout") + && strcmp (d->d_name, "stderr")) + { + size_t dlen = _D_ALLOC_NAMLEN (d); + if (devlen + dlen > namelen) + { + free (name); + namelen = 2 * (devlen + dlen); /* Big enough. */ + name = malloc (namelen); + if (! name) + { + *dostat = -1; + /* Perhaps it helps to free the directory stream buffer. */ + (void) closedir (dirstream); + return NULL; + } + *((char *) __mempcpy (name, dev, devlen - 1)) = '/'; + } + memcpy (&name[devlen], d->d_name, dlen); + if (stat (name, &st) == 0 +#ifdef _STATBUF_ST_RDEV + && S_ISCHR (st.st_mode) && st.st_rdev == mydev +#else + && (ino_t) d->d_fileno == myino && st.st_dev == mydev +#endif + ) + { + (void) closedir (dirstream); + __ttyname = name; + __set_errno (save); + return name; + } + } + + (void) closedir (dirstream); + __set_errno (save); + return NULL; +} + +/* Return the pathname of the terminal FD is open on, or NULL on errors. + The returned storage is good only until the next call to this function. */ +char * +ttyname (fd) + int fd; +{ + struct stat st, st1; + int dostat = 0; + char *name; + int save = errno; + + if (!__isatty (fd)) + return NULL; + + if (fstat (fd, &st) < 0) + return NULL; + + if (stat ("/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode)) + { +#ifdef _STATBUF_ST_RDEV + name = getttyname ("/dev/pts", fd, st.st_rdev, st.st_ino, save, &dostat); +#else + name = getttyname ("/dev/pts", fd, st.st_dev, st.st_ino, save, &dostat); +#endif + } + else + { + __set_errno (save); + name = NULL; + } + + if (!name && dostat != -1) + { +#ifdef _STATBUF_ST_RDEV + name = getttyname ("/dev", fd, st.st_rdev, st.st_ino, save, &dostat); +#else + name = getttyname ("/dev", fd, st.st_dev, st.st_ino, save, &dostat); +#endif + } + + if (!name && dostat != -1) + { + dostat = 1; +#ifdef _STATBUF_ST_RDEV + name = getttyname ("/dev", fd, st.st_rdev, st.st_ino, save, &dostat); +#else + name = getttyname ("/dev", fd, st.st_dev, st.st_ino, save, &dostat); +#endif + } + + return name; +} diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c new file mode 100644 index 0000000000..9f22f71f31 --- /dev/null +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -0,0 +1,182 @@ +/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <limits.h> +#include <stddef.h> +#include <dirent.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <string.h> +#include <stdlib.h> + +static int getttyname_r __P ((int fd, char *buf, size_t buflen, + dev_t mydev, ino_t myino, int save, + int *dostat)) internal_function; + +static int +internal_function +getttyname_r (fd, buf, buflen, mydev, myino, save, dostat) + int fd; + char *buf; + size_t buflen; + dev_t mydev; + ino_t myino; + int save; + int *dostat; +{ + struct stat st; + DIR *dirstream; + struct dirent *d; + size_t devlen = strlen (buf); + + dirstream = opendir (buf); + if (dirstream == NULL) + { + *dostat = -1; + return errno; + } + + while ((d = readdir (dirstream)) != NULL) + if (((ino_t) d->d_fileno == myino || *dostat) + && strcmp (d->d_name, "stdin") + && strcmp (d->d_name, "stdout") + && strcmp (d->d_name, "stderr")) + { + char *cp; + size_t needed = _D_EXACT_NAMLEN (d) + 1; + + if (needed > buflen) + { + *dostat = -1; + (void) closedir (dirstream); + __set_errno (ERANGE); + return ERANGE; + } + + cp = __stpncpy (buf + devlen, d->d_name, needed); + cp[0] = '\0'; + + if (stat (buf, &st) == 0 +#ifdef _STATBUF_ST_RDEV + && S_ISCHR (st.st_mode) && st.st_rdev == mydev +#else + && (ino_t) d->d_fileno == myino && st.st_dev == mydev +#endif + ) + { + (void) closedir (dirstream); + __set_errno (save); + return 0; + } + } + + (void) closedir (dirstream); + __set_errno (save); + /* It is not clear what to return in this case. `isatty' says FD + refers to a TTY but no entry in /dev has this inode. */ + return ENOTTY; +} + +/* Store at most BUFLEN character of the pathname of the terminal FD is + open on in BUF. Return 0 on success, otherwise an error number. */ +int +__ttyname_r (fd, buf, buflen) + int fd; + char *buf; + size_t buflen; +{ + struct stat st, st1; + int dostat = 0; + int save = errno; + int ret; + + /* Test for the absolute minimal size. This makes life easier inside + the loop. */ + if (!buf) + { + __set_errno (EINVAL); + return EINVAL; + } + + if (buflen < sizeof ("/dev/pts/")) + { + __set_errno (ERANGE); + return ERANGE; + } + + if (!__isatty (fd)) + { + __set_errno (ENOTTY); + return ENOTTY; + } + + if (fstat (fd, &st) < 0) + return errno; + + /* Prepare the result buffer. */ + memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/")); + buflen -= sizeof ("/dev/pts/") - 1; + + if (stat (buf, &st1) == 0 && S_ISDIR (st1.st_mode)) + { +#ifdef _STATBUF_ST_RDEV + ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, save, + &dostat); +#else + ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, save, + &dostat); +#endif + } + else + { + __set_errno (save); + ret = ENOENT; + } + + if (ret && dostat != -1) + { + buf[sizeof ("/dev/") - 1] = '\0'; + buflen += sizeof ("pts/") - 1; +#ifdef _STATBUF_ST_RDEV + ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, save, + &dostat); +#else + ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, save, + &dostat); +#endif + } + + if (ret && dostat != -1) + { + buf[sizeof ("/dev/") - 1] = '\0'; + dostat = 1; +#ifdef _STATBUF_ST_RDEV + ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, + save, &dostat); +#else + ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, + save, &dostat); +#endif + } + + return ret; +} + +weak_alias (__ttyname_r, ttyname_r) |