summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/util.c22
-rw-r--r--src/util.h2
2 files changed, 21 insertions, 3 deletions
diff --git a/src/util.c b/src/util.c
index c9366c4a39..ee6217d64c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -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;
}
diff --git a/src/util.h b/src/util.h
index 13e5f6203a..320bcd7c3d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -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);