X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fstr.c;h=ab603da1ab8e760f8f4f250ac757985427c6418a;hp=e4616e60f15ec8bdec1fc3c9f0b4e89f222aaaa0;hb=75b25db9f40ea7bbd11e63652d5fae591b3f1206;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/lib-lib/str.c b/lib-lib/str.c
index e4616e6..ab603da 100644
--- a/lib-lib/str.c
+++ b/lib-lib/str.c
@@ -117,16 +117,12 @@ ssize_t m_strncpy(char *dst, ssize_t n, const char *src, ssize_t l)
 
 char *m_strrtrim(char *s)
 {
-    if (s) {
-        char *p = s + m_strlen(s);
+    ssize_t len = m_strlen(s);
 
-        while (p > s && ISSPACE(p[-1])) {
-            *--p = '\0';
-        }
-        return p;
-    }
+    while (len > 1 && ISSPACE(s[len - 1]))
+        s[--len] = '\0';
 
-    return NULL;
+    return s + len;
 }
 
 const char *m_stristrn(const char *haystack, const char *needle, ssize_t nlen)