echo et al: support \e escape

[oweals/busybox.git] / libbb / compare_string_array.c

diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index 731d3d8c1421be0d1bd6c05537b47a7629a7f87a..43c59e8e0e2f8fd1a0c1f85529e240d3458b4eaa 100644 (file)
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -7,7 +7,7 @@
 
 /* returns the array index of the string */
 /* (index of first match is returned, or -1) */
-int index_in_str_array(const char *const string_array[], const char *key)
+int FAST_FUNC index_in_str_array(const char *const string_array[], const char *key)
 {
        int i;
 
@@ -19,11 +19,11 @@ int index_in_str_array(const char *const string_array[], const char *key)
        return -1;
 }
 
-int index_in_strings(const char *strings, const char *key)
+int FAST_FUNC index_in_strings(const char *strings, const char *key)
 {
        int idx = 0;
 
-       while (strings[0]) {
+       while (*strings) {
                if (strcmp(strings, key) == 0) {
                        return idx;
                }
@@ -36,7 +36,7 @@ int index_in_strings(const char *strings, const char *key)
 /* returns the array index of the string, even if it matches only a beginning */
 /* (index of first match is returned, or -1) */
 #ifdef UNUSED
-int index_in_substr_array(const char *const string_array[], const char *key)
+int FAST_FUNC index_in_substr_array(const char *const string_array[], const char *key)
 {
        int i;
        int len = strlen(key);
@@ -51,13 +51,13 @@ int index_in_substr_array(const char *const string_array[], const char *key)
 }
 #endif
 
-int index_in_substrings(const char *strings, const char *key)
+int FAST_FUNC index_in_substrings(const char *strings, const char *key)
 {
        int len = strlen(key);
 
        if (len) {
                int idx = 0;
-               while (strings[0]) {
+               while (*strings) {
                        if (strncmp(strings, key, len) == 0) {
                                return idx;
                        }
@@ -67,3 +67,12 @@ int index_in_substrings(const char *strings, const char *key)
        }
        return -1;
 }
+
+const char* FAST_FUNC nth_string(const char *strings, int n)
+{
+       while (n) {
+               n--;
+               strings += strlen(strings) + 1;
+       }
+       return strings;
+}