diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-18 17:54:26 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-18 17:54:26 -0500 |
| commit | 405e89c48e9a20f45d74494ac08b026de27d3ee6 (patch) | |
| tree | acf4d5bcdb58aad825d59a60389a8ab585f08bb2 | |
| parent | 250e496d097ecc7034edf32211e79c545dfd4201 (diff) | |
core: prefs updated to handle cases of env var delared properly.
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_prefs.cc | 33 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_prefs.h | 1 |
2 files changed, 22 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/general/gr_prefs.cc b/gnuradio-core/src/lib/general/gr_prefs.cc index 37ca7c6f34..34303a5629 100644 --- a/gnuradio-core/src/lib/general/gr_prefs.cc +++ b/gnuradio-core/src/lib/general/gr_prefs.cc @@ -107,6 +107,19 @@ gr_prefs::_read_files() d_configs.erase(std::remove_if(d_configs.begin(), d_configs.end(), ::isspace), d_configs.end()); } +char * +gr_prefs::option_to_env(std::string section, std::string option) +{ + std::stringstream envname; + std::string secname=section, optname=option; + + std::transform(section.begin(), section.end(), secname.begin(), ::toupper); + std::transform(option.begin(), option.end(), optname.begin(), ::toupper); + envname << "GR_CONF_" << secname << "_" << optname; + + return getenv(envname.str().c_str()); +} + bool gr_prefs::has_section(const std::string section) { @@ -117,6 +130,9 @@ gr_prefs::has_section(const std::string section) bool gr_prefs::has_option(const std::string section, const std::string option) { + if(option_to_env(section, option)) + return true; + if(has_section(section)) { size_t sec = d_configs.find("[" + section + "]#"); size_t opt = d_configs.find("#" + option + "=", sec); @@ -128,19 +144,12 @@ gr_prefs::has_option(const std::string section, const std::string option) } const std::string -gr_prefs::get_string(const std::string section, const std::string option, const std::string default_val) +gr_prefs::get_string(const std::string section, const std::string option, + const std::string default_val) { - std::stringstream envname; - std::string secname=section, optname=option; - - std::transform(section.begin(), section.end(), secname.begin(), ::toupper); - std::transform(option.begin(), option.end(), optname.begin(), ::toupper); - envname << "GR_CONF_" << secname << "_" << optname; - - char *v = getenv(envname.str().c_str()); - if(v) { - return std::string(v); - } + char *env = option_to_env(section, option); + if(env) + return std::string(env); if(has_option(section, option)) { std::string optname = "#" + option + "="; diff --git a/gnuradio-core/src/lib/general/gr_prefs.h b/gnuradio-core/src/lib/general/gr_prefs.h index 90d6027411..d9b0c791ba 100644 --- a/gnuradio-core/src/lib/general/gr_prefs.h +++ b/gnuradio-core/src/lib/general/gr_prefs.h @@ -84,6 +84,7 @@ public: protected: virtual std::vector<std::string> _sys_prefs_filenames(); virtual void _read_files(); + virtual char * option_to_env(std::string section, std::string option); private: gruel::mutex d_mutex; |