From: drh <> Date: Tue, 9 Sep 2025 19:00:55 +0000 (+0000) Subject: If open files in VxWorks, do not unlink the file unless the file was marked X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7f190b8e1138a270d311c9b2c2125faf3ae3cc3;p=thirdparty%2Fsqlite.git If open files in VxWorks, do not unlink the file unless the file was marked as delete-on-close. FossilOrigin-Name: bb6114dbbf3bfbea57cd9be21666299663e94576b0175f6aeefd1d0f7107398e --- diff --git a/manifest b/manifest index 1d6181ed63..e572aaba4b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sallow\sattempts\sto\sopen\sfiles\sin\sVxWorks\sunless\sthe\sfull\spathname\sis\nprovided. -D 2025-09-09T17:39:28.868 +C If\sopen\sfiles\sin\sVxWorks,\sdo\snot\sunlink\sthe\sfile\sunless\sthe\sfile\swas\smarked\nas\sdelete-on-close. +D 2025-09-09T19:00:55.004 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -726,7 +726,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c f04137f2d709048c2c22384bdbbe594be36d84f88a0c4b06b666d8c71bf87d42 +F src/os_unix.c 7210cc026cbe8a5da0258dc9eb005cf24074ad770ab368bff7e70dc3db4ed75a F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19 F src/pager.c ee48e0cc9ae4abfd7c37b838bff62a14d520a9fa311007fa57929ac7cc5d609c @@ -2174,8 +2174,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P cb880145d899832cca0612b89024a54d188ed706600fa812ea74587d69c261be -R d6116e7a1ac97419abe73b087e6a1104 +P 4720205249214c01f6e63738e4927c0f53c853346cc2dfa45522aaa469f4d702 +R 28cd361ab09796e13d6919ca761a942b U drh -Z 149c7f76da9dbd587256f92be3d9fd4f +Z 60929786cacc94424cefe1a0e89c6c19 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index de9b9fdbe2..2676409b74 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4720205249214c01f6e63738e4927c0f53c853346cc2dfa45522aaa469f4d702 +bb6114dbbf3bfbea57cd9be21666299663e94576b0175f6aeefd1d0f7107398e diff --git a/src/os_unix.c b/src/os_unix.c index ec644c447d..c5489f0023 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5986,8 +5986,9 @@ static int fillInUnixFile( robust_close(pNew, h, __LINE__); h = -1; } - osUnlink(zFilename); - pNew->ctrlFlags |= UNIXFILE_DELETE; + if( pNew->ctrlFlags & UNIXFILE_DELETE ){ + osUnlink(zFilename); + } if( pNew->pId ){ vxworksReleaseFileId(pNew->pId); pNew->pId = 0;