Read base path for config files from TMPDIR env var

project-chip · Jun 11, 2024 · 76750ee · 76750ee
1 parent 23e0f3b
commit 76750ee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
@@ -37,27 +37,9 @@
 #include <platform/Linux/CHIPLinuxStorageIni.h>
 #include <string>
 
-#ifndef FATCONFDIR
-#define FATCONFDIR "/tmp"
-#endif
-
-#ifndef SYSCONFDIR
-#define SYSCONFDIR "/tmp"
-#endif
-
-#ifndef LOCALSTATEDIR
-#define LOCALSTATEDIR "/tmp"
-#endif
-
-#define CHIP_DEFAULT_FACTORY_PATH \
- FATCONFDIR "/" \
- "chip_factory.ini"
-#define CHIP_DEFAULT_CONFIG_PATH \
- SYSCONFDIR "/" \
- "chip_config.ini"
-#define CHIP_DEFAULT_DATA_PATH \
- LOCALSTATEDIR "/" \
- "chip_counters.ini"
+#define CHIP_DEFAULT_FACTORY_FILE_NAME "chip_factory.ini"
+#define CHIP_DEFAULT_CONFIG_FILE_NAME "chip_config.ini"
+#define CHIP_DEFAULT_DATA_FILE_NAME "chip_counters.ini"
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/Linux/PosixConfig.cpp b/src/platform/Linux/PosixConfig.cpp
@@ -453,6 +453,19 @@ bool PosixConfig::ConfigValueExists(Key key)
  return storage->HasValue(key.Name);
 }
 
+std::string PosixConfig::GetFilePath(std::string defaultFileName)
+{
+ // Match what GetFilename in ExamplePersistentStorage.cpp does.
+ const char * dir = getenv("TMPDIR");
+ if (dir == nullptr)
+ {
+ dir = "/tmp";
+ }
+ std::string storageDir = dir;
+
+ return storageDir + "/" + defaultFileName;
+}
+
 CHIP_ERROR PosixConfig::EnsureNamespace(const char * ns)
 {
  CHIP_ERROR err = CHIP_NO_ERROR;
@@ -461,17 +474,20 @@ CHIP_ERROR PosixConfig::EnsureNamespace(const char * ns)
  if (strcmp(ns, kConfigNamespace_ChipFactory) == 0)
  {
  storage = &gChipLinuxFactoryStorage;
- err = storage->Init(CHIP_DEFAULT_FACTORY_PATH);
+ std::string filePath = GetFilePath(CHIP_DEFAULT_FACTORY_FILE_NAME);
+ err = storage->Init(filePath.c_str());
  }
  else if (strcmp(ns, kConfigNamespace_ChipConfig) == 0)
  {
  storage = &gChipLinuxConfigStorage;
- err = storage->Init(CHIP_DEFAULT_CONFIG_PATH);
+ std::string filePath = GetFilePath(CHIP_DEFAULT_CONFIG_FILE_NAME);
+ err = storage->Init(filePath.c_str());
  }
  else if (strcmp(ns, kConfigNamespace_ChipCounters) == 0)
  {
  storage = &gChipLinuxCountersStorage;
- err = storage->Init(CHIP_DEFAULT_DATA_PATH);
+ std::string filePath = GetFilePath(CHIP_DEFAULT_DATA_FILE_NAME);
+ err = storage->Init(filePath.c_str());
  }
 
  SuccessOrExit(err);

diff --git a/src/platform/Linux/PosixConfig.h b/src/platform/Linux/PosixConfig.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <functional>
+#include <string>
 #include <inttypes.h>
 
 #include <lib/core/CHIPError.h>
@@ -111,6 +112,7 @@ class PosixConfig
 
 private:
  static ChipLinuxStorage * GetStorageForNamespace(Key key);
+ static std::string GetFilePath(std::string defaultFileName);
 };
 
 struct PosixConfig::Key