diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-20 23:45:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 23:45:54 +0000 |
| commit | 8ff02ff769604dc2cb27e3e65a05373198c59d67 (patch) | |
| tree | 5cd6e7808e25459e6b2216e3e722ed0235f3b889 | |
| parent | e5ac0b7dfa32475a89f0c35e8c3770a158921a96 (diff) | |
| parent | 2b4357b77f05cfeae7790af5fd8add41c111acaa (diff) | |
| download | netsim-8ff02ff769604dc2cb27e3e65a05373198c59d67.tar.gz | |
Merge "Remove duplicate slashes in netsim ini filepath" am: 122042abfc am: 2b4357b77f
Original change: https://android-review.googlesource.com/c/platform/tools/netsim/+/2553292
Change-Id: I837486129efe6c8c058cc5887ae128bb07364a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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) { |