Add sqlite_temp_directory to the windows driver. (CVS 1905)

FossilOrigin-Name: f5b0e5b0b2f17d179c23c7e4542dbbb452096056

diff --git a/manifest b/manifest
index c3fb81dd6c4fbf3168f508d18089e0f22a5d3224..5acf1ef9965ebda9dbb3818d2b695dd510267195 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sTCL\sbinding\sdocumentation\sto\sdescribe\sthe\snewly\sadded\sability\nto\sspecify\sTCL\svariable\snames\sin\sthe\sbody\sof\san\sSQL\sstatement.\s(CVS\s1904)
-D 2004-08-26T01:12:14
+C Add\ssqlite_temp_directory\sto\sthe\swindows\sdriver.\s(CVS\s1905)
+D 2004-08-28T01:12:57
 F Makefile.in 4a5e570a9e2d35b09c31b3cf01b78cea764ade4b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -49,7 +49,7 @@ F src/os_test.c d3cb336448d28cb6238f8c0d7a44b0ff010601ea
 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
 F src/os_unix.c 3239a45dbd2f50195bfc97f1ed35cb8fe5a3f60c
 F src/os_unix.h f3097815e041e82e24d92505e1ff61ba24172d13
-F src/os_win.c 54181eb73cb4783c4241feca9eaa490768b39008
+F src/os_win.c feba371674076e4fb8c0b214c579e877677e34d5
 F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44
 F src/pager.c 6ecf24602f56ac98914685d449f6653903f36fec
 F src/pager.h 67739fe649f33be55dba522ca8a9cc4e42d14f71
@@ -243,7 +243,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 6199f2f243514bbd4befbf768a7e03aec775bed2
-R f973acd39b99533a4d32c0284d2f7a6d
+P b3b9e58103dd6c65c55caf9a25bc1c257b37df88
+R af741a99488fdab1ea07d8dfec296d71
 U drh
-Z e1a14528ab39e612df9c5d5bff54ca90
+Z f2d1ace11f29f4f151b3075cb095a708

diff --git a/manifest.uuid b/manifest.uuid
index ad60b9d28e1a820a4fc7f9cb74f889f5b036e023..df6f5f73dd2b2d6a1c5f6ab83ee423b2ddb7e996 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3b9e58103dd6c65c55caf9a25bc1c257b37df88
\ No newline at end of file
+f5b0e5b0b2f17d179c23c7e4542dbbb452096056
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index f070e77e864706af5fed4f2b5e9138ea0a6ec498..437330528fe73fa565c2c7e3a113eca0ac6cc334 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -197,6 +197,13 @@ int sqlite3OsOpenDirectory(
   return SQLITE_OK;
 }
 
+/*
+** If the following global variable points to a string which is the
+** name of a directory, then that directory will be used to store
+** temporary files.
+*/
+const char *sqlite_temp_directory = 0;
+
 /*
 ** Create a temporary file name in zBuf.  zBuf must be big enough to
 ** hold at least SQLITE_TEMPNAME_SIZE characters.
@@ -208,7 +215,12 @@ int sqlite3OsTempFileName(char *zBuf){
     "0123456789";
   int i, j;
   char zTempPath[SQLITE_TEMPNAME_SIZE];
-  GetTempPathA(SQLITE_TEMPNAME_SIZE-30, zTempPath);
+  if( sqlite_temp_directory ){
+    strncpy(zTempPath, sqlite_temp_directory, SQLITE_TEMPNAME_SIZE-30);
+    zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0;
+  }else{
+    GetTempPathA(SQLITE_TEMPNAME_SIZE-30, zTempPath);
+  }
   for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){}
   zTempPath[i] = 0;
   for(;;){