Skip to content

Commit

Permalink
Don't include Android.patch diff in the patch (yeah...)
Browse files Browse the repository at this point in the history
  • Loading branch information
grendello committed Feb 11, 2020
1 parent b4e9f95 commit 49232bc
Showing 1 changed file with 0 additions and 146 deletions.
146 changes: 0 additions & 146 deletions dist/Android.patch
Original file line number Diff line number Diff line change
@@ -1,149 +1,3 @@
diff --git a/dist/Android.patch b/dist/Android.patch
index 7ecbecb..e69de29 100644
--- a/dist/Android.patch
+++ b/dist/Android.patch
@@ -1,141 +0,0 @@
---- orig/shell.c 2019-06-11 15:05:36.341739007 -0700
-+++ shell.c 2019-06-11 15:05:36.401739332 -0700
-@@ -87,6 +87,12 @@
- #endif
- #include <ctype.h>
- #include <stdarg.h>
-+// Begin Android Add
-+#ifndef NO_ANDROID_FUNCS
-+#include <aicu/AIcu.h>
-+#include <sqlite3_android.h>
-+#endif
-+// End Android Add
-
- #if !defined(_WIN32) && !defined(WIN32)
- # include <signal.h>
-@@ -11698,6 +11704,23 @@
- sqlite3_create_function(p->db, "edit", 2, SQLITE_UTF8, 0,
- editFunc, 0, 0);
- #endif
-+
-+// Begin Android Add
-+#ifndef NO_ANDROID_FUNCS
-+ AIcu_initializeIcuOrDie();
-+ int err = register_localized_collators(p->db, "en_US", 0);
-+ if (err != SQLITE_OK) {
-+ fprintf(stderr, "register_localized_collators() failed\n");
-+ exit(1);
-+ }
-+ err = register_android_functions(p->db, 0);
-+ if (err != SQLITE_OK) {
-+ fprintf(stderr, "register_android_functions() failed\n");
-+ exit(1);
-+ }
-+#endif
-+// End Android Add
-+
- if( p->openMode==SHELL_OPEN_ZIPFILE ){
- char *zSql = sqlite3_mprintf(
- "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename);
---- orig/sqlite3.c 2019-06-11 15:05:36.393739289 -0700
-+++ sqlite3.c 2019-06-11 15:05:36.449739593 -0700
-@@ -32438,6 +32438,10 @@
- # include <sys/mount.h>
- #endif
-
-+#if defined(__BIONIC__)
-+# include <android/fdsan.h>
-+#endif
-+
- #ifdef HAVE_UTIME
- # include <utime.h>
- #endif
-@@ -33197,6 +33201,12 @@
- #if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0)
- osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
- #endif
-+
-+#if defined(__BIONIC__) && __ANDROID_API__ >= __ANDROID_API_Q__
-+ uint64_t tag = android_fdsan_create_owner_tag(
-+ ANDROID_FDSAN_OWNER_TYPE_SQLITE, fd);
-+ android_fdsan_exchange_owner_tag(fd, 0, tag);
-+#endif
- }
- return fd;
- }
-@@ -33777,7 +33787,13 @@
- ** and move on.
- */
- static void robust_close(unixFile *pFile, int h, int lineno){
-+#if defined(__BIONIC__) && __ANDROID_API__ >= __ANDROID_API_Q__
-+ uint64_t tag = android_fdsan_create_owner_tag(
-+ ANDROID_FDSAN_OWNER_TYPE_SQLITE, h);
-+ if( android_fdsan_close_with_tag(h, tag) ){
-+#else
- if( osClose(h) ){
-+#endif
- unixLogErrorAtLine(SQLITE_IOERR_CLOSE, "close",
- pFile ? pFile->zPath : 0, lineno);
- }
-@@ -36310,7 +36326,7 @@
- SimulateIOError( rc=1 );
- if( rc!=0 ){
- storeLastErrno((unixFile*)id, errno);
-- return SQLITE_IOERR_FSTAT;
-+ return unixLogError(SQLITE_IOERR_FSTAT, "fstat", ((unixFile*)id)->zPath);
- }
- *pSize = buf.st_size;
-
-@@ -36346,7 +36362,7 @@
- struct stat buf; /* Used to hold return values of fstat() */
-
- if( osFstat(pFile->h, &buf) ){
-- return SQLITE_IOERR_FSTAT;
-+ return unixLogError(SQLITE_IOERR_FSTAT, "fstat", pFile->zPath);
- }
-
- nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
-@@ -37032,7 +37048,7 @@
- ** with the same permissions.
- */
- if( osFstat(pDbFd->h, &sStat) ){
-- rc = SQLITE_IOERR_FSTAT;
-+ rc = unixLogError(SQLITE_IOERR_FSTAT, "fstat", pDbFd->zPath);
- goto shm_open_err;
- }
-
-@@ -123984,7 +124000,7 @@
- }
- if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){
- sqlite3SetString(pzErrMsg, db, "unsupported file format");
-- rc = SQLITE_ERROR;
-+ rc = SQLITE_CORRUPT_BKPT; // Android Change from "rc = SQLITE_ERROR;";
- goto initone_error_out;
- }
-
-@@ -164271,13 +164287,25 @@
- ** module with sqlite.
- */
- if( SQLITE_OK==rc
-+#ifndef ANDROID /* fts3_tokenizer disabled for security reasons */
- && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer"))
-+#endif
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", 1))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 1))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 2))
- && SQLITE_OK==(rc = sqlite3_overload_function(db, "optimize", 1))
- ){
-+#ifdef SQLITE_ENABLE_FTS3_BACKWARDS
-+ rc = sqlite3_create_module_v2(
-+ db, "fts1", &fts3Module, (void *)pHash, 0
-+ );
-+ if(rc) return rc;
-+ rc = sqlite3_create_module_v2(
-+ db, "fts2", &fts3Module, (void *)pHash, 0
-+ );
-+ if(rc) return rc;
-+#endif
- rc = sqlite3_create_module_v2(
- db, "fts3", &fts3Module, (void *)pHash, hashDestroy
- );
diff --git a/dist/shell.c b/dist/shell.c
index 4e3d397..fc13bd9 100644
--- a/dist/shell.c
Expand Down

0 comments on commit 49232bc

Please sign in to comment.