diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_string_utils.h | 5 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_utils.c | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h index b3aed438641..273f20315bd 100644 --- a/source/blender/blenlib/BLI_string_utils.h +++ b/source/blender/blenlib/BLI_string_utils.h @@ -48,6 +48,11 @@ char *BLI_string_join_array(char *result, size_t result_len, const char *strings[], uint strings_len) ATTR_NONNULL(); +char *BLI_string_join_array_by_sep_char(char *result, + size_t result_len, + char sep, + const char *strings[], + uint strings_len) ATTR_NONNULL(); char *BLI_string_join_arrayN(const char *strings[], uint strings_len) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); diff --git a/source/blender/blenlib/intern/string_utils.c b/source/blender/blenlib/intern/string_utils.c index 85cb32b6457..a579327c73e 100644 --- a/source/blender/blenlib/intern/string_utils.c +++ b/source/blender/blenlib/intern/string_utils.c @@ -435,6 +435,29 @@ char *BLI_string_join_array(char *result, } /** + * A version of #BLI_string_join that takes a separator which can be any character including '\0'. + */ +char *BLI_string_join_array_by_sep_char( + char *result, size_t result_len, char sep, const char *strings[], uint strings_len) +{ + char *c = result; + char *c_end = &result[result_len - 1]; + for (uint i = 0; i < strings_len; i++) { + if (i != 0) { + if (c < c_end) { + *c++ = sep; + } + } + const char *p = strings[i]; + while (*p && (c < c_end)) { + *c++ = *p++; + } + } + *c = '\0'; + return c; +} + +/** * Join an array of strings into a newly allocated, null terminated string. */ char *BLI_string_join_arrayN(const char *strings[], uint strings_len) |