From: drh <> Date: Fri, 30 Sep 2022 20:53:36 +0000 (+0000) Subject: Fix a bug in the demoDelete fix from [d76a301e22e05722]. X-Git-Tag: version-3.40.0~189 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d3261fe86fe44db2e5c7c1b2c2c9a1631f4a6c3;p=thirdparty%2Fsqlite.git Fix a bug in the demoDelete fix from [d76a301e22e05722]. FossilOrigin-Name: 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 --- diff --git a/manifest b/manifest index 184fbf3db6..6bb1c440b2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sNEVER()\sto\stwo\serror-detection\stests\sthat\swere\smade\sunreachable\sby\nthe\sprevious\scheck-in. -D 2022-09-30T20:48:22.942 +C Fix\sa\sbug\sin\sthe\sdemoDelete\sfix\sfrom\s[d76a301e22e05722]. +D 2022-09-30T20:53:36.120 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f -F src/test_demovfs.c 7b3be8cdf07d00f025309fbb2453cb5f0fd9ed74f40543c7f4353dcac2879aa7 +F src/test_demovfs.c 7cc7623d1025d1e92c51da20fd25060759733b7a356a121545a3b7d2faa8a0f1 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a24e46804893a7e6e8f3130abca882f9a3aa3b7b2b82aa39a0a20856172766d5 -R 8bfaaa610b5d0f34ae8d80b099fa1f85 +P 5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 +R 6c12ece1941670ef2f49e367d800c0c1 U drh -Z 2f23c91e3b0fb20186493d1c2a872ed4 +Z 385aaa082b1d75a68fdcc7e487d480fa # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 76127b97a2..a127fb8b80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5166acf3f00404597e77910aee88920ab833af8447766f50bf4f70525606cf95 \ No newline at end of file +7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 \ No newline at end of file diff --git a/src/test_demovfs.c b/src/test_demovfs.c index 49f2814464..29307675bd 100644 --- a/src/test_demovfs.c +++ b/src/test_demovfs.c @@ -468,7 +468,7 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ /* Figure out the directory name from the path of the file deleted. */ sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath); zDir[MAXPATHNAME] = '\0'; - zSlash = strrchr(zPath,'/'); + zSlash = strrchr(zDir,'/'); if( zSlash ){ /* Open a file-descriptor on the directory. Sync. Close. */ zSlash[0] = 0;