2 files changed, 39 insertions, 8 deletions

diff --git a/src/utils/strings.c b/src/utils/strings.c
index 6f10d56..846ae95 100644
--- a/src/utils/strings.c
+++ b/src/utils/strings.c
@@ -103,22 +103,44 @@ b_str_ends_with(const char *str, const char *suffix)
 
 
 char*
-b_str_strip(char *str)
+b_str_lstrip(char *str)
 {
     if (str == NULL)
-        return str;
+        return NULL;
+    int i;
+    size_t str_len = strlen(str);
+    for (i = 0; i < str_len; i++) {
+        if ((str[i] != ' ') && (str[i] != '\t') && (str[i] != '\n') &&
+            (str[i] != '\r') && (str[i] != '\t'))
+        {
+            str += i;
+            break;
+        }
+        if (i == str_len - 1) {
+            str += str_len;
+            break;
+        }
+    }
+    return str;
+}
+
+
+char*
+b_str_rstrip(char *str)
+{
+    if (str == NULL)
+        return NULL;
     int i;
     size_t str_len = strlen(str);
     for (i = str_len - 1; i >= 0; i--) {
-        if (!isspace(str[i])) {
+        if ((str[i] != ' ') && (str[i] != '\t') && (str[i] != '\n') &&
+            (str[i] != '\r') && (str[i] != '\t'))
+        {
             str[i + 1] = '\0';
             break;
         }
-    }
-    str_len = strlen(str);
-    for (i = 0; i < str_len; i++) {
-        if (!isspace(str[i])) {
-            str = str + i;
+        if (i == 0) {
+            str[0] = '\0';
             break;
         }
     }
@@ -126,6 +148,13 @@ b_str_strip(char *str)
 }
 
 
+char*
+b_str_strip(char *str)
+{
+    return b_str_lstrip(b_str_rstrip(str));
+}
+
+
 char**
 b_str_split(const char *str, char c, unsigned int max_pieces)
 {
diff --git a/src/utils/utils.h b/src/utils/utils.h
index 49a7735..dc67497 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -50,6 +50,8 @@ char* b_strdup_vprintf(const char *format, va_list ap);
 char* b_strdup_printf(const char *format, ...);
 bool b_str_starts_with(const char *str, const char *prefix);
 bool b_str_ends_with(const char *str, const char *suffix);
+char* b_str_lstrip(char *str);
+char* b_str_rstrip(char *str);
 char* b_str_strip(char *str);
 char** b_str_split(const char *str, char c, unsigned int max_pieces);
 char* b_str_replace(const char *str, const char search, const char *replace);