/ Check-in [2b35c514]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix an issue with finding the access permissions of journal files when 8+3 filenames are in use.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2b35c5144ddcc2ed6d0fcaa8c0ba5d20b9487be7
User & Date: drh 2011-10-20 18:23:35
Context
2011-10-21
14:27
If an error occurs while writing to the database file during a VACUUM, discard the contents of the in-memory cache. This is required as if the database is a zipvfs database, the contents of the cache may be inconsistent with respect to the database as stored on disk. check-in: 07159e84 user: dan tags: trunk
2011-10-20
18:23
Fix an issue with finding the access permissions of journal files when 8+3 filenames are in use. check-in: 2b35c514 user: drh tags: trunk
00:55
Enhancements to the omittest.tcl script used to verify that the SQLITE_OMIT compile-time options are working. check-in: 4344483f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  4870   4870       ** the following naming conventions:
  4871   4871       **
  4872   4872       **   "<path to db>-journal"
  4873   4873       **   "<path to db>-wal"
  4874   4874       **   "<path to db>-journalNN"
  4875   4875       **   "<path to db>-walNN"
  4876   4876       **
  4877         -    ** where NN is a 4 digit decimal number. The NN naming schemes are 
         4877  +    ** where NN is a decimal number. The NN naming schemes are 
  4878   4878       ** used by the test_multiplex.c module.
  4879   4879       */
  4880   4880       nDb = sqlite3Strlen30(zPath) - 1; 
  4881   4881   #ifdef SQLITE_ENABLE_8_3_NAMES
  4882         -    while( nDb>0 && zPath[nDb]!='-' && zPath[nDb]!='/' ) nDb--;
  4883         -    if( nDb==0 || zPath[nDb]=='/' ) return SQLITE_OK;
         4882  +    while( nDb>0 && !sqlite3Isalnum(zPath[nDb]) ) nDb--;
         4883  +    if( nDb==0 || zPath[nDb]!='-' ) return SQLITE_OK;
  4884   4884   #else
  4885   4885       while( zPath[nDb]!='-' ){
  4886   4886         assert( nDb>0 );
  4887   4887         assert( zPath[nDb]!='\n' );
  4888   4888         nDb--;
  4889   4889       }
  4890   4890   #endif