Fix issue #110

A wrong patch of the SQLite shell source could lead to either not or doubly including the miniz sources depending on whether the flag SQLITE_ENABLE_COMPRESS is defined or not.

Author: utelle

scripts/patchshell.sh

@@ -15,6 +15,6 @@ die() {
 }
 
 sed -e '/int nHistory;/{n;N;N;N;N;d}' "$INPUT" \
-    | sed '50i#if SQLITE3MC_USE_MINIZ != 0\n#include "miniz.c"\n#ifdef SQLITE_HAVE_ZLIB\n#undef SQLITE_HAVE_ZLIB\n#endif\n#define SQLITE_HAVE_ZLIB 1\n#endif\n' \
-    | sed '/#include <zlib.h>/c #include "zlibwrap.h"' \
-    | sed '/int nHistory;/a \      extern char* sqlite3mc_version();\n      printf(\n        "SQLite version \%s \%.19s" \/\*extra-version-info\*\/\n        " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/\n        "Enter \\".help\\" for usage hints.\\n\",\n        sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version()\n      );'
+  | sed '/#ifdef SQLITE_CUSTOM_INCLUDE/!{p;d;};n;n;n;a #if SQLITE3MC_USE_MINIZ != 0 && !defined(SQLITE_ENABLE_COMPRESS)\n#include "miniz.c"\n#ifdef SQLITE_HAVE_ZLIB\n#undef SQLITE_HAVE_ZLIB\n#endif\n#define SQLITE_HAVE_ZLIB 1\n#endif\n' \
+  | sed '/#include <zlib.h>/c #include "zlibwrap.h"' \
+  | sed '/int nHistory;/a \      extern char* sqlite3mc_version();\n      printf(\n        "SQLite version \%s \%.19s" \/\*extra-version-info\*\/\n        " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/\n        "Enter \\".help\\" for usage hints.\\n\",\n        sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version()\n      );'

src/shell.c

@@ -47,16 +47,16 @@ typedef unsigned short int u16;
 # define SHELL_STRINGIFY(f) SHELL_STRINGIFY_(f)
 #ifdef SQLITE_CUSTOM_INCLUDE
 # include SHELL_STRINGIFY(SQLITE_CUSTOM_INCLUDE)
-#if SQLITE3MC_USE_MINIZ != 0
+#endif
+
+#if SQLITE3MC_USE_MINIZ != 0 && !defined(SQLITE_ENABLE_COMPRESS)
 #include "miniz.c"
 #ifdef SQLITE_HAVE_ZLIB
 #undef SQLITE_HAVE_ZLIB
 #endif
 #define SQLITE_HAVE_ZLIB 1
 #endif
 
-#endif
-
 /*
 ** Determine if we are dealing with WinRT, which provides only a subset of
 ** the full Win32 API.