Fix an issue with finding the access permissions of journal files when

8+3 filenames are in use.

FossilOrigin-Name: 2b35c5144ddcc2ed6d0fcaa8c0ba5d20b9487be7

diff --git a/manifest b/manifest
index 4592d79c105584accdbddc6b370d116373f550ab..d5fdd2bfa3b90570aaa980b47139a3a0b4eb68dc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\sthe\somittest.tcl\sscript\sused\sto\sverify\sthat\sthe\nSQLITE_OMIT\scompile-time\soptions\sare\sworking.
-D 2011-10-20T00:55:54.955
+C Fix\san\sissue\swith\sfinding\sthe\saccess\spermissions\sof\sjournal\sfiles\swhen\n8+3\sfilenames\sare\sin\suse.
+D 2011-10-20T18:23:35.274
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os.c 5d9b02782ed36345348d6fe21d7762ed3a9cfd2a
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 1e7dcc176a6b1ec3dc3256b27a058459b35c2a73
+F src/os_unix.c ddda0b1c5ae536669634d7bff31b3f8f4d654866
 F src/os_win.c 49d418916428a59d773f39993db0ecde56ab4c37
 F src/pager.c 60c80db526d39286b913c824cf8303d34ab17a89
 F src/pager.h dbcaa791e8b6c3a6b77c168c5c27deec289fb176
@@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 1af4a25631c4077a9bfc64e15eb92fbf5146c89c
-R f519850801e0581ab79d9a8c90ed8863
+P 4344483f7d7f64dffadde0053e6c745948db9486
+R 8791a00ec886d9269177e370bb87a885
 U drh
-Z f005e14c521f1568740d231c984f07e1
+Z bc76726412c4dd0d1fa3c4a2fb94fbb7

diff --git a/manifest.uuid b/manifest.uuid
index 9127f8d266a79e1831b2a53e2a4e73b8857e8b79..ca4f8c9ff0cc8cabd3d297da19da6983afbe016b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4344483f7d7f64dffadde0053e6c745948db9486
\ No newline at end of file
+2b35c5144ddcc2ed6d0fcaa8c0ba5d20b9487be7
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 2e43eabf17f006d743b6bac26613b8636cbe722d..0ea6daf27fe0613cff67fcc3186f8e3b1e4e5b4a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4874,13 +4874,13 @@ static int findCreateFileMode(
     **   "<path to db>-journalNN"
     **   "<path to db>-walNN"
     **
-    ** where NN is a 4 digit decimal number. The NN naming schemes are 
+    ** where NN is a decimal number. The NN naming schemes are 
     ** used by the test_multiplex.c module.
     */
     nDb = sqlite3Strlen30(zPath) - 1; 
 #ifdef SQLITE_ENABLE_8_3_NAMES
-    while( nDb>0 && zPath[nDb]!='-' && zPath[nDb]!='/' ) nDb--;
-    if( nDb==0 || zPath[nDb]=='/' ) return SQLITE_OK;
+    while( nDb>0 && !sqlite3Isalnum(zPath[nDb]) ) nDb--;
+    if( nDb==0 || zPath[nDb]!='-' ) return SQLITE_OK;
 #else
     while( zPath[nDb]!='-' ){
       assert( nDb>0 );