Fossil SCM
Cherrypick SQLite [http://www.sqlite.org/src/info/c43b59dac1|c43b59dac1]: Correct the VFS name as reported by the file control when explicitly using the 'win32-longpath' VFS
Commit
242e0b81c95b96f221f2fce339fbd68a47d3475f
Parent
26362ef00221879…
1 file changed
+1
-1
+1
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -34081,11 +34081,11 @@ | ||
| 34081 | 34081 | winModeBit(pFile, WINFILE_PSOW, (int*)pArg); |
| 34082 | 34082 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34083 | 34083 | return SQLITE_OK; |
| 34084 | 34084 | } |
| 34085 | 34085 | case SQLITE_FCNTL_VFSNAME: { |
| 34086 | - *(char**)pArg = sqlite3_mprintf("win32"); | |
| 34086 | + *(char**)pArg = sqlite3_mprintf("%s", pFile->pVfs->zName); | |
| 34087 | 34087 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34088 | 34088 | return SQLITE_OK; |
| 34089 | 34089 | } |
| 34090 | 34090 | case SQLITE_FCNTL_WIN32_AV_RETRY: { |
| 34091 | 34091 | int *a = (int*)pArg; |
| 34092 | 34092 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -34081,11 +34081,11 @@ | |
| 34081 | winModeBit(pFile, WINFILE_PSOW, (int*)pArg); |
| 34082 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34083 | return SQLITE_OK; |
| 34084 | } |
| 34085 | case SQLITE_FCNTL_VFSNAME: { |
| 34086 | *(char**)pArg = sqlite3_mprintf("win32"); |
| 34087 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34088 | return SQLITE_OK; |
| 34089 | } |
| 34090 | case SQLITE_FCNTL_WIN32_AV_RETRY: { |
| 34091 | int *a = (int*)pArg; |
| 34092 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -34081,11 +34081,11 @@ | |
| 34081 | winModeBit(pFile, WINFILE_PSOW, (int*)pArg); |
| 34082 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34083 | return SQLITE_OK; |
| 34084 | } |
| 34085 | case SQLITE_FCNTL_VFSNAME: { |
| 34086 | *(char**)pArg = sqlite3_mprintf("%s", pFile->pVfs->zName); |
| 34087 | OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h)); |
| 34088 | return SQLITE_OK; |
| 34089 | } |
| 34090 | case SQLITE_FCNTL_WIN32_AV_RETRY: { |
| 34091 | int *a = (int*)pArg; |
| 34092 |