Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

Fixed #373, segmentation fault when HOME is unset (#375)

Browse Source
This commit is contained in:
Kevin Mooney 2018-01-19 14:06:55 +00:00 committed by Brenden Matthews
parent e1f38f9b68
commit 49daff2ced
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.cc
View File

@ -130,11 +130,12 @@ double get_time(void)
return tv.tv_sec + (tv.tv_nsec * 1e-9); return tv.tv_sec + (tv.tv_nsec * 1e-9);
} }
/* Converts '~/...' paths to '/home/blah/...' /* Converts '~/...' paths to '/home/blah/...'. It's similar to
* It's similar to variable_substitute, except only cheques for $HOME and ~/ in path */ * variable_substitute, except only cheques for $HOME and ~/ in
* path. If HOME is unset it uses an empty string for substitution */
std::string to_real_path(const std::string &source) std::string to_real_path(const std::string &source)
{ {
const char *homedir = getenv("HOME"); const char *homedir = getenv("HOME") ? : "";
if(source.find("~/") == 0) if(source.find("~/") == 0)
return homedir + source.substr(1); return homedir + source.substr(1);
else if(source.find("$HOME/") == 0) else if(source.find("$HOME/") == 0)