Trim leading and trailing whitespaces from strings.

util.c

@@ -263,17 +263,33 @@ verify_status_code (char *str)
 }
 
 char *
-trim_str (char *str)
+ltrim (char *s)
 {
-  char *p;
-  if (!str)
-    return NULL;
-  if (!*str)
-    return str;
-  for (p = str + strlen (str) - 1; (p >= str) && isspace (*p); --p);
-  p[1] = '\0';
+  char *begin = s;
 
-  return str;
+  while (isspace (*begin))
+    ++begin;
+  memmove (s, begin, strlen (begin) + 1);
+
+  return s;
+}
+
+char *
+rtrim (char *s)
+{
+  char *end = s + strlen (s);
+
+  while ((end != s) && isspace (*(end - 1)))
+    --end;
+  *end = '\0';
+
+  return s;
+}
+
+char *
+trim_str (char *str)
+{
+  return rtrim (ltrim (str));
 }
 
 char *

util.h

@@ -47,7 +47,9 @@ char *filesize_str (unsigned long long log_size);
 char *float_to_str (float num);
 char *int_to_str (int d);
 char *left_pad_str (const char *s, int indent);
+char *ltrim (char *s);
 char *replace_str (const char *str, const char *old, const char *new);
+char *rtrim (char *s);
 char *secs_to_str (int secs);
 char *substring (const char *str, int begin, int len);
 char *trim_str (char *str);