diff options
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index f3dd051..c5f7e1d 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,6 +1,7 @@ ---- orig/shell.c 2019-01-02 14:50:34.332810092 -0800 -+++ shell.c 2019-01-02 14:50:34.384809875 -0800 -@@ -52,6 +52,12 @@ +diff -r -u -d orig/shell.c ./shell.c +--- orig/shell.c 2018-04-13 17:25:47.747857988 -0700 ++++ ./shell.c 2018-04-13 17:25:47.787857731 -0700 +@@ -87,6 +87,12 @@ #endif #include <ctype.h> #include <stdarg.h> @@ -13,10 +14,10 @@ #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 @@ -33,12 +34,14 @@ + } + #endif + // End Android Add - } - } - ---- orig/sqlite3.c 2019-01-02 15:26:14.984740997 -0800 -+++ sqlite3.c 2019-01-02 15:39:55.689451371 -0800 -@@ -33622,7 +33622,7 @@ ++ + 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 2018-12-27 15:39:18.784267281 -0800 ++++ ./sqlite3.c 2018-12-27 15:39:18.788267250 -0800 +@@ -34428,7 +34428,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); @@ -47,7 +50,7 @@ } *pSize = buf.st_size; -@@ -33658,7 +33658,7 @@ +@@ -34464,7 +34464,7 @@ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ){ @@ -56,7 +59,7 @@ } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; -@@ -34266,7 +34266,7 @@ +@@ -35139,7 +35139,7 @@ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ @@ -65,7 +68,7 @@ goto shm_open_err; } -@@ -116137,7 +116137,7 @@ +@@ -118054,7 +118054,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -74,15 +77,7 @@ goto initone_error_out; } -@@ -149535,6 +149535,7 @@ - char *zErr = sqlite3_mprintf("illegal first argument to %s", zFunc); - sqlite3_result_error(pContext, zErr, -1); - sqlite3_free(zErr); -+ *ppCsr = pRet; - return SQLITE_ERROR; - } - *ppCsr = pRet; -@@ -149929,13 +149930,25 @@ +@@ -152769,13 +152769,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |