提交 b6218764 编写于 作者: R Rich Felker

fix bogus lazy allocation in ctermid and missing malloc failure check

also clean up, optimize, and simplify the code, removing branches by
simply pre-setting the result string to an empty string, which will be
preserved if other operations fail.
上级 cdf0f53f
......@@ -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;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册