From: drh <>
Date: Mon, 8 Sep 2025 18:45:58 +0000 (+0000)
Subject: In VxWorks, temporary filenames must be full absolute pathnames in order for
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91020438c09c01871a5761cd04061d689f9ef377;p=thirdparty%2Fsqlite.git

In VxWorks, temporary filenames must be full absolute pathnames in order for
vxworksFindFileId() to work.

FossilOrigin-Name: 1fc94becc5971812c3a91fb1410cb54f6ecb9e50da2d30863dc840cbf4e6c1f5
---

diff --git a/manifest b/manifest
index 7e96eb2f7a..fc0ad42184 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sability\sto\scompile\swith\s-DOS_VXWORKS=1\son\sLinux\ssystems,\sin\san\neffort\sto\sdebug\sthe\sVxWorks\scapabilities\swithout\sactually\shaving\sto\nrun\sVxWorks.
-D 2025-09-08T17:52:17.463
+C In\sVxWorks,\stemporary\sfilenames\smust\sbe\sfull\sabsolute\spathnames\sin\sorder\sfor\nvxworksFindFileId()\sto\swork.
+D 2025-09-08T18:45:58.689
 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 e5760f2c43c7d7cf9e409abe6ac82d0cd327c2d748f0d65e4a430ac8f5774dc6
+F src/os_unix.c cac4239af53a2db3cd3d53dcad66c733741160b0c2f4695529b5837f611f1140
 F src/os_win.c f81a7cffdfe8c593a840895b3f64290714f0186b06302d2c397012252d830374
 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 F src/pager.c ee48e0cc9ae4abfd7c37b838bff62a14d520a9fa311007fa57929ac7cc5d609c
@@ -2174,11 +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 4384ad8918801780f2660817dead919020423eb94aa880fff9b04f2d5f5d932f
-R 7d2fd16c23bb8e3e1ac21dbfa249e14f
-T *branch * vxworks
-T *sym-vxworks *
-T -sym-trunk *
+P c87e68d791215729fb513c651e77c6ef6bb260deff37ed2ab6e99b777271bdfe
+R 80e9f402d7a8c193e31c20e8dc8a9c4d
 U drh
-Z 67c601469857ad735371f6931571c137
+Z 7bd1420ecf42bd36a5fe0dd1d8cae4bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d15fa66b72..daf656800a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c87e68d791215729fb513c651e77c6ef6bb260deff37ed2ab6e99b777271bdfe
+1fc94becc5971812c3a91fb1410cb54f6ecb9e50da2d30863dc840cbf4e6c1f5
diff --git a/src/os_unix.c b/src/os_unix.c
index 27f3d0b5a9..12cb61eb58 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6029,6 +6029,9 @@ static const char *unixTempFileDir(void){
 
   while(1){
     if( zDir!=0
+#if OS_VXWORKS
+     && zDir[0]=='/'
+#endif
      && osStat(zDir, &buf)==0
      && S_ISDIR(buf.st_mode)
      && osAccess(zDir, 03)==0
@@ -6543,8 +6546,11 @@ static int unixOpen(
   }
 #endif
 
-  assert( zPath==0 || zPath[0]=='/'
-      || eType==SQLITE_OPEN_SUPER_JOURNAL || eType==SQLITE_OPEN_MAIN_JOURNAL
+  assert( zPath==0
+       || zPath[0]=='/'
+       || eType==SQLITE_OPEN_SUPER_JOURNAL
+       || eType==SQLITE_OPEN_MAIN_JOURNAL
+       || eType==SQLITE_OPEN_TEMP_JOURNAL
   );
   rc = fillInUnixFile(pVfs, fd, pFile, zPath, ctrlFlags);