create and use underVespaHome

2 files changed, 18 insertions, 0 deletions

diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp
index a7d290bde93..923bc044bdf 100644
--- a/defaults/src/vespa/defaults.cpp
+++ b/defaults/src/vespa/defaults.cpp
@@ -157,6 +157,22 @@ Defaults::vespaHome()
     return defaultHome;
 }
 
+std::string
+Defaults::underVespaHome(const char *path)
+{
+    if (path[0] == '/') {
+        return path;
+    }
+    if (path[0] == '.' && path[1] == '/') {
+        return path;
+    }
+    findDefaults();
+    std::string ret = defaultHome;
+    ret += '/';
+    ret += path;
+    return ret;
+}
+
 const char *
 Defaults::vespaUser()
 {
diff --git a/defaults/src/vespa/defaults.h b/defaults/src/vespa/defaults.h
index 2785ef46677..53e44b3f526 100644
--- a/defaults/src/vespa/defaults.h
+++ b/defaults/src/vespa/defaults.h
@@ -25,6 +25,8 @@ public:
      **/
     static const char *vespaHome();
 
+    static std::string underVespaHome(const char *path);
+
     /**
      * Compute the user name to own directories and run processes.
      * @return the vespa user name