From 0cf9d412c8cc71b7caf9f1feb063a3dddab16fd3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 23 May 2019 15:02:38 -0400 Subject: [PATCH] Replace g_build_path with g_build_filename for portability MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit g_build_filename will use the correct separator depending on the platform. Signed-off-by: Michael Jeanson Change-Id: Iaeeb1a4c30aaea7690ba479ba05108c6fc57dd4e Reviewed-on: https://review.lttng.org/c/babeltrace/+/1331 Tested-by: jenkins Reviewed-by: Jérémie Galarneau --- plugins/lttng-utils/debug-info/bin-info.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/lttng-utils/debug-info/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c index eeac6b4b..f861b2ed 100644 --- a/plugins/lttng-utils/debug-info/bin-info.c +++ b/plugins/lttng-utils/debug-info/bin-info.c @@ -90,8 +90,7 @@ struct bin_info *bin_info_create(struct bt_fd_cache *fdc, const char *path, } if (target_prefix) { - bin->elf_path = g_build_path("/", target_prefix, - path, NULL); + bin->elf_path = g_build_filename(target_prefix, path, NULL); } else { bin->elf_path = g_strdup(path); } @@ -592,7 +591,7 @@ int bin_info_set_dwarf_info_build_id(struct bin_info *bin) g_snprintf(&build_id_file[build_id_char_len], build_id_suffix_char_len, BUILD_ID_SUFFIX); - path = g_build_path("/", dbg_dir, BUILD_ID_SUBDIR, build_id_file, NULL); + path = g_build_filename(dbg_dir, BUILD_ID_SUBDIR, build_id_file, NULL); if (!path) { goto error; } -- 2.34.1