From: drh Date: Wed, 13 Aug 2014 11:39:42 +0000 (+0000) Subject: Minor change to unixDelete for VxWorks with a DOS filesystem. X-Git-Tag: version-3.8.6~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd9455457a5d752399c288f203439f8ce3105c13;p=thirdparty%2Fsqlite.git Minor change to unixDelete for VxWorks with a DOS filesystem. FossilOrigin-Name: f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd --- diff --git a/manifest b/manifest index 8f0418df43..2718e0bc1a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\swhere9.test\sso\sthat\sit\sworks\swith\sthe\s"no_optimization"\spermutation. -D 2014-08-12T20:13:22.252 +C Minor\schange\sto\sunixDelete\sfor\sVxWorks\swith\sa\sDOS\sfilesystem. +D 2014-08-13T11:39:42.875 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -207,7 +207,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa -F src/os_unix.c 119f4f1fb94e74373d53e4946d33e4bc31e91b26 +F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542 F src/os_win.c 1c936c7b0659d0eb12b868e2cd710a570e78873e F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8 @@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 6715991296886c2a02b9a285a1e61189ad1f79c0 -R 710d8f15d7faf7079d5cbb8c78df8572 -U dan -Z 37c0d23955a964bca892f819d09ecb97 +P d46adf9d8f741838b9c30f915231d6a3986c3591 +R 0bcddbf637a1ae28dd56c0df43bdd1a6 +U drh +Z a0023172094bb1f589643de5ae500c6e diff --git a/manifest.uuid b/manifest.uuid index e6ce5cc412..12fc1aa48f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d46adf9d8f741838b9c30f915231d6a3986c3591 \ No newline at end of file +f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index d8b5db7680..b1a0bedcff 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5883,7 +5883,11 @@ static int unixDelete( UNUSED_PARAMETER(NotUsed); SimulateIOError(return SQLITE_IOERR_DELETE); if( osUnlink(zPath)==(-1) ){ - if( errno==ENOENT ){ + if( errno==ENOENT +#if OS_VXWORKS + || errno==0x380003 +#endif + ){ rc = SQLITE_IOERR_DELETE_NOENT; }else{ rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath);