diff options
| author | mistachkin <mistachkin@noemail.net> | 2013-08-30 21:52:38 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2013-08-30 21:52:38 +0000 |
| commit | d95a3d3527d6d3db37759cdbda7850fdd52c1090 (patch) | |
| tree | 5edbd2eed3e9aeb28bfe60983dc27cce9cf5be99 /src/os_unix.c | |
| parent | ad4c7aa10fd8563550a0465879cab5a1bbea04bb (diff) | |
| download | sqlite-d95a3d3527d6d3db37759cdbda7850fdd52c1090.tar.gz sqlite-d95a3d3527d6d3db37759cdbda7850fdd52c1090.zip | |
Add support for Cygwin when handling temporary file names. Improve error codes and diagnostic messages for temporary file name handling on Windows. Rename winConvertUtf8Filename to winConvertFromUtf8Filename. Improve placement and comments for forward function declarations.
FossilOrigin-Name: a411df725153119acb3bcf44fb71deecaa307887
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 797ace031..cd8cec004 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5340,6 +5340,7 @@ static const char *unixTempFileDir(void){ static const char *azDirs[] = { 0, 0, + 0, "/var/tmp", "/usr/tmp", "/tmp", @@ -5350,7 +5351,8 @@ static const char *unixTempFileDir(void){ const char *zDir = 0; azDirs[0] = sqlite3_temp_directory; - if( !azDirs[1] ) azDirs[1] = getenv("TMPDIR"); + if( !azDirs[1] ) azDirs[1] = getenv("SQLITE_TMPDIR"); + if( !azDirs[2] ) azDirs[2] = getenv("TMPDIR"); for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){ if( zDir==0 ) continue; if( osStat(zDir, &buf) ) continue; |