diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-20 22:31:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-04-20 22:31:59 +0000 |
| commit | 122042abfc9d37ea91b0f672d3efff994e179d4a (patch) | |
| tree | 5cd6e7808e25459e6b2216e3e722ed0235f3b889 | |
| parent | 55c40ff74e0b3b6c0714133e30e73729fd65039d (diff) | |
| parent | 2284de70e8e323ac6d2a56a930337817132ded25 (diff) | |
| download | netsim-122042abfc9d37ea91b0f672d3efff994e179d4a.tar.gz | |
Merge "Remove duplicate slashes in netsim ini filepath"
| -rw-r--r-- | src/util/os_utils.cc | 8 |
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) { |