]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
terminal-util: use PATH_STARTSWITH_SET() instead of plain startswith() where appropriate 10901/head
authorLennart Poettering <lennart@poettering.net>
Fri, 23 Nov 2018 15:53:39 +0000 (16:53 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 26 Nov 2018 13:08:46 +0000 (14:08 +0100)
After all, we deal with paths here.

src/basic/terminal-util.c

index 7fce84bf8213fafb8daad0326f2140b54df4aeb4..a5e4de00b0818e49d910e5e817d2a633864d9528 100644 (file)
@@ -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);