From 28a67fd3f8d2868a6ce5fa5af92eadb53dfa4d39 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 12 Dec 2011 19:48:43 +0000 Subject: [PATCH] Fix os_unix.c so that, unless 8.3 filenames are actually in use, journal and wal file permissions are assigned correctly even if SQLITE_ENABLE_8_3_NAMES is defined. FossilOrigin-Name: 169e12295cca701443746b1209bd6a7714fd8988 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_unix.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 79ab16d091..1b7bb9a180 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\smultiplexor\sVFS\sso\sthat\sxTruncate\sis\sa\sno-op\son\sdatabase\sfiles. -D 2011-12-12T18:55:44.020 +C Fix\sos_unix.c\sso\sthat,\sunless\s8.3\sfilenames\sare\sactually\sin\suse,\sjournal\sand\swal\sfile\spermissions\sare\sassigned\scorrectly\seven\sif\sSQLITE_ENABLE_8_3_NAMES\sis\sdefined. +D 2011-12-12T19:48:43.750 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -166,7 +166,7 @@ F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9 F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 -F src/os_unix.c 07dcae2de5f1aab27a16e6c6fc89fe1bb134026e +F src/os_unix.c dcb42d74044efcf760c3c03c668e9e7314aa2427 F src/os_win.c 8af100f78f157eb6185fd9153d7f35b829c4da04 F src/pager.c d981f3bfcc0e4460537d983899620700ccf8f539 F src/pager.h 5cd760857707529b403837d813d86b68938d6183 @@ -979,7 +979,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 713071c493e9937a20c436b07299df428249e378 -R a7073a245182348c2b23e6c1f035f042 +P ee1e012256ae8010b6b6c4895a74b6883f20e73c +R 6f54deb234c6e01cb7083112d4738ce0 U dan -Z 56d8f5d800b0598a435509f86c8ead65 +Z 1fe68808d0e2249c5544c1978ff3d49d diff --git a/manifest.uuid b/manifest.uuid index 88b7f467c1..a794f24ca6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ee1e012256ae8010b6b6c4895a74b6883f20e73c \ No newline at end of file +169e12295cca701443746b1209bd6a7714fd8988 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 0f003fc499..51778c861f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4899,7 +4899,7 @@ static int findCreateFileMode( */ nDb = sqlite3Strlen30(zPath) - 1; #ifdef SQLITE_ENABLE_8_3_NAMES - while( nDb>0 && !sqlite3Isalnum(zPath[nDb]) ) nDb--; + while( nDb>0 && sqlite3Isalnum(zPath[nDb]) ) nDb--; if( nDb==0 || zPath[nDb]!='-' ) return SQLITE_OK; #else while( zPath[nDb]!='-' ){