ardour/livetrax
13
0
Fork 0
Code

Fix session-archive on macOS

Browse Source 
By default Apple uses a private TMP folder. While mktemp
returns "/tmp/xxx" the canonical path is "/private/tmp/xxx".
This lead to issues when tmp-prefix is removed when building
the session-archive.

See also e52bdc55ad
This commit is contained in:
Robin Gareus 2021-03-17 18:05:48 +01:00
parent 71f8c8ff38
commit 48556cbd3c
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/ardour/session_state.cc
View File

@ -5336,29 +5336,16 @@ Session::archive_session (const std::string& dest,
}
/* create temporary dir to save session to */
#ifdef PLATFORM_WINDOWS
char tmp[256] = "C:\\TEMP\\";
GetTempPath (sizeof (tmp), tmp);
#else
char const* tmp = getenv("TMPDIR");
if (!tmp) {
tmp = "/tmp/";
}
#endif
if ((strlen (tmp) + 21) > 1024) {
GError* err = NULL;
char* td = g_dir_make_tmp ("ardourarchive-XXXXXX", &err);
if (!td) {
error << string_compose(_("Could not make tmpdir: %1"), err->message) << endmsg;
return -1;
}
char tmptpl[1024];
strcpy (tmptpl, tmp);
strcat (tmptpl, "ardourarchive-XXXXXX");
char* tmpdir = g_mkdtemp (tmptpl);
if (!tmpdir) {
return -1;
}
std::string to_dir = std::string (tmpdir);
const string to_dir = PBD::canonical_path (td);
g_free (td);
g_clear_error (&err);
/* switch session directory temporarily */
(*_session_dir) = to_dir;