From 0833de336567cccd1de4d246eed30b7fd5ce0413 Mon Sep 17 00:00:00 2001
From: Steve Bennett <steveb@workware.net.au>
Date: Tue, 28 Sep 2010 07:39:01 +1000
Subject: string trimright now always removes nulls

Not Tcl compatible, but makes sense

Signed-off-by: Steve Bennett <steveb@workware.net.au>
---
 jim.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'jim.c')

diff --git a/jim.c b/jim.c
index 598ac3f..1b4f51d 100644
--- a/jim.c
+++ b/jim.c
@@ -2227,15 +2227,14 @@ static const char *trim_left(const char *str, const char *trimchars)
     return str + strspn(str, trimchars);
 }
 
+/* Note that trim_right() always trims null characters */
 static void trim_right(char *str, const char *trimchars)
 {
     char *p = str + strlen(str) - 1;
     char *end = str - 1;
-    int c;
 
     while (p != end) {
-        c = *p;
-        if (strchr(trimchars, c) == 0) {
+        if (*p && strchr(trimchars, *p) == NULL) {
             break;
         }
         p--;
-- 
cgit v1.1