inet_cksum: big-endian fix

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

diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index e873d7cc3c0661dc297536dd72380382c21c47dc..4b10cc138ab216556e12b93eecaa09a013e46f35 100644 (file)
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -1,13 +1,13 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
 /* 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,19 +51,45 @@ 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);
+       int matched_idx = -1;
+       const int len = strlen(key);
 
        if (len) {
                int idx = 0;
-               while (strings[0]) {
+               while (*strings) {
                        if (strncmp(strings, key, len) == 0) {
-                               return idx;
+                               if (strings[len] == '\0')
+                                       return idx; /* exact match */
+                               if (matched_idx >= 0)
+                                       return -1; /* ambiguous match */
+                               matched_idx = idx;
                        }
                        strings += strlen(strings) + 1; /* skip NUL */
                        idx++;
                }
        }
-       return -1;
+       return matched_idx;
+}
+
+const char* FAST_FUNC nth_string(const char *strings, int n)
+{
+       while (n) {
+               n--;
+               strings += strlen(strings) + 1;
+       }
+       return strings;
 }
+
+#ifdef UNUSED_SO_FAR /* only brctl.c needs it yet */
+/* Returns 0 for no, 1 for yes or a negative value on error.  */
+smallint FAST_FUNC yesno(const char *str)
+{
+       static const char no_yes[] ALIGN1 =
+               "0\0" "off\0" "no\0"
+               "1\0" "on\0" "yes\0";
+       int ret = index_in_substrings(no_yes, str);
+       return ret / 3;
+}
+#endif