From 3ebc048b6bd8cb34b5d570d5817770d5817396a0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Nov 2018 16:53:39 +0100 Subject: [PATCH] terminal-util: use PATH_STARTSWITH_SET() instead of plain startswith() where appropriate After all, we deal with paths here. --- src/basic/terminal-util.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 7fce84bf82..a5e4de00b0 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);