X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fcompare_string_array.c;h=d15578ca3605200b3954c54b16fb8f42bd6ab2d1;hb=6f0540e7eca61fa10344699d023f4a90f705601d;hp=e4191e35af2301a22eb0ac4e96ae353c1b2f967b;hpb=c1ef7bdd8d002ae0889efcf883d0e1b7faa938d4;p=oweals%2Fbusybox.git

diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index e4191e35a..d15578ca3 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -1,24 +1,13 @@
+/* vi: set sw=4 ts=4: */
 /*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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 */
-extern 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;
 
@@ -27,6 +16,22 @@ compare_string_array(const char * const string_array[], const char *key)
 			return i;
 		}
 	}
-	return -i;
+	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)
+{
+	int i;
+	int len = strlen(key);
+	if (!len)
+		return -1;
+
+	for (i = 0; string_array[i] != 0; i++) {
+		if (strncmp(string_array[i], key, len) == 0) {
+			return i;
+		}
+	}
+	return -1;
+}