morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

terminal-util: modernize ptsname_malloc a bit

Browse Source
This commit is contained in:
Mike Yuan
2025-06-15 21:25:34 +02:00
committed by Yu Watanabe
parent 18d79a7f9c
commit deedd5c26e
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/basic/terminal-util.c
View File

@@ -1583,33 +1583,25 @@ int get_ctty(pid_t pid, dev_t *ret_devnr, char **ret) {
}
int ptsname_malloc(int fd, char **ret) {
size_t l = 100;
assert(fd >= 0);
assert(ret);
for (;;) {
char *c;
for (size_t l = 50;;) {
_cleanup_free_ char *c = NULL;
c = new(char, l);
if (!c)
return -ENOMEM;
if (ptsname_r(fd, c, l) == 0) {
*ret = c;
if (ptsname_r(fd, c, l) >= 0) {
*ret = TAKE_PTR(c);
return 0;
}
if (errno != ERANGE) {
free(c);
if (errno != ERANGE)
return -errno;
}
free(c);
if (l > SIZE_MAX / 2)
if (!MUL_ASSIGN_SAFE(&l, 2))
return -ENOMEM;
l *= 2;
}
}