aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBailey Kuo <formosa@google.com>2023-04-20 14:08:14 -0700
committerBailey Kuo <formosa@google.com>2023-04-20 14:08:14 -0700
commit2284de70e8e323ac6d2a56a930337817132ded25 (patch)
tree6f7925fcee724c8b823241e96a1b84321004c295
parent3f12ec211b745af8a33e4570b813c4a5612f1cc5 (diff)
downloadnetsim-2284de70e8e323ac6d2a56a930337817132ded25.tar.gz
Remove duplicate slashes in netsim ini filepath
Test: ninja Change-Id: Ib94060db63d084c79010c1c7ffc9cd626b32d573
-rw-r--r--src/util/os_utils.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util/os_utils.cc b/src/util/os_utils.cc
index 21dc866f..4b8eb289 100644
--- a/src/util/os_utils.cc
+++ b/src/util/os_utils.cc
@@ -70,9 +70,11 @@ std::string GetDiscoveryDirectory() {
}
std::string GetNetsimIniFilepath() {
- return GetDiscoveryDirectory()
- .append(netsim::filesystem::slash)
- .append("netsim.ini");
+ auto discovery_dir = GetDiscoveryDirectory();
+ // Check if directory has a trailing slash.
+ if (discovery_dir.back() != netsim::filesystem::slash.back())
+ discovery_dir.append(netsim::filesystem::slash);
+ return discovery_dir.append("netsim.ini");
}
std::optional<std::string> GetServerAddress(bool frontend_server) {