database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

Update the cygwin interface to use the newer 1.7 APIs instead of the

Browse Source 
1.5 APIs.  Also shorten over-length source code lines in os_win.c.

FossilOrigin-Name: 6b2838336a31e34c540210ccc9c934d4ba94757c
This commit is contained in:
drh
2013-03-01 23:24:04 +00:00
parent 6e8a54fbd2
commit 1488052d38
3 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Prevent\sTcl\sfile\sencoding\sissues\sin\sthe\stests\sfor\sthe\sunicode()\sand\schar()\sfunctions. C Update\sthe\scygwin\sinterface\sto\suse\sthe\snewer\s1.7\sAPIs\sinstead\sof\sthe\n1.5\sAPIs.\s\sAlso\sshorten\sover-length\ssource\scode\slines\sin\sos_win.c.
D 2013-03-01T23:13:37.546 D 2013-03-01T23:24:04.416
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -161,7 +161,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c 8964f621aaab1f2c9804fbbff4450d9811ef5548 F src/os_unix.c 8964f621aaab1f2c9804fbbff4450d9811ef5548
F src/os_win.c eabd00b813577d36bd66271cb08dd64ea0589dac F src/os_win.c f7da4dc0a2545c0a430080380809946ae4d676d6
F src/pager.c 9e51c2a37a2f2c3ed4689c25204e2977b5450ac0 F src/pager.c 9e51c2a37a2f2c3ed4689c25204e2977b5450ac0
F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
@@ -1036,7 +1036,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P f476eace86102fd5442cfbba169c18f6ee44eae2 d2e7dfca5a92074a7984032deb6a4e3681389c72 P c9c2b82c86fff457a0b32d5be84ec66639065ae1
R 8f643957234789baf5ec785ee72ea00a R f939bbf001afa25b994d8ca6deefd57b
U mistachkin U drh
Z d27776955493f492e2d5a7d687e61dbc Z d24cb65108217f32a1099dd98d4c4743

2
manifest.uuid
View File

@@ -1 +1 @@
c9c2b82c86fff457a0b32d5be84ec66639065ae1 6b2838336a31e34c540210ccc9c934d4ba94757c

47
src/os_win.c
View File

@@ -1838,7 +1838,8 @@ static BOOL winceLockFile(
} }
/* Want a pending lock? */ /* Want a pending lock? */
else if (dwFileOffsetLow == (DWORD)PENDING_BYTE && nNumberOfBytesToLockLow == 1){ else if (dwFileOffsetLow == (DWORD)PENDING_BYTE
&& nNumberOfBytesToLockLow == 1){
/* If no pending lock has been acquired, then acquire it */ /* If no pending lock has been acquired, then acquire it */
if (pFile->shared->bPending == 0) { if (pFile->shared->bPending == 0) {
pFile->shared->bPending = TRUE; pFile->shared->bPending = TRUE;
@@ -1848,7 +1849,8 @@ static BOOL winceLockFile(
} }
/* Want a reserved lock? */ /* Want a reserved lock? */
else if (dwFileOffsetLow == (DWORD)RESERVED_BYTE && nNumberOfBytesToLockLow == 1){ else if (dwFileOffsetLow == (DWORD)RESERVED_BYTE
&& nNumberOfBytesToLockLow == 1){
if (pFile->shared->bReserved == 0) { if (pFile->shared->bReserved == 0) {
pFile->shared->bReserved = TRUE; pFile->shared->bReserved = TRUE;
pFile->local.bReserved = TRUE; pFile->local.bReserved = TRUE;
@@ -1891,7 +1893,8 @@ static BOOL winceUnlockFile(
/* Did we just have a reader lock? */ /* Did we just have a reader lock? */
else if (pFile->local.nReaders){ else if (pFile->local.nReaders){
assert(nNumberOfBytesToUnlockLow == (DWORD)SHARED_SIZE || nNumberOfBytesToUnlockLow == 1); assert(nNumberOfBytesToUnlockLow == (DWORD)SHARED_SIZE
|| nNumberOfBytesToUnlockLow == 1);
pFile->local.nReaders --; pFile->local.nReaders --;
if (pFile->local.nReaders == 0) if (pFile->local.nReaders == 0)
{ {
@@ -1902,7 +1905,8 @@ static BOOL winceUnlockFile(
} }
/* Releasing a pending lock */ /* Releasing a pending lock */
else if (dwFileOffsetLow == (DWORD)PENDING_BYTE && nNumberOfBytesToUnlockLow == 1){ else if (dwFileOffsetLow == (DWORD)PENDING_BYTE
&& nNumberOfBytesToUnlockLow == 1){
if (pFile->local.bPending){ if (pFile->local.bPending){
pFile->local.bPending = FALSE; pFile->local.bPending = FALSE;
pFile->shared->bPending = FALSE; pFile->shared->bPending = FALSE;
@@ -1910,7 +1914,8 @@ static BOOL winceUnlockFile(
} }
} }
/* Releasing a reserved lock */ /* Releasing a reserved lock */
else if (dwFileOffsetLow == (DWORD)RESERVED_BYTE && nNumberOfBytesToUnlockLow == 1){ else if (dwFileOffsetLow == (DWORD)RESERVED_BYTE
&& nNumberOfBytesToUnlockLow == 1){
if (pFile->local.bReserved) { if (pFile->local.bReserved) {
pFile->local.bReserved = FALSE; pFile->local.bReserved = FALSE;
pFile->shared->bReserved = FALSE; pFile->shared->bReserved = FALSE;
@@ -3073,7 +3078,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
rc = winOpen(pDbFd->pVfs, rc = winOpen(pDbFd->pVfs,
pShmNode->zFilename, /* Name of the file (UTF-8) */ pShmNode->zFilename, /* Name of the file (UTF-8) */
(sqlite3_file*)&pShmNode->hFile, /* File handle here */ (sqlite3_file*)&pShmNode->hFile, /* File handle here */
SQLITE_OPEN_WAL | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, /* Mode flags */ SQLITE_OPEN_WAL | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
0); 0);
if( SQLITE_OK!=rc ){ if( SQLITE_OK!=rc ){
goto shm_open_err; goto shm_open_err;
@@ -3827,7 +3832,9 @@ static int winOpen(
sqlite3_free(zConverted); sqlite3_free(zConverted);
if( isReadWrite && !isExclusive ){ if( isReadWrite && !isExclusive ){
return winOpen(pVfs, zName, id, return winOpen(pVfs, zName, id,
((flags|SQLITE_OPEN_READONLY)&~(SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE)), pOutFlags); ((flags|SQLITE_OPEN_READONLY) &
~(SQLITE_OPEN_CREATE|SQLITE_OPEN_READWRITE)),
pOutFlags);
}else{ }else{
return SQLITE_CANTOPEN_BKPT; return SQLITE_CANTOPEN_BKPT;
} }
@@ -3910,7 +3917,8 @@ static int winDelete(
attr = sAttrData.dwFileAttributes; attr = sAttrData.dwFileAttributes;
}else{ }else{
lastErrno = osGetLastError(); lastErrno = osGetLastError();
if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){ if( lastErrno==ERROR_FILE_NOT_FOUND
|| lastErrno==ERROR_PATH_NOT_FOUND ){
rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
}else{ }else{
rc = SQLITE_ERROR; rc = SQLITE_ERROR;
@@ -3922,7 +3930,8 @@ static int winDelete(
#endif #endif
if ( attr==INVALID_FILE_ATTRIBUTES ){ if ( attr==INVALID_FILE_ATTRIBUTES ){
lastErrno = osGetLastError(); lastErrno = osGetLastError();
if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){ if( lastErrno==ERROR_FILE_NOT_FOUND
|| lastErrno==ERROR_PATH_NOT_FOUND ){
rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
}else{ }else{
rc = SQLITE_ERROR; rc = SQLITE_ERROR;
@@ -3949,7 +3958,8 @@ static int winDelete(
attr = osGetFileAttributesA(zConverted); attr = osGetFileAttributesA(zConverted);
if ( attr==INVALID_FILE_ATTRIBUTES ){ if ( attr==INVALID_FILE_ATTRIBUTES ){
lastErrno = osGetLastError(); lastErrno = osGetLastError();
if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){ if( lastErrno==ERROR_FILE_NOT_FOUND
|| lastErrno==ERROR_PATH_NOT_FOUND ){
rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
}else{ }else{
rc = SQLITE_ERROR; rc = SQLITE_ERROR;
@@ -4117,16 +4127,12 @@ static int winFullPathname(
*/ */
char zOut[MAX_PATH+1]; char zOut[MAX_PATH+1];
memset(zOut, 0, MAX_PATH+1); memset(zOut, 0, MAX_PATH+1);
cygwin_conv_to_win32_path(zRelative, zOut); /* POSIX to Win32 */ cygwin_conv_path(CCP_POSIX_TO_WIN_A|CCP_RELATIVE, zRelative, zOut,
MAX_PATH+1);
sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s\\%s", sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s\\%s",
sqlite3_data_directory, zOut); sqlite3_data_directory, zOut);
}else{ }else{
/* cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull);
** NOTE: The Cygwin docs state that the maximum length needed
** for the buffer passed to cygwin_conv_to_full_win32_path
** is MAX_PATH.
*/
cygwin_conv_to_full_win32_path(zRelative, zFull);
} }
return SQLITE_OK; return SQLITE_OK;
#endif #endif
@@ -4284,9 +4290,9 @@ static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
getLastErrorMsg(osGetLastError(), nBuf, zBufOut); getLastErrorMsg(osGetLastError(), nBuf, zBufOut);
} }
static void (*winDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol))(void){ static void (*winDlSym(sqlite3_vfs *pVfs,void *pH,const char *zSym))(void){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
return (void(*)(void))osGetProcAddressA((HANDLE)pHandle, zSymbol); return (void(*)(void))osGetProcAddressA((HANDLE)pH, zSym);
} }
static void winDlClose(sqlite3_vfs *pVfs, void *pHandle){ static void winDlClose(sqlite3_vfs *pVfs, void *pHandle){
UNUSED_PARAMETER(pVfs); UNUSED_PARAMETER(pVfs);
@@ -4384,7 +4390,8 @@ static int winCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *piNow){
#endif #endif
/* 2^32 - to avoid use of LL and warnings in gcc */ /* 2^32 - to avoid use of LL and warnings in gcc */
static const sqlite3_int64 max32BitValue = static const sqlite3_int64 max32BitValue =
(sqlite3_int64)2000000000 + (sqlite3_int64)2000000000 + (sqlite3_int64)294967296; (sqlite3_int64)2000000000 + (sqlite3_int64)2000000000 +
(sqlite3_int64)294967296;
#if SQLITE_OS_WINCE #if SQLITE_OS_WINCE
SYSTEMTIME time; SYSTEMTIME time;