Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/compare_string_array.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/compare_string_array.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/libbb/compare_string_array.c

@@ -1 +1 @@
 /* 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.
  */
 
@@ -8 +8 @@
 /* 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;
@@ -20 +20 @@
 }
 
-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;
@@ -37 +37 @@
 /* (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;
@@ -52 +52 @@
 #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 */
@@ -66 +71 @@
         }
     }
-    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