i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finddir: Add SYSTEM_DESKBAR_DIRECTORY

Browse Source 
* Resolves #18883

Change-Id: Ib971272319d55b37fa06d6874f257c8080bdab8f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7611
Reviewed-by: waddlesplash <[email protected]>
Reviewed-by: nephele nephele <[email protected]>
Reviewed-by: Alexander von Gluck <[email protected]>
Reviewed-by: Fredrik Holmqvist <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Alexander von Gluck
2024-04-13 14:03:35 +00:00
parent 1778920aff
commit c237c4ce59
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/storage/FindDirectory.h
+1
View File
@@ -32,6 +32,7 @@ typedef enum {
B_SYSTEM_DEVELOP_DIRECTORY, B_SYSTEM_DEVELOP_DIRECTORY,
B_SYSTEM_PACKAGES_DIRECTORY, B_SYSTEM_PACKAGES_DIRECTORY,
B_SYSTEM_HEADERS_DIRECTORY, B_SYSTEM_HEADERS_DIRECTORY,
B_SYSTEM_DESKBAR_DIRECTORY,
B_SYSTEM_ETC_DIRECTORY = 2008, B_SYSTEM_ETC_DIRECTORY = 2008,
B_SYSTEM_SETTINGS_DIRECTORY = 2010, B_SYSTEM_SETTINGS_DIRECTORY = 2010,
src/bin/finddir.c
+1
View File
@@ -50,6 +50,7 @@ directoryType directoryTypes[] = {
KEYVALUE_PAIR(B_SYSTEM_DEVELOP_DIRECTORY), KEYVALUE_PAIR(B_SYSTEM_DEVELOP_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_PACKAGES_DIRECTORY), KEYVALUE_PAIR(B_SYSTEM_PACKAGES_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_HEADERS_DIRECTORY), KEYVALUE_PAIR(B_SYSTEM_HEADERS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_DESKBAR_DIRECTORY),
// Writable system directories // Writable system directories
KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY), KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
src/system/libroot/os/find_directory.cpp
+3
View File
@@ -103,6 +103,7 @@ static const char *kSystemDirectories[] = {
SYSTEM "/develop", SYSTEM "/develop",
SYSTEM "/packages", SYSTEM "/packages",
SYSTEM "/develop/headers$a", SYSTEM "/develop/headers$a",
SYSTEM "/data/deskbar/menu",
}; };
/* Common directories, shared among users */ /* Common directories, shared among users */
@@ -358,6 +359,7 @@ __find_directory(directory_which which, dev_t device, bool createIt,
case B_SYSTEM_DEVELOP_DIRECTORY: case B_SYSTEM_DEVELOP_DIRECTORY:
case B_SYSTEM_PACKAGES_DIRECTORY: case B_SYSTEM_PACKAGES_DIRECTORY:
case B_SYSTEM_HEADERS_DIRECTORY: case B_SYSTEM_HEADERS_DIRECTORY:
case B_SYSTEM_DESKBAR_DIRECTORY:
templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY]; templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY];
break; break;
@@ -565,6 +567,7 @@ __find_directory(directory_which which, dev_t device, bool createIt,
case B_SYSTEM_DEVELOP_DIRECTORY: case B_SYSTEM_DEVELOP_DIRECTORY:
case B_SYSTEM_PACKAGES_DIRECTORY: case B_SYSTEM_PACKAGES_DIRECTORY:
case B_SYSTEM_HEADERS_DIRECTORY: case B_SYSTEM_HEADERS_DIRECTORY:
case B_SYSTEM_DESKBAR_DIRECTORY:
templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY]; templatePath = kSystemDirectories[which - B_SYSTEM_DIRECTORY];
break; break;
src/tests/kits/storage/FindDirectoryTest.cpp
+4
View File
@@ -43,6 +43,7 @@ const directory_which directories[] = {
B_SYSTEM_SPOOL_DIRECTORY, B_SYSTEM_SPOOL_DIRECTORY,
B_SYSTEM_TEMP_DIRECTORY, B_SYSTEM_TEMP_DIRECTORY,
B_SYSTEM_VAR_DIRECTORY, B_SYSTEM_VAR_DIRECTORY,
B_SYSTEM_DESKBAR_DIRECTORY,
// User directories. These are interpreted in the context // User directories. These are interpreted in the context
// of the user making the find_directory call. // of the user making the find_directory call.
B_USER_DIRECTORY, B_USER_DIRECTORY,
@@ -231,6 +232,9 @@ test_find_directory(directory_which dir, BPath &path, dev_t device)
case B_SYSTEM_VAR_DIRECTORY: case B_SYSTEM_VAR_DIRECTORY:
error = path.SetTo("/boot/var"); error = path.SetTo("/boot/var");
break; break;
case B_SYSTEM_DESKBAR_DIRECTORY:
error = path.SetTo("/boot/system/data/deskbar/menu");
break;
// User directories. These are interpreted in the context // User directories. These are interpreted in the context
// of the user making the find_directory call. // of the user making the find_directory call.
case B_USER_DIRECTORY: case B_USER_DIRECTORY: