From 91612633fc7c24968f4ef03f6cc32741951a0819 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 6 Jun 2017 11:24:21 -0400 Subject: [PATCH] Port: normalize windows path on Mingw MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- common/common.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/common/common.c b/common/common.c index 363ffe2d..aa67b21f 100644 --- a/common/common.c +++ b/common/common.c @@ -1078,6 +1078,38 @@ void destroy_gstring(void *gstring) (void) g_string_free(gstring, TRUE); } +#ifdef __MINGW32__ +BT_HIDDEN +GString *bt_common_normalize_path(const char *path, const char *wd) +{ + char *tmp; + GString *norm_path = NULL; + + assert(path); + + tmp = _fullpath(NULL, path, PATH_MAX); + if (!tmp) { + goto error; + } + + norm_path = g_string_new(tmp); + if (!norm_path) { + goto error; + } + + goto end; +error: + if (norm_path) { + g_string_free(norm_path, TRUE); + norm_path = NULL; + } +end: + if (tmp) { + free(tmp); + } + return norm_path; +} +#else BT_HIDDEN GString *bt_common_normalize_path(const char *path, const char *wd) { @@ -1161,6 +1193,7 @@ end: return norm_path; } +#endif BT_HIDDEN size_t bt_common_get_page_size(void) -- 2.34.1