diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-03-22 22:32:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-22 22:33:30 +0300 |
commit | d8b34a17ac4375cf4618974626c6ba2643603590 (patch) | |
tree | 56b440374e7a89e8e50af52c62076f6bc16358a7 /source/blender/editors/space_file/fsmenu.c | |
parent | c7a4f96f885c83a6c7feb99b1598f156db7a7294 (diff) |
Cleanup: remove BLI_getlastdir
Replace with BLI_path_name_at_index
Diffstat (limited to 'source/blender/editors/space_file/fsmenu.c')
-rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index d7aa1040e0f..71d49e0dc2e 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -169,12 +169,15 @@ void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path) static void fsmenu_entry_generate_name(struct FSMenuEntry *fsentry, char *name, size_t name_size) { - char temp[FILE_MAX]; + int offset = 0; + int len = name_size; - BLI_strncpy(temp, fsentry->path, FILE_MAX); - BLI_add_slash(temp); - BLI_getlastdir(temp, name, name_size); - BLI_del_slash(name); + if (BLI_path_name_at_index(fsentry->path, -1, &offset, &len)) { + /* use as size */ + len += 1; + } + + BLI_strncpy(name, &fsentry->path[offset], MIN2(len, name_size)); if (!name[0]) { name[0] = '/'; name[1] = '\0'; |