picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12113 from poettering/terminal-util-fixlets

Browse source 
tiny terminal-util.c fixlets
This commit is contained in:
Lennart Poettering 2019-03-27 14:15:59 +01:00 committed by GitHub
parent 65aeb9d4ab 1fd4c4edce
commit 93ba507d66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/basic/terminal-util.c
View file

@ -912,20 +912,18 @@ int getttyname_malloc(int fd, char **ret) {
return 0;
}
int getttyname_harder(int fd, char **r) {
int k;
char *s = NULL;
int getttyname_harder(int fd, char **ret) {
_cleanup_free_ char *s = NULL;
int r;
k = getttyname_malloc(fd, &s);
if (k < 0)
return k;
r = getttyname_malloc(fd, &s);
if (r < 0)
return r;
if (streq(s, "tty")) {
free(s);
return get_ctty(0, NULL, r);
}
if (streq(s, "tty"))
return get_ctty(0, NULL, ret);
*r = s;
*ret = TAKE_PTR(s);
return 0;
}
@ -1043,6 +1041,10 @@ int ptsname_malloc(int fd, char **ret) {
}
free(c);
if (l > SIZE_MAX / 2)
return -ENOMEM;
l *= 2;
}
}