Fossil SCM
Cherry-pick [http://www.sqlite.org/src/info/f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd|f01d42cc8b]: Minor change to unixDelete for VxWorks with a DOS filesystem.
Commit
119cc97040a4e3da0a7f8fa31d9cd6b116aa22a7
Parent
a3cf0e3390e23fc…
2 files changed
+5
-1
+5
-1
+5
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -30152,11 +30152,15 @@ | ||
| 30152 | 30152 | ){ |
| 30153 | 30153 | int rc = SQLITE_OK; |
| 30154 | 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | - if( errno==ENOENT ){ | |
| 30157 | + if( errno==ENOENT | |
| 30158 | +#if OS_VXWORKS | |
| 30159 | + || errno==0x380003 | |
| 30160 | +#endif | |
| 30161 | + ){ | |
| 30158 | 30162 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30159 | 30163 | }else{ |
| 30160 | 30164 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30161 | 30165 | } |
| 30162 | 30166 | return rc; |
| 30163 | 30167 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -30152,11 +30152,15 @@ | |
| 30152 | ){ |
| 30153 | int rc = SQLITE_OK; |
| 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | if( errno==ENOENT ){ |
| 30158 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30159 | }else{ |
| 30160 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30161 | } |
| 30162 | return rc; |
| 30163 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -30152,11 +30152,15 @@ | |
| 30152 | ){ |
| 30153 | int rc = SQLITE_OK; |
| 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | if( errno==ENOENT |
| 30158 | #if OS_VXWORKS |
| 30159 | || errno==0x380003 |
| 30160 | #endif |
| 30161 | ){ |
| 30162 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30163 | }else{ |
| 30164 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30165 | } |
| 30166 | return rc; |
| 30167 |
+5
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -30152,11 +30152,15 @@ | ||
| 30152 | 30152 | ){ |
| 30153 | 30153 | int rc = SQLITE_OK; |
| 30154 | 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | - if( errno==ENOENT ){ | |
| 30157 | + if( errno==ENOENT | |
| 30158 | +#if OS_VXWORKS | |
| 30159 | + || errno==0x380003 | |
| 30160 | +#endif | |
| 30161 | + ){ | |
| 30158 | 30162 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30159 | 30163 | }else{ |
| 30160 | 30164 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30161 | 30165 | } |
| 30162 | 30166 | return rc; |
| 30163 | 30167 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -30152,11 +30152,15 @@ | |
| 30152 | ){ |
| 30153 | int rc = SQLITE_OK; |
| 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | if( errno==ENOENT ){ |
| 30158 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30159 | }else{ |
| 30160 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30161 | } |
| 30162 | return rc; |
| 30163 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -30152,11 +30152,15 @@ | |
| 30152 | ){ |
| 30153 | int rc = SQLITE_OK; |
| 30154 | UNUSED_PARAMETER(NotUsed); |
| 30155 | SimulateIOError(return SQLITE_IOERR_DELETE); |
| 30156 | if( osUnlink(zPath)==(-1) ){ |
| 30157 | if( errno==ENOENT |
| 30158 | #if OS_VXWORKS |
| 30159 | || errno==0x380003 |
| 30160 | #endif |
| 30161 | ){ |
| 30162 | rc = SQLITE_IOERR_DELETE_NOENT; |
| 30163 | }else{ |
| 30164 | rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); |
| 30165 | } |
| 30166 | return rc; |
| 30167 |