Import the 'naive tokenizer' library in libutility

remote-process uses the 'naive tokenizer'.  Let's make it part of the utility
and make remote-process link against libutility.

Signed-off-by: David Wagner <david.wagner@intel.com>

4 files changed, 114 insertions, 3 deletions

diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index 2facaf7..1bb1be9 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -47,7 +47,7 @@ common_c_includes := \
     $(LOCAL_PATH)/../remote-processor/
 
 common_shared_libraries := libremote-processor
-common_static_libraries := libaudiocomms_naive_tokenizer
+common_static_libraries := libutility
 
 #############################
 # Target build
@@ -89,6 +89,7 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_SHARED_LIBRARIES := $(foreach shared_library, $(common_shared_libraries), \
     $(shared_library)_host)
-LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
+LOCAL_STATIC_LIBRARIES := $(foreach static_library, $(common_static_libraries), \
+    $(static_library)_host)
 
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/utility/Android.mk b/utility/Android.mk
index e828568..1913fb7 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -33,7 +33,8 @@ LOCAL_PATH := $(call my-dir)
 
 common_src_files := \
     Tokenizer.cpp \
-    Utility.cpp
+    Utility.cpp \
+    NaiveTokenizer.cpp
 
 common_module := libutility
 common_module_tags := optional
diff --git a/utility/NaiveTokenizer.cpp b/utility/NaiveTokenizer.cpp
new file mode 100644
index 0000000..320fec0
--- /dev/null
+++ b/utility/NaiveTokenizer.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011-2014, Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "NaiveTokenizer.h"
+#include <cstring>
+
+char* NaiveTokenizer::getNextToken(char** line)
+{
+    const char *quotes = "'\""; // single or double quotes
+    char separator[2] = " ";
+    char first[2];
+
+    if (*line == NULL || (*line)[0] == '\0') {
+        return NULL;
+    }
+
+    // Copy the first character into its own new string
+    first[0] = (*line)[0];
+    first[1] = '\0';
+
+    // Check if the first character is a quote
+    if (strstr(quotes, first) != NULL) {
+        // If so, move forward and set the separator to that quote
+        (*line)++;
+        strncpy(separator, first, sizeof(separator));
+    }
+    // If it is not, get the next space-delimited token
+    // First, move the cursor forward if the first character is a space
+    // This effectively ignores multiple spaces in a row
+    else if (strstr(separator, first) != NULL) {
+        (*line)++;
+        return NaiveTokenizer::getNextToken(line);
+    }
+
+    return strsep(line, separator);
+}
diff --git a/utility/NaiveTokenizer.h b/utility/NaiveTokenizer.h
new file mode 100644
index 0000000..2558e37
--- /dev/null
+++ b/utility/NaiveTokenizer.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011-2014, Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class NaiveTokenizer {
+public:
+    /** tokenize a space-separated string, handling quotes
+     *
+     * The input is tokenized, using " " (space) as the tokenizer; multiple
+     * spaces are regarded as a single separator.  If the input begins with a
+     * quote (either single (') or double (")), the next token will be all the
+     * characters (including spaces) until the next identical quote.
+     * Warning: This function modifies its argument in-place !
+     *
+     * It aims at reproducing the parsing of a shell.
+     *
+     * @param[inout] line The string to be tokenized. Warning: modified in-place
+     * @return Pointer to the next token (which is actually the original value of 'line'
+     */
+    static char* getNextToken(char** line);
+};