diff options
| author | John Wiegley <johnw@newartisans.com> | 2008-08-17 05:18:25 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-08-17 05:18:25 -0400 |
| commit | b89fcfb54a198c2b749302da29b49ef088067feb (patch) | |
| tree | 8610134f3a04ca58fdac0358d743292b7223cc49 /src/utils.cc | |
| parent | a1db45dca1e30829e7c55f0798f71d596d6d4ed6 (diff) | |
| download | fork-ledger-b89fcfb54a198c2b749302da29b49ef088067feb.tar.gz fork-ledger-b89fcfb54a198c2b749302da29b49ef088067feb.tar.bz2 fork-ledger-b89fcfb54a198c2b749302da29b49ef088067feb.zip | |
Re-enabled the disabled expand_path routine.
Diffstat (limited to 'src/utils.cc')
| -rw-r--r-- | src/utils.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/utils.cc b/src/utils.cc index 5ac5cef0..2f563dde 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -656,13 +656,11 @@ path expand_path(const path& pathname) if (pathname.empty()) return pathname; -#if 0 - // jww (2007-04-30): I need to port this code to use - // boost::filesystem::path + std::string path_string = pathname.string(); const char * pfx = NULL; - string::size_type pos = pathname.find_first_of('/'); + string::size_type pos = path_string.find_first_of('/'); - if (pathname.length() == 1 || pos == 1) { + if (path_string.length() == 1 || pos == 1) { pfx = std::getenv("HOME"); #ifdef HAVE_GETPWUID if (! pfx) { @@ -675,8 +673,8 @@ path expand_path(const path& pathname) } #ifdef HAVE_GETPWNAM else { - string user(pathname, 1, pos == string::npos ? - string::npos : pos - 1); + string user(path_string, 1, pos == string::npos ? + string::npos : pos - 1); struct passwd * pw = getpwnam(user.c_str()); if (pw) pfx = pw->pw_dir; @@ -696,12 +694,9 @@ path expand_path(const path& pathname) if (result.length() == 0 || result[result.length() - 1] != '/') result += '/'; - result += pathname.substr(pos + 1); + result += path_string.substr(pos + 1); return result; -#else - return pathname; -#endif } path resolve_path(const path& pathname) |