[haiku-commits] r40860 - in haiku/branches/features/package-management: headers/os/storage src/bin src/system/libroot/os

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 7 Mar 2011 20:39:50 +0100 (CET)

Author: zooey
Date: 2011-03-07 20:39:50 +0100 (Mon, 07 Mar 2011)
New Revision: 40860
Changeset: http://dev.haiku-os.org/changeset/40860

Modified:
   haiku/branches/features/package-management/headers/os/storage/FindDirectory.h
   haiku/branches/features/package-management/src/bin/finddir.c
   
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
Log:
* add B_PACKAGE_LINKS_DIRECTORY to find_directory() and finddir binary

Modified: 
haiku/branches/features/package-management/headers/os/storage/FindDirectory.h
===================================================================
--- 
haiku/branches/features/package-management/headers/os/storage/FindDirectory.h   
    2011-03-07 19:13:21 UTC (rev 40859)
+++ 
haiku/branches/features/package-management/headers/os/storage/FindDirectory.h   
    2011-03-07 19:39:50 UTC (rev 40860)
@@ -78,6 +78,7 @@
        B_APPS_DIRECTORY                                        = 4000,
        B_PREFERENCES_DIRECTORY,
        B_UTILITIES_DIRECTORY,
+       B_PACKAGE_LINKS_DIRECTORY,
 
        /* Obsolete: Legacy BeOS definition to be phased out */
        B_BEOS_DIRECTORY                                        = 1000,

Modified: haiku/branches/features/package-management/src/bin/finddir.c
===================================================================
--- haiku/branches/features/package-management/src/bin/finddir.c        
2011-03-07 19:13:21 UTC (rev 40859)
+++ haiku/branches/features/package-management/src/bin/finddir.c        
2011-03-07 19:39:50 UTC (rev 40860)
@@ -28,6 +28,7 @@
        KEYVALUE_PAIR(B_DESKTOP_DIRECTORY),
        KEYVALUE_PAIR(B_TRASH_DIRECTORY),
        KEYVALUE_PAIR(B_APPS_DIRECTORY),
+       KEYVALUE_PAIR(B_PACKAGE_LINKS_DIRECTORY),
        KEYVALUE_PAIR(B_PREFERENCES_DIRECTORY),
        KEYVALUE_PAIR(B_UTILITIES_DIRECTORY),
 

Modified: 
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
===================================================================
--- 
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
 2011-03-07 19:13:21 UTC (rev 40859)
+++ 
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
 2011-03-07 19:39:50 UTC (rev 40860)
@@ -72,7 +72,7 @@
        COMMON "/settings/etc",
        COMMON "/documentation",
        COMMON "/settings",
-       COMMON "/develop",      // B_COMMON_DEVELOP_DIRECTORY
+       COMMON "/develop",                                              // 
B_COMMON_DEVELOP_DIRECTORY
        COMMON "/var/log",                                              // 
B_COMMON_LOG_DIRECTORY
        COMMON "/var/spool",                                    // 
B_COMMON_SPOOL_DIRECTORY
        COMMON "/cache/tmp",                                    // 
B_COMMON_TEMP_DIRECTORY
@@ -187,6 +187,9 @@
                                strlcat(buffer, "/boot", pathLength);
                        }
                        break;
+               case B_PACKAGE_LINKS_DIRECTORY:
+                       // this is a directory living in rootfs
+                       break;
                default:
                        strlcat(buffer, "/boot", pathLength);
                        break;
@@ -288,6 +291,9 @@
                case B_UTILITIES_DIRECTORY:
                        templatePath = "utilities";
                        break;
+               case B_PACKAGE_LINKS_DIRECTORY:
+                       templatePath = "package-links";
+                       break;
 
                default:
                        free(buffer);


Other related posts:

  • » [haiku-commits] r40860 - in haiku/branches/features/package-management: headers/os/storage src/bin src/system/libroot/os - zooey