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

util: properly identify pty devices by their major

Browse source
This commit is contained in:
Lennart Poettering 2011-03-14 02:33:23 +01:00
parent 3eb4d9a214
commit 46824d0e6b
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/util.c
View file

@ -2865,7 +2865,7 @@ int getttyname_harder(int fd, char **r) {
if (streq(s, "tty")) {
free(s);
return get_ctty(r);
return get_ctty(r, NULL);
}
*r = s;
@ -2907,7 +2907,7 @@ int get_ctty_devnr(dev_t *d) {
return 0;
}
int get_ctty(char **r) {
int get_ctty(char **r, dev_t *_devnr) {
int k;
char fn[128], *s, *b, *p;
dev_t devnr;
@ -2925,6 +2925,18 @@ int get_ctty(char **r) {
if (k != -ENOENT)
return k;
/* This is an ugly hack */
if (major(devnr) == 136) {
if (asprintf(&b, "pts/%lu", (unsigned long) minor(devnr)) < 0)
return -ENOMEM;
*r = b;
if (_devnr)
*_devnr = devnr;
return 0;
}
/* Probably something like the ptys which have no
* symlink in /dev/char. Let's return something
* vaguely useful. */
@ -2933,6 +2945,9 @@ int get_ctty(char **r) {
return -ENOMEM;
*r = b;
if (_devnr)
*_devnr = devnr;
return 0;
}
@ -2950,6 +2965,9 @@ int get_ctty(char **r) {
return -ENOMEM;
*r = b;
if (_devnr)
*_devnr = devnr;
return 0;
}

2
src/util.h
View file

@ -337,7 +337,7 @@ int getttyname_malloc(int fd, char **r);
int getttyname_harder(int fd, char **r);
int get_ctty_devnr(dev_t *d);
int get_ctty(char **r);
int get_ctty(char **r, dev_t *_devnr);
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);