From: Franck Bui <fbui@suse.com>
Date: Fri, 24 Aug 2018 07:20:51 +0000 (+0200)
Subject: logind: make use of vtnr_from_tty() in seat_read_active_vt() (#9923)
X-Git-Tag: v240~800
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49679ff70f147cf3b6ff2120e1c8ccff838dba87;p=thirdparty%2Fsystemd.git

logind: make use of vtnr_from_tty() in seat_read_active_vt() (#9923)

No functional changes.
---

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index cca4f907274..f24fe96841e 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -355,8 +355,7 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
 int seat_read_active_vt(Seat *s) {
         char t[64];
         ssize_t k;
-        unsigned int vtnr;
-        int r;
+        int vtnr;
 
         assert(s);
 
@@ -375,17 +374,9 @@ int seat_read_active_vt(Seat *s) {
         t[k] = 0;
         truncate_nl(t);
 
-        if (!startswith(t, "tty")) {
-                log_error("Hm, /sys/class/tty/tty0/active is badly formatted.");
-                return -EIO;
-        }
-
-        r = safe_atou(t+3, &vtnr);
-        if (r < 0)
-                return log_error_errno(r, "Failed to parse VT number \"%s\": %m", t+3);
-
-        if (!vtnr) {
-                log_error("VT number invalid: %s", t+3);
+        vtnr = vtnr_from_tty(t);
+        if (vtnr < 0) {
+                log_error_errno(vtnr, "Hm, /sys/class/tty/tty0/active is badly formatted: %m");
                 return -EIO;
         }