]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
The xFullPathname method of the unix VFS now normalizes the filenames by
authordrh <drh@noemail.net>
Thu, 19 Nov 2020 21:12:08 +0000 (21:12 +0000)
committerdrh <drh@noemail.net>
Thu, 19 Nov 2020 21:12:08 +0000 (21:12 +0000)
omitting surplus "/", "/./" and "/../" strings.

FossilOrigin-Name: c38dec6f52c01614c1bee8356daf0fcd9f708d029116e9bff51e06719a730dde

1  2 
manifest
manifest.uuid
src/os_unix.c

diff --cc manifest
index 83d71f54b53b6b3568c766ee5cbf57d78ebcccd4,702a295477f401ab1b19863bf40559ba92bf5158..4fab75a14489c478246c3a25d445f0ad6d739c2d
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\san\sephemeral\stable\srather\sthan\sa\sRowSet\sto\sremember\srowids\sin\sthe\ntwo-pass\sUPDATE\salgorithm,\sas\sthis\suses\smuch\sless\smemory\sfor\slarge\sUPDATEs.
- D 2020-11-19T19:43:46.382
 -C More\stest\scase\schanges\sso\sthat\sshared-cache\smode\stests\sall\swork\nwith\snormalized\sdatabase\snames.
 -D 2020-11-19T21:01:11.755
++C The\sxFullPathname\smethod\sof\sthe\sunix\sVFS\snow\snormalizes\sthe\sfilenames\sby\nomitting\ssurplus\s"/",\s"/./"\sand\s"/../"\sstrings.
++D 2020-11-19T21:12:08.560
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -522,7 -521,7 +522,7 @@@ F src/os.c 80e4cf3e5da06be03ca641661e33
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c c19f392825f4787dbdff2637371ba2210eef8aecfc268509c7aafa9beea3a653
 -F src/os_unix.c cd1ff5c1e49e8d9869a689ac40e626cb91c4f4a0aedb3c03bfaa22e6cfff12e2
++F src/os_unix.c 7c42aa79024d259635a6e5099b03276942bed7d33fc2e5f76f71445042977f10
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 3700a1c55427a3d4168ad1f1b8a8b0cb9ace1d107e4506e30a8f1e66d8a1195e
@@@ -1885,8 -1883,7 +1885,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 849e4e14fd06eda512381f5f8aa65f75ad0a955e835da7c63526a53cf5e8f4dc df8ce2675b070fcdc338918e7652a26ffc90439fe399ceac206fadf8a93a681f
- R 5b0ca35860159e705bbb48c4cfa88f5f
- T +closed df8ce2675b070fcdc338918e7652a26ffc90439fe399ceac206fadf8a93a681f
 -P e85d32ac6c82d39f5dc9b28f881d5d72f5e5a7e16df12c19315bfa8edea1b0b4
 -R d6f4d784be7bd5d8f9c2ac433021e94e
++P 842c432772e6cd8464cdb7bfdb38789adeea9aa9e0486d4034cc9841f085f517 6f0d5f0949130a4688319adf05d37c5ccd683ca9ad2dacb7ce433a5fe18ac3c3
++R 9bca7f34bcf3572651c390350ebafdef
++T +closed 6f0d5f0949130a4688319adf05d37c5ccd683ca9ad2dacb7ce433a5fe18ac3c3
  U drh
- Z 0ac093dc2dc75a2b8780ce68ce6383a8
 -Z f744e95c5d535aa2faa8ffb35a575ff0
++Z 8c74c867e3ffdcd79c4ff4d10ad118b3
diff --cc manifest.uuid
index a5fa26bc927101dc14a837780bb0aeed539991a5,c7ad7d44cc0faf5609415ae47ae5580cc76cfb28..c187ecc61425aba5b1443fc8878901685ef55235
@@@ -1,1 -1,1 +1,1 @@@
- 842c432772e6cd8464cdb7bfdb38789adeea9aa9e0486d4034cc9841f085f517
 -6f0d5f0949130a4688319adf05d37c5ccd683ca9ad2dacb7ce433a5fe18ac3c3
++c38dec6f52c01614c1bee8356daf0fcd9f708d029116e9bff51e06719a730dde
diff --cc src/os_unix.c
Simple merge