OS/2 fixes for pre-C99 compilers and a return code correction in os2Access(). (CVS...

FossilOrigin-Name: 3241a3bdd08f6abf3f1655152e296cc7ebe73bca

diff --git a/manifest b/manifest
index 7d0e4aaab94efa1cf6dd795a84814fe77bec28ff..6cca1cc09da78a129fdeb63887a135f80a401bec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\smemory\sallocation\ssystem\sin\smem3.c\sso\sto\sfit\sin\swith\sthe\snew\ssqlite3_mem_methods\sscheme.\sAt\sthis\spoint\sit\sonly\s"mostly"\sworks.\s(CVS\s5297)
-D 2008-06-24T19:02:55
+C OS/2\sfixes\sfor\spre-C99\scompilers\sand\sa\sreturn\scode\scorrection\sin\sos2Access().\s(CVS\s5298)
+D 2008-06-24T22:50:06
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/mutex_w32.c 7aa9ad79b36931314b81ac4045f40f2c503b1e44
 F src/os.c b1c73547466b832612b3be425a8f21afd603fd9b
 F src/os.h c9a7f94e80193fd4cf27f5c5698eb56753f1b05a
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c 9dc031a31ec631c4b2ee3bc2f8b2533b36f20376
+F src/os_os2.c 4647d718d7ad3f84c3d1241cda971a0ae67cb45e
 F src/os_unix.c b8c07b0cd85c9909000740dc3f29ce938091b00c
 F src/os_win.c 0b90d9a1ce18bfd2a5f3c4a6bdb13ec369c805a9
 F src/pager.c e2a49872f1e15eb83895ace704c48ac8ded998ba
@@ -593,7 +593,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 37b084fd7d7ad7f13fc9454fc25ca5aed48d4a31
-R 465c685f9632ada3f1635a03ece5ad9c
-U danielk1977
-Z 585b6f7015b63e1eb50cf90d6b5f14fd
+P 3febef548fb1c314336fe4bc359d72a4fe84e84e
+R 2bb349bf8738c9c34feda271d58ba513
+U pweilbacher
+Z b3e4e1f56a819d60939aa1a1f4cf6934

diff --git a/manifest.uuid b/manifest.uuid
index bf7c5dfcb6da985dd52ff97ffeba43948b8cb028..164a53da2c6fcca673df8a4ed381449467b57896 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3febef548fb1c314336fe4bc359d72a4fe84e84e
\ No newline at end of file
+3241a3bdd08f6abf3f1655152e296cc7ebe73bca
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index 6025c11cd26f3813532788cb3eb3171c3bae0869..ffa767e44951e9c0bea5f5c1391ff1f977c81a6e 100644 (file)
--- 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.44 2008/06/18 21:08:16 pweilbacher Exp $
+** $Id: os_os2.c,v 1.45 2008/06/24 22:50:06 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -772,7 +772,8 @@ static int os2Open(
   if( rc != NO_ERROR ){
     OSTRACE7( "OPEN Invalid handle rc=%d: zName=%s, ulAction=%#lx, ulAttr=%#lx, ulFlags=%#lx, ulMode=%#lx\n",
               rc, zName, ulAction, ulFileAttribute, ulOpenFlags, ulOpenMode );
-    free( pFile->pathToDel );
+    if ( pFile->pathToDel )
+      free( pFile->pathToDel );
     pFile->pathToDel = NULL;
     if( flags & SQLITE_OPEN_READWRITE ){
       OSTRACE2( "OPEN %d Invalid handle\n", ((flags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE) );
@@ -804,8 +805,8 @@ int os2Delete(
   int syncDir                            /* Not used on os2 */
 ){
   APIRET rc = NO_ERROR;
-  SimulateIOError(return SQLITE_IOERR_DELETE);
   char *zFilenameCp = convertUtf8PathToCp( zFilename );
+  SimulateIOError( return SQLITE_IOERR_DELETE );
   rc = DosDelete( (PSZ)zFilenameCp );
   free( zFilenameCp );
   OSTRACE2( "DELETE \"%s\"\n", zFilename );
@@ -823,9 +824,9 @@ static int os2Access(
 ){
   FILESTATUS3 fsts3ConfigInfo;
   APIRET rc = NO_ERROR;
+  char *zFilenameCp = convertUtf8PathToCp( zFilename );
 
   memset( &fsts3ConfigInfo, 0, sizeof(fsts3ConfigInfo) );
-  char *zFilenameCp = convertUtf8PathToCp( zFilename );
   rc = DosQueryPathInfo( (PSZ)zFilenameCp, FIL_STANDARD,
                          &fsts3ConfigInfo, sizeof(FILESTATUS3) );
   free( zFilenameCp );
@@ -838,7 +839,7 @@ static int os2Access(
       OSTRACE3( "ACCESS %s access of read and exists  rc=%d\n", zFilename, rc );
       break;
     case SQLITE_ACCESS_READWRITE:
-      rc = (fsts3ConfigInfo.attrFile & FILE_READONLY) == 0;
+      rc = (rc == NO_ERROR) && ( (fsts3ConfigInfo.attrFile & FILE_READONLY) == 0 );
       OSTRACE3( "ACCESS %s access of read/write  rc=%d\n", zFilename, rc );
       break;
     default:
@@ -849,7 +850,6 @@ static int os2Access(
 }
 
 
-
 /*
 ** Turn a relative pathname into a full pathname.  Write the full
 ** pathname into zFull[].  zFull[] will be at least pVfs->mxPathname