diff --git a/manifest b/manifest index 7245780fcf..f3dd4563d3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\shandling\sof\ssqlite3OsTruncate\sby\sthe\stest_async.c\sdemo.\nAdded\strans.test\sto\sthe\ssuite\sof\stests\sfor\sasychronous\sI/O.\s(CVS\s3091) -D 2006-02-13T18:35:06 +C Disable\sthe\s/./\sand\s/../\scollapser\slogic\sin\ssqlite3OsFullPathname\sunder\sUnix.\s(CVS\s3092) +D 2006-02-13T18:42:21 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -55,7 +55,7 @@ F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78 F src/os_common.h 108cd719c96a2b714b64e02aeabbd40684274e6a F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 -F src/os_unix.c 7604ea2bdb447c1f87ca9f5103e452b9cd1cbd1d +F src/os_unix.c 365edd498b0fac097be5490b85fdb5ed7807691a F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c c67a2c46d929cf54c8f80ec5e6079cf684a141a9 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b @@ -105,7 +105,7 @@ F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7 F test/altermalloc.test 6e1f404ec021eb2ba6582e3c77b0a35cf206b7af F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0 -F test/async.test f1c74c05949e9c84e07483e960dc2bb41f82a322 +F test/async.test eb14d928f45e078df9a8927ae9a0b4bcff981db1 F test/attach.test 036315207c477211470168bf121b1c493f781515 F test/attach2.test 0e6a7c54343c85dd877a1e86073a05176043ed40 F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe @@ -352,7 +352,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 42379c623073eb541d053c2dff9f49087fb290f8 -R 330ce6786fd3253716ec7a53675d8402 +P 5b16c43542194d6c736bf7aadaaa7f31ff12af31 +R 831835406768778b86263965c0d8f6b6 U drh -Z 0f6750cc1b9da8a55632afa45dde9fa3 +Z 22bc2ca1978bf264cba39ec7791e0786 diff --git a/manifest.uuid b/manifest.uuid index da707a79bf..d19b181f02 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5b16c43542194d6c736bf7aadaaa7f31ff12af31 \ No newline at end of file +111a426b3e2fae77c9e6c3cd903fd80652b23720 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 6621625ac2..ce3101ed10 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1539,7 +1539,6 @@ static int unixClose(OsFile **pId){ */ char *sqlite3UnixFullPathname(const char *zRelative){ char *zFull = 0; - int i, j; if( zRelative[0]=='/' ){ sqlite3SetString(&zFull, zRelative, (char*)0); }else{ @@ -1552,11 +1551,14 @@ char *sqlite3UnixFullPathname(const char *zRelative){ (char*)0); sqliteFree(zBuf); } + +#if 0 /* ** Remove "/./" path elements and convert "/A/./" path elements ** to just "/". */ if( zFull ){ + int i, j; for(i=j=0; zFull[i]; i++){ if( zFull[i]=='/' ){ if( zFull[i+1]=='/' ) continue; @@ -1574,6 +1576,8 @@ char *sqlite3UnixFullPathname(const char *zRelative){ } zFull[j] = 0; } +#endif + return zFull; } diff --git a/test/async.test b/test/async.test index cd47b7c79c..d71878c2dd 100644 --- a/test/async.test +++ b/test/async.test @@ -6,7 +6,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: async.test,v 1.4 2006/02/13 18:35:06 drh Exp $ +# $Id: async.test,v 1.5 2006/02/13 18:42:21 drh Exp $ if {[catch {sqlite3async_enable}]} {