mod_moder/blender
mod_moder/blender
0
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +17 -4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b778e09492 - Show all commits

21
source/blender/blenlib/intern/path_util.c
View File

@ -590,14 +590,27 @@ bool BLI_path_suffix(char *string, size_t maxlen, const char *suffix, const char
const size_t string_len = strlen(string); const size_t string_len = strlen(string);
const size_t suffix_len = strlen(suffix); const size_t suffix_len = strlen(suffix);
const size_t sep_len = strlen(sep); const size_t sep_len = strlen(sep);
const char *const extension = BLI_path_extension(string); char *extension = (char *)BLI_path_extension(string);
const size_t extension_len = extension ? (((string + string_len) - extension)) : 0;
const size_t string_end = extension != NULL ? (int)((extension - string)) : string_len; const size_t string_end = extension != NULL ? (int)((extension - string)) : string_len;
char extension_copy[FILE_MAX];
if (string_len + sep_len + suffix_len >= maxlen) { if (string_len + sep_len + suffix_len >= maxlen) {
return false; return false;
} }
BLI_strncpy(extension_copy, string + string_end, sizeof(extension_copy));
BLI_sprintf(string + string_end, "%s%s%s", sep, suffix, extension_copy); if (extension) {
memmove(extension + (sep_len + suffix_len), extension, extension_len);
}
char *c = string + string_end;
if (sep_len) {
memcpy(c, sep, sep_len);
c += sep_len;
}
if (suffix_len) {
memcpy(c, suffix, suffix_len);
c += suffix_len;
}
c += extension_len;
*c = '\0';
return true; return true;
} }