diff options
author | Rich Felker <dalias@aerifal.cx> | 2015-01-12 00:59:49 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2015-01-12 00:59:49 -0500 |
commit | 9772eadba8f8b32a1744c4df5048d70c567f6082 (patch) | |
tree | a84dc010cc286e3c63884c1666679bb5885e74d2 /src/unistd | |
parent | 699d4532f6a8f792271c7f46608e2505ca3afc21 (diff) | |
download | musl-9772eadba8f8b32a1744c4df5048d70c567f6082.tar.gz |
simplify ctermid
opening /dev/tty then using ttyname_r on it does not produce a
canonical terminal name; it simply yields "/dev/tty".
it would be possible to make ctermid determine the actual controlling
terminal device via field 7 of /proc/self/stat, but doing so would
introduce a buffer overflow into applications built with L_ctermid==9,
which glibc defines, adversely affecting the quality of ABI compat.
Diffstat (limited to 'src/unistd')
-rw-r--r-- | src/unistd/ctermid.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/unistd/ctermid.c b/src/unistd/ctermid.c index 77684050..1612770a 100644 --- a/src/unistd/ctermid.c +++ b/src/unistd/ctermid.c @@ -1,19 +1,7 @@ #include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <limits.h> -#include "syscall.h" +#include <string.h> char *ctermid(char *s) { - static char s2[L_ctermid]; - int fd; - if (!s) s = s2; - *s = 0; - fd = open("/dev/tty", O_WRONLY | O_NOCTTY | O_CLOEXEC); - if (fd >= 0) { - ttyname_r(fd, s, L_ctermid); - __syscall(SYS_close, fd); - } - return s; + return s ? strcpy(s, "/dev/tty") : "/dev/tty"; } |