Fossil SCM

Merge updates from trunk.

mistachkin 2013-10-14 08:51 UTC allExtra merge

Commit 14be8e8a1763394cdea3dd029c6fb8329c3de65f

Parent 33d26b91c49b0c2…

24 files changed +1 -1 +2 -2 +4 -4 +1 +1 -1 +1 -1 +3 -2 +1 +2 -2 +1 -1 +1 -1 +521 -523 +1 -1 +1 -1 +1 -1 +1 -1 +116 -18 +1 -1 +1 -1 +1 -1 +1 -1 +3 -3 +3 -3 +4

~ src/captcha.c ~ src/cgi.c ~ src/config.h ~ src/delta.c ~ src/event.c ~ src/gzip.c ~ src/makemake.tcl ~ src/md5.c ~ src/setup.c ~ src/sha1.c ~ src/skins.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/stat.c ~ src/tar.c ~ src/th.c ~ src/timeline.c ~ src/wiki.c ~ src/wikiformat.c ~ src/wysiwyg.c ~ src/zip.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ www/changes.wiki

M src/captcha.c

+1 -1

		--- src/captcha.c
		+++ src/captcha.c
		@@ -17,12 +17,12 @@
17	17	**
18	18	** This file contains code to a simple text-based CAPTCHA. Though easily
19	19	** defeated by a sophisticated attacker, this CAPTCHA does at least make
20	20	** scripting attacks more difficult.
21	21	*/
22		-#include <assert.h>
23	22	#include "config.h"
	23	+#include <assert.h>
24	24	#include "captcha.h"
25	25
26	26	#if INTERFACE
27	27	#define CAPTCHA 3 /* Which captcha rendering to use */
28	28	#endif
29	29

	--- src/captcha.c
	+++ src/captcha.c
	@@ -17,12 +17,12 @@
17	**
18	** This file contains code to a simple text-based CAPTCHA. Though easily
19	** defeated by a sophisticated attacker, this CAPTCHA does at least make
20	** scripting attacks more difficult.
21	*/
22	#include <assert.h>
23	#include "config.h"

24	#include "captcha.h"
25
26	#if INTERFACE
27	#define CAPTCHA 3 /* Which captcha rendering to use */
28	#endif
29

	--- src/captcha.c
	+++ src/captcha.c
	@@ -17,12 +17,12 @@
17	**
18	** This file contains code to a simple text-based CAPTCHA. Though easily
19	** defeated by a sophisticated attacker, this CAPTCHA does at least make
20	** scripting attacks more difficult.
21	*/

22	#include "config.h"
23	#include <assert.h>
24	#include "captcha.h"
25
26	#if INTERFACE
27	#define CAPTCHA 3 /* Which captcha rendering to use */
28	#endif
29

M src/cgi.c

+2 -2

		--- src/cgi.c
		+++ src/cgi.c
		@@ -1323,12 +1323,12 @@
1323	1323	*/
1324	1324	void cgi_handle_ssh_http_request(const char *zIpAddr){
1325	1325	static int nCycles = 0;
1326	1326	static char *zCmd = 0;
1327	1327	char z, zToken;
1328		- const char *zType;
1329		- int i, content_length;
	1328	+ const char *zType = 0;
	1329	+ int i, content_length = 0;
1330	1330	char zLine[2000]; /* A single line of input. */
1331	1331
1332	1332	if( zIpAddr ){
1333	1333	if( nCycles==0 ){
1334	1334	cgi_setenv("REMOTE_ADDR", zIpAddr);
1335	1335

	--- src/cgi.c
	+++ src/cgi.c
	@@ -1323,12 +1323,12 @@
1323	*/
1324	void cgi_handle_ssh_http_request(const char *zIpAddr){
1325	static int nCycles = 0;
1326	static char *zCmd = 0;
1327	char z, zToken;
1328	const char *zType;
1329	int i, content_length;
1330	char zLine[2000]; /* A single line of input. */
1331
1332	if( zIpAddr ){
1333	if( nCycles==0 ){
1334	cgi_setenv("REMOTE_ADDR", zIpAddr);
1335

	--- src/cgi.c
	+++ src/cgi.c
	@@ -1323,12 +1323,12 @@
1323	*/
1324	void cgi_handle_ssh_http_request(const char *zIpAddr){
1325	static int nCycles = 0;
1326	static char *zCmd = 0;
1327	char z, zToken;
1328	const char *zType = 0;
1329	int i, content_length = 0;
1330	char zLine[2000]; /* A single line of input. */
1331
1332	if( zIpAddr ){
1333	if( nCycles==0 ){
1334	cgi_setenv("REMOTE_ADDR", zIpAddr);
1335

M src/config.h

+4 -4

		--- src/config.h
		+++ src/config.h
		@@ -25,13 +25,13 @@
25	25	#ifndef _FILE_OFFSET_BITS
26	26	# define _FILE_OFFSET_BITS 64
27	27	#endif
28	28	#define _LARGEFILE_SOURCE 1
29	29
30		-/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */
31		-#ifdef _WIN64
32		-# undef _USE_32BIT_TIME_T
	30	+/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
	31	+#if defined(_WIN32) && !defined(_WIN64)
	32	+# define _USE_32BIT_TIME_T
33	33	#endif
34	34
35	35	#ifdef HAVE_AUTOCONFIG_H
36	36	#include "autoconfig.h"
37	37	#endif
		@@ -87,11 +87,11 @@
87	87	# else
88	88	# define COMPILER_NAME "unknown"
89	89	# endif
90	90	#endif
91	91
92		-#ifndef _RC_COMPILE_
	92	+#if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION)
93	93
94	94	#include "sqlite3.h"
95	95
96	96	/*
97	97	** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257.
98	98

	--- src/config.h
	+++ src/config.h
	@@ -25,13 +25,13 @@
25	#ifndef _FILE_OFFSET_BITS
26	# define _FILE_OFFSET_BITS 64
27	#endif
28	#define _LARGEFILE_SOURCE 1
29
30	/* Make sure that in 64-bit builds, _USE_32BIT_TIME_T is NEVER defined. */
31	#ifdef _WIN64
32	# undef _USE_32BIT_TIME_T
33	#endif
34
35	#ifdef HAVE_AUTOCONFIG_H
36	#include "autoconfig.h"
37	#endif
	@@ -87,11 +87,11 @@
87	# else
88	# define COMPILER_NAME "unknown"
89	# endif
90	#endif
91
92	#ifndef _RC_COMPILE_
93
94	#include "sqlite3.h"
95
96	/*
97	** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257.
98

	--- src/config.h
	+++ src/config.h
	@@ -25,13 +25,13 @@
25	#ifndef _FILE_OFFSET_BITS
26	# define _FILE_OFFSET_BITS 64
27	#endif
28	#define _LARGEFILE_SOURCE 1
29
30	/* Make sure that in Win32 builds, _USE_32BIT_TIME_T is always defined. */
31	#if defined(_WIN32) && !defined(_WIN64)
32	# define _USE_32BIT_TIME_T
33	#endif
34
35	#ifdef HAVE_AUTOCONFIG_H
36	#include "autoconfig.h"
37	#endif
	@@ -87,11 +87,11 @@
87	# else
88	# define COMPILER_NAME "unknown"
89	# endif
90	#endif
91
92	#if !defined(_RC_COMPILE_) && !defined(SQLITE_AMALGAMATION)
93
94	#include "sqlite3.h"
95
96	/*
97	** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257.
98

M src/delta.c

		--- src/delta.c
		+++ src/delta.c
		@@ -20,10 +20,11 @@
20	20	** Though developed specifically for fossil, the code in this file
21	21	** is generally applicable and is thus easily separated from the
22	22	** fossil source code base. Nothing in this file depends on anything
23	23	** else in fossil.
24	24	*/
	25	+#include "config.h"
25	26	#include <stdio.h>
26	27	#include <assert.h>
27	28	#include <stdlib.h>
28	29	#include <string.h>
29	30	#include "delta.h"
30	31

	--- src/delta.c
	+++ src/delta.c
	@@ -20,10 +20,11 @@
20	** Though developed specifically for fossil, the code in this file
21	** is generally applicable and is thus easily separated from the
22	** fossil source code base. Nothing in this file depends on anything
23	** else in fossil.
24	*/

25	#include <stdio.h>
26	#include <assert.h>
27	#include <stdlib.h>
28	#include <string.h>
29	#include "delta.h"
30

	--- src/delta.c
	+++ src/delta.c
	@@ -20,10 +20,11 @@
20	** Though developed specifically for fossil, the code in this file
21	** is generally applicable and is thus easily separated from the
22	** fossil source code base. Nothing in this file depends on anything
23	** else in fossil.
24	*/
25	#include "config.h"
26	#include <stdio.h>
27	#include <assert.h>
28	#include <stdlib.h>
29	#include <string.h>
30	#include "delta.h"
31

M src/event.c

+1 -1

		--- src/event.c
		+++ src/event.c
		@@ -21,13 +21,13 @@
21	21	** Blog posts
22	22	** New articles
23	23	** Process checkpoints
24	24	** Announcements
25	25	*/
	26	+#include "config.h"
26	27	#include <assert.h>
27	28	#include <ctype.h>
28		-#include "config.h"
29	29	#include "event.h"
30	30
31	31	/*
32	32	** Output a hyperlink to an event given its tagid.
33	33	*/
34	34

	--- src/event.c
	+++ src/event.c
	@@ -21,13 +21,13 @@
21	** Blog posts
22	** New articles
23	** Process checkpoints
24	** Announcements
25	*/

26	#include <assert.h>
27	#include <ctype.h>
28	#include "config.h"
29	#include "event.h"
30
31	/*
32	** Output a hyperlink to an event given its tagid.
33	*/
34

	--- src/event.c
	+++ src/event.c
	@@ -21,13 +21,13 @@
21	** Blog posts
22	** New articles
23	** Process checkpoints
24	** Announcements
25	*/
26	#include "config.h"
27	#include <assert.h>
28	#include <ctype.h>

29	#include "event.h"
30
31	/*
32	** Output a hyperlink to an event given its tagid.
33	*/
34

M src/gzip.c

+1 -1

		--- src/gzip.c
		+++ src/gzip.c
		@@ -19,13 +19,13 @@
19	19	** file. The GZIP format is described in RFC-1952.
20	20	**
21	21	** State information is stored in static variables, so this implementation
22	22	** can only be building up a single GZIP file at a time.
23	23	*/
	24	+#include "config.h"
24	25	#include <assert.h>
25	26	#include <zlib.h>
26		-#include "config.h"
27	27	#include "gzip.h"
28	28
29	29	/*
30	30	** State information for the GZIP file under construction.
31	31	*/
32	32

	--- src/gzip.c
	+++ src/gzip.c
	@@ -19,13 +19,13 @@
19	** file. The GZIP format is described in RFC-1952.
20	**
21	** State information is stored in static variables, so this implementation
22	** can only be building up a single GZIP file at a time.
23	*/

24	#include <assert.h>
25	#include <zlib.h>
26	#include "config.h"
27	#include "gzip.h"
28
29	/*
30	** State information for the GZIP file under construction.
31	*/
32

	--- src/gzip.c
	+++ src/gzip.c
	@@ -19,13 +19,13 @@
19	** file. The GZIP format is described in RFC-1952.
20	**
21	** State information is stored in static variables, so this implementation
22	** can only be building up a single GZIP file at a time.
23	*/
24	#include "config.h"
25	#include <assert.h>
26	#include <zlib.h>

27	#include "gzip.h"
28
29	/*
30	** State information for the GZIP file under construction.
31	*/
32

M src/makemake.tcl

+3 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -502,12 +502,12 @@
502	502	endif
503	503	endif
504	504
505	505	# With MinGW command line handling workaround
506	506	ifdef MINGW_IS_32BIT_ONLY
507		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
508		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	507	+TCC += -DBROKEN_MINGW_CMDLINE=1
	508	+RCC += -DBROKEN_MINGW_CMDLINE=1
509	509	endif
510	510
511	511	# With HTTPS support
512	512	ifdef FOSSIL_ENABLE_SSL
513	513	TCC += -DFOSSIL_ENABLE_SSL=1
		@@ -771,10 +771,11 @@
771	771	}
772	772
773	773
774	774	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
775	775	set opt $SQLITE_OPTIONS
	776	+append opt " -D_HAVE_SQLITE_CONFIG_H"
776	777	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
777	778
778	779	set opt {}
779	780	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
780	781	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
781	782

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -502,12 +502,12 @@
502	endif
503	endif
504
505	# With MinGW command line handling workaround
506	ifdef MINGW_IS_32BIT_ONLY
507	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
508	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
509	endif
510
511	# With HTTPS support
512	ifdef FOSSIL_ENABLE_SSL
513	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -771,10 +771,11 @@
771	}
772
773
774	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
775	set opt $SQLITE_OPTIONS

776	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
777
778	set opt {}
779	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
780	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
781

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -502,12 +502,12 @@
502	endif
503	endif
504
505	# With MinGW command line handling workaround
506	ifdef MINGW_IS_32BIT_ONLY
507	TCC += -DBROKEN_MINGW_CMDLINE=1
508	RCC += -DBROKEN_MINGW_CMDLINE=1
509	endif
510
511	# With HTTPS support
512	ifdef FOSSIL_ENABLE_SSL
513	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -771,10 +771,11 @@
771	}
772
773
774	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
775	set opt $SQLITE_OPTIONS
776	append opt " -D_HAVE_SQLITE_CONFIG_H"
777	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
778
779	set opt {}
780	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
781	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782

M src/md5.c

		--- src/md5.c
		+++ src/md5.c
		@@ -16,10 +16,11 @@
16	16	* To compute the message digest of a chunk of bytes, declare an
17	17	* MD5Context structure, pass it to MD5Init, call MD5Update as
18	18	* needed on buffers full of bytes, and then call MD5Final, which
19	19	* will fill a supplied 16-byte array with the digest.
20	20	*/
	21	+#include "config.h"
21	22	#include <string.h>
22	23	#include <stdio.h>
23	24	#include <sqlite3.h>
24	25	#include "md5.h"
25	26
26	27

	--- src/md5.c
	+++ src/md5.c
	@@ -16,10 +16,11 @@
16	* To compute the message digest of a chunk of bytes, declare an
17	* MD5Context structure, pass it to MD5Init, call MD5Update as
18	* needed on buffers full of bytes, and then call MD5Final, which
19	* will fill a supplied 16-byte array with the digest.
20	*/

21	#include <string.h>
22	#include <stdio.h>
23	#include <sqlite3.h>
24	#include "md5.h"
25
26

	--- src/md5.c
	+++ src/md5.c
	@@ -16,10 +16,11 @@
16	* To compute the message digest of a chunk of bytes, declare an
17	* MD5Context structure, pass it to MD5Init, call MD5Update as
18	* needed on buffers full of bytes, and then call MD5Final, which
19	* will fill a supplied 16-byte array with the digest.
20	*/
21	#include "config.h"
22	#include <string.h>
23	#include <stdio.h>
24	#include <sqlite3.h>
25	#include "md5.h"
26
27

M src/setup.c

+2 -2

		--- src/setup.c
		+++ src/setup.c
		@@ -15,12 +15,12 @@
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** Implementation of the Setup page
19	19	*/
20		-#include <assert.h>
21	20	#include "config.h"
	21	+#include <assert.h>
22	22	#include "setup.h"
23	23
24	24	/*
25	25	** The table of web pages supported by this application is generated
26	26	** automatically by the "mkindex" program and written into a file
		@@ -1496,11 +1496,11 @@
1496	1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	1498	@ Ticket changes enter the system and are shown locally, but are not
1499	1499	@ synced until they are approved. The moderator has the option to
1500	1500	@ delete the change rather than approve it. Ticket changes made by
1501		- @ a user who hwas the Mod-Tkt privilege are never subject to
	1501	+ @ a user who has the Mod-Tkt privilege are never subject to
1502	1502	@ moderation.
1503	1503	@
1504	1504	@ <hr />
1505	1505	onoff_attribute("Moderate wiki changes",
1506	1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507	1507

	--- src/setup.c
	+++ src/setup.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** Implementation of the Setup page
19	*/
20	#include <assert.h>
21	#include "config.h"

22	#include "setup.h"
23
24	/*
25	** The table of web pages supported by this application is generated
26	** automatically by the "mkindex" program and written into a file
	@@ -1496,11 +1496,11 @@
1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	@ Ticket changes enter the system and are shown locally, but are not
1499	@ synced until they are approved. The moderator has the option to
1500	@ delete the change rather than approve it. Ticket changes made by
1501	@ a user who hwas the Mod-Tkt privilege are never subject to
1502	@ moderation.
1503	@
1504	@ <hr />
1505	onoff_attribute("Moderate wiki changes",
1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507

	--- src/setup.c
	+++ src/setup.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** Implementation of the Setup page
19	*/

20	#include "config.h"
21	#include <assert.h>
22	#include "setup.h"
23
24	/*
25	** The table of web pages supported by this application is generated
26	** automatically by the "mkindex" program and written into a file
	@@ -1496,11 +1496,11 @@
1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	@ Ticket changes enter the system and are shown locally, but are not
1499	@ synced until they are approved. The moderator has the option to
1500	@ delete the change rather than approve it. Ticket changes made by
1501	@ a user who has the Mod-Tkt privilege are never subject to
1502	@ moderation.
1503	@
1504	@ <hr />
1505	onoff_attribute("Moderate wiki changes",
1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507

M src/sha1.c

+1 -1

		--- src/sha1.c
		+++ src/sha1.c
		@@ -1,10 +1,10 @@
1	1	/*
2	2	** This implementation of SHA1.
3	3	*/
4		-#include <sys/types.h>
5	4	#include "config.h"
	5	+#include <sys/types.h>
6	6	#include "sha1.h"
7	7
8	8
9	9	/*
10	10	** The SHA1 implementation below is adapted from:
11	11

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,10 +1,10 @@
1	/*
2	** This implementation of SHA1.
3	*/
4	#include <sys/types.h>
5	#include "config.h"

6	#include "sha1.h"
7
8
9	/*
10	** The SHA1 implementation below is adapted from:
11

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,10 +1,10 @@
1	/*
2	** This implementation of SHA1.
3	*/

4	#include "config.h"
5	#include <sys/types.h>
6	#include "sha1.h"
7
8
9	/*
10	** The SHA1 implementation below is adapted from:
11

M src/skins.c

+1 -1

		--- src/skins.c
		+++ src/skins.c
		@@ -15,12 +15,12 @@
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** Implementation of the Setup page for "skins".
19	19	*/
20		-#include <assert.h>
21	20	#include "config.h"
	21	+#include <assert.h>
22	22	#include "skins.h"
23	23
24	24	/* @-comment: ## */
25	25	/*
26	26	** A black-and-white theme with the project title in a bar across the top
27	27

	--- src/skins.c
	+++ src/skins.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** Implementation of the Setup page for "skins".
19	*/
20	#include <assert.h>
21	#include "config.h"

22	#include "skins.h"
23
24	/* @-comment: ## */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27

	--- src/skins.c
	+++ src/skins.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** Implementation of the Setup page for "skins".
19	*/

20	#include "config.h"
21	#include <assert.h>
22	#include "skins.h"
23
24	/* @-comment: ## */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27

M src/sqlite3.c

+521 -523

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -23,531 +23,10 @@
23	23	# define SQLITE_PRIVATE static
24	24	#endif
25	25	#ifndef SQLITE_API
26	26	# define SQLITE_API
27	27	#endif
28		-/************ Begin file sqliteInt.h *************************************/
29		-/*
30		-** 2001 September 15
31		-**
32		-** The author disclaims copyright to this source code. In place of
33		-** a legal notice, here is a blessing:
34		-**
35		-** May you do good and not evil.
36		-** May you find forgiveness for yourself and forgive others.
37		-** May you share freely, never taking more than you give.
38		-**
39		-*************************************************************************
40		-** Internal interface definitions for SQLite.
41		-**
42		-*/
43		-#ifndef _SQLITEINT_H_
44		-#define _SQLITEINT_H_
45		-
46		-/*
47		-** These #defines should enable >2GB file support on POSIX if the
48		-** underlying operating system supports it. If the OS lacks
49		-** large file support, or if the OS is windows, these should be no-ops.
50		-**
51		-** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any
52		-** system #includes. Hence, this block of code must be the very first
53		-** code in all source files.
54		-**
55		-** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
56		-** on the compiler command line. This is necessary if you are compiling
57		-** on a recent machine (ex: Red Hat 7.2) but you want your code to work
58		-** on an older machine (ex: Red Hat 6.0). If you compile on Red Hat 7.2
59		-** without this option, LFS is enable. But LFS does not exist in the kernel
60		-** in Red Hat 6.0, so the code won't work. Hence, for maximum binary
61		-** portability you should omit LFS.
62		-**
63		-** Similar is true for Mac OS X. LFS is only supported on Mac OS X 9 and later.
64		-*/
65		-#ifndef SQLITE_DISABLE_LFS
66		-# define _LARGE_FILE 1
67		-# ifndef _FILE_OFFSET_BITS
68		-# define _FILE_OFFSET_BITS 64
69		-# endif
70		-# define _LARGEFILE_SOURCE 1
71		-#endif
72		-
73		-/*
74		-** Include the configuration header output by 'configure' if we're using the
75		-** autoconf-based build
76		-*/
77		-#ifdef _HAVE_SQLITE_CONFIG_H
78		-#include "config.h"
79		-#endif
80		-
81		-/************ Include sqliteLimit.h in the middle of sqliteInt.h *********/
82		-/************ Begin file sqliteLimit.h ***********************************/
83		-/*
84		-** 2007 May 7
85		-**
86		-** The author disclaims copyright to this source code. In place of
87		-** a legal notice, here is a blessing:
88		-**
89		-** May you do good and not evil.
90		-** May you find forgiveness for yourself and forgive others.
91		-** May you share freely, never taking more than you give.
92		-**
93		-*************************************************************************
94		-**
95		-** This file defines various limits of what SQLite can process.
96		-*/
97		-
98		-/*
99		-** The maximum length of a TEXT or BLOB in bytes. This also
100		-** limits the size of a row in a table or index.
101		-**
102		-** The hard limit is the ability of a 32-bit signed integer
103		-** to count the size: 2^31-1 or 2147483647.
104		-*/
105		-#ifndef SQLITE_MAX_LENGTH
106		-# define SQLITE_MAX_LENGTH 1000000000
107		-#endif
108		-
109		-/*
110		-** This is the maximum number of
111		-**
112		-** * Columns in a table
113		-** * Columns in an index
114		-** * Columns in a view
115		-** * Terms in the SET clause of an UPDATE statement
116		-** * Terms in the result set of a SELECT statement
117		-** * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
118		-** * Terms in the VALUES clause of an INSERT statement
119		-**
120		-** The hard upper limit here is 32676. Most database people will
121		-** tell you that in a well-normalized database, you usually should
122		-** not have more than a dozen or so columns in any table. And if
123		-** that is the case, there is no point in having more than a few
124		-** dozen values in any of the other situations described above.
125		-*/
126		-#ifndef SQLITE_MAX_COLUMN
127		-# define SQLITE_MAX_COLUMN 2000
128		-#endif
129		-
130		-/*
131		-** The maximum length of a single SQL statement in bytes.
132		-**
133		-** It used to be the case that setting this value to zero would
134		-** turn the limit off. That is no longer true. It is not possible
135		-** to turn this limit off.
136		-*/
137		-#ifndef SQLITE_MAX_SQL_LENGTH
138		-# define SQLITE_MAX_SQL_LENGTH 1000000000
139		-#endif
140		-
141		-/*
142		-** The maximum depth of an expression tree. This is limited to
143		-** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might
144		-** want to place more severe limits on the complexity of an
145		-** expression.
146		-**
147		-** A value of 0 used to mean that the limit was not enforced.
148		-** But that is no longer true. The limit is now strictly enforced
149		-** at all times.
150		-*/
151		-#ifndef SQLITE_MAX_EXPR_DEPTH
152		-# define SQLITE_MAX_EXPR_DEPTH 1000
153		-#endif
154		-
155		-/*
156		-** The maximum number of terms in a compound SELECT statement.
157		-** The code generator for compound SELECT statements does one
158		-** level of recursion for each term. A stack overflow can result
159		-** if the number of terms is too large. In practice, most SQL
160		-** never has more than 3 or 4 terms. Use a value of 0 to disable
161		-** any limit on the number of terms in a compount SELECT.
162		-*/
163		-#ifndef SQLITE_MAX_COMPOUND_SELECT
164		-# define SQLITE_MAX_COMPOUND_SELECT 500
165		-#endif
166		-
167		-/*
168		-** The maximum number of opcodes in a VDBE program.
169		-** Not currently enforced.
170		-*/
171		-#ifndef SQLITE_MAX_VDBE_OP
172		-# define SQLITE_MAX_VDBE_OP 25000
173		-#endif
174		-
175		-/*
176		-** The maximum number of arguments to an SQL function.
177		-*/
178		-#ifndef SQLITE_MAX_FUNCTION_ARG
179		-# define SQLITE_MAX_FUNCTION_ARG 127
180		-#endif
181		-
182		-/*
183		-** The maximum number of in-memory pages to use for the main database
184		-** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE
185		-*/
186		-#ifndef SQLITE_DEFAULT_CACHE_SIZE
187		-# define SQLITE_DEFAULT_CACHE_SIZE 2000
188		-#endif
189		-#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
190		-# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
191		-#endif
192		-
193		-/*
194		-** The default number of frames to accumulate in the log file before
195		-** checkpointing the database in WAL mode.
196		-*/
197		-#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
198		-# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT 1000
199		-#endif
200		-
201		-/*
202		-** The maximum number of attached databases. This must be between 0
203		-** and 62. The upper bound on 62 is because a 64-bit integer bitmap
204		-** is used internally to track attached databases.
205		-*/
206		-#ifndef SQLITE_MAX_ATTACHED
207		-# define SQLITE_MAX_ATTACHED 10
208		-#endif
209		-
210		-
211		-/*
212		-** The maximum value of a ?nnn wildcard that the parser will accept.
213		-*/
214		-#ifndef SQLITE_MAX_VARIABLE_NUMBER
215		-# define SQLITE_MAX_VARIABLE_NUMBER 999
216		-#endif
217		-
218		-/* Maximum page size. The upper bound on this value is 65536. This a limit
219		-** imposed by the use of 16-bit offsets within each page.
220		-**
221		-** Earlier versions of SQLite allowed the user to change this value at
222		-** compile time. This is no longer permitted, on the grounds that it creates
223		-** a library that is technically incompatible with an SQLite library
224		-** compiled with a different limit. If a process operating on a database
225		-** with a page-size of 65536 bytes crashes, then an instance of SQLite
226		-** compiled with the default page-size limit will not be able to rollback
227		-** the aborted transaction. This could lead to database corruption.
228		-*/
229		-#ifdef SQLITE_MAX_PAGE_SIZE
230		-# undef SQLITE_MAX_PAGE_SIZE
231		-#endif
232		-#define SQLITE_MAX_PAGE_SIZE 65536
233		-
234		-
235		-/*
236		-** The default size of a database page.
237		-*/
238		-#ifndef SQLITE_DEFAULT_PAGE_SIZE
239		-# define SQLITE_DEFAULT_PAGE_SIZE 1024
240		-#endif
241		-#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
242		-# undef SQLITE_DEFAULT_PAGE_SIZE
243		-# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
244		-#endif
245		-
246		-/*
247		-** Ordinarily, if no value is explicitly provided, SQLite creates databases
248		-** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
249		-** device characteristics (sector-size and atomic write() support),
250		-** SQLite may choose a larger value. This constant is the maximum value
251		-** SQLite will choose on its own.
252		-*/
253		-#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
254		-# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
255		-#endif
256		-#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
257		-# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
258		-# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
259		-#endif
260		-
261		-
262		-/*
263		-** Maximum number of pages in one database file.
264		-**
265		-** This is really just the default value for the max_page_count pragma.
266		-** This value can be lowered (or raised) at run-time using that the
267		-** max_page_count macro.
268		-*/
269		-#ifndef SQLITE_MAX_PAGE_COUNT
270		-# define SQLITE_MAX_PAGE_COUNT 1073741823
271		-#endif
272		-
273		-/*
274		-** Maximum length (in bytes) of the pattern in a LIKE or GLOB
275		-** operator.
276		-*/
277		-#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
278		-# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
279		-#endif
280		-
281		-/*
282		-** Maximum depth of recursion for triggers.
283		-**
284		-** A value of 1 means that a trigger program will not be able to itself
285		-** fire any triggers. A value of 0 means that no trigger programs at all
286		-** may be executed.
287		-*/
288		-#ifndef SQLITE_MAX_TRIGGER_DEPTH
289		-# define SQLITE_MAX_TRIGGER_DEPTH 1000
290		-#endif
291		-
292		-/************ End of sqliteLimit.h ***************************************/
293		-/************ Continuing where we left off in sqliteInt.h ****************/
294		-
295		-/* Disable nuisance warnings on Borland compilers */
296		-#if defined(__BORLANDC__)
297		-#pragma warn -rch /* unreachable code */
298		-#pragma warn -ccc /* Condition is always true or false */
299		-#pragma warn -aus /* Assigned value is never used */
300		-#pragma warn -csu /* Comparing signed and unsigned */
301		-#pragma warn -spa /* Suspicious pointer arithmetic */
302		-#endif
303		-
304		-/* Needed for various definitions... */
305		-#ifndef _GNU_SOURCE
306		-# define _GNU_SOURCE
307		-#endif
308		-
309		-#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
310		-# define _BSD_SOURCE
311		-#endif
312		-
313		-/*
314		-** Include standard header files as necessary
315		-*/
316		-#ifdef HAVE_STDINT_H
317		-#include <stdint.h>
318		-#endif
319		-#ifdef HAVE_INTTYPES_H
320		-#include <inttypes.h>
321		-#endif
322		-
323		-/*
324		-** The following macros are used to cast pointers to integers and
325		-** integers to pointers. The way you do this varies from one compiler
326		-** to the next, so we have developed the following set of #if statements
327		-** to generate appropriate macros for a wide range of compilers.
328		-**
329		-** The correct "ANSI" way to do this is to use the intptr_t type.
330		-** Unfortunately, that typedef is not available on all compilers, or
331		-** if it is available, it requires an #include of specific headers
332		-** that vary from one machine to the next.
333		-**
334		-** Ticket #3860: The llvm-gcc-4.2 compiler from Apple chokes on
335		-** the ((void)&((char)0)[X]) construct. But MSVC chokes on ((void*)(X)).
336		-** So we have to define the macros in different ways depending on the
337		-** compiler.
338		-*/
339		-#if defined(__PTRDIFF_TYPE__) /* This case should work for GCC */
340		-# define SQLITE_INT_TO_PTR(X) ((void*)(__PTRDIFF_TYPE__)(X))
341		-# define SQLITE_PTR_TO_INT(X) ((int)(__PTRDIFF_TYPE__)(X))
342		-#elif !defined(__GNUC__) /* Works for compilers other than LLVM */
343		-# define SQLITE_INT_TO_PTR(X) ((void)&((char)0)[X])
344		-# define SQLITE_PTR_TO_INT(X) ((int)(((char)X)-(char)0))
345		-#elif defined(HAVE_STDINT_H) /* Use this case if we have ANSI headers */
346		-# define SQLITE_INT_TO_PTR(X) ((void*)(intptr_t)(X))
347		-# define SQLITE_PTR_TO_INT(X) ((int)(intptr_t)(X))
348		-#else /* Generates a warning - but it always works */
349		-# define SQLITE_INT_TO_PTR(X) ((void*)(X))
350		-# define SQLITE_PTR_TO_INT(X) ((int)(X))
351		-#endif
352		-
353		-/*
354		-** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
355		-** 0 means mutexes are permanently disable and the library is never
356		-** threadsafe. 1 means the library is serialized which is the highest
357		-** level of threadsafety. 2 means the library is multithreaded - multiple
358		-** threads can use SQLite as long as no two threads try to use the same
359		-** database connection at the same time.
360		-**
361		-** Older versions of SQLite used an optional THREADSAFE macro.
362		-** We support that for legacy.
363		-*/
364		-#if !defined(SQLITE_THREADSAFE)
365		-# if defined(THREADSAFE)
366		-# define SQLITE_THREADSAFE THREADSAFE
367		-# else
368		-# define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
369		-# endif
370		-#endif
371		-
372		-/*
373		-** Powersafe overwrite is on by default. But can be turned off using
374		-** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
375		-*/
376		-#ifndef SQLITE_POWERSAFE_OVERWRITE
377		-# define SQLITE_POWERSAFE_OVERWRITE 1
378		-#endif
379		-
380		-/*
381		-** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
382		-** It determines whether or not the features related to
383		-** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
384		-** be overridden at runtime using the sqlite3_config() API.
385		-*/
386		-#if !defined(SQLITE_DEFAULT_MEMSTATUS)
387		-# define SQLITE_DEFAULT_MEMSTATUS 1
388		-#endif
389		-
390		-/*
391		-** Exactly one of the following macros must be defined in order to
392		-** specify which memory allocation subsystem to use.
393		-**
394		-** SQLITE_SYSTEM_MALLOC // Use normal system malloc()
395		-** SQLITE_WIN32_MALLOC // Use Win32 native heap API
396		-** SQLITE_ZERO_MALLOC // Use a stub allocator that always fails
397		-** SQLITE_MEMDEBUG // Debugging version of system malloc()
398		-**
399		-** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
400		-** assert() macro is enabled, each call into the Win32 native heap subsystem
401		-** will cause HeapValidate to be called. If heap validation should fail, an
402		-** assertion will be triggered.
403		-**
404		-** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
405		-** the default.
406		-*/
407		-#if defined(SQLITE_SYSTEM_MALLOC) \
408		- + defined(SQLITE_WIN32_MALLOC) \
409		- + defined(SQLITE_ZERO_MALLOC) \
410		- + defined(SQLITE_MEMDEBUG)>1
411		-# error "Two or more of the following compile-time configuration options\
412		- are defined but at most one is allowed:\
413		- SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
414		- SQLITE_ZERO_MALLOC"
415		-#endif
416		-#if defined(SQLITE_SYSTEM_MALLOC) \
417		- + defined(SQLITE_WIN32_MALLOC) \
418		- + defined(SQLITE_ZERO_MALLOC) \
419		- + defined(SQLITE_MEMDEBUG)==0
420		-# define SQLITE_SYSTEM_MALLOC 1
421		-#endif
422		-
423		-/*
424		-** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
425		-** sizes of memory allocations below this value where possible.
426		-*/
427		-#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
428		-# define SQLITE_MALLOC_SOFT_LIMIT 1024
429		-#endif
430		-
431		-/*
432		-** We need to define _XOPEN_SOURCE as follows in order to enable
433		-** recursive mutexes on most Unix systems and fchmod() on OpenBSD.
434		-** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
435		-** it.
436		-*/
437		-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
438		-# define _XOPEN_SOURCE 600
439		-#endif
440		-
441		-/*
442		-** NDEBUG and SQLITE_DEBUG are opposites. It should always be true that
443		-** defined(NDEBUG)==!defined(SQLITE_DEBUG). If this is not currently true,
444		-** make it true by defining or undefining NDEBUG.
445		-**
446		-** Setting NDEBUG makes the code smaller and faster by disabling the
447		-** assert() statements in the code. So we want the default action
448		-** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
449		-** is set. Thus NDEBUG becomes an opt-in rather than an opt-out
450		-** feature.
451		-*/
452		-#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
453		-# define NDEBUG 1
454		-#endif
455		-#if defined(NDEBUG) && defined(SQLITE_DEBUG)
456		-# undef NDEBUG
457		-#endif
458		-
459		-/*
460		-** The testcase() macro is used to aid in coverage testing. When
461		-** doing coverage testing, the condition inside the argument to
462		-** testcase() must be evaluated both true and false in order to
463		-** get full branch coverage. The testcase() macro is inserted
464		-** to help ensure adequate test coverage in places where simple
465		-** condition/decision coverage is inadequate. For example, testcase()
466		-** can be used to make sure boundary values are tested. For
467		-** bitmask tests, testcase() can be used to make sure each bit
468		-** is significant and used at least once. On switch statements
469		-** where multiple cases go to the same block of code, testcase()
470		-** can insure that all cases are evaluated.
471		-**
472		-*/
473		-#ifdef SQLITE_COVERAGE_TEST
474		-SQLITE_PRIVATE void sqlite3Coverage(int);
475		-# define testcase(X) if( X ){ sqlite3Coverage(__LINE__); }
476		-#else
477		-# define testcase(X)
478		-#endif
479		-
480		-/*
481		-** The TESTONLY macro is used to enclose variable declarations or
482		-** other bits of code that are needed to support the arguments
483		-** within testcase() and assert() macros.
484		-*/
485		-#if !defined(NDEBUG) \|\| defined(SQLITE_COVERAGE_TEST)
486		-# define TESTONLY(X) X
487		-#else
488		-# define TESTONLY(X)
489		-#endif
490		-
491		-/*
492		-** Sometimes we need a small amount of code such as a variable initialization
493		-** to setup for a later assert() statement. We do not want this code to
494		-** appear when assert() is disabled. The following macro is therefore
495		-** used to contain that setup code. The "VVA" acronym stands for
496		-** "Verification, Validation, and Accreditation". In other words, the
497		-** code within VVA_ONLY() will only run during verification processes.
498		-*/
499		-#ifndef NDEBUG
500		-# define VVA_ONLY(X) X
501		-#else
502		-# define VVA_ONLY(X)
503		-#endif
504		-
505		-/*
506		-** The ALWAYS and NEVER macros surround boolean expressions which
507		-** are intended to always be true or false, respectively. Such
508		-** expressions could be omitted from the code completely. But they
509		-** are included in a few cases in order to enhance the resilience
510		-** of SQLite to unexpected behavior - to make the code "self-healing"
511		-** or "ductile" rather than being "brittle" and crashing at the first
512		-** hint of unplanned behavior.
513		-**
514		-** In other words, ALWAYS and NEVER are added for defensive code.
515		-**
516		-** When doing coverage testing ALWAYS and NEVER are hard-coded to
517		-** be true and false so that the unreachable code they specify will
518		-** not be counted as untested code.
519		-*/
520		-#if defined(SQLITE_COVERAGE_TEST)
521		-# define ALWAYS(X) (1)
522		-# define NEVER(X) (0)
523		-#elif !defined(NDEBUG)
524		-# define ALWAYS(X) ((X)?1:(assert(0),0))
525		-# define NEVER(X) ((X)?(assert(0),1):0)
526		-#else
527		-# define ALWAYS(X) (X)
528		-# define NEVER(X) (X)
529		-#endif
530		-
531		-/*
532		-** Return true (non-zero) if the input is a integer that is too large
533		-** to fit in 32-bits. This macro is used inside of various testcase()
534		-** macros to verify that we have tested SQLite for large-file support.
535		-*/
536		-#define IS_BIG_INT(X) (((X)&~(i64)0xffffffff)!=0)
537		-
538		-/*
539		-** The macro unlikely() is a hint that surrounds a boolean
540		-** expression that is usually false. Macro likely() surrounds
541		-** a boolean expression that is usually true. These hints could,
542		-** in theory, be used by the compiler to generate better code, but
543		-** currently they are just comments for human readers.
544		-*/
545		-#define likely(X) (X)
546		-#define unlikely(X) (X)
547		-
548		-/************ Include sqlite3.h in the middle of sqliteInt.h *************/
549	28	/************ Begin file sqlite3.h ***************************************/
550	29	/*
551	30	** 2001 September 15
552	31	**
553	32	** The author disclaims copyright to this source code. In place of
		@@ -656,11 +135,11 @@
656	135	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
657	136	** [sqlite_version()] and [sqlite_source_id()].
658	137	*/
659	138	#define SQLITE_VERSION "3.8.1"
660	139	#define SQLITE_VERSION_NUMBER 3008001
661		-#define SQLITE_SOURCE_ID "2013-10-10 15:04:52 af7abebeb1f70466833bc766d294d721eaef746f"
	140	+#define SQLITE_SOURCE_ID "2013-10-11 13:27:26 03593817ab5abdd4bbaa5e47e2e4745eef025af9"
662	141
663	142	/*
664	143	** CAPI3REF: Run-Time Library Version Numbers
665	144	** KEYWORDS: sqlite3_version, sqlite3_sourceid
666	145	**
		@@ -7846,11 +7325,530 @@
7846	7325
7847	7326	#endif /* ifndef _SQLITE3RTREE_H_ */
7848	7327
7849	7328
7850	7329	/************ End of sqlite3.h *******************************************/
	7330	+/************ Begin file sqliteInt.h *************************************/
	7331	+/*
	7332	+** 2001 September 15
	7333	+**
	7334	+** The author disclaims copyright to this source code. In place of
	7335	+** a legal notice, here is a blessing:
	7336	+**
	7337	+** May you do good and not evil.
	7338	+** May you find forgiveness for yourself and forgive others.
	7339	+** May you share freely, never taking more than you give.
	7340	+**
	7341	+*************************************************************************
	7342	+** Internal interface definitions for SQLite.
	7343	+**
	7344	+*/
	7345	+#ifndef _SQLITEINT_H_
	7346	+#define _SQLITEINT_H_
	7347	+
	7348	+/*
	7349	+** These #defines should enable >2GB file support on POSIX if the
	7350	+** underlying operating system supports it. If the OS lacks
	7351	+** large file support, or if the OS is windows, these should be no-ops.
	7352	+**
	7353	+** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any
	7354	+** system #includes. Hence, this block of code must be the very first
	7355	+** code in all source files.
	7356	+**
	7357	+** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
	7358	+** on the compiler command line. This is necessary if you are compiling
	7359	+** on a recent machine (ex: Red Hat 7.2) but you want your code to work
	7360	+** on an older machine (ex: Red Hat 6.0). If you compile on Red Hat 7.2
	7361	+** without this option, LFS is enable. But LFS does not exist in the kernel
	7362	+** in Red Hat 6.0, so the code won't work. Hence, for maximum binary
	7363	+** portability you should omit LFS.
	7364	+**
	7365	+** Similar is true for Mac OS X. LFS is only supported on Mac OS X 9 and later.
	7366	+*/
	7367	+#ifndef SQLITE_DISABLE_LFS
	7368	+# define _LARGE_FILE 1
	7369	+# ifndef _FILE_OFFSET_BITS
	7370	+# define _FILE_OFFSET_BITS 64
	7371	+# endif
	7372	+# define _LARGEFILE_SOURCE 1
	7373	+#endif
	7374	+
	7375	+/*
	7376	+** Include the configuration header output by 'configure' if we're using the
	7377	+** autoconf-based build
	7378	+*/
	7379	+#ifdef _HAVE_SQLITE_CONFIG_H
	7380	+#include "config.h"
	7381	+#endif
	7382	+
	7383	+/************ Include sqliteLimit.h in the middle of sqliteInt.h *********/
	7384	+/************ Begin file sqliteLimit.h ***********************************/
	7385	+/*
	7386	+** 2007 May 7
	7387	+**
	7388	+** The author disclaims copyright to this source code. In place of
	7389	+** a legal notice, here is a blessing:
	7390	+**
	7391	+** May you do good and not evil.
	7392	+** May you find forgiveness for yourself and forgive others.
	7393	+** May you share freely, never taking more than you give.
	7394	+**
	7395	+*************************************************************************
	7396	+**
	7397	+** This file defines various limits of what SQLite can process.
	7398	+*/
	7399	+
	7400	+/*
	7401	+** The maximum length of a TEXT or BLOB in bytes. This also
	7402	+** limits the size of a row in a table or index.
	7403	+**
	7404	+** The hard limit is the ability of a 32-bit signed integer
	7405	+** to count the size: 2^31-1 or 2147483647.
	7406	+*/
	7407	+#ifndef SQLITE_MAX_LENGTH
	7408	+# define SQLITE_MAX_LENGTH 1000000000
	7409	+#endif
	7410	+
	7411	+/*
	7412	+** This is the maximum number of
	7413	+**
	7414	+** * Columns in a table
	7415	+** * Columns in an index
	7416	+** * Columns in a view
	7417	+** * Terms in the SET clause of an UPDATE statement
	7418	+** * Terms in the result set of a SELECT statement
	7419	+** * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
	7420	+** * Terms in the VALUES clause of an INSERT statement
	7421	+**
	7422	+** The hard upper limit here is 32676. Most database people will
	7423	+** tell you that in a well-normalized database, you usually should
	7424	+** not have more than a dozen or so columns in any table. And if
	7425	+** that is the case, there is no point in having more than a few
	7426	+** dozen values in any of the other situations described above.
	7427	+*/
	7428	+#ifndef SQLITE_MAX_COLUMN
	7429	+# define SQLITE_MAX_COLUMN 2000
	7430	+#endif
	7431	+
	7432	+/*
	7433	+** The maximum length of a single SQL statement in bytes.
	7434	+**
	7435	+** It used to be the case that setting this value to zero would
	7436	+** turn the limit off. That is no longer true. It is not possible
	7437	+** to turn this limit off.
	7438	+*/
	7439	+#ifndef SQLITE_MAX_SQL_LENGTH
	7440	+# define SQLITE_MAX_SQL_LENGTH 1000000000
	7441	+#endif
	7442	+
	7443	+/*
	7444	+** The maximum depth of an expression tree. This is limited to
	7445	+** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might
	7446	+** want to place more severe limits on the complexity of an
	7447	+** expression.
	7448	+**
	7449	+** A value of 0 used to mean that the limit was not enforced.
	7450	+** But that is no longer true. The limit is now strictly enforced
	7451	+** at all times.
	7452	+*/
	7453	+#ifndef SQLITE_MAX_EXPR_DEPTH
	7454	+# define SQLITE_MAX_EXPR_DEPTH 1000
	7455	+#endif
	7456	+
	7457	+/*
	7458	+** The maximum number of terms in a compound SELECT statement.
	7459	+** The code generator for compound SELECT statements does one
	7460	+** level of recursion for each term. A stack overflow can result
	7461	+** if the number of terms is too large. In practice, most SQL
	7462	+** never has more than 3 or 4 terms. Use a value of 0 to disable
	7463	+** any limit on the number of terms in a compount SELECT.
	7464	+*/
	7465	+#ifndef SQLITE_MAX_COMPOUND_SELECT
	7466	+# define SQLITE_MAX_COMPOUND_SELECT 500
	7467	+#endif
	7468	+
	7469	+/*
	7470	+** The maximum number of opcodes in a VDBE program.
	7471	+** Not currently enforced.
	7472	+*/
	7473	+#ifndef SQLITE_MAX_VDBE_OP
	7474	+# define SQLITE_MAX_VDBE_OP 25000
	7475	+#endif
	7476	+
	7477	+/*
	7478	+** The maximum number of arguments to an SQL function.
	7479	+*/
	7480	+#ifndef SQLITE_MAX_FUNCTION_ARG
	7481	+# define SQLITE_MAX_FUNCTION_ARG 127
	7482	+#endif
	7483	+
	7484	+/*
	7485	+** The maximum number of in-memory pages to use for the main database
	7486	+** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE
	7487	+*/
	7488	+#ifndef SQLITE_DEFAULT_CACHE_SIZE
	7489	+# define SQLITE_DEFAULT_CACHE_SIZE 2000
	7490	+#endif
	7491	+#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
	7492	+# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
	7493	+#endif
	7494	+
	7495	+/*
	7496	+** The default number of frames to accumulate in the log file before
	7497	+** checkpointing the database in WAL mode.
	7498	+*/
	7499	+#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
	7500	+# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT 1000
	7501	+#endif
	7502	+
	7503	+/*
	7504	+** The maximum number of attached databases. This must be between 0
	7505	+** and 62. The upper bound on 62 is because a 64-bit integer bitmap
	7506	+** is used internally to track attached databases.
	7507	+*/
	7508	+#ifndef SQLITE_MAX_ATTACHED
	7509	+# define SQLITE_MAX_ATTACHED 10
	7510	+#endif
	7511	+
	7512	+
	7513	+/*
	7514	+** The maximum value of a ?nnn wildcard that the parser will accept.
	7515	+*/
	7516	+#ifndef SQLITE_MAX_VARIABLE_NUMBER
	7517	+# define SQLITE_MAX_VARIABLE_NUMBER 999
	7518	+#endif
	7519	+
	7520	+/* Maximum page size. The upper bound on this value is 65536. This a limit
	7521	+** imposed by the use of 16-bit offsets within each page.
	7522	+**
	7523	+** Earlier versions of SQLite allowed the user to change this value at
	7524	+** compile time. This is no longer permitted, on the grounds that it creates
	7525	+** a library that is technically incompatible with an SQLite library
	7526	+** compiled with a different limit. If a process operating on a database
	7527	+** with a page-size of 65536 bytes crashes, then an instance of SQLite
	7528	+** compiled with the default page-size limit will not be able to rollback
	7529	+** the aborted transaction. This could lead to database corruption.
	7530	+*/
	7531	+#ifdef SQLITE_MAX_PAGE_SIZE
	7532	+# undef SQLITE_MAX_PAGE_SIZE
	7533	+#endif
	7534	+#define SQLITE_MAX_PAGE_SIZE 65536
	7535	+
	7536	+
	7537	+/*
	7538	+** The default size of a database page.
	7539	+*/
	7540	+#ifndef SQLITE_DEFAULT_PAGE_SIZE
	7541	+# define SQLITE_DEFAULT_PAGE_SIZE 1024
	7542	+#endif
	7543	+#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
	7544	+# undef SQLITE_DEFAULT_PAGE_SIZE
	7545	+# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
	7546	+#endif
	7547	+
	7548	+/*
	7549	+** Ordinarily, if no value is explicitly provided, SQLite creates databases
	7550	+** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
	7551	+** device characteristics (sector-size and atomic write() support),
	7552	+** SQLite may choose a larger value. This constant is the maximum value
	7553	+** SQLite will choose on its own.
	7554	+*/
	7555	+#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
	7556	+# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
	7557	+#endif
	7558	+#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
	7559	+# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
	7560	+# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
	7561	+#endif
	7562	+
	7563	+
	7564	+/*
	7565	+** Maximum number of pages in one database file.
	7566	+**
	7567	+** This is really just the default value for the max_page_count pragma.
	7568	+** This value can be lowered (or raised) at run-time using that the
	7569	+** max_page_count macro.
	7570	+*/
	7571	+#ifndef SQLITE_MAX_PAGE_COUNT
	7572	+# define SQLITE_MAX_PAGE_COUNT 1073741823
	7573	+#endif
	7574	+
	7575	+/*
	7576	+** Maximum length (in bytes) of the pattern in a LIKE or GLOB
	7577	+** operator.
	7578	+*/
	7579	+#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
	7580	+# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
	7581	+#endif
	7582	+
	7583	+/*
	7584	+** Maximum depth of recursion for triggers.
	7585	+**
	7586	+** A value of 1 means that a trigger program will not be able to itself
	7587	+** fire any triggers. A value of 0 means that no trigger programs at all
	7588	+** may be executed.
	7589	+*/
	7590	+#ifndef SQLITE_MAX_TRIGGER_DEPTH
	7591	+# define SQLITE_MAX_TRIGGER_DEPTH 1000
	7592	+#endif
	7593	+
	7594	+/************ End of sqliteLimit.h ***************************************/
7851	7595	/************ Continuing where we left off in sqliteInt.h ****************/
	7596	+
	7597	+/* Disable nuisance warnings on Borland compilers */
	7598	+#if defined(__BORLANDC__)
	7599	+#pragma warn -rch /* unreachable code */
	7600	+#pragma warn -ccc /* Condition is always true or false */
	7601	+#pragma warn -aus /* Assigned value is never used */
	7602	+#pragma warn -csu /* Comparing signed and unsigned */
	7603	+#pragma warn -spa /* Suspicious pointer arithmetic */
	7604	+#endif
	7605	+
	7606	+/* Needed for various definitions... */
	7607	+#ifndef _GNU_SOURCE
	7608	+# define _GNU_SOURCE
	7609	+#endif
	7610	+
	7611	+#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
	7612	+# define _BSD_SOURCE
	7613	+#endif
	7614	+
	7615	+/*
	7616	+** Include standard header files as necessary
	7617	+*/
	7618	+#ifdef HAVE_STDINT_H
	7619	+#include <stdint.h>
	7620	+#endif
	7621	+#ifdef HAVE_INTTYPES_H
	7622	+#include <inttypes.h>
	7623	+#endif
	7624	+
	7625	+/*
	7626	+** The following macros are used to cast pointers to integers and
	7627	+** integers to pointers. The way you do this varies from one compiler
	7628	+** to the next, so we have developed the following set of #if statements
	7629	+** to generate appropriate macros for a wide range of compilers.
	7630	+**
	7631	+** The correct "ANSI" way to do this is to use the intptr_t type.
	7632	+** Unfortunately, that typedef is not available on all compilers, or
	7633	+** if it is available, it requires an #include of specific headers
	7634	+** that vary from one machine to the next.
	7635	+**
	7636	+** Ticket #3860: The llvm-gcc-4.2 compiler from Apple chokes on
	7637	+** the ((void)&((char)0)[X]) construct. But MSVC chokes on ((void*)(X)).
	7638	+** So we have to define the macros in different ways depending on the
	7639	+** compiler.
	7640	+*/
	7641	+#if defined(__PTRDIFF_TYPE__) /* This case should work for GCC */
	7642	+# define SQLITE_INT_TO_PTR(X) ((void*)(__PTRDIFF_TYPE__)(X))
	7643	+# define SQLITE_PTR_TO_INT(X) ((int)(__PTRDIFF_TYPE__)(X))
	7644	+#elif !defined(__GNUC__) /* Works for compilers other than LLVM */
	7645	+# define SQLITE_INT_TO_PTR(X) ((void)&((char)0)[X])
	7646	+# define SQLITE_PTR_TO_INT(X) ((int)(((char)X)-(char)0))
	7647	+#elif defined(HAVE_STDINT_H) /* Use this case if we have ANSI headers */
	7648	+# define SQLITE_INT_TO_PTR(X) ((void*)(intptr_t)(X))
	7649	+# define SQLITE_PTR_TO_INT(X) ((int)(intptr_t)(X))
	7650	+#else /* Generates a warning - but it always works */
	7651	+# define SQLITE_INT_TO_PTR(X) ((void*)(X))
	7652	+# define SQLITE_PTR_TO_INT(X) ((int)(X))
	7653	+#endif
	7654	+
	7655	+/*
	7656	+** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
	7657	+** 0 means mutexes are permanently disable and the library is never
	7658	+** threadsafe. 1 means the library is serialized which is the highest
	7659	+** level of threadsafety. 2 means the library is multithreaded - multiple
	7660	+** threads can use SQLite as long as no two threads try to use the same
	7661	+** database connection at the same time.
	7662	+**
	7663	+** Older versions of SQLite used an optional THREADSAFE macro.
	7664	+** We support that for legacy.
	7665	+*/
	7666	+#if !defined(SQLITE_THREADSAFE)
	7667	+# if defined(THREADSAFE)
	7668	+# define SQLITE_THREADSAFE THREADSAFE
	7669	+# else
	7670	+# define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
	7671	+# endif
	7672	+#endif
	7673	+
	7674	+/*
	7675	+** Powersafe overwrite is on by default. But can be turned off using
	7676	+** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
	7677	+*/
	7678	+#ifndef SQLITE_POWERSAFE_OVERWRITE
	7679	+# define SQLITE_POWERSAFE_OVERWRITE 1
	7680	+#endif
	7681	+
	7682	+/*
	7683	+** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
	7684	+** It determines whether or not the features related to
	7685	+** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
	7686	+** be overridden at runtime using the sqlite3_config() API.
	7687	+*/
	7688	+#if !defined(SQLITE_DEFAULT_MEMSTATUS)
	7689	+# define SQLITE_DEFAULT_MEMSTATUS 1
	7690	+#endif
	7691	+
	7692	+/*
	7693	+** Exactly one of the following macros must be defined in order to
	7694	+** specify which memory allocation subsystem to use.
	7695	+**
	7696	+** SQLITE_SYSTEM_MALLOC // Use normal system malloc()
	7697	+** SQLITE_WIN32_MALLOC // Use Win32 native heap API
	7698	+** SQLITE_ZERO_MALLOC // Use a stub allocator that always fails
	7699	+** SQLITE_MEMDEBUG // Debugging version of system malloc()
	7700	+**
	7701	+** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
	7702	+** assert() macro is enabled, each call into the Win32 native heap subsystem
	7703	+** will cause HeapValidate to be called. If heap validation should fail, an
	7704	+** assertion will be triggered.
	7705	+**
	7706	+** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
	7707	+** the default.
	7708	+*/
	7709	+#if defined(SQLITE_SYSTEM_MALLOC) \
	7710	+ + defined(SQLITE_WIN32_MALLOC) \
	7711	+ + defined(SQLITE_ZERO_MALLOC) \
	7712	+ + defined(SQLITE_MEMDEBUG)>1
	7713	+# error "Two or more of the following compile-time configuration options\
	7714	+ are defined but at most one is allowed:\
	7715	+ SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
	7716	+ SQLITE_ZERO_MALLOC"
	7717	+#endif
	7718	+#if defined(SQLITE_SYSTEM_MALLOC) \
	7719	+ + defined(SQLITE_WIN32_MALLOC) \
	7720	+ + defined(SQLITE_ZERO_MALLOC) \
	7721	+ + defined(SQLITE_MEMDEBUG)==0
	7722	+# define SQLITE_SYSTEM_MALLOC 1
	7723	+#endif
	7724	+
	7725	+/*
	7726	+** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
	7727	+** sizes of memory allocations below this value where possible.
	7728	+*/
	7729	+#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
	7730	+# define SQLITE_MALLOC_SOFT_LIMIT 1024
	7731	+#endif
	7732	+
	7733	+/*
	7734	+** We need to define _XOPEN_SOURCE as follows in order to enable
	7735	+** recursive mutexes on most Unix systems and fchmod() on OpenBSD.
	7736	+** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
	7737	+** it.
	7738	+*/
	7739	+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
	7740	+# define _XOPEN_SOURCE 600
	7741	+#endif
	7742	+
	7743	+/*
	7744	+** NDEBUG and SQLITE_DEBUG are opposites. It should always be true that
	7745	+** defined(NDEBUG)==!defined(SQLITE_DEBUG). If this is not currently true,
	7746	+** make it true by defining or undefining NDEBUG.
	7747	+**
	7748	+** Setting NDEBUG makes the code smaller and faster by disabling the
	7749	+** assert() statements in the code. So we want the default action
	7750	+** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
	7751	+** is set. Thus NDEBUG becomes an opt-in rather than an opt-out
	7752	+** feature.
	7753	+*/
	7754	+#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
	7755	+# define NDEBUG 1
	7756	+#endif
	7757	+#if defined(NDEBUG) && defined(SQLITE_DEBUG)
	7758	+# undef NDEBUG
	7759	+#endif
	7760	+
	7761	+/*
	7762	+** The testcase() macro is used to aid in coverage testing. When
	7763	+** doing coverage testing, the condition inside the argument to
	7764	+** testcase() must be evaluated both true and false in order to
	7765	+** get full branch coverage. The testcase() macro is inserted
	7766	+** to help ensure adequate test coverage in places where simple
	7767	+** condition/decision coverage is inadequate. For example, testcase()
	7768	+** can be used to make sure boundary values are tested. For
	7769	+** bitmask tests, testcase() can be used to make sure each bit
	7770	+** is significant and used at least once. On switch statements
	7771	+** where multiple cases go to the same block of code, testcase()
	7772	+** can insure that all cases are evaluated.
	7773	+**
	7774	+*/
	7775	+#ifdef SQLITE_COVERAGE_TEST
	7776	+SQLITE_PRIVATE void sqlite3Coverage(int);
	7777	+# define testcase(X) if( X ){ sqlite3Coverage(__LINE__); }
	7778	+#else
	7779	+# define testcase(X)
	7780	+#endif
	7781	+
	7782	+/*
	7783	+** The TESTONLY macro is used to enclose variable declarations or
	7784	+** other bits of code that are needed to support the arguments
	7785	+** within testcase() and assert() macros.
	7786	+*/
	7787	+#if !defined(NDEBUG) \|\| defined(SQLITE_COVERAGE_TEST)
	7788	+# define TESTONLY(X) X
	7789	+#else
	7790	+# define TESTONLY(X)
	7791	+#endif
	7792	+
	7793	+/*
	7794	+** Sometimes we need a small amount of code such as a variable initialization
	7795	+** to setup for a later assert() statement. We do not want this code to
	7796	+** appear when assert() is disabled. The following macro is therefore
	7797	+** used to contain that setup code. The "VVA" acronym stands for
	7798	+** "Verification, Validation, and Accreditation". In other words, the
	7799	+** code within VVA_ONLY() will only run during verification processes.
	7800	+*/
	7801	+#ifndef NDEBUG
	7802	+# define VVA_ONLY(X) X
	7803	+#else
	7804	+# define VVA_ONLY(X)
	7805	+#endif
	7806	+
	7807	+/*
	7808	+** The ALWAYS and NEVER macros surround boolean expressions which
	7809	+** are intended to always be true or false, respectively. Such
	7810	+** expressions could be omitted from the code completely. But they
	7811	+** are included in a few cases in order to enhance the resilience
	7812	+** of SQLite to unexpected behavior - to make the code "self-healing"
	7813	+** or "ductile" rather than being "brittle" and crashing at the first
	7814	+** hint of unplanned behavior.
	7815	+**
	7816	+** In other words, ALWAYS and NEVER are added for defensive code.
	7817	+**
	7818	+** When doing coverage testing ALWAYS and NEVER are hard-coded to
	7819	+** be true and false so that the unreachable code they specify will
	7820	+** not be counted as untested code.
	7821	+*/
	7822	+#if defined(SQLITE_COVERAGE_TEST)
	7823	+# define ALWAYS(X) (1)
	7824	+# define NEVER(X) (0)
	7825	+#elif !defined(NDEBUG)
	7826	+# define ALWAYS(X) ((X)?1:(assert(0),0))
	7827	+# define NEVER(X) ((X)?(assert(0),1):0)
	7828	+#else
	7829	+# define ALWAYS(X) (X)
	7830	+# define NEVER(X) (X)
	7831	+#endif
	7832	+
	7833	+/*
	7834	+** Return true (non-zero) if the input is a integer that is too large
	7835	+** to fit in 32-bits. This macro is used inside of various testcase()
	7836	+** macros to verify that we have tested SQLite for large-file support.
	7837	+*/
	7838	+#define IS_BIG_INT(X) (((X)&~(i64)0xffffffff)!=0)
	7839	+
	7840	+/*
	7841	+** The macro unlikely() is a hint that surrounds a boolean
	7842	+** expression that is usually false. Macro likely() surrounds
	7843	+** a boolean expression that is usually true. These hints could,
	7844	+** in theory, be used by the compiler to generate better code, but
	7845	+** currently they are just comments for human readers.
	7846	+*/
	7847	+#define likely(X) (X)
	7848	+#define unlikely(X) (X)
	7849	+
7852	7850	/************ Include hash.h in the middle of sqliteInt.h ****************/
7853	7851	/************ Begin file hash.h ******************************************/
7854	7852	/*
7855	7853	** 2001 September 22
7856	7854	**
		@@ -31494,11 +31492,11 @@
31494	31492	#endif
31495	31493
31496	31494	#define osGetVersionExA ((BOOL(WINAPI*)( \
31497	31495	LPOSVERSIONINFOA))aSyscall[34].pCurrent)
31498	31496
31499		-#if defined(SQLITE_WIN32_HAS_WIDE)
	31497	+#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE)
31500	31498	{ "GetVersionExW", (SYSCALL)GetVersionExW, 0 },
31501	31499	#else
31502	31500	{ "GetVersionExW", (SYSCALL)0, 0 },
31503	31501	#endif
31504	31502
31505	31503

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -23,531 +23,10 @@
23	# define SQLITE_PRIVATE static
24	#endif
25	#ifndef SQLITE_API
26	# define SQLITE_API
27	#endif
28	/************ Begin file sqliteInt.h *************************************/
29	/*
30	** 2001 September 15
31	**
32	** The author disclaims copyright to this source code. In place of
33	** a legal notice, here is a blessing:
34	**
35	** May you do good and not evil.
36	** May you find forgiveness for yourself and forgive others.
37	** May you share freely, never taking more than you give.
38	**
39	*************************************************************************
40	** Internal interface definitions for SQLite.
41	**
42	*/
43	#ifndef _SQLITEINT_H_
44	#define _SQLITEINT_H_
45
46	/*
47	** These #defines should enable >2GB file support on POSIX if the
48	** underlying operating system supports it. If the OS lacks
49	** large file support, or if the OS is windows, these should be no-ops.
50	**
51	** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any
52	** system #includes. Hence, this block of code must be the very first
53	** code in all source files.
54	**
55	** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
56	** on the compiler command line. This is necessary if you are compiling
57	** on a recent machine (ex: Red Hat 7.2) but you want your code to work
58	** on an older machine (ex: Red Hat 6.0). If you compile on Red Hat 7.2
59	** without this option, LFS is enable. But LFS does not exist in the kernel
60	** in Red Hat 6.0, so the code won't work. Hence, for maximum binary
61	** portability you should omit LFS.
62	**
63	** Similar is true for Mac OS X. LFS is only supported on Mac OS X 9 and later.
64	*/
65	#ifndef SQLITE_DISABLE_LFS
66	# define _LARGE_FILE 1
67	# ifndef _FILE_OFFSET_BITS
68	# define _FILE_OFFSET_BITS 64
69	# endif
70	# define _LARGEFILE_SOURCE 1
71	#endif
72
73	/*
74	** Include the configuration header output by 'configure' if we're using the
75	** autoconf-based build
76	*/
77	#ifdef _HAVE_SQLITE_CONFIG_H
78	#include "config.h"
79	#endif
80
81	/************ Include sqliteLimit.h in the middle of sqliteInt.h *********/
82	/************ Begin file sqliteLimit.h ***********************************/
83	/*
84	** 2007 May 7
85	**
86	** The author disclaims copyright to this source code. In place of
87	** a legal notice, here is a blessing:
88	**
89	** May you do good and not evil.
90	** May you find forgiveness for yourself and forgive others.
91	** May you share freely, never taking more than you give.
92	**
93	*************************************************************************
94	**
95	** This file defines various limits of what SQLite can process.
96	*/
97
98	/*
99	** The maximum length of a TEXT or BLOB in bytes. This also
100	** limits the size of a row in a table or index.
101	**
102	** The hard limit is the ability of a 32-bit signed integer
103	** to count the size: 2^31-1 or 2147483647.
104	*/
105	#ifndef SQLITE_MAX_LENGTH
106	# define SQLITE_MAX_LENGTH 1000000000
107	#endif
108
109	/*
110	** This is the maximum number of
111	**
112	** * Columns in a table
113	** * Columns in an index
114	** * Columns in a view
115	** * Terms in the SET clause of an UPDATE statement
116	** * Terms in the result set of a SELECT statement
117	** * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
118	** * Terms in the VALUES clause of an INSERT statement
119	**
120	** The hard upper limit here is 32676. Most database people will
121	** tell you that in a well-normalized database, you usually should
122	** not have more than a dozen or so columns in any table. And if
123	** that is the case, there is no point in having more than a few
124	** dozen values in any of the other situations described above.
125	*/
126	#ifndef SQLITE_MAX_COLUMN
127	# define SQLITE_MAX_COLUMN 2000
128	#endif
129
130	/*
131	** The maximum length of a single SQL statement in bytes.
132	**
133	** It used to be the case that setting this value to zero would
134	** turn the limit off. That is no longer true. It is not possible
135	** to turn this limit off.
136	*/
137	#ifndef SQLITE_MAX_SQL_LENGTH
138	# define SQLITE_MAX_SQL_LENGTH 1000000000
139	#endif
140
141	/*
142	** The maximum depth of an expression tree. This is limited to
143	** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might
144	** want to place more severe limits on the complexity of an
145	** expression.
146	**
147	** A value of 0 used to mean that the limit was not enforced.
148	** But that is no longer true. The limit is now strictly enforced
149	** at all times.
150	*/
151	#ifndef SQLITE_MAX_EXPR_DEPTH
152	# define SQLITE_MAX_EXPR_DEPTH 1000
153	#endif
154
155	/*
156	** The maximum number of terms in a compound SELECT statement.
157	** The code generator for compound SELECT statements does one
158	** level of recursion for each term. A stack overflow can result
159	** if the number of terms is too large. In practice, most SQL
160	** never has more than 3 or 4 terms. Use a value of 0 to disable
161	** any limit on the number of terms in a compount SELECT.
162	*/
163	#ifndef SQLITE_MAX_COMPOUND_SELECT
164	# define SQLITE_MAX_COMPOUND_SELECT 500
165	#endif
166
167	/*
168	** The maximum number of opcodes in a VDBE program.
169	** Not currently enforced.
170	*/
171	#ifndef SQLITE_MAX_VDBE_OP
172	# define SQLITE_MAX_VDBE_OP 25000
173	#endif
174
175	/*
176	** The maximum number of arguments to an SQL function.
177	*/
178	#ifndef SQLITE_MAX_FUNCTION_ARG
179	# define SQLITE_MAX_FUNCTION_ARG 127
180	#endif
181
182	/*
183	** The maximum number of in-memory pages to use for the main database
184	** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE
185	*/
186	#ifndef SQLITE_DEFAULT_CACHE_SIZE
187	# define SQLITE_DEFAULT_CACHE_SIZE 2000
188	#endif
189	#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
190	# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
191	#endif
192
193	/*
194	** The default number of frames to accumulate in the log file before
195	** checkpointing the database in WAL mode.
196	*/
197	#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
198	# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT 1000
199	#endif
200
201	/*
202	** The maximum number of attached databases. This must be between 0
203	** and 62. The upper bound on 62 is because a 64-bit integer bitmap
204	** is used internally to track attached databases.
205	*/
206	#ifndef SQLITE_MAX_ATTACHED
207	# define SQLITE_MAX_ATTACHED 10
208	#endif
209
210
211	/*
212	** The maximum value of a ?nnn wildcard that the parser will accept.
213	*/
214	#ifndef SQLITE_MAX_VARIABLE_NUMBER
215	# define SQLITE_MAX_VARIABLE_NUMBER 999
216	#endif
217
218	/* Maximum page size. The upper bound on this value is 65536. This a limit
219	** imposed by the use of 16-bit offsets within each page.
220	**
221	** Earlier versions of SQLite allowed the user to change this value at
222	** compile time. This is no longer permitted, on the grounds that it creates
223	** a library that is technically incompatible with an SQLite library
224	** compiled with a different limit. If a process operating on a database
225	** with a page-size of 65536 bytes crashes, then an instance of SQLite
226	** compiled with the default page-size limit will not be able to rollback
227	** the aborted transaction. This could lead to database corruption.
228	*/
229	#ifdef SQLITE_MAX_PAGE_SIZE
230	# undef SQLITE_MAX_PAGE_SIZE
231	#endif
232	#define SQLITE_MAX_PAGE_SIZE 65536
233
234
235	/*
236	** The default size of a database page.
237	*/
238	#ifndef SQLITE_DEFAULT_PAGE_SIZE
239	# define SQLITE_DEFAULT_PAGE_SIZE 1024
240	#endif
241	#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
242	# undef SQLITE_DEFAULT_PAGE_SIZE
243	# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
244	#endif
245
246	/*
247	** Ordinarily, if no value is explicitly provided, SQLite creates databases
248	** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
249	** device characteristics (sector-size and atomic write() support),
250	** SQLite may choose a larger value. This constant is the maximum value
251	** SQLite will choose on its own.
252	*/
253	#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
254	# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
255	#endif
256	#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
257	# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
258	# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
259	#endif
260
261
262	/*
263	** Maximum number of pages in one database file.
264	**
265	** This is really just the default value for the max_page_count pragma.
266	** This value can be lowered (or raised) at run-time using that the
267	** max_page_count macro.
268	*/
269	#ifndef SQLITE_MAX_PAGE_COUNT
270	# define SQLITE_MAX_PAGE_COUNT 1073741823
271	#endif
272
273	/*
274	** Maximum length (in bytes) of the pattern in a LIKE or GLOB
275	** operator.
276	*/
277	#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
278	# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
279	#endif
280
281	/*
282	** Maximum depth of recursion for triggers.
283	**
284	** A value of 1 means that a trigger program will not be able to itself
285	** fire any triggers. A value of 0 means that no trigger programs at all
286	** may be executed.
287	*/
288	#ifndef SQLITE_MAX_TRIGGER_DEPTH
289	# define SQLITE_MAX_TRIGGER_DEPTH 1000
290	#endif
291
292	/************ End of sqliteLimit.h ***************************************/
293	/************ Continuing where we left off in sqliteInt.h ****************/
294
295	/* Disable nuisance warnings on Borland compilers */
296	#if defined(__BORLANDC__)
297	#pragma warn -rch /* unreachable code */
298	#pragma warn -ccc /* Condition is always true or false */
299	#pragma warn -aus /* Assigned value is never used */
300	#pragma warn -csu /* Comparing signed and unsigned */
301	#pragma warn -spa /* Suspicious pointer arithmetic */
302	#endif
303
304	/* Needed for various definitions... */
305	#ifndef _GNU_SOURCE
306	# define _GNU_SOURCE
307	#endif
308
309	#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
310	# define _BSD_SOURCE
311	#endif
312
313	/*
314	** Include standard header files as necessary
315	*/
316	#ifdef HAVE_STDINT_H
317	#include <stdint.h>
318	#endif
319	#ifdef HAVE_INTTYPES_H
320	#include <inttypes.h>
321	#endif
322
323	/*
324	** The following macros are used to cast pointers to integers and
325	** integers to pointers. The way you do this varies from one compiler
326	** to the next, so we have developed the following set of #if statements
327	** to generate appropriate macros for a wide range of compilers.
328	**
329	** The correct "ANSI" way to do this is to use the intptr_t type.
330	** Unfortunately, that typedef is not available on all compilers, or
331	** if it is available, it requires an #include of specific headers
332	** that vary from one machine to the next.
333	**
334	** Ticket #3860: The llvm-gcc-4.2 compiler from Apple chokes on
335	** the ((void)&((char)0)[X]) construct. But MSVC chokes on ((void*)(X)).
336	** So we have to define the macros in different ways depending on the
337	** compiler.
338	*/
339	#if defined(__PTRDIFF_TYPE__) /* This case should work for GCC */
340	# define SQLITE_INT_TO_PTR(X) ((void*)(__PTRDIFF_TYPE__)(X))
341	# define SQLITE_PTR_TO_INT(X) ((int)(__PTRDIFF_TYPE__)(X))
342	#elif !defined(__GNUC__) /* Works for compilers other than LLVM */
343	# define SQLITE_INT_TO_PTR(X) ((void)&((char)0)[X])
344	# define SQLITE_PTR_TO_INT(X) ((int)(((char)X)-(char)0))
345	#elif defined(HAVE_STDINT_H) /* Use this case if we have ANSI headers */
346	# define SQLITE_INT_TO_PTR(X) ((void*)(intptr_t)(X))
347	# define SQLITE_PTR_TO_INT(X) ((int)(intptr_t)(X))
348	#else /* Generates a warning - but it always works */
349	# define SQLITE_INT_TO_PTR(X) ((void*)(X))
350	# define SQLITE_PTR_TO_INT(X) ((int)(X))
351	#endif
352
353	/*
354	** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
355	** 0 means mutexes are permanently disable and the library is never
356	** threadsafe. 1 means the library is serialized which is the highest
357	** level of threadsafety. 2 means the library is multithreaded - multiple
358	** threads can use SQLite as long as no two threads try to use the same
359	** database connection at the same time.
360	**
361	** Older versions of SQLite used an optional THREADSAFE macro.
362	** We support that for legacy.
363	*/
364	#if !defined(SQLITE_THREADSAFE)
365	# if defined(THREADSAFE)
366	# define SQLITE_THREADSAFE THREADSAFE
367	# else
368	# define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
369	# endif
370	#endif
371
372	/*
373	** Powersafe overwrite is on by default. But can be turned off using
374	** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
375	*/
376	#ifndef SQLITE_POWERSAFE_OVERWRITE
377	# define SQLITE_POWERSAFE_OVERWRITE 1
378	#endif
379
380	/*
381	** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
382	** It determines whether or not the features related to
383	** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
384	** be overridden at runtime using the sqlite3_config() API.
385	*/
386	#if !defined(SQLITE_DEFAULT_MEMSTATUS)
387	# define SQLITE_DEFAULT_MEMSTATUS 1
388	#endif
389
390	/*
391	** Exactly one of the following macros must be defined in order to
392	** specify which memory allocation subsystem to use.
393	**
394	** SQLITE_SYSTEM_MALLOC // Use normal system malloc()
395	** SQLITE_WIN32_MALLOC // Use Win32 native heap API
396	** SQLITE_ZERO_MALLOC // Use a stub allocator that always fails
397	** SQLITE_MEMDEBUG // Debugging version of system malloc()
398	**
399	** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
400	** assert() macro is enabled, each call into the Win32 native heap subsystem
401	** will cause HeapValidate to be called. If heap validation should fail, an
402	** assertion will be triggered.
403	**
404	** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
405	** the default.
406	*/
407	#if defined(SQLITE_SYSTEM_MALLOC) \
408	+ defined(SQLITE_WIN32_MALLOC) \
409	+ defined(SQLITE_ZERO_MALLOC) \
410	+ defined(SQLITE_MEMDEBUG)>1
411	# error "Two or more of the following compile-time configuration options\
412	are defined but at most one is allowed:\
413	SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
414	SQLITE_ZERO_MALLOC"
415	#endif
416	#if defined(SQLITE_SYSTEM_MALLOC) \
417	+ defined(SQLITE_WIN32_MALLOC) \
418	+ defined(SQLITE_ZERO_MALLOC) \
419	+ defined(SQLITE_MEMDEBUG)==0
420	# define SQLITE_SYSTEM_MALLOC 1
421	#endif
422
423	/*
424	** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
425	** sizes of memory allocations below this value where possible.
426	*/
427	#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
428	# define SQLITE_MALLOC_SOFT_LIMIT 1024
429	#endif
430
431	/*
432	** We need to define _XOPEN_SOURCE as follows in order to enable
433	** recursive mutexes on most Unix systems and fchmod() on OpenBSD.
434	** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
435	** it.
436	*/
437	#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
438	# define _XOPEN_SOURCE 600
439	#endif
440
441	/*
442	** NDEBUG and SQLITE_DEBUG are opposites. It should always be true that
443	** defined(NDEBUG)==!defined(SQLITE_DEBUG). If this is not currently true,
444	** make it true by defining or undefining NDEBUG.
445	**
446	** Setting NDEBUG makes the code smaller and faster by disabling the
447	** assert() statements in the code. So we want the default action
448	** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
449	** is set. Thus NDEBUG becomes an opt-in rather than an opt-out
450	** feature.
451	*/
452	#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
453	# define NDEBUG 1
454	#endif
455	#if defined(NDEBUG) && defined(SQLITE_DEBUG)
456	# undef NDEBUG
457	#endif
458
459	/*
460	** The testcase() macro is used to aid in coverage testing. When
461	** doing coverage testing, the condition inside the argument to
462	** testcase() must be evaluated both true and false in order to
463	** get full branch coverage. The testcase() macro is inserted
464	** to help ensure adequate test coverage in places where simple
465	** condition/decision coverage is inadequate. For example, testcase()
466	** can be used to make sure boundary values are tested. For
467	** bitmask tests, testcase() can be used to make sure each bit
468	** is significant and used at least once. On switch statements
469	** where multiple cases go to the same block of code, testcase()
470	** can insure that all cases are evaluated.
471	**
472	*/
473	#ifdef SQLITE_COVERAGE_TEST
474	SQLITE_PRIVATE void sqlite3Coverage(int);
475	# define testcase(X) if( X ){ sqlite3Coverage(__LINE__); }
476	#else
477	# define testcase(X)
478	#endif
479
480	/*
481	** The TESTONLY macro is used to enclose variable declarations or
482	** other bits of code that are needed to support the arguments
483	** within testcase() and assert() macros.
484	*/
485	#if !defined(NDEBUG) \|\| defined(SQLITE_COVERAGE_TEST)
486	# define TESTONLY(X) X
487	#else
488	# define TESTONLY(X)
489	#endif
490
491	/*
492	** Sometimes we need a small amount of code such as a variable initialization
493	** to setup for a later assert() statement. We do not want this code to
494	** appear when assert() is disabled. The following macro is therefore
495	** used to contain that setup code. The "VVA" acronym stands for
496	** "Verification, Validation, and Accreditation". In other words, the
497	** code within VVA_ONLY() will only run during verification processes.
498	*/
499	#ifndef NDEBUG
500	# define VVA_ONLY(X) X
501	#else
502	# define VVA_ONLY(X)
503	#endif
504
505	/*
506	** The ALWAYS and NEVER macros surround boolean expressions which
507	** are intended to always be true or false, respectively. Such
508	** expressions could be omitted from the code completely. But they
509	** are included in a few cases in order to enhance the resilience
510	** of SQLite to unexpected behavior - to make the code "self-healing"
511	** or "ductile" rather than being "brittle" and crashing at the first
512	** hint of unplanned behavior.
513	**
514	** In other words, ALWAYS and NEVER are added for defensive code.
515	**
516	** When doing coverage testing ALWAYS and NEVER are hard-coded to
517	** be true and false so that the unreachable code they specify will
518	** not be counted as untested code.
519	*/
520	#if defined(SQLITE_COVERAGE_TEST)
521	# define ALWAYS(X) (1)
522	# define NEVER(X) (0)
523	#elif !defined(NDEBUG)
524	# define ALWAYS(X) ((X)?1:(assert(0),0))
525	# define NEVER(X) ((X)?(assert(0),1):0)
526	#else
527	# define ALWAYS(X) (X)
528	# define NEVER(X) (X)
529	#endif
530
531	/*
532	** Return true (non-zero) if the input is a integer that is too large
533	** to fit in 32-bits. This macro is used inside of various testcase()
534	** macros to verify that we have tested SQLite for large-file support.
535	*/
536	#define IS_BIG_INT(X) (((X)&~(i64)0xffffffff)!=0)
537
538	/*
539	** The macro unlikely() is a hint that surrounds a boolean
540	** expression that is usually false. Macro likely() surrounds
541	** a boolean expression that is usually true. These hints could,
542	** in theory, be used by the compiler to generate better code, but
543	** currently they are just comments for human readers.
544	*/
545	#define likely(X) (X)
546	#define unlikely(X) (X)
547
548	/************ Include sqlite3.h in the middle of sqliteInt.h *************/
549	/************ Begin file sqlite3.h ***************************************/
550	/*
551	** 2001 September 15
552	**
553	** The author disclaims copyright to this source code. In place of
	@@ -656,11 +135,11 @@
656	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
657	** [sqlite_version()] and [sqlite_source_id()].
658	*/
659	#define SQLITE_VERSION "3.8.1"
660	#define SQLITE_VERSION_NUMBER 3008001
661	#define SQLITE_SOURCE_ID "2013-10-10 15:04:52 af7abebeb1f70466833bc766d294d721eaef746f"
662
663	/*
664	** CAPI3REF: Run-Time Library Version Numbers
665	** KEYWORDS: sqlite3_version, sqlite3_sourceid
666	**
	@@ -7846,11 +7325,530 @@
7846
7847	#endif /* ifndef _SQLITE3RTREE_H_ */
7848
7849
7850	/************ End of sqlite3.h *******************************************/









































































































































































































































































7851	/************ Continuing where we left off in sqliteInt.h ****************/






























































































































































































































































7852	/************ Include hash.h in the middle of sqliteInt.h ****************/
7853	/************ Begin file hash.h ******************************************/
7854	/*
7855	** 2001 September 22
7856	**
	@@ -31494,11 +31492,11 @@
31494	#endif
31495
31496	#define osGetVersionExA ((BOOL(WINAPI*)( \
31497	LPOSVERSIONINFOA))aSyscall[34].pCurrent)
31498
31499	#if defined(SQLITE_WIN32_HAS_WIDE)
31500	{ "GetVersionExW", (SYSCALL)GetVersionExW, 0 },
31501	#else
31502	{ "GetVersionExW", (SYSCALL)0, 0 },
31503	#endif
31504
31505

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -23,531 +23,10 @@
23	# define SQLITE_PRIVATE static
24	#endif
25	#ifndef SQLITE_API
26	# define SQLITE_API
27	#endif









































































































































































































































































































































































































































































































































28	/************ Begin file sqlite3.h ***************************************/
29	/*
30	** 2001 September 15
31	**
32	** The author disclaims copyright to this source code. In place of
	@@ -656,11 +135,11 @@
135	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136	** [sqlite_version()] and [sqlite_source_id()].
137	*/
138	#define SQLITE_VERSION "3.8.1"
139	#define SQLITE_VERSION_NUMBER 3008001
140	#define SQLITE_SOURCE_ID "2013-10-11 13:27:26 03593817ab5abdd4bbaa5e47e2e4745eef025af9"
141
142	/*
143	** CAPI3REF: Run-Time Library Version Numbers
144	** KEYWORDS: sqlite3_version, sqlite3_sourceid
145	**
	@@ -7846,11 +7325,530 @@
7325
7326	#endif /* ifndef _SQLITE3RTREE_H_ */
7327
7328
7329	/************ End of sqlite3.h *******************************************/
7330	/************ Begin file sqliteInt.h *************************************/
7331	/*
7332	** 2001 September 15
7333	**
7334	** The author disclaims copyright to this source code. In place of
7335	** a legal notice, here is a blessing:
7336	**
7337	** May you do good and not evil.
7338	** May you find forgiveness for yourself and forgive others.
7339	** May you share freely, never taking more than you give.
7340	**
7341	*************************************************************************
7342	** Internal interface definitions for SQLite.
7343	**
7344	*/
7345	#ifndef _SQLITEINT_H_
7346	#define _SQLITEINT_H_
7347
7348	/*
7349	** These #defines should enable >2GB file support on POSIX if the
7350	** underlying operating system supports it. If the OS lacks
7351	** large file support, or if the OS is windows, these should be no-ops.
7352	**
7353	** Ticket #2739: The _LARGEFILE_SOURCE macro must appear before any
7354	** system #includes. Hence, this block of code must be the very first
7355	** code in all source files.
7356	**
7357	** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
7358	** on the compiler command line. This is necessary if you are compiling
7359	** on a recent machine (ex: Red Hat 7.2) but you want your code to work
7360	** on an older machine (ex: Red Hat 6.0). If you compile on Red Hat 7.2
7361	** without this option, LFS is enable. But LFS does not exist in the kernel
7362	** in Red Hat 6.0, so the code won't work. Hence, for maximum binary
7363	** portability you should omit LFS.
7364	**
7365	** Similar is true for Mac OS X. LFS is only supported on Mac OS X 9 and later.
7366	*/
7367	#ifndef SQLITE_DISABLE_LFS
7368	# define _LARGE_FILE 1
7369	# ifndef _FILE_OFFSET_BITS
7370	# define _FILE_OFFSET_BITS 64
7371	# endif
7372	# define _LARGEFILE_SOURCE 1
7373	#endif
7374
7375	/*
7376	** Include the configuration header output by 'configure' if we're using the
7377	** autoconf-based build
7378	*/
7379	#ifdef _HAVE_SQLITE_CONFIG_H
7380	#include "config.h"
7381	#endif
7382
7383	/************ Include sqliteLimit.h in the middle of sqliteInt.h *********/
7384	/************ Begin file sqliteLimit.h ***********************************/
7385	/*
7386	** 2007 May 7
7387	**
7388	** The author disclaims copyright to this source code. In place of
7389	** a legal notice, here is a blessing:
7390	**
7391	** May you do good and not evil.
7392	** May you find forgiveness for yourself and forgive others.
7393	** May you share freely, never taking more than you give.
7394	**
7395	*************************************************************************
7396	**
7397	** This file defines various limits of what SQLite can process.
7398	*/
7399
7400	/*
7401	** The maximum length of a TEXT or BLOB in bytes. This also
7402	** limits the size of a row in a table or index.
7403	**
7404	** The hard limit is the ability of a 32-bit signed integer
7405	** to count the size: 2^31-1 or 2147483647.
7406	*/
7407	#ifndef SQLITE_MAX_LENGTH
7408	# define SQLITE_MAX_LENGTH 1000000000
7409	#endif
7410
7411	/*
7412	** This is the maximum number of
7413	**
7414	** * Columns in a table
7415	** * Columns in an index
7416	** * Columns in a view
7417	** * Terms in the SET clause of an UPDATE statement
7418	** * Terms in the result set of a SELECT statement
7419	** * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
7420	** * Terms in the VALUES clause of an INSERT statement
7421	**
7422	** The hard upper limit here is 32676. Most database people will
7423	** tell you that in a well-normalized database, you usually should
7424	** not have more than a dozen or so columns in any table. And if
7425	** that is the case, there is no point in having more than a few
7426	** dozen values in any of the other situations described above.
7427	*/
7428	#ifndef SQLITE_MAX_COLUMN
7429	# define SQLITE_MAX_COLUMN 2000
7430	#endif
7431
7432	/*
7433	** The maximum length of a single SQL statement in bytes.
7434	**
7435	** It used to be the case that setting this value to zero would
7436	** turn the limit off. That is no longer true. It is not possible
7437	** to turn this limit off.
7438	*/
7439	#ifndef SQLITE_MAX_SQL_LENGTH
7440	# define SQLITE_MAX_SQL_LENGTH 1000000000
7441	#endif
7442
7443	/*
7444	** The maximum depth of an expression tree. This is limited to
7445	** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might
7446	** want to place more severe limits on the complexity of an
7447	** expression.
7448	**
7449	** A value of 0 used to mean that the limit was not enforced.
7450	** But that is no longer true. The limit is now strictly enforced
7451	** at all times.
7452	*/
7453	#ifndef SQLITE_MAX_EXPR_DEPTH
7454	# define SQLITE_MAX_EXPR_DEPTH 1000
7455	#endif
7456
7457	/*
7458	** The maximum number of terms in a compound SELECT statement.
7459	** The code generator for compound SELECT statements does one
7460	** level of recursion for each term. A stack overflow can result
7461	** if the number of terms is too large. In practice, most SQL
7462	** never has more than 3 or 4 terms. Use a value of 0 to disable
7463	** any limit on the number of terms in a compount SELECT.
7464	*/
7465	#ifndef SQLITE_MAX_COMPOUND_SELECT
7466	# define SQLITE_MAX_COMPOUND_SELECT 500
7467	#endif
7468
7469	/*
7470	** The maximum number of opcodes in a VDBE program.
7471	** Not currently enforced.
7472	*/
7473	#ifndef SQLITE_MAX_VDBE_OP
7474	# define SQLITE_MAX_VDBE_OP 25000
7475	#endif
7476
7477	/*
7478	** The maximum number of arguments to an SQL function.
7479	*/
7480	#ifndef SQLITE_MAX_FUNCTION_ARG
7481	# define SQLITE_MAX_FUNCTION_ARG 127
7482	#endif
7483
7484	/*
7485	** The maximum number of in-memory pages to use for the main database
7486	** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE
7487	*/
7488	#ifndef SQLITE_DEFAULT_CACHE_SIZE
7489	# define SQLITE_DEFAULT_CACHE_SIZE 2000
7490	#endif
7491	#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
7492	# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
7493	#endif
7494
7495	/*
7496	** The default number of frames to accumulate in the log file before
7497	** checkpointing the database in WAL mode.
7498	*/
7499	#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
7500	# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT 1000
7501	#endif
7502
7503	/*
7504	** The maximum number of attached databases. This must be between 0
7505	** and 62. The upper bound on 62 is because a 64-bit integer bitmap
7506	** is used internally to track attached databases.
7507	*/
7508	#ifndef SQLITE_MAX_ATTACHED
7509	# define SQLITE_MAX_ATTACHED 10
7510	#endif
7511
7512
7513	/*
7514	** The maximum value of a ?nnn wildcard that the parser will accept.
7515	*/
7516	#ifndef SQLITE_MAX_VARIABLE_NUMBER
7517	# define SQLITE_MAX_VARIABLE_NUMBER 999
7518	#endif
7519
7520	/* Maximum page size. The upper bound on this value is 65536. This a limit
7521	** imposed by the use of 16-bit offsets within each page.
7522	**
7523	** Earlier versions of SQLite allowed the user to change this value at
7524	** compile time. This is no longer permitted, on the grounds that it creates
7525	** a library that is technically incompatible with an SQLite library
7526	** compiled with a different limit. If a process operating on a database
7527	** with a page-size of 65536 bytes crashes, then an instance of SQLite
7528	** compiled with the default page-size limit will not be able to rollback
7529	** the aborted transaction. This could lead to database corruption.
7530	*/
7531	#ifdef SQLITE_MAX_PAGE_SIZE
7532	# undef SQLITE_MAX_PAGE_SIZE
7533	#endif
7534	#define SQLITE_MAX_PAGE_SIZE 65536
7535
7536
7537	/*
7538	** The default size of a database page.
7539	*/
7540	#ifndef SQLITE_DEFAULT_PAGE_SIZE
7541	# define SQLITE_DEFAULT_PAGE_SIZE 1024
7542	#endif
7543	#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
7544	# undef SQLITE_DEFAULT_PAGE_SIZE
7545	# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
7546	#endif
7547
7548	/*
7549	** Ordinarily, if no value is explicitly provided, SQLite creates databases
7550	** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
7551	** device characteristics (sector-size and atomic write() support),
7552	** SQLite may choose a larger value. This constant is the maximum value
7553	** SQLite will choose on its own.
7554	*/
7555	#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
7556	# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
7557	#endif
7558	#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
7559	# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
7560	# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
7561	#endif
7562
7563
7564	/*
7565	** Maximum number of pages in one database file.
7566	**
7567	** This is really just the default value for the max_page_count pragma.
7568	** This value can be lowered (or raised) at run-time using that the
7569	** max_page_count macro.
7570	*/
7571	#ifndef SQLITE_MAX_PAGE_COUNT
7572	# define SQLITE_MAX_PAGE_COUNT 1073741823
7573	#endif
7574
7575	/*
7576	** Maximum length (in bytes) of the pattern in a LIKE or GLOB
7577	** operator.
7578	*/
7579	#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
7580	# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
7581	#endif
7582
7583	/*
7584	** Maximum depth of recursion for triggers.
7585	**
7586	** A value of 1 means that a trigger program will not be able to itself
7587	** fire any triggers. A value of 0 means that no trigger programs at all
7588	** may be executed.
7589	*/
7590	#ifndef SQLITE_MAX_TRIGGER_DEPTH
7591	# define SQLITE_MAX_TRIGGER_DEPTH 1000
7592	#endif
7593
7594	/************ End of sqliteLimit.h ***************************************/
7595	/************ Continuing where we left off in sqliteInt.h ****************/
7596
7597	/* Disable nuisance warnings on Borland compilers */
7598	#if defined(__BORLANDC__)
7599	#pragma warn -rch /* unreachable code */
7600	#pragma warn -ccc /* Condition is always true or false */
7601	#pragma warn -aus /* Assigned value is never used */
7602	#pragma warn -csu /* Comparing signed and unsigned */
7603	#pragma warn -spa /* Suspicious pointer arithmetic */
7604	#endif
7605
7606	/* Needed for various definitions... */
7607	#ifndef _GNU_SOURCE
7608	# define _GNU_SOURCE
7609	#endif
7610
7611	#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
7612	# define _BSD_SOURCE
7613	#endif
7614
7615	/*
7616	** Include standard header files as necessary
7617	*/
7618	#ifdef HAVE_STDINT_H
7619	#include <stdint.h>
7620	#endif
7621	#ifdef HAVE_INTTYPES_H
7622	#include <inttypes.h>
7623	#endif
7624
7625	/*
7626	** The following macros are used to cast pointers to integers and
7627	** integers to pointers. The way you do this varies from one compiler
7628	** to the next, so we have developed the following set of #if statements
7629	** to generate appropriate macros for a wide range of compilers.
7630	**
7631	** The correct "ANSI" way to do this is to use the intptr_t type.
7632	** Unfortunately, that typedef is not available on all compilers, or
7633	** if it is available, it requires an #include of specific headers
7634	** that vary from one machine to the next.
7635	**
7636	** Ticket #3860: The llvm-gcc-4.2 compiler from Apple chokes on
7637	** the ((void)&((char)0)[X]) construct. But MSVC chokes on ((void*)(X)).
7638	** So we have to define the macros in different ways depending on the
7639	** compiler.
7640	*/
7641	#if defined(__PTRDIFF_TYPE__) /* This case should work for GCC */
7642	# define SQLITE_INT_TO_PTR(X) ((void*)(__PTRDIFF_TYPE__)(X))
7643	# define SQLITE_PTR_TO_INT(X) ((int)(__PTRDIFF_TYPE__)(X))
7644	#elif !defined(__GNUC__) /* Works for compilers other than LLVM */
7645	# define SQLITE_INT_TO_PTR(X) ((void)&((char)0)[X])
7646	# define SQLITE_PTR_TO_INT(X) ((int)(((char)X)-(char)0))
7647	#elif defined(HAVE_STDINT_H) /* Use this case if we have ANSI headers */
7648	# define SQLITE_INT_TO_PTR(X) ((void*)(intptr_t)(X))
7649	# define SQLITE_PTR_TO_INT(X) ((int)(intptr_t)(X))
7650	#else /* Generates a warning - but it always works */
7651	# define SQLITE_INT_TO_PTR(X) ((void*)(X))
7652	# define SQLITE_PTR_TO_INT(X) ((int)(X))
7653	#endif
7654
7655	/*
7656	** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
7657	** 0 means mutexes are permanently disable and the library is never
7658	** threadsafe. 1 means the library is serialized which is the highest
7659	** level of threadsafety. 2 means the library is multithreaded - multiple
7660	** threads can use SQLite as long as no two threads try to use the same
7661	** database connection at the same time.
7662	**
7663	** Older versions of SQLite used an optional THREADSAFE macro.
7664	** We support that for legacy.
7665	*/
7666	#if !defined(SQLITE_THREADSAFE)
7667	# if defined(THREADSAFE)
7668	# define SQLITE_THREADSAFE THREADSAFE
7669	# else
7670	# define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
7671	# endif
7672	#endif
7673
7674	/*
7675	** Powersafe overwrite is on by default. But can be turned off using
7676	** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
7677	*/
7678	#ifndef SQLITE_POWERSAFE_OVERWRITE
7679	# define SQLITE_POWERSAFE_OVERWRITE 1
7680	#endif
7681
7682	/*
7683	** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
7684	** It determines whether or not the features related to
7685	** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
7686	** be overridden at runtime using the sqlite3_config() API.
7687	*/
7688	#if !defined(SQLITE_DEFAULT_MEMSTATUS)
7689	# define SQLITE_DEFAULT_MEMSTATUS 1
7690	#endif
7691
7692	/*
7693	** Exactly one of the following macros must be defined in order to
7694	** specify which memory allocation subsystem to use.
7695	**
7696	** SQLITE_SYSTEM_MALLOC // Use normal system malloc()
7697	** SQLITE_WIN32_MALLOC // Use Win32 native heap API
7698	** SQLITE_ZERO_MALLOC // Use a stub allocator that always fails
7699	** SQLITE_MEMDEBUG // Debugging version of system malloc()
7700	**
7701	** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
7702	** assert() macro is enabled, each call into the Win32 native heap subsystem
7703	** will cause HeapValidate to be called. If heap validation should fail, an
7704	** assertion will be triggered.
7705	**
7706	** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
7707	** the default.
7708	*/
7709	#if defined(SQLITE_SYSTEM_MALLOC) \
7710	+ defined(SQLITE_WIN32_MALLOC) \
7711	+ defined(SQLITE_ZERO_MALLOC) \
7712	+ defined(SQLITE_MEMDEBUG)>1
7713	# error "Two or more of the following compile-time configuration options\
7714	are defined but at most one is allowed:\
7715	SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
7716	SQLITE_ZERO_MALLOC"
7717	#endif
7718	#if defined(SQLITE_SYSTEM_MALLOC) \
7719	+ defined(SQLITE_WIN32_MALLOC) \
7720	+ defined(SQLITE_ZERO_MALLOC) \
7721	+ defined(SQLITE_MEMDEBUG)==0
7722	# define SQLITE_SYSTEM_MALLOC 1
7723	#endif
7724
7725	/*
7726	** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
7727	** sizes of memory allocations below this value where possible.
7728	*/
7729	#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
7730	# define SQLITE_MALLOC_SOFT_LIMIT 1024
7731	#endif
7732
7733	/*
7734	** We need to define _XOPEN_SOURCE as follows in order to enable
7735	** recursive mutexes on most Unix systems and fchmod() on OpenBSD.
7736	** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
7737	** it.
7738	*/
7739	#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
7740	# define _XOPEN_SOURCE 600
7741	#endif
7742
7743	/*
7744	** NDEBUG and SQLITE_DEBUG are opposites. It should always be true that
7745	** defined(NDEBUG)==!defined(SQLITE_DEBUG). If this is not currently true,
7746	** make it true by defining or undefining NDEBUG.
7747	**
7748	** Setting NDEBUG makes the code smaller and faster by disabling the
7749	** assert() statements in the code. So we want the default action
7750	** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
7751	** is set. Thus NDEBUG becomes an opt-in rather than an opt-out
7752	** feature.
7753	*/
7754	#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
7755	# define NDEBUG 1
7756	#endif
7757	#if defined(NDEBUG) && defined(SQLITE_DEBUG)
7758	# undef NDEBUG
7759	#endif
7760
7761	/*
7762	** The testcase() macro is used to aid in coverage testing. When
7763	** doing coverage testing, the condition inside the argument to
7764	** testcase() must be evaluated both true and false in order to
7765	** get full branch coverage. The testcase() macro is inserted
7766	** to help ensure adequate test coverage in places where simple
7767	** condition/decision coverage is inadequate. For example, testcase()
7768	** can be used to make sure boundary values are tested. For
7769	** bitmask tests, testcase() can be used to make sure each bit
7770	** is significant and used at least once. On switch statements
7771	** where multiple cases go to the same block of code, testcase()
7772	** can insure that all cases are evaluated.
7773	**
7774	*/
7775	#ifdef SQLITE_COVERAGE_TEST
7776	SQLITE_PRIVATE void sqlite3Coverage(int);
7777	# define testcase(X) if( X ){ sqlite3Coverage(__LINE__); }
7778	#else
7779	# define testcase(X)
7780	#endif
7781
7782	/*
7783	** The TESTONLY macro is used to enclose variable declarations or
7784	** other bits of code that are needed to support the arguments
7785	** within testcase() and assert() macros.
7786	*/
7787	#if !defined(NDEBUG) \|\| defined(SQLITE_COVERAGE_TEST)
7788	# define TESTONLY(X) X
7789	#else
7790	# define TESTONLY(X)
7791	#endif
7792
7793	/*
7794	** Sometimes we need a small amount of code such as a variable initialization
7795	** to setup for a later assert() statement. We do not want this code to
7796	** appear when assert() is disabled. The following macro is therefore
7797	** used to contain that setup code. The "VVA" acronym stands for
7798	** "Verification, Validation, and Accreditation". In other words, the
7799	** code within VVA_ONLY() will only run during verification processes.
7800	*/
7801	#ifndef NDEBUG
7802	# define VVA_ONLY(X) X
7803	#else
7804	# define VVA_ONLY(X)
7805	#endif
7806
7807	/*
7808	** The ALWAYS and NEVER macros surround boolean expressions which
7809	** are intended to always be true or false, respectively. Such
7810	** expressions could be omitted from the code completely. But they
7811	** are included in a few cases in order to enhance the resilience
7812	** of SQLite to unexpected behavior - to make the code "self-healing"
7813	** or "ductile" rather than being "brittle" and crashing at the first
7814	** hint of unplanned behavior.
7815	**
7816	** In other words, ALWAYS and NEVER are added for defensive code.
7817	**
7818	** When doing coverage testing ALWAYS and NEVER are hard-coded to
7819	** be true and false so that the unreachable code they specify will
7820	** not be counted as untested code.
7821	*/
7822	#if defined(SQLITE_COVERAGE_TEST)
7823	# define ALWAYS(X) (1)
7824	# define NEVER(X) (0)
7825	#elif !defined(NDEBUG)
7826	# define ALWAYS(X) ((X)?1:(assert(0),0))
7827	# define NEVER(X) ((X)?(assert(0),1):0)
7828	#else
7829	# define ALWAYS(X) (X)
7830	# define NEVER(X) (X)
7831	#endif
7832
7833	/*
7834	** Return true (non-zero) if the input is a integer that is too large
7835	** to fit in 32-bits. This macro is used inside of various testcase()
7836	** macros to verify that we have tested SQLite for large-file support.
7837	*/
7838	#define IS_BIG_INT(X) (((X)&~(i64)0xffffffff)!=0)
7839
7840	/*
7841	** The macro unlikely() is a hint that surrounds a boolean
7842	** expression that is usually false. Macro likely() surrounds
7843	** a boolean expression that is usually true. These hints could,
7844	** in theory, be used by the compiler to generate better code, but
7845	** currently they are just comments for human readers.
7846	*/
7847	#define likely(X) (X)
7848	#define unlikely(X) (X)
7849
7850	/************ Include hash.h in the middle of sqliteInt.h ****************/
7851	/************ Begin file hash.h ******************************************/
7852	/*
7853	** 2001 September 22
7854	**
	@@ -31494,11 +31492,11 @@
31492	#endif
31493
31494	#define osGetVersionExA ((BOOL(WINAPI*)( \
31495	LPOSVERSIONINFOA))aSyscall[34].pCurrent)
31496
31497	#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE)
31498	{ "GetVersionExW", (SYSCALL)GetVersionExW, 0 },
31499	#else
31500	{ "GetVersionExW", (SYSCALL)0, 0 },
31501	#endif
31502
31503

M src/sqlite3.h

+1 -1

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -107,11 +107,11 @@
107	107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	108	** [sqlite_version()] and [sqlite_source_id()].
109	109	*/
110	110	#define SQLITE_VERSION "3.8.1"
111	111	#define SQLITE_VERSION_NUMBER 3008001
112		-#define SQLITE_SOURCE_ID "2013-10-10 15:04:52 af7abebeb1f70466833bc766d294d721eaef746f"
	112	+#define SQLITE_SOURCE_ID "2013-10-11 13:27:26 03593817ab5abdd4bbaa5e47e2e4745eef025af9"
113	113
114	114	/*
115	115	** CAPI3REF: Run-Time Library Version Numbers
116	116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	117	**
118	118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.8.1"
111	#define SQLITE_VERSION_NUMBER 3008001
112	#define SQLITE_SOURCE_ID "2013-10-10 15:04:52 af7abebeb1f70466833bc766d294d721eaef746f"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.8.1"
111	#define SQLITE_VERSION_NUMBER 3008001
112	#define SQLITE_SOURCE_ID "2013-10-11 13:27:26 03593817ab5abdd4bbaa5e47e2e4745eef025af9"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

M src/stat.c

+1 -1

		--- src/stat.c
		+++ src/stat.c
		@@ -16,12 +16,12 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code to implement the stat web page
19	19	**
20	20	*/
21		-#include <string.h>
22	21	#include "config.h"
	22	+#include <string.h>
23	23	#include "stat.h"
24	24
25	25	/*
26	26	** For a sufficiently large integer, provide an alternative
27	27	** representation as MB or GB or TB.
28	28

	--- src/stat.c
	+++ src/stat.c
	@@ -16,12 +16,12 @@
16	*******************************************************************************
17	**
18	** This file contains code to implement the stat web page
19	**
20	*/
21	#include <string.h>
22	#include "config.h"

23	#include "stat.h"
24
25	/*
26	** For a sufficiently large integer, provide an alternative
27	** representation as MB or GB or TB.
28

	--- src/stat.c
	+++ src/stat.c
	@@ -16,12 +16,12 @@
16	*******************************************************************************
17	**
18	** This file contains code to implement the stat web page
19	**
20	*/

21	#include "config.h"
22	#include <string.h>
23	#include "stat.h"
24
25	/*
26	** For a sufficiently large integer, provide an alternative
27	** representation as MB or GB or TB.
28

M src/tar.c

+1 -1

		--- src/tar.c
		+++ src/tar.c
		@@ -15,13 +15,13 @@
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to generate tarballs.
19	19	*/
	20	+#include "config.h"
20	21	#include <assert.h>
21	22	#include <zlib.h>
22		-#include "config.h"
23	23	#include "tar.h"
24	24
25	25	/*
26	26	** State information for the tarball builder.
27	27	*/
28	28

	--- src/tar.c
	+++ src/tar.c
	@@ -15,13 +15,13 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to generate tarballs.
19	*/

20	#include <assert.h>
21	#include <zlib.h>
22	#include "config.h"
23	#include "tar.h"
24
25	/*
26	** State information for the tarball builder.
27	*/
28

	--- src/tar.c
	+++ src/tar.c
	@@ -15,13 +15,13 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to generate tarballs.
19	*/
20	#include "config.h"
21	#include <assert.h>
22	#include <zlib.h>

23	#include "tar.h"
24
25	/*
26	** State information for the tarball builder.
27	*/
28

M src/th.c

+1 -1

		--- src/th.c
		+++ src/th.c
		@@ -2,10 +2,11 @@
2	2	/*
3	3	** The implementation of the TH core. This file contains the parser, and
4	4	** the implementation of the interface in th.h.
5	5	*/
6	6
	7	+#include "config.h"
7	8	#include "th.h"
8	9	#include <string.h>
9	10	#include <assert.h>
10	11
11	12	typedef struct Th_Command Th_Command;
		@@ -2354,11 +2355,10 @@
2354	2355	}
2355	2356
2356	2357	#ifndef LONGDOUBLE_TYPE
2357	2358	# define LONGDOUBLE_TYPE long double
2358	2359	#endif
2359		-typedef char u8;
2360	2360
2361	2361
2362	2362	/*
2363	2363	** Return TRUE if z is a pure numeric string. Return FALSE if the
2364	2364	** string contains any character which is not part of a number. If
2365	2365

	--- src/th.c
	+++ src/th.c
	@@ -2,10 +2,11 @@
2	/*
3	** The implementation of the TH core. This file contains the parser, and
4	** the implementation of the interface in th.h.
5	*/
6

7	#include "th.h"
8	#include <string.h>
9	#include <assert.h>
10
11	typedef struct Th_Command Th_Command;
	@@ -2354,11 +2355,10 @@
2354	}
2355
2356	#ifndef LONGDOUBLE_TYPE
2357	# define LONGDOUBLE_TYPE long double
2358	#endif
2359	typedef char u8;
2360
2361
2362	/*
2363	** Return TRUE if z is a pure numeric string. Return FALSE if the
2364	** string contains any character which is not part of a number. If
2365

	--- src/th.c
	+++ src/th.c
	@@ -2,10 +2,11 @@
2	/*
3	** The implementation of the TH core. This file contains the parser, and
4	** the implementation of the interface in th.h.
5	*/
6
7	#include "config.h"
8	#include "th.h"
9	#include <string.h>
10	#include <assert.h>
11
12	typedef struct Th_Command Th_Command;
	@@ -2354,11 +2355,10 @@
2355	}
2356
2357	#ifndef LONGDOUBLE_TYPE
2358	# define LONGDOUBLE_TYPE long double
2359	#endif

2360
2361
2362	/*
2363	** Return TRUE if z is a pure numeric string. Return FALSE if the
2364	** string contains any character which is not part of a number. If
2365

M src/timeline.c

+116 -18

		--- src/timeline.c
		+++ src/timeline.c
		@@ -16,13 +16,13 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code to implement the timeline web page
19	19	**
20	20	*/
	21	+#include "config.h"
21	22	#include <string.h>
22	23	#include <time.h>
23		-#include "config.h"
24	24	#include "timeline.h"
25	25
26	26	/*
27	27	** Shorten a UUID so that is the minimum length needed to contain
28	28	** at least one digit in the range 'a'..'f'. The minimum length is 10.
		@@ -1851,10 +1851,24 @@
1851	1851	}
1852	1852	db_finalize(&q);
1853	1853	style_footer();
1854	1854	}
1855	1855
	1856	+
	1857	+/*
	1858	+** Used by stats_report_xxxxx() to remember which type of events
	1859	+** to show. Populated by stats_report_init_view() and holds the
	1860	+** return value of that function.
	1861	+*/
	1862	+static int statsReportType = 0;
	1863	+
	1864	+/*
	1865	+** Set by stats_report_init_view() to one of the y=XXXX values
	1866	+** accepted by /timeline?y=XXXX.
	1867	+*/
	1868	+static char const * statsReportTimelineYFlag = NULL;
	1869	+
1856	1870	/*
1857	1871	** Creates a TEMP VIEW named v_reports which is a wrapper around the
1858	1872	** EVENT table filtered on event.type. It looks for the request
1859	1873	** parameter 'type' (reminder: we "should" use 'y' for consistency
1860	1874	** with /timeline, but /reports uses 'y' for the year) and expects it
		@@ -1869,14 +1883,15 @@
1869	1883	**
1870	1884	** Returns one of: 'c', 'w', 'g', 't', 'e', representing the type of
1871	1885	** filter it applies, or '*' if no filter is applied (i.e. if "all" is
1872	1886	** used).
1873	1887	*/
1874		-static char stats_report_init_view(){
	1888	+static int stats_report_init_view(){
1875	1889	char const * zType = PD("type",""); / analog to /timeline?y=... */
1876	1890	char const * zRealType = NULL; /* normalized form of zType */
1877		- char rc = 0; /* result code */
	1891	+ int rc = 0; /* result code */
	1892	+ assert( !statsReportType && "Must not be called more than once." );
1878	1893	switch( (zType && zType) ? zType : 0 ){
1879	1894	case 'c':
1880	1895	case 'C':
1881	1896	zRealType = "ci";
1882	1897	rc = *zRealType;
		@@ -1905,18 +1920,82 @@
1905	1920	rc = '*';
1906	1921	break;
1907	1922	}
1908	1923	assert(0 != rc);
1909	1924	if(zRealType){
	1925	+ statsReportTimelineYFlag = zRealType;
1910	1926	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1911	1927	"SELECT * FROM event WHERE type GLOB %Q",
1912	1928	zRealType);
1913	1929	}else{
	1930	+ statsReportTimelineYFlag = "a";
1914	1931	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1915	1932	"SELECT * FROM event");
1916	1933	}
1917		- return rc;
	1934	+ return statsReportType = rc;
	1935	+}
	1936	+
	1937	+/*
	1938	+** Returns a string suitable (for a given value of suitable) for
	1939	+** use in a label with the header of the /reports pages, dependent
	1940	+** on the 'type' flag. See stats_report_init_view().
	1941	+** The returned bytes are static.
	1942	+*/
	1943	+static char const * stats_report_label_for_type(){
	1944	+ assert( statsReportType && "Must call stats_report_init_view() first." );
	1945	+ switch( statsReportType ){
	1946	+ case 'c':
	1947	+ return "checkins";
	1948	+ case 'w':
	1949	+ return "wiki changes";
	1950	+ case 't':
	1951	+ return "ticket changes";
	1952	+ case 'g':
	1953	+ return "tag changes";
	1954	+ default:
	1955	+ return "all types";
	1956	+ }
	1957	+}
	1958	+
	1959	+/*
	1960	+** A helper for the /reports family of pages which prints out a menu
	1961	+** of links for the various type=XXX flags. zCurrentViewName must be
	1962	+** the name/value of the 'view' parameter which is in effect at
	1963	+** the time this is called. e.g. if called from the 'byuser' view
	1964	+** then zCurrentViewName must be "byuser".
	1965	+*/
	1966	+static void stats_report_event_types_menu(char const * zCurrentViewName){
	1967	+ char * zTop = mprintf("%s/reports?view=%s", g.zTop, zCurrentViewName);
	1968	+ cgi_printf("<div>");
	1969	+ cgi_printf("<span>Event types:</span> ");
	1970	+ if('*' == statsReportType){
	1971	+ cgi_printf(" <strong>all</strong>", zTop);
	1972	+ }else{
	1973	+ cgi_printf(" <a href='%s'>all</a>", zTop);
	1974	+ }
	1975	+ if('c' == statsReportType){
	1976	+ cgi_printf(" <strong>checkins</strong>", zTop);
	1977	+ }else{
	1978	+ cgi_printf(" <a href='%s&type=ci'>checkins</a>", zTop);
	1979	+ }
	1980	+ if( 't' == statsReportType ){
	1981	+ cgi_printf(" <strong>tickets</strong>", zTop);
	1982	+ }else{
	1983	+ cgi_printf(" <a href='%s&type=t'>tickets</a>", zTop);
	1984	+ }
	1985	+ if( 'g' == statsReportType ){
	1986	+ cgi_printf(" <strong>tags</strong>", zTop);
	1987	+ }else{
	1988	+ cgi_printf(" <a href='%s&type=g'>tags</a>", zTop);
	1989	+ }
	1990	+ if( 'w' == statsReportType ){
	1991	+ cgi_printf(" <strong>wiki</strong>", zTop);
	1992	+ }else{
	1993	+ cgi_printf(" <a href='%s&type=w'>wiki</a>", zTop);
	1994	+ }
	1995	+ fossil_free(zTop);
	1996	+ cgi_printf("</div>");
1918	1997	}
1919	1998
1920	1999
1921	2000	/*
1922	2001	** Helper for stats_report_by_month_year(), which generates a list of
		@@ -1938,13 +2017,13 @@
1938	2017	zTimeframe);
1939	2018	while( SQLITE_ROW == db_step(&stWeek) ){
1940	2019	const char * zWeek = db_column_text(&stWeek,0);
1941	2020	const int nCount = db_column_int(&stWeek,1);
1942	2021	cgi_printf("<a href='%s/timeline?"
1943		- "yw=%t-%t&n=%d'>%s</a>",
	2022	+ "yw=%t-%t&n=%d&y=%s'>%s</a>",
1944	2023	g.zTop, yearPart, zWeek,
1945		- nCount, zWeek);
	2024	+ nCount, statsReportTimelineYFlag, zWeek);
1946	2025	}
1947	2026	db_finalize(&stWeek);
1948	2027	}
1949	2028
1950	2029	/*
		@@ -1974,11 +2053,13 @@
1974	2053	int nMaxEvents = 1; /* for calculating length of graph
1975	2054	bars. */
1976	2055	int iterations = 0; /* number of weeks/months we iterate
1977	2056	over */
1978	2057	stats_report_init_view();
1979		- blob_appendf(&header, "Timeline Events by year%s",
	2058	+ stats_report_event_types_menu( includeMonth ? "bymonth" : "byyear" );
	2059	+ blob_appendf(&header, "Timeline Events (%s) by year%s",
	2060	+ stats_report_label_for_type(),
1980	2061	(includeMonth ? "/month" : ""));
1981	2062	blob_appendf(&sql,
1982	2063	"SELECT substr(date(mtime),1,%d) AS timeframe, "
1983	2064	"count(*) AS eventCount "
1984	2065	"FROM v_reports ",
		@@ -2047,21 +2128,23 @@
2047	2128	nEventsPerYear += nCount;
2048	2129	@<tr class='row%d(rowClass)'>
2049	2130	@ <td>
2050	2131	if(includeMonth){
2051	2132	cgi_printf("<a href='%s/timeline?"
2052		- "ym=%t&n=%d",
2053		- g.zTop, zTimeframe, nCount );
	2133	+ "ym=%t&n=%d&y=%s",
	2134	+ g.zTop, zTimeframe, nCount,
	2135	+ statsReportTimelineYFlag );
2054	2136	/* Reminder: n=nCount is not actually correct for bymonth unless
2055	2137	that was the only user who caused events.
2056	2138	*/
2057	2139	if( zUserName && *zUserName ){
2058	2140	cgi_printf("&u=%t", zUserName);
2059	2141	}
2060	2142	cgi_printf("' target='_new'>%s</a>",zTimeframe);
2061	2143	}else {
2062		- cgi_printf("<a href='?view=byweek&y=%s", zTimeframe);
	2144	+ cgi_printf("<a href='?view=byweek&y=%s&type=%c",
	2145	+ zTimeframe, (char)statsReportType);
2063	2146	if(zUserName && *zUserName){
2064	2147	cgi_printf("&u=%t", zUserName);
2065	2148	}
2066	2149	cgi_printf("'>%s</a>", zTimeframe);
2067	2150	}
		@@ -2120,19 +2203,21 @@
2120	2203	row colors */
2121	2204	Blob sql = empty_blob; /* SQL */
2122	2205	int nMaxEvents = 1; /* max number of events for
2123	2206	all rows. */
2124	2207	stats_report_init_view();
	2208	+ stats_report_event_types_menu("byuser");
2125	2209	blob_append(&sql,
2126	2210	"SELECT user, "
2127	2211	"COUNT(*) AS eventCount "
2128	2212	"FROM v_reports "
2129	2213	"GROUP BY user ORDER BY eventCount DESC",
2130	2214	-1);
2131	2215	db_prepare(&query, blob_str(&sql));
2132	2216	blob_reset(&sql);
2133		- @ <h1>Timeline Events by User</h1>
	2217	+ @ <h1>Timeline Events
	2218	+ @ (%s(stats_report_label_for_type())) by User</h1>
2134	2219	@ <table class='statistics-report-table-events' border='0'
2135	2220	@ cellpadding='2' cellspacing='0' id='statsTable'>
2136	2221	@ <thead><tr>
2137	2222	@ <th>User</th>
2138	2223	@ <th>Events</th>
		@@ -2154,11 +2239,11 @@
2154	2239	if(!nCount) continue /* arguable! Possible? */;
2155	2240	rowClass = ++nRowNumber % 2;
2156	2241	nEventTotal += nCount;
2157	2242	@<tr class='row%d(rowClass)'>
2158	2243	@ <td>
2159		- @ <a href="?view=bymonth&user=%h(zUser)">%h(zUser)</a>
	2244	+ @ <a href="?view=bymonth&user=%h(zUser)&type=%c((char)statsReportType)">%h(zUser)</a>
2160	2245	@ </td><td>%d(nCount)</td>
2161	2246	@ <td>
2162	2247	@ <div class='statistics-report-graph-line'
2163	2248	@ style='height:16px;width:%d(nSize)%%;'>
2164	2249	@ </div></td>
		@@ -2187,12 +2272,12 @@
2187	2272	char * zDefaultYear = NULL;
2188	2273	Blob sql = empty_blob;
2189	2274	int nMaxEvents = 1; /* max number of events for
2190	2275	all rows. */
2191	2276	int iterations = 0; /* # of active time periods. */
2192		-
2193	2277	stats_report_init_view();
	2278	+ stats_report_event_types_menu("byweek");
2194	2279	cgi_printf("Select year: ");
2195	2280	blob_append(&sql,
2196	2281	"SELECT DISTINCT substr(date(mtime),1,4) AS y "
2197	2282	"FROM v_reports WHERE 1 ", -1);
2198	2283	if(zUserName&&*zUserName){
		@@ -2204,11 +2289,12 @@
2204	2289	while( SQLITE_ROW == db_step(&qYears) ){
2205	2290	const char * zT = db_column_text(&qYears, 0);
2206	2291	if( i++ ){
2207	2292	cgi_printf(" ");
2208	2293	}
2209		- cgi_printf("<a href='?view=byweek&y=%s", zT);
	2294	+ cgi_printf("<a href='?view=byweek&y=%s&type=%c", zT,
	2295	+ (char)statsReportType);
2210	2296	if(zUserName && *zUserName){
2211	2297	cgi_printf("&user=%t",zUserName);
2212	2298	}
2213	2299	cgi_printf("'>%s</a>",zT);
2214	2300	}
		@@ -2222,12 +2308,13 @@
2222	2308	if(4 == nYear){
2223	2309	Stmt stWeek = empty_Stmt;
2224	2310	int rowCount = 0;
2225	2311	int total = 0;
2226	2312	Blob header = empty_blob;
2227		- blob_appendf(&header, "Timeline events for the calendar weeks "
2228		- "of %h", zYear);
	2313	+ blob_appendf(&header, "Timeline events (%s) for the calendar weeks "
	2314	+ "of %h", stats_report_label_for_type(),
	2315	+ zYear);
2229	2316	blob_appendf(&sql,
2230	2317	"SELECT DISTINCT strftime('%%%%W',mtime) AS wk, "
2231	2318	"count(*) AS n "
2232	2319	"FROM v_reports "
2233	2320	"WHERE %Q=substr(date(mtime),1,4) "
		@@ -2265,12 +2352,13 @@
2265	2352	const int nSize = nCount
2266	2353	? (int)(100 * nCount / nMaxEvents)
2267	2354	: 0;
2268	2355	total += nCount;
2269	2356	cgi_printf("<tr class='row%d'>", ++rowCount % 2 );
2270		- cgi_printf("<td><a href='%s/timeline?yw=%t-%s&n=%d",
2271		- g.zTop, zYear, zWeek, nCount);
	2357	+ cgi_printf("<td><a href='%s/timeline?yw=%t-%s&n=%d&y=%s",
	2358	+ g.zTop, zYear, zWeek, nCount,
	2359	+ statsReportTimelineYFlag);
2272	2360	if(zUserName && *zUserName){
2273	2361	cgi_printf("&u=%t",zUserName);
2274	2362	}
2275	2363	cgi_printf("'>%s</a></td>",zWeek);
2276	2364
		@@ -2303,10 +2391,20 @@
2303	2391	**
2304	2392	** Query Parameters:
2305	2393	**
2306	2394	** view=REPORT_NAME Valid values: bymonth, byyear, byuser
2307	2395	** user=NAME Restricts statistics to the given user
	2396	+** type=TYPE Restricts the report to a specific event type:
	2397	+** ci (checkin), w (wiki), t (ticket), g (tag)
	2398	+** Defaulting to all event types.
	2399	+**
	2400	+** The view-specific query parameters include:
	2401	+**
	2402	+** view=byweek:
	2403	+**
	2404	+** y=YYYY The year to report (default is the server's
	2405	+** current year).
2308	2406	*/
2309	2407	void stats_report_page(){
2310	2408	HQuery url; /* URL for various branch links */
2311	2409	const char * zView = P("view"); /* Which view/report to show. */
2312	2410	const char *zUserName = P("user");
2313	2411

	--- src/timeline.c
	+++ src/timeline.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code to implement the timeline web page
19	**
20	*/

21	#include <string.h>
22	#include <time.h>
23	#include "config.h"
24	#include "timeline.h"
25
26	/*
27	** Shorten a UUID so that is the minimum length needed to contain
28	** at least one digit in the range 'a'..'f'. The minimum length is 10.
	@@ -1851,10 +1851,24 @@
1851	}
1852	db_finalize(&q);
1853	style_footer();
1854	}
1855














1856	/*
1857	** Creates a TEMP VIEW named v_reports which is a wrapper around the
1858	** EVENT table filtered on event.type. It looks for the request
1859	** parameter 'type' (reminder: we "should" use 'y' for consistency
1860	** with /timeline, but /reports uses 'y' for the year) and expects it
	@@ -1869,14 +1883,15 @@
1869	**
1870	** Returns one of: 'c', 'w', 'g', 't', 'e', representing the type of
1871	** filter it applies, or '*' if no filter is applied (i.e. if "all" is
1872	** used).
1873	*/
1874	static char stats_report_init_view(){
1875	char const * zType = PD("type",""); / analog to /timeline?y=... */
1876	char const * zRealType = NULL; /* normalized form of zType */
1877	char rc = 0; /* result code */

1878	switch( (zType && zType) ? zType : 0 ){
1879	case 'c':
1880	case 'C':
1881	zRealType = "ci";
1882	rc = *zRealType;
	@@ -1905,18 +1920,82 @@
1905	rc = '*';
1906	break;
1907	}
1908	assert(0 != rc);
1909	if(zRealType){

1910	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1911	"SELECT * FROM event WHERE type GLOB %Q",
1912	zRealType);
1913	}else{

1914	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1915	"SELECT * FROM event");
1916	}
1917	return rc;






























































1918	}
1919
1920
1921	/*
1922	** Helper for stats_report_by_month_year(), which generates a list of
	@@ -1938,13 +2017,13 @@
1938	zTimeframe);
1939	while( SQLITE_ROW == db_step(&stWeek) ){
1940	const char * zWeek = db_column_text(&stWeek,0);
1941	const int nCount = db_column_int(&stWeek,1);
1942	cgi_printf("<a href='%s/timeline?"
1943	"yw=%t-%t&n=%d'>%s</a>",
1944	g.zTop, yearPart, zWeek,
1945	nCount, zWeek);
1946	}
1947	db_finalize(&stWeek);
1948	}
1949
1950	/*
	@@ -1974,11 +2053,13 @@
1974	int nMaxEvents = 1; /* for calculating length of graph
1975	bars. */
1976	int iterations = 0; /* number of weeks/months we iterate
1977	over */
1978	stats_report_init_view();
1979	blob_appendf(&header, "Timeline Events by year%s",


1980	(includeMonth ? "/month" : ""));
1981	blob_appendf(&sql,
1982	"SELECT substr(date(mtime),1,%d) AS timeframe, "
1983	"count(*) AS eventCount "
1984	"FROM v_reports ",
	@@ -2047,21 +2128,23 @@
2047	nEventsPerYear += nCount;
2048	@<tr class='row%d(rowClass)'>
2049	@ <td>
2050	if(includeMonth){
2051	cgi_printf("<a href='%s/timeline?"
2052	"ym=%t&n=%d",
2053	g.zTop, zTimeframe, nCount );

2054	/* Reminder: n=nCount is not actually correct for bymonth unless
2055	that was the only user who caused events.
2056	*/
2057	if( zUserName && *zUserName ){
2058	cgi_printf("&u=%t", zUserName);
2059	}
2060	cgi_printf("' target='_new'>%s</a>",zTimeframe);
2061	}else {
2062	cgi_printf("<a href='?view=byweek&y=%s", zTimeframe);

2063	if(zUserName && *zUserName){
2064	cgi_printf("&u=%t", zUserName);
2065	}
2066	cgi_printf("'>%s</a>", zTimeframe);
2067	}
	@@ -2120,19 +2203,21 @@
2120	row colors */
2121	Blob sql = empty_blob; /* SQL */
2122	int nMaxEvents = 1; /* max number of events for
2123	all rows. */
2124	stats_report_init_view();

2125	blob_append(&sql,
2126	"SELECT user, "
2127	"COUNT(*) AS eventCount "
2128	"FROM v_reports "
2129	"GROUP BY user ORDER BY eventCount DESC",
2130	-1);
2131	db_prepare(&query, blob_str(&sql));
2132	blob_reset(&sql);
2133	@ <h1>Timeline Events by User</h1>

2134	@ <table class='statistics-report-table-events' border='0'
2135	@ cellpadding='2' cellspacing='0' id='statsTable'>
2136	@ <thead><tr>
2137	@ <th>User</th>
2138	@ <th>Events</th>
	@@ -2154,11 +2239,11 @@
2154	if(!nCount) continue /* arguable! Possible? */;
2155	rowClass = ++nRowNumber % 2;
2156	nEventTotal += nCount;
2157	@<tr class='row%d(rowClass)'>
2158	@ <td>
2159	@ <a href="?view=bymonth&user=%h(zUser)">%h(zUser)</a>
2160	@ </td><td>%d(nCount)</td>
2161	@ <td>
2162	@ <div class='statistics-report-graph-line'
2163	@ style='height:16px;width:%d(nSize)%%;'>
2164	@ </div></td>
	@@ -2187,12 +2272,12 @@
2187	char * zDefaultYear = NULL;
2188	Blob sql = empty_blob;
2189	int nMaxEvents = 1; /* max number of events for
2190	all rows. */
2191	int iterations = 0; /* # of active time periods. */
2192
2193	stats_report_init_view();

2194	cgi_printf("Select year: ");
2195	blob_append(&sql,
2196	"SELECT DISTINCT substr(date(mtime),1,4) AS y "
2197	"FROM v_reports WHERE 1 ", -1);
2198	if(zUserName&&*zUserName){
	@@ -2204,11 +2289,12 @@
2204	while( SQLITE_ROW == db_step(&qYears) ){
2205	const char * zT = db_column_text(&qYears, 0);
2206	if( i++ ){
2207	cgi_printf(" ");
2208	}
2209	cgi_printf("<a href='?view=byweek&y=%s", zT);

2210	if(zUserName && *zUserName){
2211	cgi_printf("&user=%t",zUserName);
2212	}
2213	cgi_printf("'>%s</a>",zT);
2214	}
	@@ -2222,12 +2308,13 @@
2222	if(4 == nYear){
2223	Stmt stWeek = empty_Stmt;
2224	int rowCount = 0;
2225	int total = 0;
2226	Blob header = empty_blob;
2227	blob_appendf(&header, "Timeline events for the calendar weeks "
2228	"of %h", zYear);

2229	blob_appendf(&sql,
2230	"SELECT DISTINCT strftime('%%%%W',mtime) AS wk, "
2231	"count(*) AS n "
2232	"FROM v_reports "
2233	"WHERE %Q=substr(date(mtime),1,4) "
	@@ -2265,12 +2352,13 @@
2265	const int nSize = nCount
2266	? (int)(100 * nCount / nMaxEvents)
2267	: 0;
2268	total += nCount;
2269	cgi_printf("<tr class='row%d'>", ++rowCount % 2 );
2270	cgi_printf("<td><a href='%s/timeline?yw=%t-%s&n=%d",
2271	g.zTop, zYear, zWeek, nCount);

2272	if(zUserName && *zUserName){
2273	cgi_printf("&u=%t",zUserName);
2274	}
2275	cgi_printf("'>%s</a></td>",zWeek);
2276
	@@ -2303,10 +2391,20 @@
2303	**
2304	** Query Parameters:
2305	**
2306	** view=REPORT_NAME Valid values: bymonth, byyear, byuser
2307	** user=NAME Restricts statistics to the given user










2308	*/
2309	void stats_report_page(){
2310	HQuery url; /* URL for various branch links */
2311	const char * zView = P("view"); /* Which view/report to show. */
2312	const char *zUserName = P("user");
2313

	--- src/timeline.c
	+++ src/timeline.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code to implement the timeline web page
19	**
20	*/
21	#include "config.h"
22	#include <string.h>
23	#include <time.h>

24	#include "timeline.h"
25
26	/*
27	** Shorten a UUID so that is the minimum length needed to contain
28	** at least one digit in the range 'a'..'f'. The minimum length is 10.
	@@ -1851,10 +1851,24 @@
1851	}
1852	db_finalize(&q);
1853	style_footer();
1854	}
1855
1856
1857	/*
1858	** Used by stats_report_xxxxx() to remember which type of events
1859	** to show. Populated by stats_report_init_view() and holds the
1860	** return value of that function.
1861	*/
1862	static int statsReportType = 0;
1863
1864	/*
1865	** Set by stats_report_init_view() to one of the y=XXXX values
1866	** accepted by /timeline?y=XXXX.
1867	*/
1868	static char const * statsReportTimelineYFlag = NULL;
1869
1870	/*
1871	** Creates a TEMP VIEW named v_reports which is a wrapper around the
1872	** EVENT table filtered on event.type. It looks for the request
1873	** parameter 'type' (reminder: we "should" use 'y' for consistency
1874	** with /timeline, but /reports uses 'y' for the year) and expects it
	@@ -1869,14 +1883,15 @@
1883	**
1884	** Returns one of: 'c', 'w', 'g', 't', 'e', representing the type of
1885	** filter it applies, or '*' if no filter is applied (i.e. if "all" is
1886	** used).
1887	*/
1888	static int stats_report_init_view(){
1889	char const * zType = PD("type",""); / analog to /timeline?y=... */
1890	char const * zRealType = NULL; /* normalized form of zType */
1891	int rc = 0; /* result code */
1892	assert( !statsReportType && "Must not be called more than once." );
1893	switch( (zType && zType) ? zType : 0 ){
1894	case 'c':
1895	case 'C':
1896	zRealType = "ci";
1897	rc = *zRealType;
	@@ -1905,18 +1920,82 @@
1920	rc = '*';
1921	break;
1922	}
1923	assert(0 != rc);
1924	if(zRealType){
1925	statsReportTimelineYFlag = zRealType;
1926	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1927	"SELECT * FROM event WHERE type GLOB %Q",
1928	zRealType);
1929	}else{
1930	statsReportTimelineYFlag = "a";
1931	db_multi_exec("CREATE TEMP VIEW v_reports AS "
1932	"SELECT * FROM event");
1933	}
1934	return statsReportType = rc;
1935	}
1936
1937	/*
1938	** Returns a string suitable (for a given value of suitable) for
1939	** use in a label with the header of the /reports pages, dependent
1940	** on the 'type' flag. See stats_report_init_view().
1941	** The returned bytes are static.
1942	*/
1943	static char const * stats_report_label_for_type(){
1944	assert( statsReportType && "Must call stats_report_init_view() first." );
1945	switch( statsReportType ){
1946	case 'c':
1947	return "checkins";
1948	case 'w':
1949	return "wiki changes";
1950	case 't':
1951	return "ticket changes";
1952	case 'g':
1953	return "tag changes";
1954	default:
1955	return "all types";
1956	}
1957	}
1958
1959	/*
1960	** A helper for the /reports family of pages which prints out a menu
1961	** of links for the various type=XXX flags. zCurrentViewName must be
1962	** the name/value of the 'view' parameter which is in effect at
1963	** the time this is called. e.g. if called from the 'byuser' view
1964	** then zCurrentViewName must be "byuser".
1965	*/
1966	static void stats_report_event_types_menu(char const * zCurrentViewName){
1967	char * zTop = mprintf("%s/reports?view=%s", g.zTop, zCurrentViewName);
1968	cgi_printf("<div>");
1969	cgi_printf("<span>Event types:</span> ");
1970	if('*' == statsReportType){
1971	cgi_printf(" <strong>all</strong>", zTop);
1972	}else{
1973	cgi_printf(" <a href='%s'>all</a>", zTop);
1974	}
1975	if('c' == statsReportType){
1976	cgi_printf(" <strong>checkins</strong>", zTop);
1977	}else{
1978	cgi_printf(" <a href='%s&type=ci'>checkins</a>", zTop);
1979	}
1980	if( 't' == statsReportType ){
1981	cgi_printf(" <strong>tickets</strong>", zTop);
1982	}else{
1983	cgi_printf(" <a href='%s&type=t'>tickets</a>", zTop);
1984	}
1985	if( 'g' == statsReportType ){
1986	cgi_printf(" <strong>tags</strong>", zTop);
1987	}else{
1988	cgi_printf(" <a href='%s&type=g'>tags</a>", zTop);
1989	}
1990	if( 'w' == statsReportType ){
1991	cgi_printf(" <strong>wiki</strong>", zTop);
1992	}else{
1993	cgi_printf(" <a href='%s&type=w'>wiki</a>", zTop);
1994	}
1995	fossil_free(zTop);
1996	cgi_printf("</div>");
1997	}
1998
1999
2000	/*
2001	** Helper for stats_report_by_month_year(), which generates a list of
	@@ -1938,13 +2017,13 @@
2017	zTimeframe);
2018	while( SQLITE_ROW == db_step(&stWeek) ){
2019	const char * zWeek = db_column_text(&stWeek,0);
2020	const int nCount = db_column_int(&stWeek,1);
2021	cgi_printf("<a href='%s/timeline?"
2022	"yw=%t-%t&n=%d&y=%s'>%s</a>",
2023	g.zTop, yearPart, zWeek,
2024	nCount, statsReportTimelineYFlag, zWeek);
2025	}
2026	db_finalize(&stWeek);
2027	}
2028
2029	/*
	@@ -1974,11 +2053,13 @@
2053	int nMaxEvents = 1; /* for calculating length of graph
2054	bars. */
2055	int iterations = 0; /* number of weeks/months we iterate
2056	over */
2057	stats_report_init_view();
2058	stats_report_event_types_menu( includeMonth ? "bymonth" : "byyear" );
2059	blob_appendf(&header, "Timeline Events (%s) by year%s",
2060	stats_report_label_for_type(),
2061	(includeMonth ? "/month" : ""));
2062	blob_appendf(&sql,
2063	"SELECT substr(date(mtime),1,%d) AS timeframe, "
2064	"count(*) AS eventCount "
2065	"FROM v_reports ",
	@@ -2047,21 +2128,23 @@
2128	nEventsPerYear += nCount;
2129	@<tr class='row%d(rowClass)'>
2130	@ <td>
2131	if(includeMonth){
2132	cgi_printf("<a href='%s/timeline?"
2133	"ym=%t&n=%d&y=%s",
2134	g.zTop, zTimeframe, nCount,
2135	statsReportTimelineYFlag );
2136	/* Reminder: n=nCount is not actually correct for bymonth unless
2137	that was the only user who caused events.
2138	*/
2139	if( zUserName && *zUserName ){
2140	cgi_printf("&u=%t", zUserName);
2141	}
2142	cgi_printf("' target='_new'>%s</a>",zTimeframe);
2143	}else {
2144	cgi_printf("<a href='?view=byweek&y=%s&type=%c",
2145	zTimeframe, (char)statsReportType);
2146	if(zUserName && *zUserName){
2147	cgi_printf("&u=%t", zUserName);
2148	}
2149	cgi_printf("'>%s</a>", zTimeframe);
2150	}
	@@ -2120,19 +2203,21 @@
2203	row colors */
2204	Blob sql = empty_blob; /* SQL */
2205	int nMaxEvents = 1; /* max number of events for
2206	all rows. */
2207	stats_report_init_view();
2208	stats_report_event_types_menu("byuser");
2209	blob_append(&sql,
2210	"SELECT user, "
2211	"COUNT(*) AS eventCount "
2212	"FROM v_reports "
2213	"GROUP BY user ORDER BY eventCount DESC",
2214	-1);
2215	db_prepare(&query, blob_str(&sql));
2216	blob_reset(&sql);
2217	@ <h1>Timeline Events
2218	@ (%s(stats_report_label_for_type())) by User</h1>
2219	@ <table class='statistics-report-table-events' border='0'
2220	@ cellpadding='2' cellspacing='0' id='statsTable'>
2221	@ <thead><tr>
2222	@ <th>User</th>
2223	@ <th>Events</th>
	@@ -2154,11 +2239,11 @@
2239	if(!nCount) continue /* arguable! Possible? */;
2240	rowClass = ++nRowNumber % 2;
2241	nEventTotal += nCount;
2242	@<tr class='row%d(rowClass)'>
2243	@ <td>
2244	@ <a href="?view=bymonth&user=%h(zUser)&type=%c((char)statsReportType)">%h(zUser)</a>
2245	@ </td><td>%d(nCount)</td>
2246	@ <td>
2247	@ <div class='statistics-report-graph-line'
2248	@ style='height:16px;width:%d(nSize)%%;'>
2249	@ </div></td>
	@@ -2187,12 +2272,12 @@
2272	char * zDefaultYear = NULL;
2273	Blob sql = empty_blob;
2274	int nMaxEvents = 1; /* max number of events for
2275	all rows. */
2276	int iterations = 0; /* # of active time periods. */

2277	stats_report_init_view();
2278	stats_report_event_types_menu("byweek");
2279	cgi_printf("Select year: ");
2280	blob_append(&sql,
2281	"SELECT DISTINCT substr(date(mtime),1,4) AS y "
2282	"FROM v_reports WHERE 1 ", -1);
2283	if(zUserName&&*zUserName){
	@@ -2204,11 +2289,12 @@
2289	while( SQLITE_ROW == db_step(&qYears) ){
2290	const char * zT = db_column_text(&qYears, 0);
2291	if( i++ ){
2292	cgi_printf(" ");
2293	}
2294	cgi_printf("<a href='?view=byweek&y=%s&type=%c", zT,
2295	(char)statsReportType);
2296	if(zUserName && *zUserName){
2297	cgi_printf("&user=%t",zUserName);
2298	}
2299	cgi_printf("'>%s</a>",zT);
2300	}
	@@ -2222,12 +2308,13 @@
2308	if(4 == nYear){
2309	Stmt stWeek = empty_Stmt;
2310	int rowCount = 0;
2311	int total = 0;
2312	Blob header = empty_blob;
2313	blob_appendf(&header, "Timeline events (%s) for the calendar weeks "
2314	"of %h", stats_report_label_for_type(),
2315	zYear);
2316	blob_appendf(&sql,
2317	"SELECT DISTINCT strftime('%%%%W',mtime) AS wk, "
2318	"count(*) AS n "
2319	"FROM v_reports "
2320	"WHERE %Q=substr(date(mtime),1,4) "
	@@ -2265,12 +2352,13 @@
2352	const int nSize = nCount
2353	? (int)(100 * nCount / nMaxEvents)
2354	: 0;
2355	total += nCount;
2356	cgi_printf("<tr class='row%d'>", ++rowCount % 2 );
2357	cgi_printf("<td><a href='%s/timeline?yw=%t-%s&n=%d&y=%s",
2358	g.zTop, zYear, zWeek, nCount,
2359	statsReportTimelineYFlag);
2360	if(zUserName && *zUserName){
2361	cgi_printf("&u=%t",zUserName);
2362	}
2363	cgi_printf("'>%s</a></td>",zWeek);
2364
	@@ -2303,10 +2391,20 @@
2391	**
2392	** Query Parameters:
2393	**
2394	** view=REPORT_NAME Valid values: bymonth, byyear, byuser
2395	** user=NAME Restricts statistics to the given user
2396	** type=TYPE Restricts the report to a specific event type:
2397	** ci (checkin), w (wiki), t (ticket), g (tag)
2398	** Defaulting to all event types.
2399	**
2400	** The view-specific query parameters include:
2401	**
2402	** view=byweek:
2403	**
2404	** y=YYYY The year to report (default is the server's
2405	** current year).
2406	*/
2407	void stats_report_page(){
2408	HQuery url; /* URL for various branch links */
2409	const char * zView = P("view"); /* Which view/report to show. */
2410	const char *zUserName = P("user");
2411

M src/wiki.c

+1 -1

		--- src/wiki.c
		+++ src/wiki.c
		@@ -16,13 +16,13 @@
16	16	**
17	17	*******************************************************************************
18	18	**
19	19	** This file contains code to do formatting of wiki text.
20	20	*/
	21	+#include "config.h"
21	22	#include <assert.h>
22	23	#include <ctype.h>
23		-#include "config.h"
24	24	#include "wiki.h"
25	25
26	26	/*
27	27	** Return true if the input string is a well-formed wiki page name.
28	28	**
29	29

	--- src/wiki.c
	+++ src/wiki.c
	@@ -16,13 +16,13 @@
16	**
17	*******************************************************************************
18	**
19	** This file contains code to do formatting of wiki text.
20	*/

21	#include <assert.h>
22	#include <ctype.h>
23	#include "config.h"
24	#include "wiki.h"
25
26	/*
27	** Return true if the input string is a well-formed wiki page name.
28	**
29

	--- src/wiki.c
	+++ src/wiki.c
	@@ -16,13 +16,13 @@
16	**
17	*******************************************************************************
18	**
19	** This file contains code to do formatting of wiki text.
20	*/
21	#include "config.h"
22	#include <assert.h>
23	#include <ctype.h>

24	#include "wiki.h"
25
26	/*
27	** Return true if the input string is a well-formed wiki page name.
28	**
29

M src/wikiformat.c

+1 -1

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -15,12 +15,12 @@
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code to do formatting of wiki text.
19	19	*/
20		-#include <assert.h>
21	20	#include "config.h"
	21	+#include <assert.h>
22	22	#include "wikiformat.h"
23	23
24	24	#if INTERFACE
25	25	/*
26	26	** Allowed wiki transformation operations
27	27

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code to do formatting of wiki text.
19	*/
20	#include <assert.h>
21	#include "config.h"

22	#include "wikiformat.h"
23
24	#if INTERFACE
25	/*
26	** Allowed wiki transformation operations
27

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -15,12 +15,12 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code to do formatting of wiki text.
19	*/

20	#include "config.h"
21	#include <assert.h>
22	#include "wikiformat.h"
23
24	#if INTERFACE
25	/*
26	** Allowed wiki transformation operations
27

M src/wysiwyg.c

+1 -1

		--- src/wysiwyg.c
		+++ src/wysiwyg.c
		@@ -16,13 +16,13 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code that generates WYSIWYG text editors on
19	19	** web pages.
20	20	*/
	21	+#include "config.h"
21	22	#include <assert.h>
22	23	#include <ctype.h>
23		-#include "config.h"
24	24	#include "wysiwyg.h"
25	25
26	26
27	27	/*
28	28	** Output code for a WYSIWYG editor. The caller must have already generated
29	29

	--- src/wysiwyg.c
	+++ src/wysiwyg.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code that generates WYSIWYG text editors on
19	** web pages.
20	*/

21	#include <assert.h>
22	#include <ctype.h>
23	#include "config.h"
24	#include "wysiwyg.h"
25
26
27	/*
28	** Output code for a WYSIWYG editor. The caller must have already generated
29

	--- src/wysiwyg.c
	+++ src/wysiwyg.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code that generates WYSIWYG text editors on
19	** web pages.
20	*/
21	#include "config.h"
22	#include <assert.h>
23	#include <ctype.h>

24	#include "wysiwyg.h"
25
26
27	/*
28	** Output code for a WYSIWYG editor. The caller must have already generated
29

M src/zip.c

+1 -1

		--- src/zip.c
		+++ src/zip.c
		@@ -15,13 +15,13 @@
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to generate ZIP archives.
19	19	*/
	20	+#include "config.h"
20	21	#include <assert.h>
21	22	#include <zlib.h>
22		-#include "config.h"
23	23	#include "zip.h"
24	24
25	25	/*
26	26	** Write a 16- or 32-bit integer as little-endian into the given buffer.
27	27	*/
28	28

	--- src/zip.c
	+++ src/zip.c
	@@ -15,13 +15,13 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to generate ZIP archives.
19	*/

20	#include <assert.h>
21	#include <zlib.h>
22	#include "config.h"
23	#include "zip.h"
24
25	/*
26	** Write a 16- or 32-bit integer as little-endian into the given buffer.
27	*/
28

	--- src/zip.c
	+++ src/zip.c
	@@ -15,13 +15,13 @@
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to generate ZIP archives.
19	*/
20	#include "config.h"
21	#include <assert.h>
22	#include <zlib.h>

23	#include "zip.h"
24
25	/*
26	** Write a 16- or 32-bit integer as little-endian into the given buffer.
27	*/
28

M win/Makefile.mingw

+3 -3

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -163,12 +163,12 @@
163	163	endif
164	164	endif
165	165
166	166	# With MinGW command line handling workaround
167	167	ifdef MINGW_IS_32BIT_ONLY
168		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	168	+TCC += -DBROKEN_MINGW_CMDLINE=1
	169	+RCC += -DBROKEN_MINGW_CMDLINE=1
170	170	endif
171	171
172	172	# With HTTPS support
173	173	ifdef FOSSIL_ENABLE_SSL
174	174	TCC += -DFOSSIL_ENABLE_SSL=1
		@@ -1685,11 +1685,11 @@
1685	1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686	1686
1687	1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688	1688
1689	1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690		- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1690	+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691	1691
1692	1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -1685,11 +1685,11 @@
1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686
1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688
1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691
1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1
169	RCC += -DBROKEN_MINGW_CMDLINE=1
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -1685,11 +1685,11 @@
1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686
1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688
1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691
1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696

M win/Makefile.mingw.mistachkin

+3 -3

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -163,12 +163,12 @@
163	163	endif
164	164	endif
165	165
166	166	# With MinGW command line handling workaround
167	167	ifdef MINGW_IS_32BIT_ONLY
168		-TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169		-RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
	168	+TCC += -DBROKEN_MINGW_CMDLINE=1
	169	+RCC += -DBROKEN_MINGW_CMDLINE=1
170	170	endif
171	171
172	172	# With HTTPS support
173	173	ifdef FOSSIL_ENABLE_SSL
174	174	TCC += -DFOSSIL_ENABLE_SSL=1
		@@ -1685,11 +1685,11 @@
1685	1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686	1686
1687	1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688	1688
1689	1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690		- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1690	+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691	1691
1692	1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
169	RCC += -DBROKEN_MINGW_CMDLINE=1 -D_USE_32BIT_TIME_T
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -1685,11 +1685,11 @@
1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686
1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688
1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691
1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -163,12 +163,12 @@
163	endif
164	endif
165
166	# With MinGW command line handling workaround
167	ifdef MINGW_IS_32BIT_ONLY
168	TCC += -DBROKEN_MINGW_CMDLINE=1
169	RCC += -DBROKEN_MINGW_CMDLINE=1
170	endif
171
172	# With HTTPS support
173	ifdef FOSSIL_ENABLE_SSL
174	TCC += -DFOSSIL_ENABLE_SSL=1
	@@ -1685,11 +1685,11 @@
1685	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1686
1687	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1688
1689	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1690	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1691
1692	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696

M www/changes.wiki

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,6 +1,10 @@
1	1	<title>Change Log</title>
	2	+
	3	+<h2>Changes For Version 1.28 (as yet unreleased)</h2>
	4	+ * Enhance [/help?cmd=/reports \| /reports] to support event type filtering.
	5	+
2	6
3	7	<h2>Changes For Version 1.27 (2013-09-11)</h2>
4	8	* Enhance the [/help?cmd=changes \| fossil changes],
5	9	[/help?cmd=clean \| fossil clean], [/help?cmd=extras \| fossil extras],
6	10	[/help?cmd=ls \| fossil ls] and [/help?cmd=status \| fossil status] commands
7	11

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,6 +1,10 @@
1	<title>Change Log</title>




2
3	<h2>Changes For Version 1.27 (2013-09-11)</h2>
4	* Enhance the [/help?cmd=changes \| fossil changes],
5	[/help?cmd=clean \| fossil clean], [/help?cmd=extras \| fossil extras],
6	[/help?cmd=ls \| fossil ls] and [/help?cmd=status \| fossil status] commands
7

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,6 +1,10 @@
1	<title>Change Log</title>
2
3	<h2>Changes For Version 1.28 (as yet unreleased)</h2>
4	* Enhance [/help?cmd=/reports \| /reports] to support event type filtering.
5
6
7	<h2>Changes For Version 1.27 (2013-09-11)</h2>
8	* Enhance the [/help?cmd=changes \| fossil changes],
9	[/help?cmd=clean \| fossil clean], [/help?cmd=extras \| fossil extras],
10	[/help?cmd=ls \| fossil ls] and [/help?cmd=status \| fossil status] commands
11

Fossil SCM

Keyboard Shortcuts