Fossil SCM

Bring in fixes and new release code.

amb 2013-09-13 02:41 ssh-transport-changes merge

Commit a359ef8f20e878e1b03d503bac69e20a5a7a2ab1

Parent 746a93e1ad29c01…

22 files changed +1 -1 +2 -2 +1 +1 +126 -120 +1 -1 +6 -4 +15 -3 +15 -3 +1 -1 +7 -2 +1 +1 -1 +1 -1 +2 -2 +1 -1 +5 -1 +5 -1 +2 -1 +7 -4 +67 -67 +4 -4

~ VERSION ~ src/branch.c ~ src/cgi.c ~ src/cgi.c ~ src/cson_amalgamation.c ~ src/finfo.c ~ src/json_timeline.c ~ src/main.c ~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ src/update.c ~ src/xfer.c ~ src/xfer.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/changes.wiki ~ www/fileformat.wiki ~ www/mkdownload.tcl

M VERSION

+1 -1

		--- VERSION
		+++ VERSION
		@@ -1,1 +1,1 @@
1		-1.26
	1	+1.27
2	2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	1.26
2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	1.27
2

M src/branch.c

+2 -2

		--- src/branch.c
		+++ src/branch.c
		@@ -325,12 +325,12 @@
325	325	}
326	326	login_anonymous_available();
327	327	style_sidebox_begin("Nomenclature:", "33%");
328	328	@ <ol>
329	329	@ <li> An <div class="sideboxDescribed">%z(href("brlist"))
330		- @ open branch</a></div> is a branch that has one or
331		- @ more %z(href("leaves"))open leaves.</a>
	330	+ @ open branch</a></div> is a branch that has one or more
	331	+ @ <div class="sideboxDescribed">%z(href("leaves"))open leaves.</a></div>
332	332	@ The presence of open leaves presumably means
333	333	@ that the branch is still being extended with new check-ins.</li>
334	334	@ <li> A <div class="sideboxDescribed">%z(href("brlist?closed"))
335	335	@ closed branch</a></div> is a branch with only
336	336	@ <div class="sideboxDescribed">%z(href("leaves?closed"))
337	337

	--- src/branch.c
	+++ src/branch.c
	@@ -325,12 +325,12 @@
325	}
326	login_anonymous_available();
327	style_sidebox_begin("Nomenclature:", "33%");
328	@ <ol>
329	@ <li> An <div class="sideboxDescribed">%z(href("brlist"))
330	@ open branch</a></div> is a branch that has one or
331	@ more %z(href("leaves"))open leaves.</a>
332	@ The presence of open leaves presumably means
333	@ that the branch is still being extended with new check-ins.</li>
334	@ <li> A <div class="sideboxDescribed">%z(href("brlist?closed"))
335	@ closed branch</a></div> is a branch with only
336	@ <div class="sideboxDescribed">%z(href("leaves?closed"))
337

	--- src/branch.c
	+++ src/branch.c
	@@ -325,12 +325,12 @@
325	}
326	login_anonymous_available();
327	style_sidebox_begin("Nomenclature:", "33%");
328	@ <ol>
329	@ <li> An <div class="sideboxDescribed">%z(href("brlist"))
330	@ open branch</a></div> is a branch that has one or more
331	@ <div class="sideboxDescribed">%z(href("leaves"))open leaves.</a></div>
332	@ The presence of open leaves presumably means
333	@ that the branch is still being extended with new check-ins.</li>
334	@ <li> A <div class="sideboxDescribed">%z(href("brlist?closed"))
335	@ closed branch</a></div> is a branch with only
336	@ <div class="sideboxDescribed">%z(href("leaves?closed"))
337

M src/cgi.c

		--- src/cgi.c
		+++ src/cgi.c
		@@ -43,10 +43,11 @@
43	43	#include <unistd.h>
44	44	#include "cgi.h"
45	45	#ifdef __CYGWIN__
46	46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	47	void , void , void *, int);
	48	+ __declspec(dllimport) extern __stdcall size_t wcslen(const wchar_t *);
48	49	#endif
49	50
50	51	#if INTERFACE
51	52	/*
52	53	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
53	54

	--- src/cgi.c
	+++ src/cgi.c
	@@ -43,10 +43,11 @@
43	#include <unistd.h>
44	#include "cgi.h"
45	#ifdef __CYGWIN__
46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	void , void , void *, int);

48	#endif
49
50	#if INTERFACE
51	/*
52	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
53

	--- src/cgi.c
	+++ src/cgi.c
	@@ -43,10 +43,11 @@
43	#include <unistd.h>
44	#include "cgi.h"
45	#ifdef __CYGWIN__
46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	void , void , void *, int);
48	__declspec(dllimport) extern __stdcall size_t wcslen(const wchar_t *);
49	#endif
50
51	#if INTERFACE
52	/*
53	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
54

M src/cgi.c

		--- src/cgi.c
		+++ src/cgi.c
		@@ -43,10 +43,11 @@
43	43	#include <unistd.h>
44	44	#include "cgi.h"
45	45	#ifdef __CYGWIN__
46	46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	47	void , void , void *, int);
	48	+ __declspec(dllimport) extern __stdcall size_t wcslen(const wchar_t *);
48	49	#endif
49	50
50	51	#if INTERFACE
51	52	/*
52	53	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
53	54

	--- src/cgi.c
	+++ src/cgi.c
	@@ -43,10 +43,11 @@
43	#include <unistd.h>
44	#include "cgi.h"
45	#ifdef __CYGWIN__
46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	void , void , void *, int);

48	#endif
49
50	#if INTERFACE
51	/*
52	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
53

	--- src/cgi.c
	+++ src/cgi.c
	@@ -43,10 +43,11 @@
43	#include <unistd.h>
44	#include "cgi.h"
45	#ifdef __CYGWIN__
46	__declspec(dllimport) extern __stdcall int ShellExecuteW(void , void ,
47	void , void , void *, int);
48	__declspec(dllimport) extern __stdcall size_t wcslen(const wchar_t *);
49	#endif
50
51	#if INTERFACE
52	/*
53	** Shortcuts for cgi_parameter. P("x") returns the value of query parameter
54

M src/cson_amalgamation.c

+126 -120

		--- src/cson_amalgamation.c
		+++ src/cson_amalgamation.c
		@@ -30,11 +30,11 @@
30	30	/* Determine the integer type use to parse non-floating point numbers */
31	31	#ifdef _WIN32
32	32	typedef __int64 JSON_int_t;
33	33	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%I64d"
34	34	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%I64d"
35		-#elif (__STDC_VERSION__ >= 199901L) \|\| (HAVE_LONG_LONG == 1)
	35	+#elif __STDC_VERSION__ >= 199901L \|\| HAVE_LONG_LONG == 1
36	36	typedef long long JSON_int_t;
37	37	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
38	38	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
39	39	#else
40	40	typedef long JSON_int_t;
		@@ -103,11 +103,11 @@
103	103	JSON_T_NULL, JSON_T_TRUE, and JSON_T_FALSE. String values are always returned
104	104	as zero-terminated C strings.
105	105
106	106	\return Non-zero if parsing should continue, else zero.
107	107	*/
108		-typedef int (JSON_parser_callback)(void ctx, int type, const struct JSON_value_struct* value);
	108	+typedef int (JSON_parser_callback)(void ctx, int type, const JSON_value* value);
109	109
110	110
111	111	/**
112	112	A typedef for allocator functions semantically compatible with malloc().
113	113	*/
		@@ -233,11 +233,11 @@
233	233
234	234	#endif /* JSON_PARSER_H */
235	235	/* end file parser/JSON_parser.h */
236	236	/* begin file parser/JSON_parser.c */
237	237	/*
238		-Copyright (c) 2005 JSON.org
	238	+Copyright (c) 2007-2013 Jean Gressmann ([email protected])
239	239
240	240	Permission is hereby granted, free of charge, to any person obtaining a copy
241	241	of this software and associated documentation files (the "Software"), to deal
242	242	in the Software without restriction, including without limitation the rights
243	243	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		@@ -245,12 +245,10 @@
245	245	furnished to do so, subject to the following conditions:
246	246
247	247	The above copyright notice and this permission notice shall be included in all
248	248	copies or substantial portions of the Software.
249	249
250		-The Software shall be used for Good, not Evil.
251		-
252	250	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
253	251	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
254	252	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
255	253	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
256	254	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		@@ -257,49 +255,52 @@
257	255	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
258	256	SOFTWARE.
259	257	*/
260	258
261	259	/*
262		- Callbacks, comments, Unicode handling by Jean Gressmann ([email protected]), 2007-2010.
263		-
264		-
265	260	Changelog:
	261	+ 2013-09-08
	262	+ Updated license to to be compatible with Debian license requirements.
	263	+
	264	+ 2012-06-06
	265	+ Fix for invalid UTF16 characters and some comment fixex ([email protected]).
	266	+
266	267	2010-11-25
267	268	Support for custom memory allocation ([email protected]).
268		-
	269	+
269	270	2010-05-07
270		- Added error handling for memory allocation failure ([email protected]).
	271	+ Added error handling for memory allocation failure ([email protected]).
271	272	Added diagnosis errors for invalid JSON.
272		-
	273	+
273	274	2010-03-25
274	275	Fixed buffer overrun in grow_parse_buffer & cleaned up code.
275		-
	276	+
276	277	2009-10-19
277		- Replaced long double in JSON_value_struct with double after reports
	278	+ Replaced long double in JSON_value_struct with double after reports
278	279	of strtold being broken on some platforms ([email protected]).
279		-
280		- 2009-05-17
	280	+
	281	+ 2009-05-17
281	282	Incorporated [email protected] fix for UTF16 decoding.
282		-
283		- 2009-05-14
	283	+
	284	+ 2009-05-14
284	285	Fixed float parsing bug related to a locale being set that didn't
285	286	use '.' as decimal point character ([email protected]).
286		-
287		- 2008-10-14
	287	+
	288	+ 2008-10-14
288	289	Renamed states.IN to states.IT to avoid name clash which IN macro
289	290	defined in windef.h ([email protected])
290		-
291		- 2008-07-19
	291	+
	292	+ 2008-07-19
292	293	Removed some duplicate code & debugging variable ([email protected])
293		-
294		- 2008-05-28
295		- Made JSON_value structure ansi C compliant. This bug was report by
	294	+
	295	+ 2008-05-28
	296	+ Made JSON_value structure ansi C compliant. This bug was report by
296	297	[email protected]
297		-
298		- 2008-05-20
299		- Fixed bug reported by [email protected] where the switching
300		- from static to dynamic parse buffer did not copy the static parse
	298	+
	299	+ 2008-05-20
	300	+ Fixed bug reported by [email protected] where the switching
	301	+ from static to dynamic parse buffer did not copy the static parse
301	302	buffer's content.
302	303	*/
303	304
304	305
305	306
		@@ -362,11 +363,11 @@
362	363	char static_parse_buffer[JSON_PARSER_PARSE_BUFFER_SIZE];
363	364	JSON_malloc_t malloc;
364	365	JSON_free_t free;
365	366	};
366	367
367		-#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
	368	+#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
368	369
369	370	/*
370	371	Characters are mapped into these character classes. This allows for
371	372	a significant reduction in the size of the state transition table.
372	373	*/
		@@ -403,11 +404,11 @@
403	404	C_LOW_T, /* t */
404	405	C_LOW_U, /* u */
405	406	C_ABCDF, /* ABCDF */
406	407	C_E, /* E */
407	408	C_ETC, /* everything else */
408		- C_STAR, /* * */
	409	+ C_STAR, /* * */
409	410	NR_CLASSES
410	411	};
411	412
412	413	static const signed char ascii_class[128] = {
413	414	/*
		@@ -419,11 +420,11 @@
419	420	__, C_WHITE, C_WHITE, __, __, C_WHITE, __, __,
420	421	__, __, __, __, __, __, __, __,
421	422	__, __, __, __, __, __, __, __,
422	423
423	424	C_SPACE, C_ETC, C_QUOTE, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
424		- C_ETC, C_ETC, C_STAR, C_PLUS, C_COMMA, C_MINUS, C_POINT, C_SLASH,
	425	+ C_ETC, C_ETC, C_STAR, C_PLUS, C_COMMA, C_MINUS, C_POINT, C_SLASH,
425	426	C_ZERO, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT,
426	427	C_DIGIT, C_DIGIT, C_COLON, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
427	428
428	429	C_ETC, C_ABCDF, C_ABCDF, C_ABCDF, C_ABCDF, C_E, C_ABCDF, C_ETC,
429	430	C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
		@@ -536,11 +537,11 @@
536	537	/false F4/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__,__,__},
537	538	/nu N1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N2,__,__,__,__},
538	539	/nul N2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N3,__,__,__,__,__,__,__,__,__},
539	540	/null N3/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__},
540	541	// C1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,C2},
541		-// C2*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
	542	+//star C2/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
542	543	/** C3*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,CE,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
543	544	/_. FX/ {OK,OK,__,-8,__,-7,__,-3,__,__,__,__,__,__,FR,FR,__,__,__,__,E1,__,__,__,__,__,__,__,__,E1,__,__},
544	545	/\ D1/ {__,__,__,__,__,__,__,__,__,D2,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__},
545	546	/\ D2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,U1,__,__,__,__},
546	547	};
		@@ -548,27 +549,27 @@
548	549
549	550	/*
550	551	These modes can be pushed on the stack.
551	552	*/
552	553	enum modes {
553		- MODE_ARRAY = 1,
554		- MODE_DONE = 2,
555		- MODE_KEY = 3,
	554	+ MODE_ARRAY = 1,
	555	+ MODE_DONE = 2,
	556	+ MODE_KEY = 3,
556	557	MODE_OBJECT = 4
557	558	};
558	559
559	560	static void set_error(JSON_parser jc)
560	561	{
561	562	switch (jc->state) {
562	563	case GO:
563	564	switch (jc->current_char) {
564		- case '{': case '}': case '[': case ']':
	565	+ case '{': case '}': case '[': case ']':
565	566	jc->error = JSON_E_UNBALANCED_COLLECTION;
566	567	break;
567	568	default:
568	569	jc->error = JSON_E_INVALID_CHAR;
569		- break;
	570	+ break;
570	571	}
571	572	break;
572	573	case OB:
573	574	jc->error = JSON_E_EXPECTED_KEY;
574	575	break;
		@@ -604,11 +605,11 @@
604	605	{
605	606	/*
606	607	Push a mode onto the stack. Return false if there is overflow.
607	608	*/
608	609	assert(jc->top <= jc->stack_capacity);
609		-
	610	+
610	611	if (jc->depth < 0) {
611	612	if (jc->top == jc->stack_capacity) {
612	613	const size_t bytes_to_copy = jc->stack_capacity * sizeof(jc->stack[0]);
613	614	const size_t new_capacity = jc->stack_capacity * 2;
614	615	const size_t bytes_to_allocate = new_capacity * sizeof(jc->stack[0]);
		@@ -653,17 +654,17 @@
653	654	#define parse_buffer_clear(jc) \
654	655	do {\
655	656	jc->parse_buffer_count = 0;\
656	657	jc->parse_buffer[0] = 0;\
657	658	} while (0)
658		-
	659	+
659	660	#define parse_buffer_pop_back_char(jc)\
660	661	do {\
661	662	assert(jc->parse_buffer_count >= 1);\
662	663	--jc->parse_buffer_count;\
663	664	jc->parse_buffer[jc->parse_buffer_count] = 0;\
664		- } while (0)
	665	+ } while (0)
665	666
666	667
667	668
668	669	void delete_JSON_parser(JSON_parser jc)
669	670	{
		@@ -673,25 +674,25 @@
673	674	}
674	675	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
675	676	jc->free((void*)jc->parse_buffer);
676	677	}
677	678	jc->free((void*)jc);
678		- }
	679	+ }
679	680	}
680	681
681	682	int JSON_parser_reset(JSON_parser jc)
682	683	{
683	684	if (NULL == jc) {
684	685	return false;
685	686	}
686		-
	687	+
687	688	jc->state = GO;
688	689	jc->top = -1;
689	690
690	691	/* parser has been used previously? */
691	692	if (NULL == jc->parse_buffer) {
692		-
	693	+
693	694	/* Do we want non-bound stack? */
694	695	if (jc->depth > 0) {
695	696	jc->stack_capacity = jc->depth;
696	697	if (jc->depth <= (int)COUNTOF(jc->static_stack)) {
697	698	jc->stack = &jc->static_stack[0];
		@@ -705,20 +706,20 @@
705	706	} else {
706	707	jc->stack_capacity = (int)COUNTOF(jc->static_stack);
707	708	jc->depth = -1;
708	709	jc->stack = &jc->static_stack[0];
709	710	}
710		-
	711	+
711	712	/* set up the parse buffer */
712	713	jc->parse_buffer = &jc->static_parse_buffer[0];
713	714	jc->parse_buffer_capacity = COUNTOF(jc->static_parse_buffer);
714	715	}
715		-
	716	+
716	717	/* set parser to start */
717	718	push(jc, MODE_DONE);
718	719	parse_buffer_clear(jc);
719		-
	720	+
720	721	return true;
721	722	}
722	723
723	724	JSON_parser
724	725	new_JSON_parser(JSON_config const * config)
		@@ -735,29 +736,29 @@
735	736
736	737	int use_std_malloc = false;
737	738	JSON_config default_config;
738	739	JSON_parser jc;
739	740	JSON_malloc_t alloc;
740		-
	741	+
741	742	/* set to default configuration if none was provided */
742	743	if (NULL == config) {
743	744	/* initialize configuration */
744	745	init_JSON_config(&default_config);
745	746	config = &default_config;
746	747	}
747		-
	748	+
748	749	/* use std malloc if either the allocator or deallocator function isn't set */
749	750	use_std_malloc = NULL == config->malloc \|\| NULL == config->free;
750		-
	751	+
751	752	alloc = use_std_malloc ? malloc : config->malloc;
752		-
753		- jc = JSON_parser_malloc(alloc, sizeof(*jc), "parser");
754		-
	753	+
	754	+ jc = (JSON_parser)JSON_parser_malloc(alloc, sizeof(*jc), "parser");
	755	+
755	756	if (NULL == jc) {
756	757	return NULL;
757	758	}
758		-
	759	+
759	760	/* configure the parser */
760	761	memset(jc, 0, sizeof(*jc));
761	762	jc->malloc = alloc;
762	763	jc->free = use_std_malloc ? free : config->free;
763	764	jc->callback = config->callback;
		@@ -765,42 +766,42 @@
765	766	jc->allow_comments = (signed char)(config->allow_comments != 0);
766	767	jc->handle_floats_manually = (signed char)(config->handle_floats_manually != 0);
767	768	jc->decimal_point = *localeconv()->decimal_point;
768	769	/* We need to be able to push at least one object */
769	770	jc->depth = config->depth == 0 ? 1 : config->depth;
770		-
	771	+
771	772	/* reset the parser */
772	773	if (!JSON_parser_reset(jc)) {
773	774	jc->free(jc);
774	775	return NULL;
775	776	}
776		-
	777	+
777	778	return jc;
778	779	}
779	780
780	781	static int parse_buffer_grow(JSON_parser jc)
781	782	{
782	783	const size_t bytes_to_copy = jc->parse_buffer_count * sizeof(jc->parse_buffer[0]);
783	784	const size_t new_capacity = jc->parse_buffer_capacity * 2;
784	785	const size_t bytes_to_allocate = new_capacity * sizeof(jc->parse_buffer[0]);
785	786	void* mem = JSON_parser_malloc(jc->malloc, bytes_to_allocate, "parse buffer");
786		-
	787	+
787	788	if (mem == NULL) {
788	789	jc->error = JSON_E_OUT_OF_MEMORY;
789	790	return false;
790	791	}
791		-
	792	+
792	793	assert(new_capacity > 0);
793	794	memcpy(mem, jc->parse_buffer, bytes_to_copy);
794		-
	795	+
795	796	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
796	797	jc->free(jc->parse_buffer);
797	798	}
798		-
	799	+
799	800	jc->parse_buffer = (char*)mem;
800	801	jc->parse_buffer_capacity = new_capacity;
801		-
	802	+
802	803	return true;
803	804	}
804	805
805	806	static int parse_buffer_reserve_for(JSON_parser jc, unsigned chars)
806	807	{
		@@ -808,11 +809,11 @@
808	809	if (!parse_buffer_grow(jc)) {
809	810	assert(jc->error == JSON_E_OUT_OF_MEMORY);
810	811	return false;
811	812	}
812	813	}
813		-
	814	+
814	815	return true;
815	816	}
816	817
817	818	#define parse_buffer_has_space_for(jc, count) \
818	819	(jc->parse_buffer_count + (count) + 1 <= jc->parse_buffer_capacity)
		@@ -830,27 +831,27 @@
830	831	jc->type == JSON_T_FALSE \|\| \
831	832	jc->type == JSON_T_TRUE \|\| \
832	833	jc->type == JSON_T_FLOAT \|\| \
833	834	jc->type == JSON_T_INTEGER \|\| \
834	835	jc->type == JSON_T_STRING)
835		-
	836	+
836	837
837	838	static int parse_parse_buffer(JSON_parser jc)
838	839	{
839	840	if (jc->callback) {
840	841	JSON_value value, *arg = NULL;
841		-
	842	+
842	843	if (jc->type != JSON_T_NONE) {
843	844	assert_is_non_container_type(jc);
844		-
	845	+
845	846	switch(jc->type) {
846	847	case JSON_T_FLOAT:
847	848	arg = &value;
848	849	if (jc->handle_floats_manually) {
849	850	value.vu.str.value = jc->parse_buffer;
850	851	value.vu.str.length = jc->parse_buffer_count;
851		- } else {
	852	+ } else {
852	853	/* not checking with end pointer b/c there may be trailing ws */
853	854	value.vu.float_value = strtod(jc->parse_buffer, NULL);
854	855	}
855	856	break;
856	857	case JSON_T_INTEGER:
		@@ -861,19 +862,19 @@
861	862	arg = &value;
862	863	value.vu.str.value = jc->parse_buffer;
863	864	value.vu.str.length = jc->parse_buffer_count;
864	865	break;
865	866	}
866		-
	867	+
867	868	if (!(*jc->callback)(jc->ctx, jc->type, arg)) {
868	869	return false;
869	870	}
870	871	}
871	872	}
872		-
	873	+
873	874	parse_buffer_clear(jc);
874		-
	875	+
875	876	return true;
876	877	}
877	878
878	879	#define IS_HIGH_SURROGATE(uc) (((uc) & 0xFC00) == 0xD800)
879	880	#define IS_LOW_SURROGATE(uc) (((uc) & 0xFC00) == 0xDC00)
		@@ -884,35 +885,39 @@
884	885	{
885	886	int i;
886	887	unsigned uc = 0;
887	888	char* p;
888	889	int trail_bytes;
889		-
	890	+
890	891	assert(jc->parse_buffer_count >= 6);
891		-
	892	+
892	893	p = &jc->parse_buffer[jc->parse_buffer_count - 4];
893		-
	894	+
894	895	for (i = 12; i >= 0; i -= 4, ++p) {
895	896	unsigned x = *p;
896		-
	897	+
897	898	if (x >= 'a') {
898	899	x -= ('a' - 10);
899	900	} else if (x >= 'A') {
900	901	x -= ('A' - 10);
901	902	} else {
902	903	x &= ~0x30u;
903	904	}
904		-
	905	+
905	906	assert(x < 16);
906		-
	907	+
907	908	uc \|= x << i;
908	909	}
909		-
	910	+
910	911	/* clear UTF-16 char from buffer */
911	912	jc->parse_buffer_count -= 6;
912	913	jc->parse_buffer[jc->parse_buffer_count] = 0;
913		-
	914	+
	915	+ if (uc == 0xffff \|\| uc == 0xfffe) {
	916	+ return false;
	917	+ }
	918	+
914	919	/* attempt decoding ... */
915	920	if (jc->utf16_high_surrogate) {
916	921	if (IS_LOW_SURROGATE(uc)) {
917	922	uc = DECODE_SURROGATE_PAIR(jc->utf16_high_surrogate, uc);
918	923	trail_bytes = 3;
		@@ -935,26 +940,26 @@
935	940	return false;
936	941	} else {
937	942	trail_bytes = 2;
938	943	}
939	944	}
940		-
	945	+
941	946	jc->parse_buffer[jc->parse_buffer_count++] = (char) ((uc >> (trail_bytes * 6)) \| utf8_lead_bits[trail_bytes]);
942		-
	947	+
943	948	for (i = trail_bytes * 6 - 6; i >= 0; i -= 6) {
944	949	jc->parse_buffer[jc->parse_buffer_count++] = (char) (((uc >> i) & 0x3F) \| 0x80);
945	950	}
946	951
947	952	jc->parse_buffer[jc->parse_buffer_count] = 0;
948		-
	953	+
949	954	return true;
950	955	}
951	956
952	957	static int add_escaped_char_to_parse_buffer(JSON_parser jc, int next_char)
953	958	{
954	959	assert(parse_buffer_has_space_for(jc, 1));
955		-
	960	+
956	961	jc->escaped = 0;
957	962	/* remove the backslash */
958	963	parse_buffer_pop_back_char(jc);
959	964	switch(next_char) {
960	965	case 'b':
		@@ -996,22 +1001,22 @@
996	1001	{
997	1002	if (!parse_buffer_reserve_for(jc, 1)) {
998	1003	assert(JSON_E_OUT_OF_MEMORY == jc->error);
999	1004	return false;
1000	1005	}
1001		-
	1006	+
1002	1007	if (jc->escaped) {
1003	1008	if (!add_escaped_char_to_parse_buffer(jc, next_char)) {
1004	1009	jc->error = JSON_E_INVALID_ESCAPE_SEQUENCE;
1005		- return false;
	1010	+ return false;
1006	1011	}
1007	1012	} else if (!jc->comment) {
1008	1013	if ((jc->type != JSON_T_NONE) \| !((next_class == C_SPACE) \| (next_class == C_WHITE)) /* non-white-space */) {
1009	1014	parse_buffer_push_back_char(jc, (char)next_char);
1010	1015	}
1011	1016	}
1012		-
	1017	+
1013	1018	return true;
1014	1019	}
1015	1020
1016	1021	#define assert_type_isnt_string_null_or_bool(jc) \
1017	1022	assert(jc->type != JSON_T_FALSE); \
		@@ -1031,13 +1036,13 @@
1031	1036	*/
1032	1037	int next_class, next_state;
1033	1038
1034	1039	/*
1035	1040	Store the current char for error handling
1036		-*/
	1041	+*/
1037	1042	jc->current_char = next_char;
1038		-
	1043	+
1039	1044	/*
1040	1045	Determine the character's class.
1041	1046	*/
1042	1047	if (next_char < 0) {
1043	1048	jc->error = JSON_E_INVALID_CHAR;
		@@ -1050,15 +1055,15 @@
1050	1055	if (next_class <= __) {
1051	1056	set_error(jc);
1052	1057	return false;
1053	1058	}
1054	1059	}
1055		-
	1060	+
1056	1061	if (!add_char_to_parse_buffer(jc, next_char, next_class)) {
1057	1062	return false;
1058	1063	}
1059		-
	1064	+
1060	1065	/*
1061	1066	Get the next state from the state transition table.
1062	1067	*/
1063	1068	next_state = state_transition_table[jc->state][next_class];
1064	1069	if (next_state >= 0) {
		@@ -1069,11 +1074,11 @@
1069	1074	} else {
1070	1075	/*
1071	1076	Or perform one of the actions.
1072	1077	*/
1073	1078	switch (next_state) {
1074		-/* Unicode character */
	1079	+/* Unicode character */
1075	1080	case UC:
1076	1081	if(!decode_unicode_char(jc)) {
1077	1082	jc->error = JSON_E_INVALID_UNICODE_SEQUENCE;
1078	1083	return false;
1079	1084	}
		@@ -1091,78 +1096,78 @@
1091	1096	break;
1092	1097	/* integer detected by minus */
1093	1098	case MX:
1094	1099	jc->type = JSON_T_INTEGER;
1095	1100	jc->state = MI;
1096		- break;
1097		-/* integer detected by zero */
	1101	+ break;
	1102	+/* integer detected by zero */
1098	1103	case ZX:
1099	1104	jc->type = JSON_T_INTEGER;
1100	1105	jc->state = ZE;
1101		- break;
1102		-/* integer detected by 1-9 */
	1106	+ break;
	1107	+/* integer detected by 1-9 */
1103	1108	case IX:
1104	1109	jc->type = JSON_T_INTEGER;
1105	1110	jc->state = IT;
1106		- break;
1107		-
	1111	+ break;
	1112	+
1108	1113	/* floating point number detected by exponent*/
1109	1114	case DE:
1110	1115	assert_type_isnt_string_null_or_bool(jc);
1111	1116	jc->type = JSON_T_FLOAT;
1112	1117	jc->state = E1;
1113		- break;
1114		-
	1118	+ break;
	1119	+
1115	1120	/* floating point number detected by fraction */
1116	1121	case DF:
1117	1122	assert_type_isnt_string_null_or_bool(jc);
1118	1123	if (!jc->handle_floats_manually) {
1119	1124	/*
1120		- Some versions of strtod (which underlies sscanf) don't support converting
	1125	+ Some versions of strtod (which underlies sscanf) don't support converting
1121	1126	C-locale formated floating point values.
1122		-*/
	1127	+*/
1123	1128	assert(jc->parse_buffer[jc->parse_buffer_count-1] == '.');
1124	1129	jc->parse_buffer[jc->parse_buffer_count-1] = jc->decimal_point;
1125		- }
	1130	+ }
1126	1131	jc->type = JSON_T_FLOAT;
1127	1132	jc->state = FX;
1128		- break;
	1133	+ break;
1129	1134	/* string begin " */
1130	1135	case SB:
1131	1136	parse_buffer_clear(jc);
1132	1137	assert(jc->type == JSON_T_NONE);
1133	1138	jc->type = JSON_T_STRING;
1134	1139	jc->state = ST;
1135		- break;
1136		-
	1140	+ break;
	1141	+
1137	1142	/* n */
1138	1143	case NU:
1139	1144	assert(jc->type == JSON_T_NONE);
1140	1145	jc->type = JSON_T_NULL;
1141	1146	jc->state = N1;
1142		- break;
	1147	+ break;
1143	1148	/* f */
1144	1149	case FA:
1145	1150	assert(jc->type == JSON_T_NONE);
1146	1151	jc->type = JSON_T_FALSE;
1147	1152	jc->state = F1;
1148		- break;
	1153	+ break;
1149	1154	/* t */
1150	1155	case TR:
1151	1156	assert(jc->type == JSON_T_NONE);
1152	1157	jc->type = JSON_T_TRUE;
1153	1158	jc->state = T1;
1154		- break;
1155		-
	1159	+ break;
	1160	+
1156	1161	/* closing comment */
1157	1162	case CE:
1158	1163	jc->comment = 0;
1159	1164	assert(jc->parse_buffer_count == 0);
1160	1165	assert(jc->type == JSON_T_NONE);
1161	1166	jc->state = jc->before_comment_state;
1162		- break;
1163		-
	1167	+ break;
	1168	+
1164	1169	/* opening comment */
1165	1170	case CB:
1166	1171	if (!jc->allow_comments) {
1167	1172	return false;
1168	1173	}
		@@ -1172,11 +1177,11 @@
1172	1177	}
1173	1178	assert(jc->parse_buffer_count == 0);
1174	1179	assert(jc->type != JSON_T_STRING);
1175	1180	switch (jc->stack[jc->top]) {
1176	1181	case MODE_ARRAY:
1177		- case MODE_OBJECT:
	1182	+ case MODE_OBJECT:
1178	1183	switch(jc->state) {
1179	1184	case VA:
1180	1185	case AR:
1181	1186	jc->before_comment_state = jc->state;
1182	1187	break;
		@@ -1192,11 +1197,11 @@
1192	1197	jc->type = JSON_T_NONE;
1193	1198	jc->state = C1;
1194	1199	jc->comment = 1;
1195	1200	break;
1196	1201	/* empty } */
1197		- case -9:
	1202	+ case -9:
1198	1203	parse_buffer_clear(jc);
1199	1204	if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_END, NULL)) {
1200	1205	return false;
1201	1206	}
1202	1207	if (!pop(jc, MODE_KEY)) {
		@@ -1231,11 +1236,11 @@
1231	1236	}
1232	1237	if (!pop(jc, MODE_ARRAY)) {
1233	1238	jc->error = JSON_E_UNBALANCED_COLLECTION;
1234	1239	return false;
1235	1240	}
1236		-
	1241	+
1237	1242	jc->type = JSON_T_NONE;
1238	1243	jc->state = OK;
1239	1244	break;
1240	1245
1241	1246	/* { */ case -6:
		@@ -1267,11 +1272,11 @@
1267	1272	switch (jc->stack[jc->top]) {
1268	1273	case MODE_KEY:
1269	1274	assert(jc->type == JSON_T_STRING);
1270	1275	jc->type = JSON_T_NONE;
1271	1276	jc->state = CO;
1272		-
	1277	+
1273	1278	if (jc->callback) {
1274	1279	JSON_value value;
1275	1280	value.vu.str.value = jc->parse_buffer;
1276	1281	value.vu.str.length = jc->parse_buffer_count;
1277	1282	if (!(*jc->callback)(jc->ctx, JSON_T_KEY, &value)) {
		@@ -1357,29 +1362,29 @@
1357	1362
1358	1363
1359	1364	int JSON_parser_is_legal_white_space_string(const char* s)
1360	1365	{
1361	1366	int c, char_class;
1362		-
	1367	+
1363	1368	if (s == NULL) {
1364	1369	return false;
1365	1370	}
1366		-
1367		- for (; *s; ++s) {
	1371	+
	1372	+ for (; *s; ++s) {
1368	1373	c = *s;
1369		-
	1374	+
1370	1375	if (c < 0 \|\| c >= 128) {
1371	1376	return false;
1372	1377	}
1373		-
	1378	+
1374	1379	char_class = ascii_class[c];
1375		-
	1380	+
1376	1381	if (char_class != C_SPACE && char_class != C_WHITE) {
1377	1382	return false;
1378	1383	}
1379	1384	}
1380		-
	1385	+
1381	1386	return true;
1382	1387	}
1383	1388
1384	1389	int JSON_parser_get_last_error(JSON_parser jc)
1385	1390	{
		@@ -1389,16 +1394,17 @@
1389	1394
1390	1395	void init_JSON_config(JSON_config* config)
1391	1396	{
1392	1397	if (config) {
1393	1398	memset(config, 0, sizeof(*config));
1394		-
	1399	+
1395	1400	config->depth = JSON_PARSER_STACK_SIZE - 1;
1396	1401	config->malloc = malloc;
1397	1402	config->free = free;
1398	1403	}
1399	1404	}
	1405	+
1400	1406	/* end file parser/JSON_parser.c */
1401	1407	/* begin file ./cson.c */
1402	1408	#include <assert.h>
1403	1409	#include <stdlib.h> /* malloc()/free() */
1404	1410	#include <string.h>
1405	1411

	--- src/cson_amalgamation.c
	+++ src/cson_amalgamation.c
	@@ -30,11 +30,11 @@
30	/* Determine the integer type use to parse non-floating point numbers */
31	#ifdef _WIN32
32	typedef __int64 JSON_int_t;
33	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%I64d"
34	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%I64d"
35	#elif (__STDC_VERSION__ >= 199901L) \|\| (HAVE_LONG_LONG == 1)
36	typedef long long JSON_int_t;
37	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
38	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
39	#else
40	typedef long JSON_int_t;
	@@ -103,11 +103,11 @@
103	JSON_T_NULL, JSON_T_TRUE, and JSON_T_FALSE. String values are always returned
104	as zero-terminated C strings.
105
106	\return Non-zero if parsing should continue, else zero.
107	*/
108	typedef int (JSON_parser_callback)(void ctx, int type, const struct JSON_value_struct* value);
109
110
111	/**
112	A typedef for allocator functions semantically compatible with malloc().
113	*/
	@@ -233,11 +233,11 @@
233
234	#endif /* JSON_PARSER_H */
235	/* end file parser/JSON_parser.h */
236	/* begin file parser/JSON_parser.c */
237	/*
238	Copyright (c) 2005 JSON.org
239
240	Permission is hereby granted, free of charge, to any person obtaining a copy
241	of this software and associated documentation files (the "Software"), to deal
242	in the Software without restriction, including without limitation the rights
243	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
	@@ -245,12 +245,10 @@
245	furnished to do so, subject to the following conditions:
246
247	The above copyright notice and this permission notice shall be included in all
248	copies or substantial portions of the Software.
249
250	The Software shall be used for Good, not Evil.
251
252	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
253	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
254	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
255	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
256	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
	@@ -257,49 +255,52 @@
257	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
258	SOFTWARE.
259	*/
260
261	/*
262	Callbacks, comments, Unicode handling by Jean Gressmann ([email protected]), 2007-2010.
263
264
265	Changelog:






266	2010-11-25
267	Support for custom memory allocation ([email protected]).
268
269	2010-05-07
270	Added error handling for memory allocation failure ([email protected]).
271	Added diagnosis errors for invalid JSON.
272
273	2010-03-25
274	Fixed buffer overrun in grow_parse_buffer & cleaned up code.
275
276	2009-10-19
277	Replaced long double in JSON_value_struct with double after reports
278	of strtold being broken on some platforms ([email protected]).
279
280	2009-05-17
281	Incorporated [email protected] fix for UTF16 decoding.
282
283	2009-05-14
284	Fixed float parsing bug related to a locale being set that didn't
285	use '.' as decimal point character ([email protected]).
286
287	2008-10-14
288	Renamed states.IN to states.IT to avoid name clash which IN macro
289	defined in windef.h ([email protected])
290
291	2008-07-19
292	Removed some duplicate code & debugging variable ([email protected])
293
294	2008-05-28
295	Made JSON_value structure ansi C compliant. This bug was report by
296	[email protected]
297
298	2008-05-20
299	Fixed bug reported by [email protected] where the switching
300	from static to dynamic parse buffer did not copy the static parse
301	buffer's content.
302	*/
303
304
305
	@@ -362,11 +363,11 @@
362	char static_parse_buffer[JSON_PARSER_PARSE_BUFFER_SIZE];
363	JSON_malloc_t malloc;
364	JSON_free_t free;
365	};
366
367	#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
368
369	/*
370	Characters are mapped into these character classes. This allows for
371	a significant reduction in the size of the state transition table.
372	*/
	@@ -403,11 +404,11 @@
403	C_LOW_T, /* t */
404	C_LOW_U, /* u */
405	C_ABCDF, /* ABCDF */
406	C_E, /* E */
407	C_ETC, /* everything else */
408	C_STAR, /* * */
409	NR_CLASSES
410	};
411
412	static const signed char ascii_class[128] = {
413	/*
	@@ -419,11 +420,11 @@
419	__, C_WHITE, C_WHITE, __, __, C_WHITE, __, __,
420	__, __, __, __, __, __, __, __,
421	__, __, __, __, __, __, __, __,
422
423	C_SPACE, C_ETC, C_QUOTE, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
424	C_ETC, C_ETC, C_STAR, C_PLUS, C_COMMA, C_MINUS, C_POINT, C_SLASH,
425	C_ZERO, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT,
426	C_DIGIT, C_DIGIT, C_COLON, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
427
428	C_ETC, C_ABCDF, C_ABCDF, C_ABCDF, C_ABCDF, C_E, C_ABCDF, C_ETC,
429	C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
	@@ -536,11 +537,11 @@
536	/false F4/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__,__,__},
537	/nu N1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N2,__,__,__,__},
538	/nul N2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N3,__,__,__,__,__,__,__,__,__},
539	/null N3/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__},
540	// C1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,C2},
541	// C2*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
542	/** C3*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,CE,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
543	/_. FX/ {OK,OK,__,-8,__,-7,__,-3,__,__,__,__,__,__,FR,FR,__,__,__,__,E1,__,__,__,__,__,__,__,__,E1,__,__},
544	/\ D1/ {__,__,__,__,__,__,__,__,__,D2,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__},
545	/\ D2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,U1,__,__,__,__},
546	};
	@@ -548,27 +549,27 @@
548
549	/*
550	These modes can be pushed on the stack.
551	*/
552	enum modes {
553	MODE_ARRAY = 1,
554	MODE_DONE = 2,
555	MODE_KEY = 3,
556	MODE_OBJECT = 4
557	};
558
559	static void set_error(JSON_parser jc)
560	{
561	switch (jc->state) {
562	case GO:
563	switch (jc->current_char) {
564	case '{': case '}': case '[': case ']':
565	jc->error = JSON_E_UNBALANCED_COLLECTION;
566	break;
567	default:
568	jc->error = JSON_E_INVALID_CHAR;
569	break;
570	}
571	break;
572	case OB:
573	jc->error = JSON_E_EXPECTED_KEY;
574	break;
	@@ -604,11 +605,11 @@
604	{
605	/*
606	Push a mode onto the stack. Return false if there is overflow.
607	*/
608	assert(jc->top <= jc->stack_capacity);
609
610	if (jc->depth < 0) {
611	if (jc->top == jc->stack_capacity) {
612	const size_t bytes_to_copy = jc->stack_capacity * sizeof(jc->stack[0]);
613	const size_t new_capacity = jc->stack_capacity * 2;
614	const size_t bytes_to_allocate = new_capacity * sizeof(jc->stack[0]);
	@@ -653,17 +654,17 @@
653	#define parse_buffer_clear(jc) \
654	do {\
655	jc->parse_buffer_count = 0;\
656	jc->parse_buffer[0] = 0;\
657	} while (0)
658
659	#define parse_buffer_pop_back_char(jc)\
660	do {\
661	assert(jc->parse_buffer_count >= 1);\
662	--jc->parse_buffer_count;\
663	jc->parse_buffer[jc->parse_buffer_count] = 0;\
664	} while (0)
665
666
667
668	void delete_JSON_parser(JSON_parser jc)
669	{
	@@ -673,25 +674,25 @@
673	}
674	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
675	jc->free((void*)jc->parse_buffer);
676	}
677	jc->free((void*)jc);
678	}
679	}
680
681	int JSON_parser_reset(JSON_parser jc)
682	{
683	if (NULL == jc) {
684	return false;
685	}
686
687	jc->state = GO;
688	jc->top = -1;
689
690	/* parser has been used previously? */
691	if (NULL == jc->parse_buffer) {
692
693	/* Do we want non-bound stack? */
694	if (jc->depth > 0) {
695	jc->stack_capacity = jc->depth;
696	if (jc->depth <= (int)COUNTOF(jc->static_stack)) {
697	jc->stack = &jc->static_stack[0];
	@@ -705,20 +706,20 @@
705	} else {
706	jc->stack_capacity = (int)COUNTOF(jc->static_stack);
707	jc->depth = -1;
708	jc->stack = &jc->static_stack[0];
709	}
710
711	/* set up the parse buffer */
712	jc->parse_buffer = &jc->static_parse_buffer[0];
713	jc->parse_buffer_capacity = COUNTOF(jc->static_parse_buffer);
714	}
715
716	/* set parser to start */
717	push(jc, MODE_DONE);
718	parse_buffer_clear(jc);
719
720	return true;
721	}
722
723	JSON_parser
724	new_JSON_parser(JSON_config const * config)
	@@ -735,29 +736,29 @@
735
736	int use_std_malloc = false;
737	JSON_config default_config;
738	JSON_parser jc;
739	JSON_malloc_t alloc;
740
741	/* set to default configuration if none was provided */
742	if (NULL == config) {
743	/* initialize configuration */
744	init_JSON_config(&default_config);
745	config = &default_config;
746	}
747
748	/* use std malloc if either the allocator or deallocator function isn't set */
749	use_std_malloc = NULL == config->malloc \|\| NULL == config->free;
750
751	alloc = use_std_malloc ? malloc : config->malloc;
752
753	jc = JSON_parser_malloc(alloc, sizeof(*jc), "parser");
754
755	if (NULL == jc) {
756	return NULL;
757	}
758
759	/* configure the parser */
760	memset(jc, 0, sizeof(*jc));
761	jc->malloc = alloc;
762	jc->free = use_std_malloc ? free : config->free;
763	jc->callback = config->callback;
	@@ -765,42 +766,42 @@
765	jc->allow_comments = (signed char)(config->allow_comments != 0);
766	jc->handle_floats_manually = (signed char)(config->handle_floats_manually != 0);
767	jc->decimal_point = *localeconv()->decimal_point;
768	/* We need to be able to push at least one object */
769	jc->depth = config->depth == 0 ? 1 : config->depth;
770
771	/* reset the parser */
772	if (!JSON_parser_reset(jc)) {
773	jc->free(jc);
774	return NULL;
775	}
776
777	return jc;
778	}
779
780	static int parse_buffer_grow(JSON_parser jc)
781	{
782	const size_t bytes_to_copy = jc->parse_buffer_count * sizeof(jc->parse_buffer[0]);
783	const size_t new_capacity = jc->parse_buffer_capacity * 2;
784	const size_t bytes_to_allocate = new_capacity * sizeof(jc->parse_buffer[0]);
785	void* mem = JSON_parser_malloc(jc->malloc, bytes_to_allocate, "parse buffer");
786
787	if (mem == NULL) {
788	jc->error = JSON_E_OUT_OF_MEMORY;
789	return false;
790	}
791
792	assert(new_capacity > 0);
793	memcpy(mem, jc->parse_buffer, bytes_to_copy);
794
795	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
796	jc->free(jc->parse_buffer);
797	}
798
799	jc->parse_buffer = (char*)mem;
800	jc->parse_buffer_capacity = new_capacity;
801
802	return true;
803	}
804
805	static int parse_buffer_reserve_for(JSON_parser jc, unsigned chars)
806	{
	@@ -808,11 +809,11 @@
808	if (!parse_buffer_grow(jc)) {
809	assert(jc->error == JSON_E_OUT_OF_MEMORY);
810	return false;
811	}
812	}
813
814	return true;
815	}
816
817	#define parse_buffer_has_space_for(jc, count) \
818	(jc->parse_buffer_count + (count) + 1 <= jc->parse_buffer_capacity)
	@@ -830,27 +831,27 @@
830	jc->type == JSON_T_FALSE \|\| \
831	jc->type == JSON_T_TRUE \|\| \
832	jc->type == JSON_T_FLOAT \|\| \
833	jc->type == JSON_T_INTEGER \|\| \
834	jc->type == JSON_T_STRING)
835
836
837	static int parse_parse_buffer(JSON_parser jc)
838	{
839	if (jc->callback) {
840	JSON_value value, *arg = NULL;
841
842	if (jc->type != JSON_T_NONE) {
843	assert_is_non_container_type(jc);
844
845	switch(jc->type) {
846	case JSON_T_FLOAT:
847	arg = &value;
848	if (jc->handle_floats_manually) {
849	value.vu.str.value = jc->parse_buffer;
850	value.vu.str.length = jc->parse_buffer_count;
851	} else {
852	/* not checking with end pointer b/c there may be trailing ws */
853	value.vu.float_value = strtod(jc->parse_buffer, NULL);
854	}
855	break;
856	case JSON_T_INTEGER:
	@@ -861,19 +862,19 @@
861	arg = &value;
862	value.vu.str.value = jc->parse_buffer;
863	value.vu.str.length = jc->parse_buffer_count;
864	break;
865	}
866
867	if (!(*jc->callback)(jc->ctx, jc->type, arg)) {
868	return false;
869	}
870	}
871	}
872
873	parse_buffer_clear(jc);
874
875	return true;
876	}
877
878	#define IS_HIGH_SURROGATE(uc) (((uc) & 0xFC00) == 0xD800)
879	#define IS_LOW_SURROGATE(uc) (((uc) & 0xFC00) == 0xDC00)
	@@ -884,35 +885,39 @@
884	{
885	int i;
886	unsigned uc = 0;
887	char* p;
888	int trail_bytes;
889
890	assert(jc->parse_buffer_count >= 6);
891
892	p = &jc->parse_buffer[jc->parse_buffer_count - 4];
893
894	for (i = 12; i >= 0; i -= 4, ++p) {
895	unsigned x = *p;
896
897	if (x >= 'a') {
898	x -= ('a' - 10);
899	} else if (x >= 'A') {
900	x -= ('A' - 10);
901	} else {
902	x &= ~0x30u;
903	}
904
905	assert(x < 16);
906
907	uc \|= x << i;
908	}
909
910	/* clear UTF-16 char from buffer */
911	jc->parse_buffer_count -= 6;
912	jc->parse_buffer[jc->parse_buffer_count] = 0;
913




914	/* attempt decoding ... */
915	if (jc->utf16_high_surrogate) {
916	if (IS_LOW_SURROGATE(uc)) {
917	uc = DECODE_SURROGATE_PAIR(jc->utf16_high_surrogate, uc);
918	trail_bytes = 3;
	@@ -935,26 +940,26 @@
935	return false;
936	} else {
937	trail_bytes = 2;
938	}
939	}
940
941	jc->parse_buffer[jc->parse_buffer_count++] = (char) ((uc >> (trail_bytes * 6)) \| utf8_lead_bits[trail_bytes]);
942
943	for (i = trail_bytes * 6 - 6; i >= 0; i -= 6) {
944	jc->parse_buffer[jc->parse_buffer_count++] = (char) (((uc >> i) & 0x3F) \| 0x80);
945	}
946
947	jc->parse_buffer[jc->parse_buffer_count] = 0;
948
949	return true;
950	}
951
952	static int add_escaped_char_to_parse_buffer(JSON_parser jc, int next_char)
953	{
954	assert(parse_buffer_has_space_for(jc, 1));
955
956	jc->escaped = 0;
957	/* remove the backslash */
958	parse_buffer_pop_back_char(jc);
959	switch(next_char) {
960	case 'b':
	@@ -996,22 +1001,22 @@
996	{
997	if (!parse_buffer_reserve_for(jc, 1)) {
998	assert(JSON_E_OUT_OF_MEMORY == jc->error);
999	return false;
1000	}
1001
1002	if (jc->escaped) {
1003	if (!add_escaped_char_to_parse_buffer(jc, next_char)) {
1004	jc->error = JSON_E_INVALID_ESCAPE_SEQUENCE;
1005	return false;
1006	}
1007	} else if (!jc->comment) {
1008	if ((jc->type != JSON_T_NONE) \| !((next_class == C_SPACE) \| (next_class == C_WHITE)) /* non-white-space */) {
1009	parse_buffer_push_back_char(jc, (char)next_char);
1010	}
1011	}
1012
1013	return true;
1014	}
1015
1016	#define assert_type_isnt_string_null_or_bool(jc) \
1017	assert(jc->type != JSON_T_FALSE); \
	@@ -1031,13 +1036,13 @@
1031	*/
1032	int next_class, next_state;
1033
1034	/*
1035	Store the current char for error handling
1036	*/
1037	jc->current_char = next_char;
1038
1039	/*
1040	Determine the character's class.
1041	*/
1042	if (next_char < 0) {
1043	jc->error = JSON_E_INVALID_CHAR;
	@@ -1050,15 +1055,15 @@
1050	if (next_class <= __) {
1051	set_error(jc);
1052	return false;
1053	}
1054	}
1055
1056	if (!add_char_to_parse_buffer(jc, next_char, next_class)) {
1057	return false;
1058	}
1059
1060	/*
1061	Get the next state from the state transition table.
1062	*/
1063	next_state = state_transition_table[jc->state][next_class];
1064	if (next_state >= 0) {
	@@ -1069,11 +1074,11 @@
1069	} else {
1070	/*
1071	Or perform one of the actions.
1072	*/
1073	switch (next_state) {
1074	/* Unicode character */
1075	case UC:
1076	if(!decode_unicode_char(jc)) {
1077	jc->error = JSON_E_INVALID_UNICODE_SEQUENCE;
1078	return false;
1079	}
	@@ -1091,78 +1096,78 @@
1091	break;
1092	/* integer detected by minus */
1093	case MX:
1094	jc->type = JSON_T_INTEGER;
1095	jc->state = MI;
1096	break;
1097	/* integer detected by zero */
1098	case ZX:
1099	jc->type = JSON_T_INTEGER;
1100	jc->state = ZE;
1101	break;
1102	/* integer detected by 1-9 */
1103	case IX:
1104	jc->type = JSON_T_INTEGER;
1105	jc->state = IT;
1106	break;
1107
1108	/* floating point number detected by exponent*/
1109	case DE:
1110	assert_type_isnt_string_null_or_bool(jc);
1111	jc->type = JSON_T_FLOAT;
1112	jc->state = E1;
1113	break;
1114
1115	/* floating point number detected by fraction */
1116	case DF:
1117	assert_type_isnt_string_null_or_bool(jc);
1118	if (!jc->handle_floats_manually) {
1119	/*
1120	Some versions of strtod (which underlies sscanf) don't support converting
1121	C-locale formated floating point values.
1122	*/
1123	assert(jc->parse_buffer[jc->parse_buffer_count-1] == '.');
1124	jc->parse_buffer[jc->parse_buffer_count-1] = jc->decimal_point;
1125	}
1126	jc->type = JSON_T_FLOAT;
1127	jc->state = FX;
1128	break;
1129	/* string begin " */
1130	case SB:
1131	parse_buffer_clear(jc);
1132	assert(jc->type == JSON_T_NONE);
1133	jc->type = JSON_T_STRING;
1134	jc->state = ST;
1135	break;
1136
1137	/* n */
1138	case NU:
1139	assert(jc->type == JSON_T_NONE);
1140	jc->type = JSON_T_NULL;
1141	jc->state = N1;
1142	break;
1143	/* f */
1144	case FA:
1145	assert(jc->type == JSON_T_NONE);
1146	jc->type = JSON_T_FALSE;
1147	jc->state = F1;
1148	break;
1149	/* t */
1150	case TR:
1151	assert(jc->type == JSON_T_NONE);
1152	jc->type = JSON_T_TRUE;
1153	jc->state = T1;
1154	break;
1155
1156	/* closing comment */
1157	case CE:
1158	jc->comment = 0;
1159	assert(jc->parse_buffer_count == 0);
1160	assert(jc->type == JSON_T_NONE);
1161	jc->state = jc->before_comment_state;
1162	break;
1163
1164	/* opening comment */
1165	case CB:
1166	if (!jc->allow_comments) {
1167	return false;
1168	}
	@@ -1172,11 +1177,11 @@
1172	}
1173	assert(jc->parse_buffer_count == 0);
1174	assert(jc->type != JSON_T_STRING);
1175	switch (jc->stack[jc->top]) {
1176	case MODE_ARRAY:
1177	case MODE_OBJECT:
1178	switch(jc->state) {
1179	case VA:
1180	case AR:
1181	jc->before_comment_state = jc->state;
1182	break;
	@@ -1192,11 +1197,11 @@
1192	jc->type = JSON_T_NONE;
1193	jc->state = C1;
1194	jc->comment = 1;
1195	break;
1196	/* empty } */
1197	case -9:
1198	parse_buffer_clear(jc);
1199	if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_END, NULL)) {
1200	return false;
1201	}
1202	if (!pop(jc, MODE_KEY)) {
	@@ -1231,11 +1236,11 @@
1231	}
1232	if (!pop(jc, MODE_ARRAY)) {
1233	jc->error = JSON_E_UNBALANCED_COLLECTION;
1234	return false;
1235	}
1236
1237	jc->type = JSON_T_NONE;
1238	jc->state = OK;
1239	break;
1240
1241	/* { */ case -6:
	@@ -1267,11 +1272,11 @@
1267	switch (jc->stack[jc->top]) {
1268	case MODE_KEY:
1269	assert(jc->type == JSON_T_STRING);
1270	jc->type = JSON_T_NONE;
1271	jc->state = CO;
1272
1273	if (jc->callback) {
1274	JSON_value value;
1275	value.vu.str.value = jc->parse_buffer;
1276	value.vu.str.length = jc->parse_buffer_count;
1277	if (!(*jc->callback)(jc->ctx, JSON_T_KEY, &value)) {
	@@ -1357,29 +1362,29 @@
1357
1358
1359	int JSON_parser_is_legal_white_space_string(const char* s)
1360	{
1361	int c, char_class;
1362
1363	if (s == NULL) {
1364	return false;
1365	}
1366
1367	for (; *s; ++s) {
1368	c = *s;
1369
1370	if (c < 0 \|\| c >= 128) {
1371	return false;
1372	}
1373
1374	char_class = ascii_class[c];
1375
1376	if (char_class != C_SPACE && char_class != C_WHITE) {
1377	return false;
1378	}
1379	}
1380
1381	return true;
1382	}
1383
1384	int JSON_parser_get_last_error(JSON_parser jc)
1385	{
	@@ -1389,16 +1394,17 @@
1389
1390	void init_JSON_config(JSON_config* config)
1391	{
1392	if (config) {
1393	memset(config, 0, sizeof(*config));
1394
1395	config->depth = JSON_PARSER_STACK_SIZE - 1;
1396	config->malloc = malloc;
1397	config->free = free;
1398	}
1399	}

1400	/* end file parser/JSON_parser.c */
1401	/* begin file ./cson.c */
1402	#include <assert.h>
1403	#include <stdlib.h> /* malloc()/free() */
1404	#include <string.h>
1405

	--- src/cson_amalgamation.c
	+++ src/cson_amalgamation.c
	@@ -30,11 +30,11 @@
30	/* Determine the integer type use to parse non-floating point numbers */
31	#ifdef _WIN32
32	typedef __int64 JSON_int_t;
33	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%I64d"
34	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%I64d"
35	#elif __STDC_VERSION__ >= 199901L \|\| HAVE_LONG_LONG == 1
36	typedef long long JSON_int_t;
37	#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
38	#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
39	#else
40	typedef long JSON_int_t;
	@@ -103,11 +103,11 @@
103	JSON_T_NULL, JSON_T_TRUE, and JSON_T_FALSE. String values are always returned
104	as zero-terminated C strings.
105
106	\return Non-zero if parsing should continue, else zero.
107	*/
108	typedef int (JSON_parser_callback)(void ctx, int type, const JSON_value* value);
109
110
111	/**
112	A typedef for allocator functions semantically compatible with malloc().
113	*/
	@@ -233,11 +233,11 @@
233
234	#endif /* JSON_PARSER_H */
235	/* end file parser/JSON_parser.h */
236	/* begin file parser/JSON_parser.c */
237	/*
238	Copyright (c) 2007-2013 Jean Gressmann ([email protected])
239
240	Permission is hereby granted, free of charge, to any person obtaining a copy
241	of this software and associated documentation files (the "Software"), to deal
242	in the Software without restriction, including without limitation the rights
243	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
	@@ -245,12 +245,10 @@
245	furnished to do so, subject to the following conditions:
246
247	The above copyright notice and this permission notice shall be included in all
248	copies or substantial portions of the Software.
249


250	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
251	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
252	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
253	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
254	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
	@@ -257,49 +255,52 @@
255	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
256	SOFTWARE.
257	*/
258
259	/*



260	Changelog:
261	2013-09-08
262	Updated license to to be compatible with Debian license requirements.
263
264	2012-06-06
265	Fix for invalid UTF16 characters and some comment fixex ([email protected]).
266
267	2010-11-25
268	Support for custom memory allocation ([email protected]).
269
270	2010-05-07
271	Added error handling for memory allocation failure ([email protected]).
272	Added diagnosis errors for invalid JSON.
273
274	2010-03-25
275	Fixed buffer overrun in grow_parse_buffer & cleaned up code.
276
277	2009-10-19
278	Replaced long double in JSON_value_struct with double after reports
279	of strtold being broken on some platforms ([email protected]).
280
281	2009-05-17
282	Incorporated [email protected] fix for UTF16 decoding.
283
284	2009-05-14
285	Fixed float parsing bug related to a locale being set that didn't
286	use '.' as decimal point character ([email protected]).
287
288	2008-10-14
289	Renamed states.IN to states.IT to avoid name clash which IN macro
290	defined in windef.h ([email protected])
291
292	2008-07-19
293	Removed some duplicate code & debugging variable ([email protected])
294
295	2008-05-28
296	Made JSON_value structure ansi C compliant. This bug was report by
297	[email protected]
298
299	2008-05-20
300	Fixed bug reported by [email protected] where the switching
301	from static to dynamic parse buffer did not copy the static parse
302	buffer's content.
303	*/
304
305
306
	@@ -362,11 +363,11 @@
363	char static_parse_buffer[JSON_PARSER_PARSE_BUFFER_SIZE];
364	JSON_malloc_t malloc;
365	JSON_free_t free;
366	};
367
368	#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
369
370	/*
371	Characters are mapped into these character classes. This allows for
372	a significant reduction in the size of the state transition table.
373	*/
	@@ -403,11 +404,11 @@
404	C_LOW_T, /* t */
405	C_LOW_U, /* u */
406	C_ABCDF, /* ABCDF */
407	C_E, /* E */
408	C_ETC, /* everything else */
409	C_STAR, /* * */
410	NR_CLASSES
411	};
412
413	static const signed char ascii_class[128] = {
414	/*
	@@ -419,11 +420,11 @@
420	__, C_WHITE, C_WHITE, __, __, C_WHITE, __, __,
421	__, __, __, __, __, __, __, __,
422	__, __, __, __, __, __, __, __,
423
424	C_SPACE, C_ETC, C_QUOTE, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
425	C_ETC, C_ETC, C_STAR, C_PLUS, C_COMMA, C_MINUS, C_POINT, C_SLASH,
426	C_ZERO, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT, C_DIGIT,
427	C_DIGIT, C_DIGIT, C_COLON, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
428
429	C_ETC, C_ABCDF, C_ABCDF, C_ABCDF, C_ABCDF, C_E, C_ABCDF, C_ETC,
430	C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC, C_ETC,
	@@ -536,11 +537,11 @@
537	/false F4/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__,__,__},
538	/nu N1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N2,__,__,__,__},
539	/nul N2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,N3,__,__,__,__,__,__,__,__,__},
540	/null N3/ {__,__,__,__,__,__,__,__,__,__,CB,__,__,__,__,__,__,__,__,__,__,__,OK,__,__,__,__,__,__,__,__,__},
541	// C1/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,C2},
542	//star C2/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
543	/** C3*/ {C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,CE,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C2,C3},
544	/_. FX/ {OK,OK,__,-8,__,-7,__,-3,__,__,__,__,__,__,FR,FR,__,__,__,__,E1,__,__,__,__,__,__,__,__,E1,__,__},
545	/\ D1/ {__,__,__,__,__,__,__,__,__,D2,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__},
546	/\ D2/ {__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,__,U1,__,__,__,__},
547	};
	@@ -548,27 +549,27 @@
549
550	/*
551	These modes can be pushed on the stack.
552	*/
553	enum modes {
554	MODE_ARRAY = 1,
555	MODE_DONE = 2,
556	MODE_KEY = 3,
557	MODE_OBJECT = 4
558	};
559
560	static void set_error(JSON_parser jc)
561	{
562	switch (jc->state) {
563	case GO:
564	switch (jc->current_char) {
565	case '{': case '}': case '[': case ']':
566	jc->error = JSON_E_UNBALANCED_COLLECTION;
567	break;
568	default:
569	jc->error = JSON_E_INVALID_CHAR;
570	break;
571	}
572	break;
573	case OB:
574	jc->error = JSON_E_EXPECTED_KEY;
575	break;
	@@ -604,11 +605,11 @@
605	{
606	/*
607	Push a mode onto the stack. Return false if there is overflow.
608	*/
609	assert(jc->top <= jc->stack_capacity);
610
611	if (jc->depth < 0) {
612	if (jc->top == jc->stack_capacity) {
613	const size_t bytes_to_copy = jc->stack_capacity * sizeof(jc->stack[0]);
614	const size_t new_capacity = jc->stack_capacity * 2;
615	const size_t bytes_to_allocate = new_capacity * sizeof(jc->stack[0]);
	@@ -653,17 +654,17 @@
654	#define parse_buffer_clear(jc) \
655	do {\
656	jc->parse_buffer_count = 0;\
657	jc->parse_buffer[0] = 0;\
658	} while (0)
659
660	#define parse_buffer_pop_back_char(jc)\
661	do {\
662	assert(jc->parse_buffer_count >= 1);\
663	--jc->parse_buffer_count;\
664	jc->parse_buffer[jc->parse_buffer_count] = 0;\
665	} while (0)
666
667
668
669	void delete_JSON_parser(JSON_parser jc)
670	{
	@@ -673,25 +674,25 @@
674	}
675	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
676	jc->free((void*)jc->parse_buffer);
677	}
678	jc->free((void*)jc);
679	}
680	}
681
682	int JSON_parser_reset(JSON_parser jc)
683	{
684	if (NULL == jc) {
685	return false;
686	}
687
688	jc->state = GO;
689	jc->top = -1;
690
691	/* parser has been used previously? */
692	if (NULL == jc->parse_buffer) {
693
694	/* Do we want non-bound stack? */
695	if (jc->depth > 0) {
696	jc->stack_capacity = jc->depth;
697	if (jc->depth <= (int)COUNTOF(jc->static_stack)) {
698	jc->stack = &jc->static_stack[0];
	@@ -705,20 +706,20 @@
706	} else {
707	jc->stack_capacity = (int)COUNTOF(jc->static_stack);
708	jc->depth = -1;
709	jc->stack = &jc->static_stack[0];
710	}
711
712	/* set up the parse buffer */
713	jc->parse_buffer = &jc->static_parse_buffer[0];
714	jc->parse_buffer_capacity = COUNTOF(jc->static_parse_buffer);
715	}
716
717	/* set parser to start */
718	push(jc, MODE_DONE);
719	parse_buffer_clear(jc);
720
721	return true;
722	}
723
724	JSON_parser
725	new_JSON_parser(JSON_config const * config)
	@@ -735,29 +736,29 @@
736
737	int use_std_malloc = false;
738	JSON_config default_config;
739	JSON_parser jc;
740	JSON_malloc_t alloc;
741
742	/* set to default configuration if none was provided */
743	if (NULL == config) {
744	/* initialize configuration */
745	init_JSON_config(&default_config);
746	config = &default_config;
747	}
748
749	/* use std malloc if either the allocator or deallocator function isn't set */
750	use_std_malloc = NULL == config->malloc \|\| NULL == config->free;
751
752	alloc = use_std_malloc ? malloc : config->malloc;
753
754	jc = (JSON_parser)JSON_parser_malloc(alloc, sizeof(*jc), "parser");
755
756	if (NULL == jc) {
757	return NULL;
758	}
759
760	/* configure the parser */
761	memset(jc, 0, sizeof(*jc));
762	jc->malloc = alloc;
763	jc->free = use_std_malloc ? free : config->free;
764	jc->callback = config->callback;
	@@ -765,42 +766,42 @@
766	jc->allow_comments = (signed char)(config->allow_comments != 0);
767	jc->handle_floats_manually = (signed char)(config->handle_floats_manually != 0);
768	jc->decimal_point = *localeconv()->decimal_point;
769	/* We need to be able to push at least one object */
770	jc->depth = config->depth == 0 ? 1 : config->depth;
771
772	/* reset the parser */
773	if (!JSON_parser_reset(jc)) {
774	jc->free(jc);
775	return NULL;
776	}
777
778	return jc;
779	}
780
781	static int parse_buffer_grow(JSON_parser jc)
782	{
783	const size_t bytes_to_copy = jc->parse_buffer_count * sizeof(jc->parse_buffer[0]);
784	const size_t new_capacity = jc->parse_buffer_capacity * 2;
785	const size_t bytes_to_allocate = new_capacity * sizeof(jc->parse_buffer[0]);
786	void* mem = JSON_parser_malloc(jc->malloc, bytes_to_allocate, "parse buffer");
787
788	if (mem == NULL) {
789	jc->error = JSON_E_OUT_OF_MEMORY;
790	return false;
791	}
792
793	assert(new_capacity > 0);
794	memcpy(mem, jc->parse_buffer, bytes_to_copy);
795
796	if (jc->parse_buffer != &jc->static_parse_buffer[0]) {
797	jc->free(jc->parse_buffer);
798	}
799
800	jc->parse_buffer = (char*)mem;
801	jc->parse_buffer_capacity = new_capacity;
802
803	return true;
804	}
805
806	static int parse_buffer_reserve_for(JSON_parser jc, unsigned chars)
807	{
	@@ -808,11 +809,11 @@
809	if (!parse_buffer_grow(jc)) {
810	assert(jc->error == JSON_E_OUT_OF_MEMORY);
811	return false;
812	}
813	}
814
815	return true;
816	}
817
818	#define parse_buffer_has_space_for(jc, count) \
819	(jc->parse_buffer_count + (count) + 1 <= jc->parse_buffer_capacity)
	@@ -830,27 +831,27 @@
831	jc->type == JSON_T_FALSE \|\| \
832	jc->type == JSON_T_TRUE \|\| \
833	jc->type == JSON_T_FLOAT \|\| \
834	jc->type == JSON_T_INTEGER \|\| \
835	jc->type == JSON_T_STRING)
836
837
838	static int parse_parse_buffer(JSON_parser jc)
839	{
840	if (jc->callback) {
841	JSON_value value, *arg = NULL;
842
843	if (jc->type != JSON_T_NONE) {
844	assert_is_non_container_type(jc);
845
846	switch(jc->type) {
847	case JSON_T_FLOAT:
848	arg = &value;
849	if (jc->handle_floats_manually) {
850	value.vu.str.value = jc->parse_buffer;
851	value.vu.str.length = jc->parse_buffer_count;
852	} else {
853	/* not checking with end pointer b/c there may be trailing ws */
854	value.vu.float_value = strtod(jc->parse_buffer, NULL);
855	}
856	break;
857	case JSON_T_INTEGER:
	@@ -861,19 +862,19 @@
862	arg = &value;
863	value.vu.str.value = jc->parse_buffer;
864	value.vu.str.length = jc->parse_buffer_count;
865	break;
866	}
867
868	if (!(*jc->callback)(jc->ctx, jc->type, arg)) {
869	return false;
870	}
871	}
872	}
873
874	parse_buffer_clear(jc);
875
876	return true;
877	}
878
879	#define IS_HIGH_SURROGATE(uc) (((uc) & 0xFC00) == 0xD800)
880	#define IS_LOW_SURROGATE(uc) (((uc) & 0xFC00) == 0xDC00)
	@@ -884,35 +885,39 @@
885	{
886	int i;
887	unsigned uc = 0;
888	char* p;
889	int trail_bytes;
890
891	assert(jc->parse_buffer_count >= 6);
892
893	p = &jc->parse_buffer[jc->parse_buffer_count - 4];
894
895	for (i = 12; i >= 0; i -= 4, ++p) {
896	unsigned x = *p;
897
898	if (x >= 'a') {
899	x -= ('a' - 10);
900	} else if (x >= 'A') {
901	x -= ('A' - 10);
902	} else {
903	x &= ~0x30u;
904	}
905
906	assert(x < 16);
907
908	uc \|= x << i;
909	}
910
911	/* clear UTF-16 char from buffer */
912	jc->parse_buffer_count -= 6;
913	jc->parse_buffer[jc->parse_buffer_count] = 0;
914
915	if (uc == 0xffff \|\| uc == 0xfffe) {
916	return false;
917	}
918
919	/* attempt decoding ... */
920	if (jc->utf16_high_surrogate) {
921	if (IS_LOW_SURROGATE(uc)) {
922	uc = DECODE_SURROGATE_PAIR(jc->utf16_high_surrogate, uc);
923	trail_bytes = 3;
	@@ -935,26 +940,26 @@
940	return false;
941	} else {
942	trail_bytes = 2;
943	}
944	}
945
946	jc->parse_buffer[jc->parse_buffer_count++] = (char) ((uc >> (trail_bytes * 6)) \| utf8_lead_bits[trail_bytes]);
947
948	for (i = trail_bytes * 6 - 6; i >= 0; i -= 6) {
949	jc->parse_buffer[jc->parse_buffer_count++] = (char) (((uc >> i) & 0x3F) \| 0x80);
950	}
951
952	jc->parse_buffer[jc->parse_buffer_count] = 0;
953
954	return true;
955	}
956
957	static int add_escaped_char_to_parse_buffer(JSON_parser jc, int next_char)
958	{
959	assert(parse_buffer_has_space_for(jc, 1));
960
961	jc->escaped = 0;
962	/* remove the backslash */
963	parse_buffer_pop_back_char(jc);
964	switch(next_char) {
965	case 'b':
	@@ -996,22 +1001,22 @@
1001	{
1002	if (!parse_buffer_reserve_for(jc, 1)) {
1003	assert(JSON_E_OUT_OF_MEMORY == jc->error);
1004	return false;
1005	}
1006
1007	if (jc->escaped) {
1008	if (!add_escaped_char_to_parse_buffer(jc, next_char)) {
1009	jc->error = JSON_E_INVALID_ESCAPE_SEQUENCE;
1010	return false;
1011	}
1012	} else if (!jc->comment) {
1013	if ((jc->type != JSON_T_NONE) \| !((next_class == C_SPACE) \| (next_class == C_WHITE)) /* non-white-space */) {
1014	parse_buffer_push_back_char(jc, (char)next_char);
1015	}
1016	}
1017
1018	return true;
1019	}
1020
1021	#define assert_type_isnt_string_null_or_bool(jc) \
1022	assert(jc->type != JSON_T_FALSE); \
	@@ -1031,13 +1036,13 @@
1036	*/
1037	int next_class, next_state;
1038
1039	/*
1040	Store the current char for error handling
1041	*/
1042	jc->current_char = next_char;
1043
1044	/*
1045	Determine the character's class.
1046	*/
1047	if (next_char < 0) {
1048	jc->error = JSON_E_INVALID_CHAR;
	@@ -1050,15 +1055,15 @@
1055	if (next_class <= __) {
1056	set_error(jc);
1057	return false;
1058	}
1059	}
1060
1061	if (!add_char_to_parse_buffer(jc, next_char, next_class)) {
1062	return false;
1063	}
1064
1065	/*
1066	Get the next state from the state transition table.
1067	*/
1068	next_state = state_transition_table[jc->state][next_class];
1069	if (next_state >= 0) {
	@@ -1069,11 +1074,11 @@
1074	} else {
1075	/*
1076	Or perform one of the actions.
1077	*/
1078	switch (next_state) {
1079	/* Unicode character */
1080	case UC:
1081	if(!decode_unicode_char(jc)) {
1082	jc->error = JSON_E_INVALID_UNICODE_SEQUENCE;
1083	return false;
1084	}
	@@ -1091,78 +1096,78 @@
1096	break;
1097	/* integer detected by minus */
1098	case MX:
1099	jc->type = JSON_T_INTEGER;
1100	jc->state = MI;
1101	break;
1102	/* integer detected by zero */
1103	case ZX:
1104	jc->type = JSON_T_INTEGER;
1105	jc->state = ZE;
1106	break;
1107	/* integer detected by 1-9 */
1108	case IX:
1109	jc->type = JSON_T_INTEGER;
1110	jc->state = IT;
1111	break;
1112
1113	/* floating point number detected by exponent*/
1114	case DE:
1115	assert_type_isnt_string_null_or_bool(jc);
1116	jc->type = JSON_T_FLOAT;
1117	jc->state = E1;
1118	break;
1119
1120	/* floating point number detected by fraction */
1121	case DF:
1122	assert_type_isnt_string_null_or_bool(jc);
1123	if (!jc->handle_floats_manually) {
1124	/*
1125	Some versions of strtod (which underlies sscanf) don't support converting
1126	C-locale formated floating point values.
1127	*/
1128	assert(jc->parse_buffer[jc->parse_buffer_count-1] == '.');
1129	jc->parse_buffer[jc->parse_buffer_count-1] = jc->decimal_point;
1130	}
1131	jc->type = JSON_T_FLOAT;
1132	jc->state = FX;
1133	break;
1134	/* string begin " */
1135	case SB:
1136	parse_buffer_clear(jc);
1137	assert(jc->type == JSON_T_NONE);
1138	jc->type = JSON_T_STRING;
1139	jc->state = ST;
1140	break;
1141
1142	/* n */
1143	case NU:
1144	assert(jc->type == JSON_T_NONE);
1145	jc->type = JSON_T_NULL;
1146	jc->state = N1;
1147	break;
1148	/* f */
1149	case FA:
1150	assert(jc->type == JSON_T_NONE);
1151	jc->type = JSON_T_FALSE;
1152	jc->state = F1;
1153	break;
1154	/* t */
1155	case TR:
1156	assert(jc->type == JSON_T_NONE);
1157	jc->type = JSON_T_TRUE;
1158	jc->state = T1;
1159	break;
1160
1161	/* closing comment */
1162	case CE:
1163	jc->comment = 0;
1164	assert(jc->parse_buffer_count == 0);
1165	assert(jc->type == JSON_T_NONE);
1166	jc->state = jc->before_comment_state;
1167	break;
1168
1169	/* opening comment */
1170	case CB:
1171	if (!jc->allow_comments) {
1172	return false;
1173	}
	@@ -1172,11 +1177,11 @@
1177	}
1178	assert(jc->parse_buffer_count == 0);
1179	assert(jc->type != JSON_T_STRING);
1180	switch (jc->stack[jc->top]) {
1181	case MODE_ARRAY:
1182	case MODE_OBJECT:
1183	switch(jc->state) {
1184	case VA:
1185	case AR:
1186	jc->before_comment_state = jc->state;
1187	break;
	@@ -1192,11 +1197,11 @@
1197	jc->type = JSON_T_NONE;
1198	jc->state = C1;
1199	jc->comment = 1;
1200	break;
1201	/* empty } */
1202	case -9:
1203	parse_buffer_clear(jc);
1204	if (jc->callback && !(*jc->callback)(jc->ctx, JSON_T_OBJECT_END, NULL)) {
1205	return false;
1206	}
1207	if (!pop(jc, MODE_KEY)) {
	@@ -1231,11 +1236,11 @@
1236	}
1237	if (!pop(jc, MODE_ARRAY)) {
1238	jc->error = JSON_E_UNBALANCED_COLLECTION;
1239	return false;
1240	}
1241
1242	jc->type = JSON_T_NONE;
1243	jc->state = OK;
1244	break;
1245
1246	/* { */ case -6:
	@@ -1267,11 +1272,11 @@
1272	switch (jc->stack[jc->top]) {
1273	case MODE_KEY:
1274	assert(jc->type == JSON_T_STRING);
1275	jc->type = JSON_T_NONE;
1276	jc->state = CO;
1277
1278	if (jc->callback) {
1279	JSON_value value;
1280	value.vu.str.value = jc->parse_buffer;
1281	value.vu.str.length = jc->parse_buffer_count;
1282	if (!(*jc->callback)(jc->ctx, JSON_T_KEY, &value)) {
	@@ -1357,29 +1362,29 @@
1362
1363
1364	int JSON_parser_is_legal_white_space_string(const char* s)
1365	{
1366	int c, char_class;
1367
1368	if (s == NULL) {
1369	return false;
1370	}
1371
1372	for (; *s; ++s) {
1373	c = *s;
1374
1375	if (c < 0 \|\| c >= 128) {
1376	return false;
1377	}
1378
1379	char_class = ascii_class[c];
1380
1381	if (char_class != C_SPACE && char_class != C_WHITE) {
1382	return false;
1383	}
1384	}
1385
1386	return true;
1387	}
1388
1389	int JSON_parser_get_last_error(JSON_parser jc)
1390	{
	@@ -1389,16 +1394,17 @@
1394
1395	void init_JSON_config(JSON_config* config)
1396	{
1397	if (config) {
1398	memset(config, 0, sizeof(*config));
1399
1400	config->depth = JSON_PARSER_STACK_SIZE - 1;
1401	config->malloc = malloc;
1402	config->free = free;
1403	}
1404	}
1405
1406	/* end file parser/JSON_parser.c */
1407	/* begin file ./cson.c */
1408	#include <assert.h>
1409	#include <stdlib.h> /* malloc()/free() */
1410	#include <string.h>
1411

M src/finfo.c

+1 -1

		--- src/finfo.c
		+++ src/finfo.c
		@@ -196,11 +196,11 @@
196	196	blob_reset(&line);
197	197	blob_appendf(&line, "%.10s ", zCiUuid);
198	198	blob_appendf(&line, "%.10s ", zDate);
199	199	blob_appendf(&line, "%8.8s ", zUser);
200	200	blob_appendf(&line, "%8.8s ", zBr);
201		- blob_appendf(&line,"%-40.40s\n", zCom );
	201	+ blob_appendf(&line,"%-39.39s", zCom );
202	202	comment_print(blob_str(&line), 0, 79);
203	203	}
204	204	}
205	205	db_finalize(&q);
206	206	blob_reset(&fname);
207	207

	--- src/finfo.c
	+++ src/finfo.c
	@@ -196,11 +196,11 @@
196	blob_reset(&line);
197	blob_appendf(&line, "%.10s ", zCiUuid);
198	blob_appendf(&line, "%.10s ", zDate);
199	blob_appendf(&line, "%8.8s ", zUser);
200	blob_appendf(&line, "%8.8s ", zBr);
201	blob_appendf(&line,"%-40.40s\n", zCom );
202	comment_print(blob_str(&line), 0, 79);
203	}
204	}
205	db_finalize(&q);
206	blob_reset(&fname);
207

	--- src/finfo.c
	+++ src/finfo.c
	@@ -196,11 +196,11 @@
196	blob_reset(&line);
197	blob_appendf(&line, "%.10s ", zCiUuid);
198	blob_appendf(&line, "%.10s ", zDate);
199	blob_appendf(&line, "%8.8s ", zUser);
200	blob_appendf(&line, "%8.8s ", zBr);
201	blob_appendf(&line,"%-39.39s", zCom );
202	comment_print(blob_str(&line), 0, 79);
203	}
204	}
205	db_finalize(&q);
206	blob_reset(&fname);
207

M src/json_timeline.c

+6 -4

		--- src/json_timeline.c
		+++ src/json_timeline.c
		@@ -124,11 +124,11 @@
124	124	**
125	125	** tag works like HTML mode's "t" option and branch works like HTML
126	126	** mode's "r" option. They are very similar, but subtly different -
127	127	** tag mode shows only entries with a given tag but branch mode can
128	128	** also reveal some with "related" tags (meaning they were merged into
129		-** the requested branch).
	129	+** the requested branch, or back).
130	130	**
131	131	** pSql is the target blob to append the query [subset]
132	132	** to.
133	133	**
134	134	** Returns a positive value if it modifies pSql, 0 if it
		@@ -144,10 +144,11 @@
144	144	*/
145	145	static char json_timeline_add_tag_branch_clause(Blob *pSql,
146	146	cson_object * pPayload){
147	147	char const * zTag = NULL;
148	148	char const * zBranch = NULL;
	149	+ char const * zMiOnly = NULL;
149	150	int tagid = 0;
150	151	if(! g.perm.Read ){
151	152	return 0;
152	153	}
153	154	zTag = json_find_option_cstr("tag",NULL,NULL);
		@@ -155,10 +156,11 @@
155	156	zBranch = json_find_option_cstr("branch",NULL,NULL);
156	157	if(!zBranch \|\| !*zBranch){
157	158	return 0;
158	159	}
159	160	zTag = zBranch;
	161	+ zMiOnly = json_find_option_cstr("mionly",NULL,NULL);
160	162	}
161	163	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'",
162	164	zTag);
163	165	if(tagid<=0){
164	166	return -1;
		@@ -175,16 +177,16 @@
175	177	/* from "r" flag code in page_timeline().*/
176	178	blob_appendf(pSql,
177	179	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid"
178	180	" WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
179	181	tagid);
180		-#if 0 /* from the undocumented "mionly" flag in page_timeline() */
181		- blob_appendf(pSql,
	182	+ if( zMiOnly==0 ){
	183	+ blob_appendf(pSql,
182	184	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid"
183	185	" WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
184	186	tagid);
185		-#endif
	187	+ }
186	188	}
187	189	blob_append(pSql," ) ",3);
188	190	return 1;
189	191	}
190	192	/*
191	193

	--- src/json_timeline.c
	+++ src/json_timeline.c
	@@ -124,11 +124,11 @@
124	**
125	** tag works like HTML mode's "t" option and branch works like HTML
126	** mode's "r" option. They are very similar, but subtly different -
127	** tag mode shows only entries with a given tag but branch mode can
128	** also reveal some with "related" tags (meaning they were merged into
129	** the requested branch).
130	**
131	** pSql is the target blob to append the query [subset]
132	** to.
133	**
134	** Returns a positive value if it modifies pSql, 0 if it
	@@ -144,10 +144,11 @@
144	*/
145	static char json_timeline_add_tag_branch_clause(Blob *pSql,
146	cson_object * pPayload){
147	char const * zTag = NULL;
148	char const * zBranch = NULL;

149	int tagid = 0;
150	if(! g.perm.Read ){
151	return 0;
152	}
153	zTag = json_find_option_cstr("tag",NULL,NULL);
	@@ -155,10 +156,11 @@
155	zBranch = json_find_option_cstr("branch",NULL,NULL);
156	if(!zBranch \|\| !*zBranch){
157	return 0;
158	}
159	zTag = zBranch;

160	}
161	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'",
162	zTag);
163	if(tagid<=0){
164	return -1;
	@@ -175,16 +177,16 @@
175	/* from "r" flag code in page_timeline().*/
176	blob_appendf(pSql,
177	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid"
178	" WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
179	tagid);
180	#if 0 /* from the undocumented "mionly" flag in page_timeline() */
181	blob_appendf(pSql,
182	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid"
183	" WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
184	tagid);
185	#endif
186	}
187	blob_append(pSql," ) ",3);
188	return 1;
189	}
190	/*
191

	--- src/json_timeline.c
	+++ src/json_timeline.c
	@@ -124,11 +124,11 @@
124	**
125	** tag works like HTML mode's "t" option and branch works like HTML
126	** mode's "r" option. They are very similar, but subtly different -
127	** tag mode shows only entries with a given tag but branch mode can
128	** also reveal some with "related" tags (meaning they were merged into
129	** the requested branch, or back).
130	**
131	** pSql is the target blob to append the query [subset]
132	** to.
133	**
134	** Returns a positive value if it modifies pSql, 0 if it
	@@ -144,10 +144,11 @@
144	*/
145	static char json_timeline_add_tag_branch_clause(Blob *pSql,
146	cson_object * pPayload){
147	char const * zTag = NULL;
148	char const * zBranch = NULL;
149	char const * zMiOnly = NULL;
150	int tagid = 0;
151	if(! g.perm.Read ){
152	return 0;
153	}
154	zTag = json_find_option_cstr("tag",NULL,NULL);
	@@ -155,10 +156,11 @@
156	zBranch = json_find_option_cstr("branch",NULL,NULL);
157	if(!zBranch \|\| !*zBranch){
158	return 0;
159	}
160	zTag = zBranch;
161	zMiOnly = json_find_option_cstr("mionly",NULL,NULL);
162	}
163	tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'",
164	zTag);
165	if(tagid<=0){
166	return -1;
	@@ -175,16 +177,16 @@
177	/* from "r" flag code in page_timeline().*/
178	blob_appendf(pSql,
179	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid"
180	" WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
181	tagid);
182	if( zMiOnly==0 ){
183	blob_appendf(pSql,
184	" OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid"
185	" WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
186	tagid);
187	}
188	}
189	blob_append(pSql," ) ",3);
190	return 1;
191	}
192	/*
193

M src/main.c

+15 -3

		--- src/main.c
		+++ src/main.c
		@@ -798,23 +798,35 @@
798	798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	800	if(!find_option("verbose","v",0)){
801	801	return;
802	802	}else{
	803	+#if defined(FOSSIL_ENABLE_TCL)
	804	+ int rc;
	805	+ const char *zRc;
	806	+#endif
803	807	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
804	808	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
805	809	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
806	810	fossil_print("Schema version %s\n", AUX_SCHEMA);
807	811	fossil_print("zlib %s\n", ZLIB_VERSION);
808	812	#if defined(FOSSIL_ENABLE_SSL)
809	813	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
810	814	#endif
811	815	#if defined(FOSSIL_ENABLE_TCL)
812		- fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL);
813		-#endif
	816	+ Th_FossilInit(0, 0);
	817	+ th_register_tcl(g.interp, &g.tcl);
	818	+ rc = Th_Eval(g.interp, 0, "tclEval {package require Tcl}", -1);
	819	+ zRc = Th_ReturnCodeName(rc, 1);
	820	+ fossil_print("TCL (Tcl %s%s%s%s)\n", zRc, zRc ? ": " : "",
	821	+ Th_GetResult(g.interp, 0),
814	822	#if defined(FOSSIL_ENABLE_TCL_STUBS)
815		- fossil_print("TCL_STUBS\n");
	823	+ zRc? "" : ", loaded only when needed"
	824	+#else
	825	+ ""
	826	+#endif
	827	+ );
816	828	#endif
817	829	#if defined(FOSSIL_ENABLE_JSON)
818	830	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
819	831	#endif
820	832	}
821	833

	--- src/main.c
	+++ src/main.c
	@@ -798,23 +798,35 @@
798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	if(!find_option("verbose","v",0)){
801	return;
802	}else{




803	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
804	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
805	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
806	fossil_print("Schema version %s\n", AUX_SCHEMA);
807	fossil_print("zlib %s\n", ZLIB_VERSION);
808	#if defined(FOSSIL_ENABLE_SSL)
809	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
810	#endif
811	#if defined(FOSSIL_ENABLE_TCL)
812	fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL);
813	#endif




814	#if defined(FOSSIL_ENABLE_TCL_STUBS)
815	fossil_print("TCL_STUBS\n");




816	#endif
817	#if defined(FOSSIL_ENABLE_JSON)
818	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
819	#endif
820	}
821

	--- src/main.c
	+++ src/main.c
	@@ -798,23 +798,35 @@
798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	if(!find_option("verbose","v",0)){
801	return;
802	}else{
803	#if defined(FOSSIL_ENABLE_TCL)
804	int rc;
805	const char *zRc;
806	#endif
807	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
808	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
809	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
810	fossil_print("Schema version %s\n", AUX_SCHEMA);
811	fossil_print("zlib %s\n", ZLIB_VERSION);
812	#if defined(FOSSIL_ENABLE_SSL)
813	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
814	#endif
815	#if defined(FOSSIL_ENABLE_TCL)
816	Th_FossilInit(0, 0);
817	th_register_tcl(g.interp, &g.tcl);
818	rc = Th_Eval(g.interp, 0, "tclEval {package require Tcl}", -1);
819	zRc = Th_ReturnCodeName(rc, 1);
820	fossil_print("TCL (Tcl %s%s%s%s)\n", zRc, zRc ? ": " : "",
821	Th_GetResult(g.interp, 0),
822	#if defined(FOSSIL_ENABLE_TCL_STUBS)
823	zRc? "" : ", loaded only when needed"
824	#else
825	""
826	#endif
827	);
828	#endif
829	#if defined(FOSSIL_ENABLE_JSON)
830	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
831	#endif
832	}
833

M src/main.c

+15 -3

		--- src/main.c
		+++ src/main.c
		@@ -798,23 +798,35 @@
798	798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	800	if(!find_option("verbose","v",0)){
801	801	return;
802	802	}else{
	803	+#if defined(FOSSIL_ENABLE_TCL)
	804	+ int rc;
	805	+ const char *zRc;
	806	+#endif
803	807	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
804	808	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
805	809	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
806	810	fossil_print("Schema version %s\n", AUX_SCHEMA);
807	811	fossil_print("zlib %s\n", ZLIB_VERSION);
808	812	#if defined(FOSSIL_ENABLE_SSL)
809	813	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
810	814	#endif
811	815	#if defined(FOSSIL_ENABLE_TCL)
812		- fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL);
813		-#endif
	816	+ Th_FossilInit(0, 0);
	817	+ th_register_tcl(g.interp, &g.tcl);
	818	+ rc = Th_Eval(g.interp, 0, "tclEval {package require Tcl}", -1);
	819	+ zRc = Th_ReturnCodeName(rc, 1);
	820	+ fossil_print("TCL (Tcl %s%s%s%s)\n", zRc, zRc ? ": " : "",
	821	+ Th_GetResult(g.interp, 0),
814	822	#if defined(FOSSIL_ENABLE_TCL_STUBS)
815		- fossil_print("TCL_STUBS\n");
	823	+ zRc? "" : ", loaded only when needed"
	824	+#else
	825	+ ""
	826	+#endif
	827	+ );
816	828	#endif
817	829	#if defined(FOSSIL_ENABLE_JSON)
818	830	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
819	831	#endif
820	832	}
821	833

	--- src/main.c
	+++ src/main.c
	@@ -798,23 +798,35 @@
798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	if(!find_option("verbose","v",0)){
801	return;
802	}else{




803	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
804	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
805	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
806	fossil_print("Schema version %s\n", AUX_SCHEMA);
807	fossil_print("zlib %s\n", ZLIB_VERSION);
808	#if defined(FOSSIL_ENABLE_SSL)
809	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
810	#endif
811	#if defined(FOSSIL_ENABLE_TCL)
812	fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL);
813	#endif




814	#if defined(FOSSIL_ENABLE_TCL_STUBS)
815	fossil_print("TCL_STUBS\n");




816	#endif
817	#if defined(FOSSIL_ENABLE_JSON)
818	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
819	#endif
820	}
821

	--- src/main.c
	+++ src/main.c
	@@ -798,23 +798,35 @@
798	fossil_print("This is fossil version " RELEASE_VERSION " "
799	MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
800	if(!find_option("verbose","v",0)){
801	return;
802	}else{
803	#if defined(FOSSIL_ENABLE_TCL)
804	int rc;
805	const char *zRc;
806	#endif
807	fossil_print("Compiled on %s %s using %s (%d-bit)\n",
808	__DATE__, __TIME__, COMPILER_NAME, sizeof(void)8);
809	fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
810	fossil_print("Schema version %s\n", AUX_SCHEMA);
811	fossil_print("zlib %s\n", ZLIB_VERSION);
812	#if defined(FOSSIL_ENABLE_SSL)
813	fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
814	#endif
815	#if defined(FOSSIL_ENABLE_TCL)
816	Th_FossilInit(0, 0);
817	th_register_tcl(g.interp, &g.tcl);
818	rc = Th_Eval(g.interp, 0, "tclEval {package require Tcl}", -1);
819	zRc = Th_ReturnCodeName(rc, 1);
820	fossil_print("TCL (Tcl %s%s%s%s)\n", zRc, zRc ? ": " : "",
821	Th_GetResult(g.interp, 0),
822	#if defined(FOSSIL_ENABLE_TCL_STUBS)
823	zRc? "" : ", loaded only when needed"
824	#else
825	""
826	#endif
827	);
828	#endif
829	#if defined(FOSSIL_ENABLE_JSON)
830	fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
831	#endif
832	}
833

M src/main.mk

+1 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -1160,11 +1160,11 @@
1160	1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162	1162
1163	1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165		- $(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1165	+ $(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
1166	1166
1167	1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168	1168	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169	1169
1170	1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171	1171

	--- src/main.mk
	+++ src/main.mk
	@@ -1160,11 +1160,11 @@
1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165	$(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171

	--- src/main.mk
	+++ src/main.mk
	@@ -1160,11 +1160,11 @@
1160	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1164	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165	$(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
1166
1167	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1171

M src/makemake.tcl

+7 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -291,10 +291,11 @@
291	291	append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
292	292	#append opt " -DSQLITE_ENABLE_FTS3=1"
293	293	append opt " -DSQLITE_ENABLE_STAT3"
294	294	append opt " -Dlocaltime=fossil_localtime"
295	295	append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
	296	+append opt " -DSQLITE_WIN32_NO_ANSI"
296	297	set SQLITE_OPTIONS $opt
297	298	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
298	299
299	300	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
300	301	set opt {-Dmain=sqlite3_shell}
		@@ -690,10 +691,14 @@
690	691	endif
691	692
692	693	zlib:
693	694	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
694	695
	696	+openssl: zlib
	697	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
	698	+ $(MAKE) -C $(OPENSSLLIBDIR)
	699	+
695	700	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
696	701	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
697	702
698	703	# This rule prevents make from using its default rules to try build
699	704	# an executable named "manifest" out of the file named "manifest.c"
		@@ -1230,17 +1235,17 @@
1230	1235
1231	1236	# define the sqlite files, which need special flags on compile
1232	1237	SQLITESRC=sqlite3.c
1233	1238	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1234	1239	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1235		-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
	1240	+SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1236	1241
1237	1242	# define the sqlite shell files, which need special flags on compile
1238	1243	SQLITESHELLSRC=shell.c
1239	1244	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1240	1245	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1241		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
	1246	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
1242	1247
1243	1248	# define the th scripting files, which need special flags on compile
1244	1249	THSRC=th.c th_lang.c
1245	1250	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1246	1251	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1247	1252

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -291,10 +291,11 @@
291	append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
292	#append opt " -DSQLITE_ENABLE_FTS3=1"
293	append opt " -DSQLITE_ENABLE_STAT3"
294	append opt " -Dlocaltime=fossil_localtime"
295	append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"

296	set SQLITE_OPTIONS $opt
297	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
298
299	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
300	set opt {-Dmain=sqlite3_shell}
	@@ -690,10 +691,14 @@
690	endif
691
692	zlib:
693	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
694




695	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
696	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
697
698	# This rule prevents make from using its default rules to try build
699	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1230,17 +1235,17 @@
1230
1231	# define the sqlite files, which need special flags on compile
1232	SQLITESRC=sqlite3.c
1233	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1234	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1235	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
1236
1237	# define the sqlite shell files, which need special flags on compile
1238	SQLITESHELLSRC=shell.c
1239	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1240	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1241	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
1242
1243	# define the th scripting files, which need special flags on compile
1244	THSRC=th.c th_lang.c
1245	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1246	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1247

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -291,10 +291,11 @@
291	append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
292	#append opt " -DSQLITE_ENABLE_FTS3=1"
293	append opt " -DSQLITE_ENABLE_STAT3"
294	append opt " -Dlocaltime=fossil_localtime"
295	append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
296	append opt " -DSQLITE_WIN32_NO_ANSI"
297	set SQLITE_OPTIONS $opt
298	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
299
300	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
301	set opt {-Dmain=sqlite3_shell}
	@@ -690,10 +691,14 @@
691	endif
692
693	zlib:
694	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
695
696	openssl: zlib
697	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
698	$(MAKE) -C $(OPENSSLLIBDIR)
699
700	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
701	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
702
703	# This rule prevents make from using its default rules to try build
704	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1230,17 +1235,17 @@
1235
1236	# define the sqlite files, which need special flags on compile
1237	SQLITESRC=sqlite3.c
1238	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1239	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1240	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1241
1242	# define the sqlite shell files, which need special flags on compile
1243	SQLITESHELLSRC=shell.c
1244	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1245	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1246	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
1247
1248	# define the th scripting files, which need special flags on compile
1249	THSRC=th.c th_lang.c
1250	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1251	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1252

M src/update.c

		--- src/update.c
		+++ src/update.c
		@@ -128,10 +128,11 @@
128	128	db_must_be_within_tree();
129	129	vid = db_lget_int("checkout", 0);
130	130	if( vid==0 ){
131	131	fossil_fatal("cannot find current version");
132	132	}
	133	+ user_select();
133	134	if( !dryRunFlag && !internalUpdate ){
134	135	autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);
135	136	}
136	137
137	138	/* Create any empty directories now, as well as after the update,
138	139

	--- src/update.c
	+++ src/update.c
	@@ -128,10 +128,11 @@
128	db_must_be_within_tree();
129	vid = db_lget_int("checkout", 0);
130	if( vid==0 ){
131	fossil_fatal("cannot find current version");
132	}

133	if( !dryRunFlag && !internalUpdate ){
134	autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);
135	}
136
137	/* Create any empty directories now, as well as after the update,
138

	--- src/update.c
	+++ src/update.c
	@@ -128,10 +128,11 @@
128	db_must_be_within_tree();
129	vid = db_lget_int("checkout", 0);
130	if( vid==0 ){
131	fossil_fatal("cannot find current version");
132	}
133	user_select();
134	if( !dryRunFlag && !internalUpdate ){
135	autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);
136	}
137
138	/* Create any empty directories now, as well as after the update,
139

M src/xfer.c

+1 -1

		--- src/xfer.c
		+++ src/xfer.c
		@@ -45,11 +45,11 @@
45	45	int nFileSent; /* Number of files sent */
46	46	int nDeltaSent; /* Number of deltas sent */
47	47	int nFileRcvd; /* Number of files received */
48	48	int nDeltaRcvd; /* Number of deltas received */
49	49	int nDanglingFile; /* Number of dangling deltas received */
50		- int mxSend; /* Stop sending "file" with pOut reaches this size */
	50	+ int mxSend; /* Stop sending "file" when pOut reaches this size */
51	51	int resync; /* Send igot cards for all holdings */
52	52	u8 syncPrivate; /* True to enable syncing private content */
53	53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	54	time_t maxTime; /* Time when this transfer should be finished */
55	55	};
56	56

	--- src/xfer.c
	+++ src/xfer.c
	@@ -45,11 +45,11 @@
45	int nFileSent; /* Number of files sent */
46	int nDeltaSent; /* Number of deltas sent */
47	int nFileRcvd; /* Number of files received */
48	int nDeltaRcvd; /* Number of deltas received */
49	int nDanglingFile; /* Number of dangling deltas received */
50	int mxSend; /* Stop sending "file" with pOut reaches this size */
51	int resync; /* Send igot cards for all holdings */
52	u8 syncPrivate; /* True to enable syncing private content */
53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	time_t maxTime; /* Time when this transfer should be finished */
55	};
56

	--- src/xfer.c
	+++ src/xfer.c
	@@ -45,11 +45,11 @@
45	int nFileSent; /* Number of files sent */
46	int nDeltaSent; /* Number of deltas sent */
47	int nFileRcvd; /* Number of files received */
48	int nDeltaRcvd; /* Number of deltas received */
49	int nDanglingFile; /* Number of dangling deltas received */
50	int mxSend; /* Stop sending "file" when pOut reaches this size */
51	int resync; /* Send igot cards for all holdings */
52	u8 syncPrivate; /* True to enable syncing private content */
53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	time_t maxTime; /* Time when this transfer should be finished */
55	};
56

M src/xfer.c

+1 -1

		--- src/xfer.c
		+++ src/xfer.c
		@@ -45,11 +45,11 @@
45	45	int nFileSent; /* Number of files sent */
46	46	int nDeltaSent; /* Number of deltas sent */
47	47	int nFileRcvd; /* Number of files received */
48	48	int nDeltaRcvd; /* Number of deltas received */
49	49	int nDanglingFile; /* Number of dangling deltas received */
50		- int mxSend; /* Stop sending "file" with pOut reaches this size */
	50	+ int mxSend; /* Stop sending "file" when pOut reaches this size */
51	51	int resync; /* Send igot cards for all holdings */
52	52	u8 syncPrivate; /* True to enable syncing private content */
53	53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	54	time_t maxTime; /* Time when this transfer should be finished */
55	55	};
56	56

	--- src/xfer.c
	+++ src/xfer.c
	@@ -45,11 +45,11 @@
45	int nFileSent; /* Number of files sent */
46	int nDeltaSent; /* Number of deltas sent */
47	int nFileRcvd; /* Number of files received */
48	int nDeltaRcvd; /* Number of deltas received */
49	int nDanglingFile; /* Number of dangling deltas received */
50	int mxSend; /* Stop sending "file" with pOut reaches this size */
51	int resync; /* Send igot cards for all holdings */
52	u8 syncPrivate; /* True to enable syncing private content */
53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	time_t maxTime; /* Time when this transfer should be finished */
55	};
56

	--- src/xfer.c
	+++ src/xfer.c
	@@ -45,11 +45,11 @@
45	int nFileSent; /* Number of files sent */
46	int nDeltaSent; /* Number of deltas sent */
47	int nFileRcvd; /* Number of files received */
48	int nDeltaRcvd; /* Number of deltas received */
49	int nDanglingFile; /* Number of dangling deltas received */
50	int mxSend; /* Stop sending "file" when pOut reaches this size */
51	int resync; /* Send igot cards for all holdings */
52	u8 syncPrivate; /* True to enable syncing private content */
53	u8 nextIsPrivate; /* If true, next "file" received is a private */
54	time_t maxTime; /* Time when this transfer should be finished */
55	};
56

M win/Makefile.PellesCGMake

+2 -2

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -83,17 +83,17 @@
83	83
84	84	# define the sqlite files, which need special flags on compile
85	85	SQLITESRC=sqlite3.c
86	86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88		-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
	88	+SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
89	89
90	90	# define the sqlite shell files, which need special flags on compile
91	91	SQLITESHELLSRC=shell.c
92	92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
	94	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
95	95
96	96	# define the th scripting files, which need special flags on compile
97	97	THSRC=th.c th_lang.c
98	98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100	100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,17 +83,17 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,17 +83,17 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

M win/Makefile.dmc

+1 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -24,11 +24,11 @@
24	24	CFLAGS = -o
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29		-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
	29	+SQLITE_OPTIONS = -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
30	30
31	31	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32	32
33	33	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_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 $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34	34
35	35

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
30
31	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32
33	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_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 $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
35

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -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
30
31	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32
33	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_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 $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
35

M win/Makefile.mingw

+5 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -658,10 +658,14 @@
658	658	endif
659	659
660	660	zlib:
661	661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662	662
	663	+openssl: zlib
	664	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
	665	+ $(MAKE) -C $(OPENSSLLIBDIR)
	666	+
663	667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
664	668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
665	669
666	670	# This rule prevents make from using its default rules to try build
667	671	# an executable named "manifest" out of the file named "manifest.c"
		@@ -1656,11 +1660,11 @@
1656	1660	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1657	1661
1658	1662	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1659	1663
1660	1664	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1661		- $(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1665	+ $(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
1662	1666
1663	1667	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1664	1668	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1665	1669
1666	1670	$(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
1667	1671

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -658,10 +658,14 @@
658	endif
659
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662




663	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
664	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
665
666	# This rule prevents make from using its default rules to try build
667	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1656,11 +1660,11 @@
1656	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1657
1658	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1659
1660	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1661	$(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1662
1663	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1664	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1665
1666	$(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
1667

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -658,10 +658,14 @@
658	endif
659
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
663	openssl: zlib
664	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665	$(MAKE) -C $(OPENSSLLIBDIR)
666
667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669
670	# This rule prevents make from using its default rules to try build
671	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1656,11 +1660,11 @@
1660	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1661
1662	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1663
1664	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1665	$(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
1666
1667	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1668	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1669
1670	$(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
1671

M win/Makefile.mingw.mistachkin

+5 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -658,10 +658,14 @@
658	658	endif
659	659
660	660	zlib:
661	661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662	662
	663	+openssl: zlib
	664	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
	665	+ $(MAKE) -C $(OPENSSLLIBDIR)
	666	+
663	667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
664	668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
665	669
666	670	# This rule prevents make from using its default rules to try build
667	671	# an executable named "manifest" out of the file named "manifest.c"
		@@ -1656,11 +1660,11 @@
1656	1660	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1657	1661
1658	1662	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1659	1663
1660	1664	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1661		- $(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1665	+ $(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
1662	1666
1663	1667	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1664	1668	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1665	1669
1666	1670	$(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
1667	1671

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -658,10 +658,14 @@
658	endif
659
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662




663	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
664	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
665
666	# This rule prevents make from using its default rules to try build
667	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1656,11 +1660,11 @@
1656	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1657
1658	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1659
1660	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1661	$(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 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1662
1663	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1664	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1665
1666	$(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
1667

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -658,10 +658,14 @@
658	endif
659
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
663	openssl: zlib
664	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665	$(MAKE) -C $(OPENSSLLIBDIR)
666
667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669
670	# This rule prevents make from using its default rules to try build
671	# an executable named "manifest" out of the file named "manifest.c"
	@@ -1656,11 +1660,11 @@
1660	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1661
1662	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1663
1664	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1665	$(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
1666
1667	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1668	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1669
1670	$(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
1671

M win/Makefile.msc

+2 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -59,11 +59,12 @@
59	59	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
60	60	/DSQLITE_THREADSAFE=0 \
61	61	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
62	62	/DSQLITE_ENABLE_STAT3 \
63	63	/Dlocaltime=fossil_localtime \
64		- /DSQLITE_ENABLE_LOCKING_STYLE=0
	64	+ /DSQLITE_ENABLE_LOCKING_STYLE=0 \
	65	+ /DSQLITE_WIN32_NO_ANSI
65	66
66	67	SRC = add_.c \
67	68	allrepo_.c \
68	69	attach_.c \
69	70	bag_.c \
70	71

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -59,11 +59,12 @@
59	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
60	/DSQLITE_THREADSAFE=0 \
61	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
62	/DSQLITE_ENABLE_STAT3 \
63	/Dlocaltime=fossil_localtime \
64	/DSQLITE_ENABLE_LOCKING_STYLE=0

65
66	SRC = add_.c \
67	allrepo_.c \
68	attach_.c \
69	bag_.c \
70

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -59,11 +59,12 @@
59	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
60	/DSQLITE_THREADSAFE=0 \
61	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
62	/DSQLITE_ENABLE_STAT3 \
63	/Dlocaltime=fossil_localtime \
64	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
65	/DSQLITE_WIN32_NO_ANSI
66
67	SRC = add_.c \
68	allrepo_.c \
69	attach_.c \
70	bag_.c \
71

M www/changes.wiki

+7 -4

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,8 +1,8 @@
1	1	<title>Change Log</title>
2	2
3		-<h2>Changes For Version 1.27 (as yet unreleased)</h2>
	3	+<h2>Changes For Version 1.27 (2013-09-11)</h2>
4	4	* Enhance the [/help?cmd=changes \| fossil changes],
5	5	[/help?cmd=clean \| fossil clean], [/help?cmd=extras \| fossil extras],
6	6	[/help?cmd=ls \| fossil ls] and [/help?cmd=status \| fossil status] commands
7	7	to restrict operation to files and directories named on the command-line.
8	8	* New --integrate option to [/help?cmd=merge \| fossil merge], which
		@@ -9,13 +9,13 @@
9	9	automatically closes the merged branch when committing.
10	10	* Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
11	11	relative, not absolute.
12	12	* Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
13	13	to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
14		- * Fixed an obscure condition under which an assertion failure could overwrite
15		- part of a repository database file, corrupting it. This problem has only
16		- been seen once in the wild.
	14	+ * Updates to SQLite to prevent opening a repository file using file descriptors
	15	+ 1 or 2 on unix. This fixes a bug under which an assertion failure could
	16	+ overwrite part of a repository database file, corrupting it.
17	17	* Added support for unlimited line lengths in side-by-side diffs.
18	18	* New --close option to [/help?cmd=commit \| fossil commit], which
19	19	immediately closes the branch being committed.
20	20	* Added <tt>chart</tt> option to [/help?cmd=bisect \| fossil bisect].
21	21	* Improvements to the "human or bot?" determination.
		@@ -22,10 +22,13 @@
22	22	* Reports errors about missing CGI-standard environment variables for HTTP
23	23	servers which do not support them.
24	24	* Minor improvements to sync support on Windows.
25	25	* Added <tt>--scgi</tt> option to [/help?cmd=server \| fossil server].
26	26	* Internal improvements to the sync process.
	27	+ * The internals of the JSON API are now MIT-licensed, so downstream
	28	+ users/packagers are no longer affected by the "do no evil" license
	29	+ clause.
27	30
28	31	<h2>Changes For Version 1.26 (2013-06-18)</h2>
29	32	* The argument to the --port option for the [/help?cmd=ui \| fossil ui] and
30	33	[/help?cmd=server \| fossil server] commands can take an IP address in addition
31	34	to the port number, causing Fossil to bind to just that one IP address.
32	35

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,8 +1,8 @@
1	<title>Change Log</title>
2
3	<h2>Changes For Version 1.27 (as yet unreleased)</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	to restrict operation to files and directories named on the command-line.
8	* New --integrate option to [/help?cmd=merge \| fossil merge], which
	@@ -9,13 +9,13 @@
9	automatically closes the merged branch when committing.
10	* Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
11	relative, not absolute.
12	* Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
13	to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
14	* Fixed an obscure condition under which an assertion failure could overwrite
15	part of a repository database file, corrupting it. This problem has only
16	been seen once in the wild.
17	* Added support for unlimited line lengths in side-by-side diffs.
18	* New --close option to [/help?cmd=commit \| fossil commit], which
19	immediately closes the branch being committed.
20	* Added <tt>chart</tt> option to [/help?cmd=bisect \| fossil bisect].
21	* Improvements to the "human or bot?" determination.
	@@ -22,10 +22,13 @@
22	* Reports errors about missing CGI-standard environment variables for HTTP
23	servers which do not support them.
24	* Minor improvements to sync support on Windows.
25	* Added <tt>--scgi</tt> option to [/help?cmd=server \| fossil server].
26	* Internal improvements to the sync process.



27
28	<h2>Changes For Version 1.26 (2013-06-18)</h2>
29	* The argument to the --port option for the [/help?cmd=ui \| fossil ui] and
30	[/help?cmd=server \| fossil server] commands can take an IP address in addition
31	to the port number, causing Fossil to bind to just that one IP address.
32

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,8 +1,8 @@
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	to restrict operation to files and directories named on the command-line.
8	* New --integrate option to [/help?cmd=merge \| fossil merge], which
	@@ -9,13 +9,13 @@
9	automatically closes the merged branch when committing.
10	* Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
11	relative, not absolute.
12	* Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
13	to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
14	* Updates to SQLite to prevent opening a repository file using file descriptors
15	1 or 2 on unix. This fixes a bug under which an assertion failure could
16	overwrite part of a repository database file, corrupting it.
17	* Added support for unlimited line lengths in side-by-side diffs.
18	* New --close option to [/help?cmd=commit \| fossil commit], which
19	immediately closes the branch being committed.
20	* Added <tt>chart</tt> option to [/help?cmd=bisect \| fossil bisect].
21	* Improvements to the "human or bot?" determination.
	@@ -22,10 +22,13 @@
22	* Reports errors about missing CGI-standard environment variables for HTTP
23	servers which do not support them.
24	* Minor improvements to sync support on Windows.
25	* Added <tt>--scgi</tt> option to [/help?cmd=server \| fossil server].
26	* Internal improvements to the sync process.
27	* The internals of the JSON API are now MIT-licensed, so downstream
28	users/packagers are no longer affected by the "do no evil" license
29	clause.
30
31	<h2>Changes For Version 1.26 (2013-06-18)</h2>
32	* The argument to the --port option for the [/help?cmd=ui \| fossil ui] and
33	[/help?cmd=server \| fossil server] commands can take an IP address in addition
34	to the port number, causing Fossil to bind to just that one IP address.
35

M www/fileformat.wiki

+67 -67

		--- www/fileformat.wiki
		+++ www/fileformat.wiki
		@@ -586,144 +586,144 @@
586	586	<td align=center><b>0-1</b></td>
587	587	</tr>
588	588	<tr>
589	589	<td><b>D</b> <i>date-time-stamp</i></td>
590	590	<td align=center><b>1</b></td>
591		-<td align=center> </td>
	591	+<td> </td>
592	592	<td align=center><b>1</b></td>
593	593	<td align=center><b>1</b></td>
594	594	<td align=center><b>1</b></td>
595	595	<td align=center><b>1</b></td>
596	596	<td align=center><b>1</b></td>
597	597	</tr>
598	598	<tr>
599	599	<td><b>E</b> <i>event-time event-id</i></td>
600		-<td align=center> </td>
601		-<td align=center> </td>
602		-<td align=center> </td>
603		-<td align=center> </td>
604		-<td align=center> </td>
605		-<td align=center> </td>
	600	+<td> </td>
	601	+<td> </td>
	602	+<td> </td>
	603	+<td> </td>
	604	+<td> </td>
	605	+<td> </td>
606	606	<td align=center><b>1</b></td>
607	607	</tr>
608	608	<tr>
609	609	<td><b>F</b> <i>filename</i> ?<i>uuid</i>? ?<i>permissions</i>? ?<i>oldname</i>?</td>
610	610	<td align=center><b>0+</b></td>
611		-<td align=center> </td>
612		-<td align=center> </td>
613		-<td align=center> </td>
614		-<td align=center> </td>
615		-<td align=center> </td>
616		-<td align=center> </td>
	611	+<td> </td>
	612	+<td> </td>
	613	+<td> </td>
	614	+<td> </td>
	615	+<td> </td>
	616	+<td> </td>
617	617	</tr>
618	618	<tr>
619	619	<td><b>J</b> <i>name</i> ?<i>value</i>?</td>
620		-<td align=center> </td>
621		-<td align=center> </td>
622		-<td align=center> </td>
623		-<td align=center> </td>
	620	+<td> </td>
	621	+<td> </td>
	622	+<td> </td>
	623	+<td> </td>
624	624	<td align=center><b>1+</b></td>
625		-<td align=center> </td>
626		-<td align=center> </td>
	625	+<td> </td>
	626	+<td> </td>
627	627	</tr>
628	628	<tr>
629	629	<td><b>K</b> <i>ticket-uuid</i></td>
630		-<td align=center> </td>
631		-<td align=center> </td>
632		-<td align=center> </td>
633		-<td align=center> </td>
	630	+<td> </td>
	631	+<td> </td>
	632	+<td> </td>
	633	+<td> </td>
634	634	<td align=center><b>1</b></td>
635		-<td align=center> </td>
636		-<td align=center> </td>
	635	+<td> </td>
	636	+<td> </td>
637	637	</tr>
638	638	<tr>
639	639	<td><b>L</b> <i>wiki-title</i></td>
640		-<td align=center> </td>
641		-<td align=center> </td>
642		-<td align=center> </td>
	640	+<td> </td>
	641	+<td> </td>
	642	+<td> </td>
643	643	<td align=center><b>1</b></td>
644		-<td align=center> </td>
645		-<td align=center> </td>
646		-<td align=center> </td>
	644	+<td> </td>
	645	+<td> </td>
	646	+<td> </td>
647	647	</tr>
648	648	<tr>
649	649	<td><b>M</b> <i>uuid</i></td>
650		-<td align=center> </td>
	650	+<td> </td>
651	651	<td align=center><b>1+</b></td>
652		-<td align=center> </td>
653		-<td align=center> </td>
654		-<td align=center> </td>
655		-<td align=center> </td>
656		-<td align=center> </td>
	652	+<td> </td>
	653	+<td> </td>
	654	+<td> </td>
	655	+<td> </td>
	656	+<td> </td>
657	657	</tr>
658	658	<tr>
659	659	<td><b>N</b> <i>mimetype</i></td>
660	660	<td align=center><b>0-1</b></td>
661		-<td align=center> </td>
662		-<td align=center> </td>
	661	+<td> </td>
	662	+<td> </td>
663	663	<td align=center><b>0-1</b></td>
664		-<td align=center> </td>
	664	+<td> </td>
665	665	<td align=center><b>0-1</b></td>
666	666	<td align=center><b>0-1</b></td>
667	667	</tr>
668	668	<tr>
669	669	<td><b>P</b> <i>uuid ...</i></td>
670	670	<td align=center><b>0-1</b></td>
671		-<td align=center> </td>
672		-<td align=center> </td>
	671	+<td> </td>
	672	+<td> </td>
673	673	<td align=center><b>0-1</b></td>
674		-<td align=center> </td>
675		-<td align=center> </td>
	674	+<td> </td>
	675	+<td> </td>
676	676	<td align=center><b>0-1</b></td>
677	677	</tr>
678	678	<tr>
679	679	<td><b>Q</b> (<b>+</b>\|<b>-</b>)<i>uuid</i> ?<i>uuid</i>?</td>
680	680	<td align=center><b>0+</b></td>
681		-<td align=center> </td>
682		-<td align=center> </td>
683		-<td align=center> </td>
684		-<td align=center> </td>
685		-<td align=center> </td>
686		-<td align=center> </td>
	681	+<td> </td>
	682	+<td> </td>
	683	+<td> </td>
	684	+<td> </td>
	685	+<td> </td>
	686	+<td> </td>
687	687	</tr>
688	688	<tr>
689	689	<td><b>R</b> <i>md5sum</i></td>
690	690	<td align=center><b>0-1</b></td>
691		-<td align=center> </td>
692		-<td align=center> </td>
693		-<td align=center> </td>
694		-<td align=center> </td>
695		-<td align=center> </td>
696		-<td align=center> </td>
	691	+<td> </td>
	692	+<td> </td>
	693	+<td> </td>
	694	+<td> </td>
	695	+<td> </td>
	696	+<td> </td>
697	697	<tr>
698	698	<td><b>T</b> (<b>+</b>\|<b>*</b>\|<b>-</b>)<i>tagname</i> <i>uuid</i> ?<i>value</i>?</td>
699	699	<td align=center><b>0+</b></td>
700		-<td align=center> </td>
	700	+<td> </td>
701	701	<td align=center><b>1+</b></td>
702		-<td align=center> </td>
703		-<td align=center> </td>
704		-<td align=center> </td>
	702	+<td> </td>
	703	+<td> </td>
	704	+<td> </td>
705	705	<td align=center><b>0+</b></td>
706	706	</tr>
707	707	<tr>
708	708	<td><b>U</b> <i>username</i></td>
709	709	<td align=center><b>1</b></td>
710		-<td align=center> </td>
	710	+<td> </td>
711	711	<td align=center><b>1</b></td>
712	712	<td align=center><b>1</b></td>
713	713	<td align=center><b>1</b></td>
714	714	<td align=center><b>0-1</b></td>
715	715	<td align=center><b>0-1</b></td>
716	716	</tr>
717	717	<tr>
718	718	<td><b>W</b> <i>size</i></td>
719		-<td align=center> </td>
720		-<td align=center> </td>
721		-<td align=center> </td>
	719	+<td> </td>
	720	+<td> </td>
	721	+<td> </td>
722	722	<td align=center><b>1</b></td>
723		-<td align=center> </td>
724		-<td align=center> </td>
	723	+<td> </td>
	724	+<td> </td>
725	725	<td align=center><b>1</b></td>
726	726	</tr>
727	727	<tr>
728	728	<td><b>Z</b> <i>md5sum</i></td>
729	729	<td align=center><b>1</b></td>
		@@ -777,7 +777,7 @@
777	777	filenames in the manifest are "fossilized" (encoded) because they contain
778	778	spaces. In that case the shell-generated hash would differ because the
779	779	<tt>stat</tt> calls will fail to find such files (which are output in encoded
780	780	form here). That approach also won't work for delta manifests. Calculating
781	781	the R-card for delta manifests requires traversing both the delta and its baseline in
782		-lexical order of the files, prefering the delta's copy if both contain
	782	+lexical order of the files, preferring the delta's copy if both contain
783	783	a given file.
784	784

	--- www/fileformat.wiki
	+++ www/fileformat.wiki
	@@ -586,144 +586,144 @@
586	<td align=center><b>0-1</b></td>
587	</tr>
588	<tr>
589	<td><b>D</b> <i>date-time-stamp</i></td>
590	<td align=center><b>1</b></td>
591	<td align=center> </td>
592	<td align=center><b>1</b></td>
593	<td align=center><b>1</b></td>
594	<td align=center><b>1</b></td>
595	<td align=center><b>1</b></td>
596	<td align=center><b>1</b></td>
597	</tr>
598	<tr>
599	<td><b>E</b> <i>event-time event-id</i></td>
600	<td align=center> </td>
601	<td align=center> </td>
602	<td align=center> </td>
603	<td align=center> </td>
604	<td align=center> </td>
605	<td align=center> </td>
606	<td align=center><b>1</b></td>
607	</tr>
608	<tr>
609	<td><b>F</b> <i>filename</i> ?<i>uuid</i>? ?<i>permissions</i>? ?<i>oldname</i>?</td>
610	<td align=center><b>0+</b></td>
611	<td align=center> </td>
612	<td align=center> </td>
613	<td align=center> </td>
614	<td align=center> </td>
615	<td align=center> </td>
616	<td align=center> </td>
617	</tr>
618	<tr>
619	<td><b>J</b> <i>name</i> ?<i>value</i>?</td>
620	<td align=center> </td>
621	<td align=center> </td>
622	<td align=center> </td>
623	<td align=center> </td>
624	<td align=center><b>1+</b></td>
625	<td align=center> </td>
626	<td align=center> </td>
627	</tr>
628	<tr>
629	<td><b>K</b> <i>ticket-uuid</i></td>
630	<td align=center> </td>
631	<td align=center> </td>
632	<td align=center> </td>
633	<td align=center> </td>
634	<td align=center><b>1</b></td>
635	<td align=center> </td>
636	<td align=center> </td>
637	</tr>
638	<tr>
639	<td><b>L</b> <i>wiki-title</i></td>
640	<td align=center> </td>
641	<td align=center> </td>
642	<td align=center> </td>
643	<td align=center><b>1</b></td>
644	<td align=center> </td>
645	<td align=center> </td>
646	<td align=center> </td>
647	</tr>
648	<tr>
649	<td><b>M</b> <i>uuid</i></td>
650	<td align=center> </td>
651	<td align=center><b>1+</b></td>
652	<td align=center> </td>
653	<td align=center> </td>
654	<td align=center> </td>
655	<td align=center> </td>
656	<td align=center> </td>
657	</tr>
658	<tr>
659	<td><b>N</b> <i>mimetype</i></td>
660	<td align=center><b>0-1</b></td>
661	<td align=center> </td>
662	<td align=center> </td>
663	<td align=center><b>0-1</b></td>
664	<td align=center> </td>
665	<td align=center><b>0-1</b></td>
666	<td align=center><b>0-1</b></td>
667	</tr>
668	<tr>
669	<td><b>P</b> <i>uuid ...</i></td>
670	<td align=center><b>0-1</b></td>
671	<td align=center> </td>
672	<td align=center> </td>
673	<td align=center><b>0-1</b></td>
674	<td align=center> </td>
675	<td align=center> </td>
676	<td align=center><b>0-1</b></td>
677	</tr>
678	<tr>
679	<td><b>Q</b> (<b>+</b>\|<b>-</b>)<i>uuid</i> ?<i>uuid</i>?</td>
680	<td align=center><b>0+</b></td>
681	<td align=center> </td>
682	<td align=center> </td>
683	<td align=center> </td>
684	<td align=center> </td>
685	<td align=center> </td>
686	<td align=center> </td>
687	</tr>
688	<tr>
689	<td><b>R</b> <i>md5sum</i></td>
690	<td align=center><b>0-1</b></td>
691	<td align=center> </td>
692	<td align=center> </td>
693	<td align=center> </td>
694	<td align=center> </td>
695	<td align=center> </td>
696	<td align=center> </td>
697	<tr>
698	<td><b>T</b> (<b>+</b>\|<b>*</b>\|<b>-</b>)<i>tagname</i> <i>uuid</i> ?<i>value</i>?</td>
699	<td align=center><b>0+</b></td>
700	<td align=center> </td>
701	<td align=center><b>1+</b></td>
702	<td align=center> </td>
703	<td align=center> </td>
704	<td align=center> </td>
705	<td align=center><b>0+</b></td>
706	</tr>
707	<tr>
708	<td><b>U</b> <i>username</i></td>
709	<td align=center><b>1</b></td>
710	<td align=center> </td>
711	<td align=center><b>1</b></td>
712	<td align=center><b>1</b></td>
713	<td align=center><b>1</b></td>
714	<td align=center><b>0-1</b></td>
715	<td align=center><b>0-1</b></td>
716	</tr>
717	<tr>
718	<td><b>W</b> <i>size</i></td>
719	<td align=center> </td>
720	<td align=center> </td>
721	<td align=center> </td>
722	<td align=center><b>1</b></td>
723	<td align=center> </td>
724	<td align=center> </td>
725	<td align=center><b>1</b></td>
726	</tr>
727	<tr>
728	<td><b>Z</b> <i>md5sum</i></td>
729	<td align=center><b>1</b></td>
	@@ -777,7 +777,7 @@
777	filenames in the manifest are "fossilized" (encoded) because they contain
778	spaces. In that case the shell-generated hash would differ because the
779	<tt>stat</tt> calls will fail to find such files (which are output in encoded
780	form here). That approach also won't work for delta manifests. Calculating
781	the R-card for delta manifests requires traversing both the delta and its baseline in
782	lexical order of the files, prefering the delta's copy if both contain
783	a given file.
784

	--- www/fileformat.wiki
	+++ www/fileformat.wiki
	@@ -586,144 +586,144 @@
586	<td align=center><b>0-1</b></td>
587	</tr>
588	<tr>
589	<td><b>D</b> <i>date-time-stamp</i></td>
590	<td align=center><b>1</b></td>
591	<td> </td>
592	<td align=center><b>1</b></td>
593	<td align=center><b>1</b></td>
594	<td align=center><b>1</b></td>
595	<td align=center><b>1</b></td>
596	<td align=center><b>1</b></td>
597	</tr>
598	<tr>
599	<td><b>E</b> <i>event-time event-id</i></td>
600	<td> </td>
601	<td> </td>
602	<td> </td>
603	<td> </td>
604	<td> </td>
605	<td> </td>
606	<td align=center><b>1</b></td>
607	</tr>
608	<tr>
609	<td><b>F</b> <i>filename</i> ?<i>uuid</i>? ?<i>permissions</i>? ?<i>oldname</i>?</td>
610	<td align=center><b>0+</b></td>
611	<td> </td>
612	<td> </td>
613	<td> </td>
614	<td> </td>
615	<td> </td>
616	<td> </td>
617	</tr>
618	<tr>
619	<td><b>J</b> <i>name</i> ?<i>value</i>?</td>
620	<td> </td>
621	<td> </td>
622	<td> </td>
623	<td> </td>
624	<td align=center><b>1+</b></td>
625	<td> </td>
626	<td> </td>
627	</tr>
628	<tr>
629	<td><b>K</b> <i>ticket-uuid</i></td>
630	<td> </td>
631	<td> </td>
632	<td> </td>
633	<td> </td>
634	<td align=center><b>1</b></td>
635	<td> </td>
636	<td> </td>
637	</tr>
638	<tr>
639	<td><b>L</b> <i>wiki-title</i></td>
640	<td> </td>
641	<td> </td>
642	<td> </td>
643	<td align=center><b>1</b></td>
644	<td> </td>
645	<td> </td>
646	<td> </td>
647	</tr>
648	<tr>
649	<td><b>M</b> <i>uuid</i></td>
650	<td> </td>
651	<td align=center><b>1+</b></td>
652	<td> </td>
653	<td> </td>
654	<td> </td>
655	<td> </td>
656	<td> </td>
657	</tr>
658	<tr>
659	<td><b>N</b> <i>mimetype</i></td>
660	<td align=center><b>0-1</b></td>
661	<td> </td>
662	<td> </td>
663	<td align=center><b>0-1</b></td>
664	<td> </td>
665	<td align=center><b>0-1</b></td>
666	<td align=center><b>0-1</b></td>
667	</tr>
668	<tr>
669	<td><b>P</b> <i>uuid ...</i></td>
670	<td align=center><b>0-1</b></td>
671	<td> </td>
672	<td> </td>
673	<td align=center><b>0-1</b></td>
674	<td> </td>
675	<td> </td>
676	<td align=center><b>0-1</b></td>
677	</tr>
678	<tr>
679	<td><b>Q</b> (<b>+</b>\|<b>-</b>)<i>uuid</i> ?<i>uuid</i>?</td>
680	<td align=center><b>0+</b></td>
681	<td> </td>
682	<td> </td>
683	<td> </td>
684	<td> </td>
685	<td> </td>
686	<td> </td>
687	</tr>
688	<tr>
689	<td><b>R</b> <i>md5sum</i></td>
690	<td align=center><b>0-1</b></td>
691	<td> </td>
692	<td> </td>
693	<td> </td>
694	<td> </td>
695	<td> </td>
696	<td> </td>
697	<tr>
698	<td><b>T</b> (<b>+</b>\|<b>*</b>\|<b>-</b>)<i>tagname</i> <i>uuid</i> ?<i>value</i>?</td>
699	<td align=center><b>0+</b></td>
700	<td> </td>
701	<td align=center><b>1+</b></td>
702	<td> </td>
703	<td> </td>
704	<td> </td>
705	<td align=center><b>0+</b></td>
706	</tr>
707	<tr>
708	<td><b>U</b> <i>username</i></td>
709	<td align=center><b>1</b></td>
710	<td> </td>
711	<td align=center><b>1</b></td>
712	<td align=center><b>1</b></td>
713	<td align=center><b>1</b></td>
714	<td align=center><b>0-1</b></td>
715	<td align=center><b>0-1</b></td>
716	</tr>
717	<tr>
718	<td><b>W</b> <i>size</i></td>
719	<td> </td>
720	<td> </td>
721	<td> </td>
722	<td align=center><b>1</b></td>
723	<td> </td>
724	<td> </td>
725	<td align=center><b>1</b></td>
726	</tr>
727	<tr>
728	<td><b>Z</b> <i>md5sum</i></td>
729	<td align=center><b>1</b></td>
	@@ -777,7 +777,7 @@
777	filenames in the manifest are "fossilized" (encoded) because they contain
778	spaces. In that case the shell-generated hash would differ because the
779	<tt>stat</tt> calls will fail to find such files (which are output in encoded
780	form here). That approach also won't work for delta manifests. Calculating
781	the R-card for delta manifests requires traversing both the delta and its baseline in
782	lexical order of the files, preferring the delta's copy if both contain
783	a given file.
784

M www/mkdownload.tcl

+4 -4

		--- www/mkdownload.tcl
		+++ www/mkdownload.tcl
		@@ -68,20 +68,20 @@
68	68	set dt [string range $datetime 0 3]-[string range $datetime 4 5]-
69	69	append dt "[string range $datetime 6 7] "
70	70	append dt "[string range $datetime 8 9]:[string range $datetime 10 11]:"
71	71	append dt "[string range $datetime 12 13]"
72	72	set link [string map {{ } +} $dt]
73		- set hr http://www.fossil-scm.org/fossil/timeline?c=$link&y=ci
	73	+ set hr "http://www.fossil-scm.org/fossil/timeline?c=$link&y=ci"
74	74	puts $out "<tr><td colspan=6 align=left><hr>"
75	75	puts $out "<center><b><a href=\"$hr\">$dt</a></b></center>"
76	76	puts $out "</td></tr>"
77	77	puts $out "<tr>"
78	78
79	79	foreach {prefix suffix img desc} {
80		- fossil-linux-x86 zip linux.gif {Linux x86}
81		- fossil-macosx-x86 zip mac.gif {Mac 10.5 x86}
82		- fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.7 x86}
	80	+ fossil-linux-x86 zip linux.gif {Linux 3.x x86}
	81	+ fossil-macosx-x86 zip mac.gif {Mac 10.x x86}
	82	+ fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.x x86}
83	83	fossil-w32 zip win32.gif {Windows}
84	84	fossil-src tar.gz src.gif {Source Tarball}
85	85	} {
86	86	set filename download/$prefix-$datetime.$suffix
87	87	if {[file exists $filename]} {
88	88

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -68,20 +68,20 @@
68	set dt [string range $datetime 0 3]-[string range $datetime 4 5]-
69	append dt "[string range $datetime 6 7] "
70	append dt "[string range $datetime 8 9]:[string range $datetime 10 11]:"
71	append dt "[string range $datetime 12 13]"
72	set link [string map {{ } +} $dt]
73	set hr http://www.fossil-scm.org/fossil/timeline?c=$link&y=ci
74	puts $out "<tr><td colspan=6 align=left><hr>"
75	puts $out "<center><b><a href=\"$hr\">$dt</a></b></center>"
76	puts $out "</td></tr>"
77	puts $out "<tr>"
78
79	foreach {prefix suffix img desc} {
80	fossil-linux-x86 zip linux.gif {Linux x86}
81	fossil-macosx-x86 zip mac.gif {Mac 10.5 x86}
82	fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.7 x86}
83	fossil-w32 zip win32.gif {Windows}
84	fossil-src tar.gz src.gif {Source Tarball}
85	} {
86	set filename download/$prefix-$datetime.$suffix
87	if {[file exists $filename]} {
88

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -68,20 +68,20 @@
68	set dt [string range $datetime 0 3]-[string range $datetime 4 5]-
69	append dt "[string range $datetime 6 7] "
70	append dt "[string range $datetime 8 9]:[string range $datetime 10 11]:"
71	append dt "[string range $datetime 12 13]"
72	set link [string map {{ } +} $dt]
73	set hr "http://www.fossil-scm.org/fossil/timeline?c=$link&y=ci"
74	puts $out "<tr><td colspan=6 align=left><hr>"
75	puts $out "<center><b><a href=\"$hr\">$dt</a></b></center>"
76	puts $out "</td></tr>"
77	puts $out "<tr>"
78
79	foreach {prefix suffix img desc} {
80	fossil-linux-x86 zip linux.gif {Linux 3.x x86}
81	fossil-macosx-x86 zip mac.gif {Mac 10.x x86}
82	fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.x x86}
83	fossil-w32 zip win32.gif {Windows}
84	fossil-src tar.gz src.gif {Source Tarball}
85	} {
86	set filename download/$prefix-$datetime.$suffix
87	if {[file exists $filename]} {
88

Fossil SCM

Keyboard Shortcuts