diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/util.h | 38 | ||||
| -rw-r--r-- | lib/util/util_strlist.c | 141 |
2 files changed, 173 insertions, 6 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index defef127d9..81c7edfbdf 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -422,7 +422,7 @@ _PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char /** return the number of elements in a string list */ -_PUBLIC_ size_t str_list_length(const char * const *list); +_PUBLIC_ size_t str_list_length(const char **list); /** copy a string list @@ -437,7 +437,7 @@ _PUBLIC_ bool str_list_equal(const char **list1, const char **list2); /** add an entry to a string list */ -_PUBLIC_ const char **str_list_add(const char **list, const char *s); +_PUBLIC_ char **str_list_add(char **list, const char *s); /** remove an entry from a string list @@ -453,6 +453,40 @@ _PUBLIC_ bool str_list_check(const char **list, const char *s); return true if a string is in a list, case insensitively */ _PUBLIC_ bool str_list_check_ci(const char **list, const char *s); +/** + append one list to another - expanding list1 +*/ +_PUBLIC_ char **str_list_append(char **list1, const char **list2); + +/** + remove duplicate elements from a list +*/ +_PUBLIC_ char **str_list_unique(char **list); + +/* + very useful when debugging complex list related code + */ +_PUBLIC_ void str_list_show(const char **list); + + +/** + append one list to another - expanding list1 + this assumes the elements of list2 are const pointers, so we can re-use them +*/ +_PUBLIC_ char **str_list_append_const(char **list1, const char **list2); + +/** + add an entry to a string list + this assumes s will not change +*/ +_PUBLIC_ char **str_list_add_const(char **list, const char *s); + +/** + copy a string list + this assumes list will not change +*/ +_PUBLIC_ char **str_list_copy_const(TALLOC_CTX *mem_ctx, const char **list); + /* The following definitions come from lib/util/util_file.c */ diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c index b069a11e38..bd7bd00888 100644 --- a/lib/util/util_strlist.c +++ b/lib/util/util_strlist.c @@ -187,7 +187,7 @@ _PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char /** return the number of elements in a string list */ -_PUBLIC_ size_t str_list_length(const char * const*list) +_PUBLIC_ size_t str_list_length(const char **list) { size_t ret; for (ret=0;list && list[ret];ret++) /* noop */ ; @@ -247,12 +247,12 @@ _PUBLIC_ bool str_list_equal(const char **list1, const char **list2) /** add an entry to a string list */ -_PUBLIC_ const char **str_list_add(const char **list, const char *s) +_PUBLIC_ char **str_list_add(char **list, const char *s) { size_t len = str_list_length(list); - const char **ret; + char **ret; - ret = talloc_realloc(NULL, list, const char *, len+2); + ret = talloc_realloc(NULL, list, char *, len+2); if (ret == NULL) return NULL; ret[len] = talloc_strdup(ret, s); @@ -308,3 +308,136 @@ _PUBLIC_ bool str_list_check_ci(const char **list, const char *s) } +/** + append one list to another - expanding list1 +*/ +_PUBLIC_ char **str_list_append(char **list1, const char **list2) +{ + size_t len1 = str_list_length(list1); + size_t len2 = str_list_length(list2); + char **ret; + int i; + + ret = talloc_realloc(NULL, list1, char *, len1+len2+1); + if (ret == NULL) return NULL; + + for (i=len1;i<len1+len2;i++) { + ret[i] = talloc_strdup(ret, list2[i-len1]); + if (ret[i] == NULL) { + return NULL; + } + } + ret[i] = NULL; + + return ret; +} + +static int list_cmp(const char **el1, const char **el2) +{ + return strcmp(*el1, *el2); +} + +/* + return a list that only contains the unique elements of a list, + removing any duplicates + */ +_PUBLIC_ char **str_list_unique(char **list) +{ + size_t len = str_list_length(list); + char **list2; + int i, j; + if (len < 2) { + return list; + } + list2 = (char **)talloc_memdup(list, list, sizeof(list[0])*(len+1)); + qsort(list2, len, sizeof(list2[0]), QSORT_CAST list_cmp); + list[0] = list2[0]; + for (i=j=1;i<len;i++) { + if (strcmp(list2[i], list[j-1]) != 0) { + list[j] = list2[i]; + j++; + } + } + list[j] = NULL; + list = talloc_realloc(NULL, list, char *, j); + talloc_free(list2); + return list; +} + +/* + very useful when debugging complex list related code + */ +_PUBLIC_ void str_list_show(const char **list) +{ + int i; + DEBUG(0,("{ ")); + for (i=0;list && list[i];i++) { + DEBUG(0,("\"%s\", ", list[i])); + } + DEBUG(0,("}\n")); +} + + + +/** + append one list to another - expanding list1 + this assumes the elements of list2 are const pointers, so we can re-use them +*/ +_PUBLIC_ char **str_list_append_const(char **list1, const char **list2) +{ + size_t len1 = str_list_length(list1); + size_t len2 = str_list_length(list2); + char **ret; + int i; + + ret = talloc_realloc(NULL, list1, char *, len1+len2+1); + if (ret == NULL) return NULL; + + for (i=len1;i<len1+len2;i++) { + ret[i] = list2[i-len1]; + } + ret[i] = NULL; + + return ret; +} + +/** + add an entry to a string list + this assumes s will not change +*/ +_PUBLIC_ char **str_list_add_const(char **list, const char *s) +{ + size_t len = str_list_length(list); + char **ret; + + ret = talloc_realloc(NULL, list, char *, len+2); + if (ret == NULL) return NULL; + + ret[len] = s; + ret[len+1] = NULL; + + return ret; +} + +/** + copy a string list + this assumes list will not change +*/ +_PUBLIC_ char **str_list_copy_const(TALLOC_CTX *mem_ctx, const char **list) +{ + int i; + char **ret; + + if (list == NULL) + return NULL; + + ret = talloc_array(mem_ctx, char *, str_list_length(list)+1); + if (ret == NULL) + return NULL; + + for (i=0;list && list[i];i++) { + ret[i] = list[i]; + } + ret[i] = NULL; + return ret; +} |