[haiku-commits] haiku: hrev46179 - src/system/libroot/os src/bin headers/os/storage
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 6 Oct 2013 01:13:47 +0200 (CEST)
hrev46179 adds 1 changeset to branch 'master'
old head: 3697e7e8b11eaa2a76b001f9f6a92658b857c1cd
new head: 635d2ac485786b0a69bed604bbbb64a6e2123018
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=635d2ac+%5E3697e7e
----------------------------------------------------------------------------
635d2ac: Add some missing B_USER_*_DIRECTORY constants
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46179
Commit: 635d2ac485786b0a69bed604bbbb64a6e2123018
URL: http://cgit.haiku-os.org/haiku/commit/?id=635d2ac
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Sat Oct 5 22:31:49 2013 UTC
----------------------------------------------------------------------------
3 files changed, 32 insertions(+)
headers/os/storage/FindDirectory.h | 8 ++++++++
src/bin/finddir.c | 8 ++++++++
src/system/libroot/os/find_directory.cpp | 16 ++++++++++++++++
----------------------------------------------------------------------------
diff --git a/headers/os/storage/FindDirectory.h
b/headers/os/storage/FindDirectory.h
index feb0170..35b9956 100644
--- a/headers/os/storage/FindDirectory.h
+++ b/headers/os/storage/FindDirectory.h
@@ -86,6 +86,14 @@ typedef enum {
B_USER_NONPACKAGED_DEVELOP_DIRECTORY,
B_USER_DEVELOP_DIRECTORY,
B_USER_DOCUMENTATION_DIRECTORY,
+ B_USER_SERVERS_DIRECTORY,
+ B_USER_APPS_DIRECTORY,
+ B_USER_BIN_DIRECTORY,
+ B_USER_PREFERENCES_DIRECTORY,
+ B_USER_ETC_DIRECTORY,
+ B_USER_LOG_DIRECTORY,
+ B_USER_SPOOL_DIRECTORY,
+ B_USER_VAR_DIRECTORY,
/* Global directories. */
B_APPS_DIRECTORY = 4000,
diff --git a/src/bin/finddir.c b/src/bin/finddir.c
index 3e4f6c9..7e5c423 100644
--- a/src/bin/finddir.c
+++ b/src/bin/finddir.c
@@ -91,6 +91,14 @@ directoryType directoryTypes[] = {
KEYVALUE_PAIR(B_USER_DEVELOP_DIRECTORY),
KEYVALUE_PAIR(B_USER_DOCUMENTATION_DIRECTORY),
KEYVALUE_PAIR(B_USER_HEADERS_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_SERVERS_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_APPS_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_BIN_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_PREFERENCES_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_ETC_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_LOG_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_SPOOL_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_VAR_DIRECTORY),
KEYVALUE_PAIR(B_USER_NONPACKAGED_DIRECTORY),
KEYVALUE_PAIR(B_USER_NONPACKAGED_ADDONS_DIRECTORY),
KEYVALUE_PAIR(B_USER_NONPACKAGED_TRANSLATORS_DIRECTORY),
diff --git a/src/system/libroot/os/find_directory.cpp
b/src/system/libroot/os/find_directory.cpp
index 4f914db..c7272fd 100644
--- a/src/system/libroot/os/find_directory.cpp
+++ b/src/system/libroot/os/find_directory.cpp
@@ -172,6 +172,14 @@ static const char *kUserDirectories[] = {
HOME CONFIG NON_PACKAGED "/develop",
HOME CONFIG "/develop",
HOME CONFIG "/documentation",
+ HOME CONFIG "/servers",
+ HOME CONFIG "/apps",
+ HOME CONFIG "/bin",
+ HOME CONFIG "/preferences",
+ HOME CONFIG "/settings/etc",
+ HOME CONFIG "/var/log",
+ HOME CONFIG "/var/spool",
+ HOME CONFIG "/var",
};
@@ -373,6 +381,14 @@ __find_directory(directory_which which, dev_t device, bool
createIt,
case B_USER_NONPACKAGED_LIB_DIRECTORY:
case B_USER_NONPACKAGED_HEADERS_DIRECTORY:
case B_USER_NONPACKAGED_DEVELOP_DIRECTORY:
+ case B_USER_SERVERS_DIRECTORY:
+ case B_USER_APPS_DIRECTORY:
+ case B_USER_BIN_DIRECTORY:
+ case B_USER_PREFERENCES_DIRECTORY:
+ case B_USER_ETC_DIRECTORY:
+ case B_USER_LOG_DIRECTORY:
+ case B_USER_SPOOL_DIRECTORY:
+ case B_USER_VAR_DIRECTORY:
templatePath = kUserDirectories[which -
B_USER_DIRECTORY];
break;
Other related posts:
- » [haiku-commits] haiku: hrev46179 - src/system/libroot/os src/bin headers/os/storage - ingo_weinhold
