aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
Diffstat (limited to 'libbb')
-rw-r--r--libbb/trim.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libbb/trim.c b/libbb/trim.c
index 38aa28231..0dca6678e 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -29,14 +29,18 @@
void trim(char *s)
{
- int len = strlen(s);
+ size_t len = strlen(s);
+ size_t lws;
/* trim trailing whitespace */
- while ( len > 0 && isspace(s[len-1]))
- s[--len]='\0';
+ while (len && isspace(s[len-1])) --len;
/* trim leading whitespace */
- memmove(s, &s[strspn(s, " \n\r\t\v")], len);
+ if(len) {
+ lws = strspn(s, " \n\r\t\v");
+ memmove(s, s + lws, len -= lws);
+ }
+ s[len] = 0;
}
/* END CODE */