From b10c9dd446f0b0567e6b16add0fc8004d465d76e Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Tue, 10 Feb 2015 15:56:50 -0800 Subject: uhd::paths - fixing `get_app_path` to use correct `get_env_var` function Also added new enviornment variable, "UHDCALIBPATH", so that users can use something other than system-required environment paths. --- host/lib/utils/paths.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'host') diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index e304555bd..235c2607d 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -173,11 +173,14 @@ std::string uhd::get_tmp_path(void){ } std::string uhd::get_app_path(void){ - const char *appdata_path = std::getenv("APPDATA"); - if (appdata_path != NULL) return appdata_path; + const std::string uhdcalib_path = get_env_var("UHDCALIBPATH"); + if (not uhdcalib_path.empty()) return uhdcalib_path; - const char *home_path = std::getenv("HOME"); - if (home_path != NULL) return home_path; + const std::string appdata_path = get_env_var("APPDATA"); + if (not appdata_path.empty()) return appdata_path; + + const std::string home_path = get_env_var("HOME"); + if (not home_path.empty()) return home_path; return uhd::get_tmp_path(); } -- cgit v1.2.3