X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Funistd%2Fctermid.c;h=ffa9b758cb60be3bc2e55c3224d6e3dc3d2e7082;hp=c238905adae25292756d62dfb6401e66a7c700fd;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hpb=cdf0f53f8ba0e79dedb83c626851597bacec53ca

diff --git a/src/unistd/ctermid.c b/src/unistd/ctermid.c
index c238905a..ffa9b758 100644
--- a/src/unistd/ctermid.c
+++ b/src/unistd/ctermid.c
@@ -8,17 +8,14 @@
 
 char *ctermid(char *s)
 {
-	static char *s2;
+	static char s2[L_ctermid];
 	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)
-		return strcpy(s, "");
-	if (ttyname_r(fd, s, L_ctermid))
-		strcpy(s, "");
-	__syscall(SYS_close, fd);
+	if (fd >= 0) {
+		ttyname_r(fd, s, L_ctermid);
+		__syscall(SYS_close, fd);
+	}
 	return s;
 }