From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Nov 2018 15:53:39 +0000 (+0100)
Subject: terminal-util: use PATH_STARTSWITH_SET() instead of plain startswith() where appropriate
X-Git-Tag: v240~220^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10901%2Fhead;p=thirdparty%2Fsystemd.git

terminal-util: use PATH_STARTSWITH_SET() instead of plain startswith() where appropriate

After all, we deal with paths here.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 7fce84bf821..a5e4de00b08 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1014,11 +1014,8 @@ int get_ctty(pid_t pid, dev_t *_devnr, char **r) {
                                 return -ENOMEM;
                 }
         } else {
-                if (startswith(s, "/dev/"))
-                        p = s + 5;
-                else if (startswith(s, "../"))
-                        p = s + 3;
-                else
+                p = PATH_STARTSWITH_SET(s, "/dev/", "../");
+                if (!p)
                         p = s;
 
                 b = strdup(p);