Merge pull request #6582 from poettering/logind-tty

various tty path parsing fixes
2017-08-26 22:12:48 +09:00
parent 0f52f8e552 c9ed61e7a0
commit 5ce96b141a
11 changed files with 59 additions and 27 deletions
@@ -3440,8 +3440,7 @@ static bool tty_may_match_dev_console(const char *tty) {
        if (!tty)
                return true;

-        if (startswith(tty, "/dev/"))
-                tty += 5;
+        tty = skip_dev_prefix(tty);

        /* trivial identity? */
        if (streq(tty, "console"))