RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better windows temp filenames

This commit is contained in:
David Rose 2009-06-20 01:24:56 +00:00
parent 7d2e756b48
commit e039ec875a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dtool/src/dtoolutil/filename.cxx
View File

@ -413,11 +413,20 @@ expand_from(const string &os_specific, Filename::Type type) {
Filename Filename::
temporary(const string &dirname, const string &prefix, const string &suffix,
Type type) {
if (dirname.empty()) {
Filename fdirname = dirname;
#ifdef WIN32
// The Windows tempnam() function doesn't do a good job of choosing
// a temporary directory. Choose one ourselves.
if (fdirname.empty()) {
fdirname = Filename::get_temp_directory();
}
#endif
if (fdirname.empty()) {
// If we are not given a dirname, use the system tempnam()
// function to create a system-defined temporary filename.
char *name = tempnam(NULL, prefix.c_str());
Filename result(name);
Filename result = Filename::from_os_specific(name);
free(name);
result.set_type(type);
return result;
@ -435,7 +444,7 @@ temporary(const string &dirname, const string &prefix, const string &suffix,
int hash = (clock() * time(NULL)) & 0xffffff;
char hex_code[10];
sprintf(hex_code, "%06x", hash);
result = Filename(dirname, Filename(prefix + hex_code + suffix));
result = Filename(fdirname, Filename(prefix + hex_code + suffix));
result.set_type(type);
} while (result.exists());