diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/compare_string_array.c | 33 | ||||
| -rw-r--r-- | libbb/dump.c | 2 | ||||
| -rw-r--r-- | libbb/getopt32.c | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c index 077a280a2..e873d7cc3 100644 --- a/libbb/compare_string_array.c +++ b/libbb/compare_string_array.c @@ -19,8 +19,23 @@ 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 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; @@ -34,3 +49,21 @@ int index_in_substr_array(const char * const string_array[], const char *key) } 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; +} diff --git a/libbb/dump.c b/libbb/dump.c index 6dbbd9f84..5ddbbaaf6 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -449,7 +449,7 @@ static const char conv_str[] = "\r\\r\0" "\t\\t\0" "\v\\v\0" - "\0"; + ; static void conv_c(PR * pr, unsigned char * p) diff --git a/libbb/getopt32.c b/libbb/getopt32.c index 25eb113df..107102329 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -79,7 +79,7 @@ const char *applet_long_options static const char applet_longopts[] = //"name\0" has_arg val "verbose\0" No_argument "v" - "\0"; + ; applet_long_options = applet_longopts; The last member of struct option (val) typically is set to |