Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01acb70e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "base: Add sensitivity to TMPDIR environment for TemporaryDir and TemporaryFile"

parents b9cb1494 6009a2de

base/file.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -72,7 +72,8 @@ namespace { 




std::string GetSystemTempDir() {

std::string GetSystemTempDir() {

#if defined(__ANDROID__)

#if defined(__ANDROID__)

  const char* tmpdir = "/data/local/tmp";

  const auto* tmpdir = getenv("TMPDIR");

  if (tmpdir == nullptr) tmpdir = "/data/local/tmp";

  if (access(tmpdir, R_OK | W_OK | X_OK) == 0) {

  if (access(tmpdir, R_OK | W_OK | X_OK) == 0) {

    return tmpdir;

    return tmpdir;

  }

  }
@@ -81,7 +82,7 @@ std::string GetSystemTempDir() { 
  return ".";

  return ".";

#elif defined(_WIN32)

#elif defined(_WIN32)

  char tmp_dir[MAX_PATH];

  char tmp_dir[MAX_PATH];

  DWORD result = GetTempPathA(sizeof(tmp_dir), tmp_dir);

  DWORD result = GetTempPathA(sizeof(tmp_dir), tmp_dir);  // checks TMP env

  CHECK_NE(result, 0ul) << "GetTempPathA failed, error: " << GetLastError();

  CHECK_NE(result, 0ul) << "GetTempPathA failed, error: " << GetLastError();

  CHECK_LT(result, sizeof(tmp_dir)) << "path truncated to: " << result;

  CHECK_LT(result, sizeof(tmp_dir)) << "path truncated to: " << result;
@@ -91,7 +92,9 @@ std::string GetSystemTempDir() { 
  tmp_dir[result - 1] = '\0';

  tmp_dir[result - 1] = '\0';

  return tmp_dir;

  return tmp_dir;

#else

#else

  return "/tmp";

  const auto* tmpdir = getenv("TMPDIR");

  if (tmpdir == nullptr) tmpdir = "/tmp";

  return tmpdir;

#endif

#endif

}

}