authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-26 14:37:26-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-26 14:37:26-04:00
log1d95fdaf6e952674514fe5692ebd3fe1834926cb
treeccb9047fd201240513e3885a4a8c888862d56cbb
parent9ec4ccc68f6473ce4f02fc5d2b87ad92e2eb555a
signature Commit is signed but in an unrecognized format.

Fix path canonicalization when $HOME has a trailing slash

1 files changed, 8 insertions(+), 2 deletions(-)

src/os.cpp+8-2
...@@ -1747,8 +1747,14 @@ Error os_get_app_data_dir(Buf *out_path, const char *appname) {...@@ -1747,8 +1747,14 @@ Error os_get_app_data_dir(Buf *out_path, const char *appname) {
1747 // TODO use /etc/passwd1747 // TODO use /etc/passwd
1748 return ErrorFileNotFound;1748 return ErrorFileNotFound;
1749 }1749 }
1750 buf_resize(out_path, 0);1750 if (home_dir[0] == 0) {
1751 buf_appendf(out_path, "%s/.local/share/%s", home_dir, appname);1751 return ErrorFileNotFound;
1752 }
1753 buf_init_from_str(out_path, home_dir);
1754 if (buf_ptr(out_path)[buf_len(out_path) - 1] != '/') {
1755 buf_append_char(out_path, '/');
1756 }
1757 buf_appendf(out_path, ".local/share/%s", appname);
1752 return ErrorNone;1758 return ErrorNone;
1753#endif1759#endif
1754}1760}