Skip to content
Snippets Groups Projects
Commit a9a21ecf authored by Aura Linden's avatar Aura Linden
Browse files

Switched mkTempDir back to using apple standard tempdir behavior instead of /tmp

parent b6abf5c0
No related branches found
No related tags found
No related merge requests found
......@@ -124,6 +124,29 @@ void sendProgress(int cur, int max, const std::string str)
setProgressText(str);
}
bool mkTempDir(boost::filesystem::path& temp_dir)
{
NSString * tempDir = NSTemporaryDirectory();
if (tempDir == nil)
tempDir = @"/tmp/";
std::string* temp_str = NSToString(tempDir);
*temp_str += std::string("SecondLifeUpdate_XXXXXX");
std::cout << "tempDir is " << temp_str << std::endl;
char temp[PATH_MAX] = ""; /* Flawfinder: ignore */
strncpy(temp, temp_str->c_str(), temp_str->length());
if(mkdtemp(temp) == NULL)
{
return false;
}
temp_dir = boost::filesystem::path(temp);
return true;
}
bool copyDir(const std::string& src_dir, const std::string& dest_dir)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
......
......@@ -494,20 +494,6 @@ bool LLMacUpdater::doInstall(const boost::filesystem::path& app_dir,
return true;
}
bool mkTempDir(boost::filesystem::path& temp_dir)
{
char temp_str[PATH_MAX] = "/tmp/SecondLifeUpdate_XXXXXX";
if(mkdtemp(temp_str) == NULL)
{
return false;
}
temp_dir = boost::filesystem::path(temp_str);
return true;
}
void* LLMacUpdater::updatethreadproc(void*)
{
char tempDir[PATH_MAX] = ""; /* Flawfinder: ignore */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment