/**
copy a string list
*/
-_PUBLIC_ char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
+_PUBLIC_ char **str_list_copy(TALLOC_CTX *mem_ctx, const char * const *list);
/**
Return true if all the elements of the list match exactly.
/**
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);
+
+/**
+ add an entry to a string list (if not already in there)
+*/
+_PUBLIC_ char **str_list_add_unique(char **list, const char *s);
/**
remove an entry from a string list
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 * const *list2);
/* The following definitions come from lib/util/util_file.c */
/**
copy a string list
*/
-_PUBLIC_ char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list)
+_PUBLIC_ char **str_list_copy(TALLOC_CTX *mem_ctx, const char * const *list)
{
int i;
char **ret;
/**
- add an entry to a string list
+ add an entry to a string list if not already in there
*/
-_PUBLIC_ const char **str_list_add(const char **list, const char *s)
+_PUBLIC_ char **str_list_add_unique(char **list, const char *s)
{
- size_t len = str_list_length(list);
+ int i;
+ size_t len;
const char **ret;
+ for (i=0;list[i];i++) {
+ if (strcmp(list[i], s) == 0) return list;
+ }
+
+ len = i;
ret = talloc_realloc(NULL, list, const char *, len+2);
if (ret == NULL) return NULL;
return ret;
}
+/**
+ add an entry to a string list
+*/
+_PUBLIC_ char **str_list_add(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] = talloc_strdup(ret, s);
+ if (ret[len] == NULL) return NULL;
+
+ ret[len+1] = NULL;
+
+ return ret;
+}
+
/**
remove an entry from a string list
*/
/**
append one list to another - expanding list1
*/
-_PUBLIC_ const char **str_list_append(const char **list1, const char **list2)
+_PUBLIC_ char **str_list_append(char **list1, const char * const *list2)
{
size_t len1 = str_list_length(list1);
size_t len2 = str_list_length(list2);
- const char **ret;
+ char **ret;
int i;
- ret = talloc_realloc(NULL, list1, const char *, len1+len2+1);
+ ret = talloc_realloc(NULL, list1, char *, len1+len2+1);
if (ret == NULL) return NULL;
for (i=len1;i<len1+len2;i++) {