summaryrefslogtreecommitdiff
path: root/dist/Android.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dist/Android.patch')
-rw-r--r--dist/Android.patch35
1 files changed, 18 insertions, 17 deletions
diff --git a/dist/Android.patch b/dist/Android.patch
index 95cde52..5ff70a7 100644
--- a/dist/Android.patch
+++ b/dist/Android.patch
@@ -1,7 +1,7 @@
diff -r -u -d orig/shell.c ./shell.c
---- orig/shell.c 2017-07-21 09:46:53.488326209 +0900
-+++ ./shell.c 2017-07-21 09:46:53.620324492 +0900
-@@ -52,6 +52,12 @@
+--- orig/shell.c 2018-01-22 10:57:34.000000000 -0800
++++ ./shell.c 2018-02-13 16:03:40.927106364 -0800
+@@ -87,6 +87,12 @@
#endif
#include <ctype.h>
#include <stdarg.h>
@@ -14,10 +14,10 @@ diff -r -u -d orig/shell.c ./shell.c
#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
-@@ -3509,6 +3515,22 @@
- sha3QueryFunc, 0, 0);
- sqlite3_create_function(p->db, "sha3_query", 2, SQLITE_UTF8, 0,
- sha3QueryFunc, 0, 0);
+@@ -10389,6 +10395,23 @@
+ editFunc, 0, 0);
+ sqlite3_create_function(p->db, "edit", 2, SQLITE_UTF8, 0,
+ editFunc, 0, 0);
+
+ // Begin Android Add
+ #ifndef NO_ANDROID_FUNCS
@@ -34,13 +34,14 @@ diff -r -u -d orig/shell.c ./shell.c
+ }
+ #endif
+ // End Android Add
- }
- }
-
++
+ if( p->openMode==SHELL_OPEN_ZIPFILE ){
+ char *zSql = sqlite3_mprintf(
+ "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename);
diff -r -u -d orig/sqlite3.c ./sqlite3.c
---- orig/sqlite3.c 2017-08-04 10:42:31.294648222 +0900
-+++ ./sqlite3.c 2017-08-10 13:27:29.784569745 +0900
-@@ -33618,7 +33618,7 @@
+--- orig/sqlite3.c 2018-01-22 10:57:34.000000000 -0800
++++ ./sqlite3.c 2018-02-13 15:48:29.453358014 -0800
+@@ -34428,7 +34428,7 @@
SimulateIOError( rc=1 );
if( rc!=0 ){
storeLastErrno((unixFile*)id, errno);
@@ -49,7 +50,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
}
*pSize = buf.st_size;
-@@ -33654,7 +33654,7 @@
+@@ -34464,7 +34464,7 @@
struct stat buf; /* Used to hold return values of fstat() */
if( osFstat(pFile->h, &buf) ){
@@ -58,7 +59,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
}
nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
-@@ -34262,7 +34262,7 @@
+@@ -35139,7 +35139,7 @@
** with the same permissions.
*/
if( osFstat(pDbFd->h, &sStat) ){
@@ -67,7 +68,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
goto shm_open_err;
}
-@@ -116120,7 +116120,7 @@
+@@ -118054,7 +118054,7 @@
}
if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){
sqlite3SetString(pzErrMsg, db, "unsupported file format");
@@ -76,7 +77,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
goto initone_error_out;
}
-@@ -149914,13 +149914,25 @@
+@@ -152769,13 +152769,25 @@
** module with sqlite.
*/
if( SQLITE_OK==rc