[haiku-commits] r40764 - haiku/branches/features/package-management/src/bin
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 1 Mar 2011 19:29:46 +0100 (CET)
Author: zooey
Date: 2011-03-01 19:29:46 +0100 (Tue, 01 Mar 2011)
New Revision: 40764
Changeset: http://dev.haiku-os.org/changeset/40764
Modified:
haiku/branches/features/package-management/src/bin/finddir.c
Log:
* added folders added for package management to finddir binary
Modified: haiku/branches/features/package-management/src/bin/finddir.c
===================================================================
--- haiku/branches/features/package-management/src/bin/finddir.c
2011-03-01 18:28:47 UTC (rev 40763)
+++ haiku/branches/features/package-management/src/bin/finddir.c
2011-03-01 18:29:46 UTC (rev 40764)
@@ -46,6 +46,9 @@
KEYVALUE_PAIR(B_SYSTEM_MEDIA_NODES_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_SOUNDS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_DATA_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_DEVELOP_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_PACKAGES_DIRECTORY),
+ KEYVALUE_PAIR(B_SYSTEM_PACKAGES_CONTENTS_DIRECTORY),
// Common directories
KEYVALUE_PAIR(B_COMMON_DIRECTORY),
@@ -68,6 +71,9 @@
KEYVALUE_PAIR(B_COMMON_MEDIA_NODES_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_SOUNDS_DIRECTORY),
KEYVALUE_PAIR(B_COMMON_DATA_DIRECTORY),
+ KEYVALUE_PAIR(B_COMMON_CACHE_DIRECTORY),
+ KEYVALUE_PAIR(B_COMMON_PACKAGES_DIRECTORY),
+ KEYVALUE_PAIR(B_COMMON_PACKAGES_CONTENTS_DIRECTORY),
// User directories
KEYVALUE_PAIR(B_USER_DIRECTORY),
@@ -84,6 +90,8 @@
KEYVALUE_PAIR(B_USER_SOUNDS_DIRECTORY),
KEYVALUE_PAIR(B_USER_DATA_DIRECTORY),
KEYVALUE_PAIR(B_USER_CACHE_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_PACKAGES_DIRECTORY),
+ KEYVALUE_PAIR(B_USER_PACKAGES_CONTENTS_DIRECTORY),
// Legacy system directories
KEYVALUE_PAIR(B_BEOS_DIRECTORY),
@@ -111,7 +119,7 @@
listDirectoryWhich(void)
{
int i;
-
+
for (i = 0; directoryTypes[i].key; i++) {
printf("%s\n", directoryTypes[i].key);
}
@@ -123,7 +131,7 @@
directory_which *valueOut)
{
unsigned i = 0;
-
+
while (list[i].key != NULL) {
if (strcmp(list[i].key, key) == 0) {
*valueOut = list[i].value;
@@ -159,16 +167,16 @@
dev_t volume;
directory_which dirType;
int returnCode;
-
+
status = NO_ERRORS;
directoryArgNr = 1;
returnCode = 0;
dirType = B_BEOS_DIRECTORY; /* so that it compiles */
-
+
/* By default use boot volume*/
volume = dev_for_path("/boot");
-
+
if (argc <= 1) {
status = ARGUMENT_MISSING;
} else {
@@ -181,11 +189,11 @@
dev_t temp_volume;
/* get volume from second arg */
temp_volume = dev_for_path(argv[2]);
-
+
/* Keep default value in case of error */
if (temp_volume >= 0)
volume = temp_volume;
-
+
/* two arguments were used for volume */
directoryArgNr+=2;
} else {
@@ -194,7 +202,7 @@
}
}
}
-
+
if (status == NO_ERRORS && argc > directoryArgNr) {
/* get directory constant from next argument */
@@ -203,9 +211,9 @@
} else {
status = ARGUMENT_MISSING;
}
-
+
/* Do the actual directoy finding */
-
+
if (status == NO_ERRORS) {
/* Question: would B_PATH_NAME_LENGTH alone have been enough? */
char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
Other related posts:
- » [haiku-commits] r40764 - haiku/branches/features/package-management/src/bin - zooey
