Improve tokenizer method to handle spaces in filename

abnvanand · Sep 1, 2018 · 88c4813 · 88c4813
1 parent 0b90cc4
commit 88c4813
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/util.cpp b/util.cpp
@@ -1,4 +1,3 @@
-#include <dirent.h>
 #include "util.h"
 
 /**
@@ -47,4 +46,29 @@ std::string get_proper_path(const std::string &path, const std::string &HOME_PAT
 
     // currrent directory relative path
     return path;
-}
+}
+
+std::vector<std::string> escaped_tokenizer(std::string command) {
+    std::vector<std::string> tokens;
+    std::string token;
+    bool escaped = false;
+    char escape_char = '\'';
+
+    for (char c: command) {
+        // build the token until we encounter a space
+        if (c == ' ' and !escaped) {
+            tokens.push_back(token);
+            token.clear();
+        } else if ((c == '\'' || c == '\"') and !escaped) {
+            escape_char = c;
+            escaped = !escaped;
+        } else if (c == escape_char) {
+            escaped = !escaped;
+        } else {
+            token += c;
+        }
+    }
+    tokens.push_back(token);    // push last token
+
+    return tokens;
+}
diff --git a/util.h b/util.h
@@ -3,6 +3,9 @@
 
 #include <string>
 #include <unistd.h>
+#include <dirent.h>
+#include <vector>
+
 
 #define RES_QUIT 0
 #define RES_NORMAL_MODE 1
@@ -25,4 +28,6 @@ bool dir_exists(const std::string &path);
 
 std::string get_proper_path(const std::string &path, const std::string &HOME_PATH);
 
+std::vector<std::string> escaped_tokenizer(std::string command);
+
 #endif //UTIL_H