From ef531e2626fa2f237101101f233f24ef751e34fe Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Tue, 14 Dec 2021 14:13:44 +0100
Subject: [PATCH] [hdrck] avoid double slashes when concatenating paths
---
headers/hdrck.ml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/headers/hdrck.ml b/headers/hdrck.ml
index 96232626de0..692c8022681 100755
--- a/headers/hdrck.ml
+++ b/headers/hdrck.ml
@@ -135,7 +135,11 @@ let error ~exit_value =
in the header_spec.txt files.
*)
let path_concat p1 p2 =
- p1 ^ "/" ^ p2
+ (* Note: use String.ends_with when minimum OCaml version is 4.13 *)
+ if String.length p1 > 0 && String.get p1 (String.length p1 - 1) = '/' then
+ p1 ^ p2
+ else
+ p1 ^ "/" ^ p2
(* Temporary directory management (cont.) *)
let get_tmp_dirname () = match !tmp_dirname with
--
GitLab