projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor headers, especially alltypes.h, and improve C++ ABI compat
[musl]
/
src
/
unistd
/
ctermid.c
diff --git
a/src/unistd/ctermid.c
b/src/unistd/ctermid.c
index
21b44ec
..
ffa9b75
100644
(file)
--- a/
src/unistd/ctermid.c
+++ b/
src/unistd/ctermid.c
@@
-4,20
+4,18
@@
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
+#include "syscall.h"
char *ctermid(char *s)
{
char *ctermid(char *s)
{
- static char
*s2
;
+ static char
s2[L_ctermid]
;
int fd;
int fd;
- if (!s) {
- if (!s2) s2 = malloc(L_ctermid);
- s = s2;
+ 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);
}
}
- fd = open("/dev/tty", O_WRONLY | O_NOCTTY);
- if (fd < 0)
- return strcpy(s, "");
- if (ttyname_r(fd, s, L_ctermid))
- strcpy(s, "");
- close(fd);
return s;
}
return s;
}