From: pweilbacher <pweilbacher@noemail.net>
Date: Fri, 22 Aug 2008 13:47:56 +0000 (+0000)
Subject: Hide (for non-debugging builds) and remove DELETEONCLOSE files on OS/2, following... 
X-Git-Tag: version-3.6.10~585
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fc76d8c5a04667d139d73c75f56c5d57d246617;p=thirdparty%2Fsqlite.git

Hide (for non-debugging builds) and remove DELETEONCLOSE files on OS/2, following the Windows example. Ticket #3328. (CVS 5592)

FossilOrigin-Name: 8aaa77000fb86fe512405a0ad40cb08678a12198
---

diff --git a/manifest b/manifest
index 46d2ce6ff9..70d6882858 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\snuisance\scompiler\swarnings.\s\sTicket\s#3309.\s(CVS\s5591)
-D 2008-08-22T12:57:09
+C Hide\s(for\snon-debugging\sbuilds)\sand\sremove\sDELETEONCLOSE\sfiles\son\sOS/2,\sfollowing\sthe\sWindows\sexample.\sTicket\s#3328.\s(CVS\s5592)
+D 2008-08-22T13:47:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 51b727303f84cf055e29514d8248e5eaf9701379
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -132,7 +132,7 @@ F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
 F src/os.c 939ae7690a01d9401685ba124b4ba45fd4a7a2ad
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c 676ed273b17bd260f905df81375c9f9950d85517
+F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
 F src/os_unix.c f1be99705e4542f01830ccea327eb773814f4eb9
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
 F src/pager.c 620b0c34f2f43acc3cc770be75c832739465bb52
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 73b260686264a31f43211efb235e4e0121115a50
-R c914bc7de113bdfb3ca8ef47fc4aa9d4
-U drh
-Z 750a87dae06fe394fb8ed452f3ce58a5
+P 2a365e29944f9fd45ca2903875a8c2e2759c9492
+R 57109e2c4d2f82977c4cd0376610232c
+U pweilbacher
+Z ec0f9d580f11413771c77027641fba31
diff --git a/manifest.uuid b/manifest.uuid
index 40a547f80b..5382ed4fd0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a365e29944f9fd45ca2903875a8c2e2759c9492
\ No newline at end of file
+8aaa77000fb86fe512405a0ad40cb08678a12198
\ No newline at end of file
diff --git a/src/os_os2.c b/src/os_os2.c
index f1af91db38..6a10eb1e95 100644
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.55 2008/07/29 18:49:29 pweilbacher Exp $
+** $Id: os_os2.c,v 1.56 2008/08/22 13:47:57 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -746,7 +746,7 @@ static int os2Open(
   int *pOutFlags                /* Status return flags */
 ){
   HFILE h;
-  ULONG ulFileAttribute = 0;
+  ULONG ulFileAttribute = FILE_NORMAL;
   ULONG ulOpenFlags = 0;
   ULONG ulOpenMode = 0;
   os2File *pFile = (os2File*)id;
@@ -771,7 +771,6 @@ static int os2Open(
 
   OSTRACE2( "OPEN want %d\n", flags );
 
-  /*ulOpenMode = flags & SQLITE_OPEN_READWRITE ? OPEN_ACCESS_READWRITE : OPEN_ACCESS_READONLY;*/
   if( flags & SQLITE_OPEN_READWRITE ){
     ulOpenMode |= OPEN_ACCESS_READWRITE;
     OSTRACE1( "OPEN read/write\n" );
@@ -780,7 +779,6 @@ static int os2Open(
     OSTRACE1( "OPEN read only\n" );
   }
 
-  /*ulOpenFlags = flags & SQLITE_OPEN_CREATE ? OPEN_ACTION_CREATE_IF_NEW : OPEN_ACTION_FAIL_IF_NEW;*/
   if( flags & SQLITE_OPEN_CREATE ){
     ulOpenFlags |= OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW;
     OSTRACE1( "OPEN open new/create\n" );
@@ -789,7 +787,6 @@ static int os2Open(
     OSTRACE1( "OPEN open existing\n" );
   }
 
-  /*ulOpenMode |= flags & SQLITE_OPEN_MAIN_DB ? OPEN_SHARE_DENYNONE : OPEN_SHARE_DENYWRITE;*/
   if( flags & SQLITE_OPEN_MAIN_DB ){
     ulOpenMode |= OPEN_SHARE_DENYNONE;
     OSTRACE1( "OPEN share read/write\n" );
@@ -798,18 +795,15 @@ static int os2Open(
     OSTRACE1( "OPEN share read only\n" );
   }
 
-  if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL
-               | SQLITE_OPEN_SUBJOURNAL) ){
+  if( flags & SQLITE_OPEN_DELETEONCLOSE ){
     char pathUtf8[CCHMAXPATH];
 #ifdef NDEBUG /* when debugging we want to make sure it is deleted */
     ulFileAttribute = FILE_HIDDEN;
 #endif
-    ulFileAttribute = FILE_NORMAL;
     os2FullPathname( pVfs, zName, CCHMAXPATH, pathUtf8 );
     pFile->pathToDel = convertUtf8PathToCp( pathUtf8 );
     OSTRACE1( "OPEN hidden/delete on close file attributes\n" );
   }else{
-    ulFileAttribute = FILE_ARCHIVED | FILE_NORMAL;
     pFile->pathToDel = NULL;
     OSTRACE1( "OPEN normal file attribute\n" );
   }