From af8974940d4b1adbab783d5fbd89332cb2d692cd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Jun 2018 11:58:18 +0200
Subject: [PATCH 1/2] process-util: make use of delete_trailing_chars() in
 get_process_cmdline()

---
 src/basic/process-util.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 61ab181e6f..9062bbb0b5 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -258,15 +258,10 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
                                 memcpy(ans, "[...]", max_length-1);
                                 ans[max_length-1] = 0;
                         } else {
-                                char *e;
-
                                 t[max_length - 6] = 0;
 
                                 /* Chop off final spaces */
-                                e = strchr(t, 0);
-                                while (e > t && isspace(e[-1]))
-                                        e--;
-                                *e = 0;
+                                delete_trailing_chars(t, WHITESPACE);
 
                                 ans = strjoin("[", t, "...]");
                         }

From 0a6ffc5c9b3a40d1093d6c305b5e50c8ef109a5f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Jun 2018 11:58:38 +0200
Subject: [PATCH 2/2] string-util: put together strstrip() from
 skip_leading_chars() and delete_trailing_chars()

---
 src/basic/string-util.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index a9362bf8bd..7ea478883b 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -269,23 +269,12 @@ char *strjoin_real(const char *x, ...) {
 }
 
 char *strstrip(char *s) {
-        char *e;
-
         if (!s)
                 return NULL;
 
-        /* Drops trailing whitespace. Modifies the string in
-         * place. Returns pointer to first non-space character */
+        /* Drops trailing whitespace. Modifies the string in place. Returns pointer to first non-space character */
 
-        s += strspn(s, WHITESPACE);
-
-        for (e = strchr(s, 0); e > s; e --)
-                if (!strchr(WHITESPACE, e[-1]))
-                        break;
-
-        *e = 0;
-
-        return s;
+        return delete_trailing_chars(skip_leading_chars(s, WHITESPACE), WHITESPACE);
 }
 
 char *delete_chars(char *s, const char *bad) {