Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/compare_string_array.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/compare_string_array.c (modified) (2 diffs)

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

@@ -1 @@
-/* vi:set ts=4:*/
+/* vi: set sw=4 ts=4: */
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <string.h>
 #include "libbb.h"
 
-/* returns the array number of the string */
-int compare_string_array(const char * const string_array[], const char *key)
+/* 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 i;
@@ -17 +17 @@
         }
     }
-    return -i;
+    return -1;
 }
 
+int index_in_strings(const char *strings, const char *key)
+{
+    int idx = 0;
+
+    while (strings[0]) {
+        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) */
+#ifdef UNUSED
+int index_in_substr_array(const char *const string_array[], const char *key)
+{
+    int i;
+    int len = strlen(key);
+    if (len) {
+        for (i = 0; string_array[i] != 0; i++) {
+            if (strncmp(string_array[i], key, len) == 0) {
+                return i;
+            }
+        }
+    }
+    return -1;
+}
+#endif
+
+int index_in_substrings(const char *strings, const char *key)
+{
+    int len = strlen(key);
+
+    if (len) {
+        int idx = 0;
+        while (strings[0]) {
+            if (strncmp(strings, key, len) == 0) {
+                return idx;
+            }
+            strings += strlen(strings) + 1; /* skip NUL */
+            idx++;
+        }
+    }
+    return -1;
+}