Ticket #2185: src_servers_registrar_TRoster.cpp.diff

src/servers/registrar/TRoster.cpp

@@ -76 +76 @@
 //! The maximal period of time an app may be early pre-registered (60 s).
 const bigtime_t kMaximalEarlyPreRegistrationPeriod = 60000000LL;
 
-//! Applications living in this tree are considered "vital system apps".
-static const char *const kVitalSystemAppPathPrefix
-    = "/boot/beos/system/servers";
-
-//! Applications living in this tree are considered "system apps".
-static const char *const kSystemAppPathPrefix = "/boot/beos/system";
-
 // get_default_roster_settings_file
 /*! \brief Returns the path to the default roster settings.
     \param path BPath to be set to the roster settings path.
@@ -93 +86 @@
 get_default_roster_settings_file(BPath &path)
 {
     // get the path of the settings dir and append the subpath of our file
-    status_t error = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
-    if (error == B_OK)
-        error = path.Append("Roster/HaikuRosterSettings");
+    status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+    if (status == B_OK)
+        status = path.Append("Roster/HaikuRosterSettings");
+    if (status < B_OK) {
+        D(PRINT(("Composing the path failed! At %s, %s, %d.\n"
+            "Reason: %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__,
+            strerror(status))));
+        return NULL;
+    }
 
-    // If some error occurred, set the standard path (can only fail, if there's
-    // insufficient memory, which can't be helped anyway).
-    if (error != B_OK)
-        path.SetTo("/boot/home/config/settings/Roster/HaikuRosterSettings");
-
     return path.Path();
 }
 
@@ -1790 +1784 @@
         return false;
 
     int len = strlen(path.Path());
-    int prefixLen = strlen(kSystemAppPathPrefix);
+    BPath systemPath;
+    status_t status = find_directory(B_BEOS_SYSTEM_DIRECTORY, &systemPath);
+    if (status < B_OK) {
+        D(PRINT(("find_directory() failed! At %s, %s, %d.\n"
+            "Reason: %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__,
+            strerror(status))));
+    }
+
+    int prefixLen = strlen(systemPath.Path());
     return (len > prefixLen
-        && strncmp(path.Path(), kSystemAppPathPrefix, prefixLen) == 0);
+        && strncmp(path.Path(), systemPath.Path(), prefixLen) == 0);
 }
 
 status_t