summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libcamera/ipa_manager.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
index f689aa69..532b77d3 100644
--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
@@ -34,19 +34,23 @@ IPAManager::IPAManager()
{
addDir(IPA_MODULE_DIR);
- std::string modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
- if (modulePaths.empty())
+ const char *modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH");
+ if (!modulePaths)
return;
- for (size_t pos = 0, delim = 0; delim != std::string::npos;
- pos = delim + 1) {
- delim = modulePaths.find(':', pos);
- size_t count = delim == std::string::npos ? delim : delim - pos;
- std::string path = modulePaths.substr(pos, count);
- if (path.empty())
- continue;
+ while (1) {
+ const char *delim = strchrnul(modulePaths, ':');
+ size_t count = delim - modulePaths;
+
+ if (count) {
+ std::string path(modulePaths, count);
+ addDir(path.c_str());
+ }
+
+ if (*delim == '\0')
+ break;
- addDir(path.c_str());
+ modulePaths += count + 1;
}
}