/ Check-in [ec55e8c6]
Login

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

Overview
Comment:Fix bugs in [7b6e30e6a7] that only show up on Mac.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ec55e8c6bb4f2419b3813aa2fd1a20d8f5016159
User & Date: drh 2011-03-02 17:54:32
Context
2011-03-02
22:07
Fix quoting of the result in rtreeB.test. check-in: c6532b35 user: drh tags: trunk
18:01
Add more system calls to the set that can be overridden in os_unix.c. Also merge in recent fixes from trunk. check-in: 80fac2a6 user: drh tags: syscall-override
17:54
Fix bugs in [7b6e30e6a7] that only show up on Mac. check-in: ec55e8c6 user: drh tags: trunk
15:44
Make sure the rtreenode() testing and analysis routine in the RTREE extension can handle 64-bit rowids. This fix is in response to a message on the mailing list. check-in: 24602557 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  5802   5802           rc = unixWrite((sqlite3_file *)conchFile, writeBuffer, writeSize, 0);
  5803   5803           fsync(conchFile->h);
  5804   5804           /* If we created a new conch file (not just updated the contents of a 
  5805   5805            ** valid conch file), try to match the permissions of the database 
  5806   5806            */
  5807   5807           if( rc==SQLITE_OK && createConch ){
  5808   5808             struct stat buf;
  5809         -          int rc;
  5810   5809             int err = fstat(pFile->h, &buf);
  5811   5810             if( err==0 ){
  5812   5811               mode_t cmode = buf.st_mode&(S_IRUSR|S_IWUSR | S_IRGRP|S_IWGRP |
  5813   5812                                           S_IROTH|S_IWOTH);
  5814   5813               /* try to match the database file R/W permissions, ignore failure */
  5815   5814   #ifndef SQLITE_PROXY_DEBUG
  5816   5815               fchmod(conchFile->h, cmode);
................................................................................
  5835   5834         }
  5836   5835         conchFile->pMethod->xUnlock((sqlite3_file*)conchFile, SHARED_LOCK);
  5837   5836         
  5838   5837       end_takeconch:
  5839   5838         OSTRACE(("TRANSPROXY: CLOSE  %d\n", pFile->h));
  5840   5839         if( rc==SQLITE_OK && pFile->openFlags ){
  5841   5840           if( pFile->h>=0 ){
  5842         -          robust_close(pFile, pFile->h, __LINE__) ){
         5841  +          robust_close(pFile, pFile->h, __LINE__);
  5843   5842           }
  5844   5843           pFile->h = -1;
  5845   5844           int fd = open(pCtx->dbPath, pFile->openFlags,
  5846   5845                         SQLITE_DEFAULT_FILE_PERMISSIONS);
  5847   5846           OSTRACE(("TRANSPROXY: OPEN  %d\n", fd));
  5848   5847           if( fd>=0 ){
  5849   5848             pFile->h = fd;