mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tool/showwal.c so that it handles WAL files that contain 64KiB pages.

Browse Source 
FossilOrigin-Name: 4060efb646c873c4abde7ab9ddf330489a44f274
This commit is contained in:
dan 2014-09-15 16:53:23 +00:00
parent ed7bcba798
commit b6dea49f3d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Avoid\sattempting\sto\scall\sthe\sxFetch()\smethod\sof\san\ssqlite3_io_methods\sobject\swith\sa\sversion\snumber\sless\sthan\s3. C Fix\stool/showwal.c\sso\sthat\sit\shandles\sWAL\sfiles\sthat\scontain\s64KiB\spages.
D 2014-09-15T16:50:34.423 D 2014-09-15T16:53:23.593
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -1179,7 +1179,7 @@ F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
F tool/showdb.c bd073a78bce714a0e42d92ea474b3eb8cb53be5d F tool/showdb.c bd073a78bce714a0e42d92ea474b3eb8cb53be5d
F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5 F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f
F tool/showwal.c 3209120269cdf9380f091459e47b776b4f81dfd3 F tool/showwal.c 85cb36d4fe3e93e2fbd63e786e0d1ce42d0c4fad
F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
F tool/spaceanal.tcl 8e50b217c56a6a086a1b47eac9d09c5cd65b996f F tool/spaceanal.tcl 8e50b217c56a6a086a1b47eac9d09c5cd65b996f
@ -1198,7 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 69a64560777f85b47349b4b2aab01dc99298592e P dedaa6fb3d2e6e697d4a48649af5f42d9a11c333
R 41452df15ff1b435df3a846f31103df4 R 9c897c2b35082efdf1b1cdba3d9a6e48
U dan U dan
Z 356b29f991ba0eb562f8fca4ef2b2ea4 Z fbf2bdf01c7200ebedc4b699448a8435

2
manifest.uuid
View File

@ -1 +1 @@
dedaa6fb3d2e6e697d4a48649af5f42d9a11c333 4060efb646c873c4abde7ab9ddf330489a44f274

8
tool/showwal.c
View File

@ -510,7 +510,7 @@ static void decode_btree_page(
int main(int argc, char **argv){ int main(int argc, char **argv){
struct stat sbuf; struct stat sbuf;
unsigned char zPgSz[2]; unsigned char zPgSz[4];
if( argc<2 ){ if( argc<2 ){
fprintf(stderr,"Usage: %s FILENAME ?PAGE? ...\n", argv[0]); fprintf(stderr,"Usage: %s FILENAME ?PAGE? ...\n", argv[0]);
exit(1); exit(1);
@ -522,9 +522,9 @@ int main(int argc, char **argv){
} }
zPgSz[0] = 0; zPgSz[0] = 0;
zPgSz[1] = 0; zPgSz[1] = 0;
lseek(fd, 10, SEEK_SET); lseek(fd, 8, SEEK_SET);
read(fd, zPgSz, 2); read(fd, zPgSz, 4);
pagesize = zPgSz[0]*256 + zPgSz[1]; pagesize = zPgSz[1]*65536 + zPgSz[2]*256 + zPgSz[3];
if( pagesize==0 ) pagesize = 1024; if( pagesize==0 ) pagesize = 1024;
printf("Pagesize: %d\n", pagesize); printf("Pagesize: %d\n", pagesize);
fstat(fd, &sbuf); fstat(fd, &sbuf);