traceroute: fix help text to not show -6 when traceroute6 is off

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

diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index d15578ca3605200b3954c54b16fb8f42bd6ab2d1..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,19 +19,60 @@ int index_in_str_array(const char * const string_array[], const char *key)
        return -1;
 }
 
+int FAST_FUNC index_in_strings(const char *strings, const char *key)
+{
+       int idx = 0;
+
+       while (*strings) {
+               if (strcmp(strings, key) == 0) {
+                       return idx;
+               }
+               strings += strlen(strings) + 1; /* skip NUL */
+               idx++;
+       }
+       return -1;
+}
+
 /* returns the array index of the string, even if it matches only a beginning */
 /* (index of first match is returned, or -1) */
-int index_in_substr_array(const char * const string_array[], const char *key)
+#ifdef UNUSED
+int FAST_FUNC index_in_substr_array(const char *const string_array[], const char *key)
 {
        int i;
        int len = strlen(key);
-       if (!len)
-               return -1;
+       if (len) {
+               for (i = 0; string_array[i] != 0; i++) {
+                       if (strncmp(string_array[i], key, len) == 0) {
+                               return i;
+                       }
+               }
+       }
+       return -1;
+}
+#endif
+
+int FAST_FUNC index_in_substrings(const char *strings, const char *key)
+{
+       int len = strlen(key);
 
-       for (i = 0; string_array[i] != 0; i++) {
-               if (strncmp(string_array[i], key, len) == 0) {
-                       return i;
+       if (len) {
+               int idx = 0;
+               while (*strings) {
+                       if (strncmp(strings, key, len) == 0) {
+                               return idx;
+                       }
+                       strings += strlen(strings) + 1; /* skip NUL */
+                       idx++;
                }
        }
        return -1;
 }
+
+const char* FAST_FUNC nth_string(const char *strings, int n)
+{
+       while (n) {
+               n--;
+               strings += strlen(strings) + 1;
+       }
+       return strings;
+}