Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for recent commit removing slashes

Browse Source 
The slashed were used for comparing bookmarks to the current directory.

Add trailing slashes in 'fsmenu_insert_entry',
which avoids having to duplicate strings just to add a slash
before passing to this function.
This commit is contained in:
Campbell Barton
2020-02-26 21:34:45 +11:00
parent 4cf3977a74
commit 661b01825f
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/space_file/fsmenu.c
View File

@@ -380,6 +380,12 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
int icon, int icon,
FSMenuInsert flag) FSMenuInsert flag)
{ {
const uint path_len = strlen(path);
BLI_assert(path_len > 0);
if (path_len == 0) {
return;
}
const bool has_trailing_slash = (path[path_len - 1] == SEP);
FSMenuEntry *fsm_prev; FSMenuEntry *fsm_prev;
FSMenuEntry *fsm_iter; FSMenuEntry *fsm_iter;
FSMenuEntry *fsm_head; FSMenuEntry *fsm_head;
@@ -389,8 +395,9 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
for (fsm_iter = fsm_head; fsm_iter; fsm_prev = fsm_iter, fsm_iter = fsm_iter->next) { for (fsm_iter = fsm_head; fsm_iter; fsm_prev = fsm_iter, fsm_iter = fsm_iter->next) {
if (fsm_iter->path) { if (fsm_iter->path) {
const int cmp_ret = BLI_path_cmp(path, fsm_iter->path); /* Compare, with/without the trailing slash in 'path'. */
if (cmp_ret == 0) { const int cmp_ret = BLI_path_ncmp(path, fsm_iter->path, path_len);
if (cmp_ret == 0 && STREQ(fsm_iter->path + path_len, has_trailing_slash ? "" : SEP_STR)) {
if (flag & FS_INSERT_FIRST) { if (flag & FS_INSERT_FIRST) {
if (fsm_iter != fsm_head) { if (fsm_iter != fsm_head) {
fsm_prev->next = fsm_iter->next; fsm_prev->next = fsm_iter->next;
@@ -415,7 +422,14 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
} }
fsm_iter = MEM_mallocN(sizeof(*fsm_iter), "fsme"); fsm_iter = MEM_mallocN(sizeof(*fsm_iter), "fsme");
fsm_iter->path = BLI_strdup(path); if (has_trailing_slash) {
fsm_iter->path = BLI_strdup(path);
}
else {
fsm_iter->path = BLI_strdupn(path, path_len + 1);
fsm_iter->path[path_len] = SEP;
fsm_iter->path[path_len + 1] = '\0';
}
fsm_iter->save = (flag & FS_INSERT_SAVE) != 0; fsm_iter->save = (flag & FS_INSERT_SAVE) != 0;
/* If entry is also in another list, use that icon and maybe name. */ /* If entry is also in another list, use that icon and maybe name. */
@@ -608,7 +622,6 @@ static void fsmenu_add_windows_folder(struct FSMenu *fsmenu,
if (SHGetKnownFolderPath(rfid, 0, NULL, &pPath) == S_OK) { if (SHGetKnownFolderPath(rfid, 0, NULL, &pPath) == S_OK) {
BLI_strncpy_wchar_as_utf8(line, pPath, FILE_MAXDIR); BLI_strncpy_wchar_as_utf8(line, pPath, FILE_MAXDIR);
CoTaskMemFree(pPath); CoTaskMemFree(pPath);
BLI_add_slash(line);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, name, icon, flag); fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, name, icon, flag);
} }
} }
@@ -745,9 +758,6 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
CFRelease(localKey); CFRelease(localKey);
} }
/* Add end slash for consistency with other platforms */
BLI_add_slash(defPath);
fsmenu_insert_entry( fsmenu_insert_entry(
fsmenu, FS_CATEGORY_SYSTEM, defPath, name[0] ? name : NULL, icon, FS_INSERT_SORTED); fsmenu, FS_CATEGORY_SYSTEM, defPath, name[0] ? name : NULL, icon, FS_INSERT_SORTED);
} }
@@ -786,9 +796,6 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
/* Exclude "all my files" as it makes no sense in blender fileselector */ /* Exclude "all my files" as it makes no sense in blender fileselector */
/* Exclude "airdrop" if wlan not active as it would show "" ) */ /* Exclude "airdrop" if wlan not active as it would show "" ) */
if (!strstr(line, "myDocuments.cannedSearch") && (*line != '\0')) { if (!strstr(line, "myDocuments.cannedSearch") && (*line != '\0')) {
/* Add end slash for consistency with other platforms */
BLI_add_slash(line);
fsmenu_insert_entry( fsmenu_insert_entry(
fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, ICON_FILE_FOLDER, FS_INSERT_LAST); fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, ICON_FILE_FOLDER, FS_INSERT_LAST);
} }