Fossil SCM

Another merge from trunk.

michael 2010-09-16 14:13 ttmrichter-skins merge

Commit 1516a26dc85d4758620fbc77ffc4984d770ce93b

Parent be5fd10aaf5d1c6…

65 files changed +2 -2 +8 -8 +24 -3 +46 -51 +9 -8 +1 -1 +34 -150 +40 -22 +9 -2 +1 +28 -13 +8 -5 +81 -14 +35 -40 +2 -1 +10 -7 +11 -9 +104 -58 +21 +11 -8 +4 -4 +164 -19 +57 -39 +40 -38 +24 -11 +12 -2 +14 -11 +243 -1 +2 -2 +11 +2 +12 -12 +1 -1 +309 -275 +11 -9 +29 -26 +57 -57 +57 -57 +1948 -1245 +25 -16 +18 -6 +328 -22 +8 -6 +1 -1 +2 -1 +37 -27 +22 -14 +94 -98 +11 -8 +2 -1 +74 -11 +3 +4 +59 -50 +47 -21 +10 -4 +1 +550 +46 +67 +43 +4 +1 -1 +2 -2 +8 -5

~ src/add.c ~ src/attach.c ~ src/blob.c ~ src/branch.c ~ src/browse.c ~ src/captcha.c ~ src/cgi.c ~ src/checkin.c ~ src/config.h ~ src/configure.c ~ src/db.c ~ src/descendants.c ~ src/diff.c ~ src/diffcmd.c ~ src/encode.c ~ src/file.c ~ src/finfo.c ~ src/graph.c ~ src/http.c ~ src/http_socket.c ~ src/http_ssl.c ~ src/http_transport.c ~ src/info.c ~ src/login.c ~ src/main.c ~ src/main.mk ~ src/makeheaders.c ~ src/makemake.tcl ~ src/merge3.c ~ src/popen.c ~ src/rebuild.c ~ src/report.c ~ src/rss.c ~ src/setup.c ~ src/sha1.c ~ src/shun.c ~ src/skins.c ~ src/skins.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/stat.c ~ src/style.c ~ src/tag.c ~ src/th.c ~ src/th_main.c ~ src/timeline.c ~ src/tkt.c ~ src/tktsetup.c ~ src/translate.c ~ src/update.c ~ src/url.c ~ src/user.c ~ src/vfile.c ~ src/wiki.c ~ src/wikiformat.c ~ src/winhttp.c ~ src/xfer.c ~ win/Makefile.dmc ~ win/Makefile.msc ~ win/include/dirent.h ~ win/include/unistd.h ~ win/version.c ~ www/index.wiki ~ www/password.wiki ~ www/quickstart.wiki

M src/add.c

+2 -2

		--- src/add.c
		+++ src/add.c
		@@ -53,11 +53,11 @@
53	53	fossil_warning("cannot add %s", zPath);
54	54	}else{
55	55	if( !file_is_simple_pathname(zPath) ){
56	56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	57	}
58		-#ifdef __MINGW32__
	58	+#if defined(_WIN32)
59	59	if( db_exists("SELECT 1 FROM vfile"
60	60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	61	db_multi_exec("UPDATE vfile SET deleted=0"
62	62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	63	}
		@@ -152,11 +152,11 @@
152	152	db_begin_transaction();
153	153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	154	blob_zero(&repo);
155	155	}
156	156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157		-#ifdef __MINGW32__
	157	+#if defined(_WIN32)
158	158	db_multi_exec(
159	159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	160	" ON vfile(pathname COLLATE nocase)"
161	161	);
162	162	#endif
163	163

	--- src/add.c
	+++ src/add.c
	@@ -53,11 +53,11 @@
53	fossil_warning("cannot add %s", zPath);
54	}else{
55	if( !file_is_simple_pathname(zPath) ){
56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	}
58	#ifdef __MINGW32__
59	if( db_exists("SELECT 1 FROM vfile"
60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	db_multi_exec("UPDATE vfile SET deleted=0"
62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	}
	@@ -152,11 +152,11 @@
152	db_begin_transaction();
153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	blob_zero(&repo);
155	}
156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157	#ifdef __MINGW32__
158	db_multi_exec(
159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	" ON vfile(pathname COLLATE nocase)"
161	);
162	#endif
163

	--- src/add.c
	+++ src/add.c
	@@ -53,11 +53,11 @@
53	fossil_warning("cannot add %s", zPath);
54	}else{
55	if( !file_is_simple_pathname(zPath) ){
56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	}
58	#if defined(_WIN32)
59	if( db_exists("SELECT 1 FROM vfile"
60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	db_multi_exec("UPDATE vfile SET deleted=0"
62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	}
	@@ -152,11 +152,11 @@
152	db_begin_transaction();
153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	blob_zero(&repo);
155	}
156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157	#if defined(_WIN32)
158	db_multi_exec(
159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	" ON vfile(pathname COLLATE nocase)"
161	);
162	#endif
163

M src/attach.c

+8 -8

		--- src/attach.c
		+++ src/attach.c
		@@ -75,20 +75,20 @@
75	75	zFilename = &zFilename[i+1];
76	76	i = -1;
77	77	}
78	78	}
79	79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80		- zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
	80	+ zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	81	}else{
82		- zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
	82	+ zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	83	}
84	84	@
85	85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86		- @ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br>
	86	+ @ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	88	if( zComment && zComment[0] ){
89		- @ %w(zComment)<br>
	89	+ @ %w(zComment)<br />
90	90	}
91	91	if( zPage==0 && zTkt==0 ){
92	92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	93	zSrc = "Deleted from";
94	94	}else {
		@@ -273,13 +273,13 @@
273	273	style_header("Add Attachment");
274	274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	276	@ enctype="multipart/form-data">
277	277	@ File to Attach:
278		- @ <input type="file" name="f" size="60"><br>
279		- @ Description:<br>
280		- @ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br>
	278	+ @ <input type="file" name="f" size="60"><br />
	279	+ @ Description:<br />
	280	+ @ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br />
281	281	if( zTkt ){
282	282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	283	}else{
284	284	@ <input type="hidden" name="page" value="%h(zPage)">
285	285	}
		@@ -351,11 +351,11 @@
351	351	cgi_redirect(zFrom);
352	352	}
353	353	style_header("Delete Attachment");
354	354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	355	@ <p>Confirm that you want to delete the attachment named
356		- @ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br>
	356	+ @ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br />
357	357	if( zTkt ){
358	358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	359	}else{
360	360	@ <input type="hidden" name="page" value="%h(zPage)">
361	361	}
362	362

	--- src/attach.c
	+++ src/attach.c
	@@ -75,20 +75,20 @@
75	zFilename = &zFilename[i+1];
76	i = -1;
77	}
78	}
79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80	zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br>
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	if( zComment && zComment[0] ){
89	@ %w(zComment)<br>
90	}
91	if( zPage==0 && zTkt==0 ){
92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	zSrc = "Deleted from";
94	}else {
	@@ -273,13 +273,13 @@
273	style_header("Add Attachment");
274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	@ enctype="multipart/form-data">
277	@ File to Attach:
278	@ <input type="file" name="f" size="60"><br>
279	@ Description:<br>
280	@ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br>
281	if( zTkt ){
282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	}else{
284	@ <input type="hidden" name="page" value="%h(zPage)">
285	}
	@@ -351,11 +351,11 @@
351	cgi_redirect(zFrom);
352	}
353	style_header("Delete Attachment");
354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	@ <p>Confirm that you want to delete the attachment named
356	@ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br>
357	if( zTkt ){
358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	}else{
360	@ <input type="hidden" name="page" value="%h(zPage)">
361	}
362

	--- src/attach.c
	+++ src/attach.c
	@@ -75,20 +75,20 @@
75	zFilename = &zFilename[i+1];
76	i = -1;
77	}
78	}
79	if( strlen(zTarget)==UUID_SIZE && validate16(zTarget,UUID_SIZE) ){
80	zUrlTail = mprintf("tkt=%s&file=%t", zTarget, zFilename);
81	}else{
82	zUrlTail = mprintf("page=%t&file=%t", zTarget, zFilename);
83	}
84	@
85	@ <p><a href="/attachview?%s(zUrlTail)">%h(zFilename)</a>
86	@ [<a href="/attachdownload/%t(zFilename)?%s(zUrlTail)">download</a>]<br />
87	if( zComment ) while( isspace(zComment[0]) ) zComment++;
88	if( zComment && zComment[0] ){
89	@ %w(zComment)<br />
90	}
91	if( zPage==0 && zTkt==0 ){
92	if( zSrc==0 \|\| zSrc[0]==0 ){
93	zSrc = "Deleted from";
94	}else {
	@@ -273,13 +273,13 @@
273	style_header("Add Attachment");
274	@ <h2>Add Attachment To %s(zTargetType)</h2>
275	@ <form action="%s(g.zBaseURL)/attachadd" method="POST"
276	@ enctype="multipart/form-data">
277	@ File to Attach:
278	@ <input type="file" name="f" size="60"><br />
279	@ Description:<br />
280	@ <textarea name="comment" cols=80 rows=5 wrap="virtual"></textarea><br />
281	if( zTkt ){
282	@ <input type="hidden" name="tkt" value="%h(zTkt)">
283	}else{
284	@ <input type="hidden" name="page" value="%h(zPage)">
285	}
	@@ -351,11 +351,11 @@
351	cgi_redirect(zFrom);
352	}
353	style_header("Delete Attachment");
354	@ <form action="%s(g.zBaseURL)/attachdelete" method="POST">
355	@ <p>Confirm that you want to delete the attachment named
356	@ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):<br />
357	if( zTkt ){
358	@ <input type="hidden" name="tkt" value="%h(zTkt)">
359	}else{
360	@ <input type="hidden" name="page" value="%h(zPage)">
361	}
362

M src/blob.c

+24 -3

		--- src/blob.c
		+++ src/blob.c
		@@ -660,11 +660,11 @@
660	660	}
661	661	nName = file_simplify_name(zName, nName);
662	662	for(i=1; i<nName; i++){
663	663	if( zName[i]=='/' ){
664	664	zName[i] = 0;
665		-#ifdef __MINGW32__
	665	+#if defined(_WIN32)
666	666	/*
667	667	** On Windows, local path looks like: C:/develop/project/file.txt
668	668	** The if stops us from trying to create a directory of a drive letter
669	669	** C: in this example.
670	670	*/
		@@ -672,11 +672,11 @@
672	672	#endif
673	673	if( file_mkdir(zName, 1) ){
674	674	fossil_fatal_recursive("unable to create directory %s", zName);
675	675	return 0;
676	676	}
677		-#ifdef __MINGW32__
	677	+#if defined(_WIN32)
678	678	}
679	679	#endif
680	680	zName[i] = '/';
681	681	}
682	682	}
		@@ -856,11 +856,11 @@
856	856	blob_reset(&b3);
857	857	}
858	858	printf("ok\n");
859	859	}
860	860
861		-#ifdef __MINGW32__
	861	+#if defined(_WIN32)
862	862	/*
863	863	** Convert every \n character in the given blob into \r\n.
864	864	*/
865	865	void blob_add_cr(Blob *p){
866	866	char *z = p->aData;
		@@ -896,5 +896,26 @@
896	896	if( z[i]!='\r' ) z[j++] = z[i];
897	897	}
898	898	z[j] = 0;
899	899	p->nUsed = j;
900	900	}
	901	+
	902	+/*
	903	+** Shell-escape the given string. Append the result to a blob.
	904	+*/
	905	+void shell_escape(Blob pBlob, const char zIn){
	906	+ int n = blob_size(pBlob);
	907	+ int k = strlen(zIn);
	908	+ int i, c;
	909	+ char *z;
	910	+ for(i=0; (c = zIn[i])!=0; i++){
	911	+ if( isspace(c) \|\| c=='"' \|\| (c=='\\' && zIn[i+1]!=0) ){
	912	+ blob_appendf(pBlob, "\"%s\"", zIn);
	913	+ z = blob_buffer(pBlob);
	914	+ for(i=n+1; i<=n+k; i++){
	915	+ if( z[i]=='"' ) z[i] = '_';
	916	+ }
	917	+ return;
	918	+ }
	919	+ }
	920	+ blob_append(pBlob, zIn, -1);
	921	+}
901	922

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#ifdef __MINGW32__
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#ifdef __MINGW32__
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#ifdef __MINGW32__
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
	@@ -896,5 +896,26 @@
896	if( z[i]!='\r' ) z[j++] = z[i];
897	}
898	z[j] = 0;
899	p->nUsed = j;
900	}





















901

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#if defined(_WIN32)
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#if defined(_WIN32)
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#if defined(_WIN32)
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
	@@ -896,5 +896,26 @@
896	if( z[i]!='\r' ) z[j++] = z[i];
897	}
898	z[j] = 0;
899	p->nUsed = j;
900	}
901
902	/*
903	** Shell-escape the given string. Append the result to a blob.
904	*/
905	void shell_escape(Blob pBlob, const char zIn){
906	int n = blob_size(pBlob);
907	int k = strlen(zIn);
908	int i, c;
909	char *z;
910	for(i=0; (c = zIn[i])!=0; i++){
911	if( isspace(c) \|\| c=='"' \|\| (c=='\\' && zIn[i+1]!=0) ){
912	blob_appendf(pBlob, "\"%s\"", zIn);
913	z = blob_buffer(pBlob);
914	for(i=n+1; i<=n+k; i++){
915	if( z[i]=='"' ) z[i] = '_';
916	}
917	return;
918	}
919	}
920	blob_append(pBlob, zIn, -1);
921	}
922

M src/branch.c

+46 -51

		--- src/branch.c
		+++ src/branch.c
		@@ -215,73 +215,71 @@
215	215	** Show a timeline of all branches
216	216	*/
217	217	void brlist_page(void){
218	218	Stmt q;
219	219	int cnt;
	220	+ int showClosed = P("closed")!=0;
220	221
221	222	login_check_credentials();
222	223	if( !g.okRead ){ login_needed(); return; }
223	224
224		- style_header("Branches");
	225	+ style_header(showClosed ? "Closed Branches" : "Open Branches");
225	226	style_submenu_element("Timeline", "Timeline", "brtimeline");
	227	+ if( showClosed ){
	228	+ style_submenu_element("Open","Open","brlist");
	229	+ }else{
	230	+ style_submenu_element("Closed","Closed","brlist?closed");
	231	+ }
226	232	login_anonymous_available();
227	233	compute_leaves(0, 1);
228	234	style_sidebox_begin("Nomenclature:", "33%");
229	235	@ <ol>
230		- @ <li> An <b>open branch</b> is a branch that has one or
	236	+ @ <li> An <div class="sideboxDescribed"><a href="brlist">
	237	+ @ open branch</a></div> is a branch that has one or
231	238	@ more <a href="leaves">open leaves.</a>
232	239	@ The presence of open leaves presumably means
233	240	@ that the branch is still being extended with new check-ins.</li>
234		- @ <li> A <b>closed branch</b> is a branch with only
235		- @ <a href="leaves?closed">closed leaves</a>.
	241	+ @ <li> A <div class="sideboxDescribed"><a href="brlist?closed">
	242	+ @ closed branch</a></div> is a branch with only
	243	+ @ <div class="sideboxDescribed"><a href="leaves?closed">
	244	+ @ closed leaves</a></div>.
236	245	@ Closed branches are fixed and do not change (unless they are first
237	246	@ reopened)</li>
238	247	@ </ol>
239	248	style_sidebox_end();
240	249
241		- db_prepare(&q,
242		- "SELECT DISTINCT value FROM tagxref"
243		- " WHERE tagid=%d AND value NOT NULL"
244		- " AND rid IN leaves"
245		- " ORDER BY value /sort/",
246		- TAG_BRANCH
247		- );
248		- cnt = 0;
249		- while( db_step(&q)==SQLITE_ROW ){
250		- const char *zBr = db_column_text(&q, 0);
251		- if( cnt==0 ){
252		- @ <h2>Open Branches:</h2>
253		- @ <ul>
254		- cnt++;
255		- }
256		- if( g.okHistory ){
257		- @ <li><a href="%s(g.zBaseURL)/timeline?r=%T(zBr)">%h(zBr)</a></li>
258		- }else{
259		- @ <li><b>%h(zBr)</b></li>
260		- }
261		- }
262		- db_finalize(&q);
263		- if( cnt ){
264		- @ </ul>
265		- }
266		- cnt = 0;
267		- db_prepare(&q,
268		- "SELECT value FROM tagxref"
269		- " WHERE tagid=%d AND value NOT NULL"
270		- " EXCEPT "
271		- "SELECT value FROM tagxref"
272		- " WHERE tagid=%d AND value NOT NULL"
273		- " AND rid IN leaves"
274		- " ORDER BY value /sort/",
275		- TAG_BRANCH, TAG_BRANCH
276		- );
277		- while( db_step(&q)==SQLITE_ROW ){
278		- const char *zBr = db_column_text(&q, 0);
279		- if( cnt==0 ){
280		- @ <h2>Closed Branches:</h2>
281		- @ <ul>
282		- cnt++;
	250	+ cnt = 0;
	251	+ if( !showClosed ){
	252	+ db_prepare(&q,
	253	+ "SELECT DISTINCT value FROM tagxref"
	254	+ " WHERE tagid=%d AND value NOT NULL"
	255	+ " AND rid IN leaves"
	256	+ " ORDER BY value /sort/",
	257	+ TAG_BRANCH
	258	+ );
	259	+ }else{
	260	+ db_prepare(&q,
	261	+ "SELECT value FROM tagxref"
	262	+ " WHERE tagid=%d AND value NOT NULL"
	263	+ " EXCEPT "
	264	+ "SELECT value FROM tagxref"
	265	+ " WHERE tagid=%d AND value NOT NULL"
	266	+ " AND rid IN leaves"
	267	+ " ORDER BY value /sort/",
	268	+ TAG_BRANCH, TAG_BRANCH
	269	+ );
	270	+ }
	271	+ while( db_step(&q)==SQLITE_ROW ){
	272	+ const char *zBr = db_column_text(&q, 0);
	273	+ if( cnt==0 ){
	274	+ if( showClosed ){
	275	+ @ <h2>Closed Branches:</h2>
	276	+ }else{
	277	+ @ <h2>Open Branches:</h2>
	278	+ }
	279	+ @ <ul>
	280	+ cnt++;
283	281	}
284	282	if( g.okHistory ){
285	283	@ <li><a href="%s(g.zBaseURL)/timeline?r=%T(zBr)">%h(zBr)</a></li>
286	284	}else{
287	285	@ <li><b>%h(zBr)</b></li>
		@@ -289,13 +287,11 @@
289	287	}
290	288	if( cnt ){
291	289	@ </ul>
292	290	}
293	291	db_finalize(&q);
294		- @ </ul>
295		- @ <br clear="both">
296		- @ <script>
	292	+ @ <script type="text/JavaScript">
297	293	@ function xin(id){
298	294	@ }
299	295	@ function xout(id){
300	296	@ }
301	297	@ </script>
		@@ -346,14 +342,13 @@
346	342	" ORDER BY event.mtime DESC",
347	343	timeline_query_for_www(), TAG_BRANCH
348	344	);
349	345	www_print_timeline(&q, 0, brtimeline_extra);
350	346	db_finalize(&q);
351		- @ <br clear="both">
352		- @ <script>
	347	+ @ <script type="text/JavaScript">
353	348	@ function xin(id){
354	349	@ }
355	350	@ function xout(id){
356	351	@ }
357	352	@ </script>
358	353	style_footer();
359	354	}
360	355

	--- src/branch.c
	+++ src/branch.c
	@@ -215,73 +215,71 @@
215	** Show a timeline of all branches
216	*/
217	void brlist_page(void){
218	Stmt q;
219	int cnt;

220
221	login_check_credentials();
222	if( !g.okRead ){ login_needed(); return; }
223
224	style_header("Branches");
225	style_submenu_element("Timeline", "Timeline", "brtimeline");





226	login_anonymous_available();
227	compute_leaves(0, 1);
228	style_sidebox_begin("Nomenclature:", "33%");
229	@ <ol>
230	@ <li> An <b>open branch</b> is a branch that has one or

231	@ more <a href="leaves">open leaves.</a>
232	@ The presence of open leaves presumably means
233	@ that the branch is still being extended with new check-ins.</li>
234	@ <li> A <b>closed branch</b> is a branch with only
235	@ <a href="leaves?closed">closed leaves</a>.


236	@ Closed branches are fixed and do not change (unless they are first
237	@ reopened)</li>
238	@ </ol>
239	style_sidebox_end();
240
241	db_prepare(&q,
242	"SELECT DISTINCT value FROM tagxref"
243	" WHERE tagid=%d AND value NOT NULL"
244	" AND rid IN leaves"
245	" ORDER BY value /sort/",
246	TAG_BRANCH
247	);
248	cnt = 0;
249	while( db_step(&q)==SQLITE_ROW ){
250	const char *zBr = db_column_text(&q, 0);
251	if( cnt==0 ){
252	@ <h2>Open Branches:</h2>
253	@ <ul>
254	cnt++;
255	}
256	if( g.okHistory ){
257	@ <li><a href="%s(g.zBaseURL)/timeline?r=%T(zBr)">%h(zBr)</a></li>
258	}else{
259	@ <li><b>%h(zBr)</b></li>
260	}
261	}
262	db_finalize(&q);
263	if( cnt ){
264	@ </ul>
265	}
266	cnt = 0;
267	db_prepare(&q,
268	"SELECT value FROM tagxref"
269	" WHERE tagid=%d AND value NOT NULL"
270	" EXCEPT "
271	"SELECT value FROM tagxref"
272	" WHERE tagid=%d AND value NOT NULL"
273	" AND rid IN leaves"
274	" ORDER BY value /sort/",
275	TAG_BRANCH, TAG_BRANCH
276	);
277	while( db_step(&q)==SQLITE_ROW ){
278	const char *zBr = db_column_text(&q, 0);
279	if( cnt==0 ){
280	@ <h2>Closed Branches:</h2>
281	@ <ul>
282	cnt++;
283	}
284	if( g.okHistory ){
285	@ <li><a href="%s(g.zBaseURL)/timeline?r=%T(zBr)">%h(zBr)</a></li>
286	}else{
287	@ <li><b>%h(zBr)</b></li>
	@@ -289,13 +287,11 @@
289	}
290	if( cnt ){
291	@ </ul>
292	}
293	db_finalize(&q);
294	@ </ul>
295	@ <br clear="both">
296	@ <script>
297	@ function xin(id){
298	@ }
299	@ function xout(id){
300	@ }
301	@ </script>
	@@ -346,14 +342,13 @@
346	" ORDER BY event.mtime DESC",
347	timeline_query_for_www(), TAG_BRANCH
348	);
349	www_print_timeline(&q, 0, brtimeline_extra);
350	db_finalize(&q);
351	@ <br clear="both">
352	@ <script>
353	@ function xin(id){
354	@ }
355	@ function xout(id){
356	@ }
357	@ </script>
358	style_footer();
359	}
360

	--- src/branch.c
	+++ src/branch.c
	@@ -215,73 +215,71 @@
215	** Show a timeline of all branches
216	*/
217	void brlist_page(void){
218	Stmt q;
219	int cnt;
220	int showClosed = P("closed")!=0;
221
222	login_check_credentials();
223	if( !g.okRead ){ login_needed(); return; }
224
225	style_header(showClosed ? "Closed Branches" : "Open Branches");
226	style_submenu_element("Timeline", "Timeline", "brtimeline");
227	if( showClosed ){
228	style_submenu_element("Open","Open","brlist");
229	}else{
230	style_submenu_element("Closed","Closed","brlist?closed");
231	}
232	login_anonymous_available();
233	compute_leaves(0, 1);
234	style_sidebox_begin("Nomenclature:", "33%");
235	@ <ol>
236	@ <li> An <div class="sideboxDescribed"><a href="brlist">
237	@ open branch</a></div> is a branch that has one or
238	@ more <a href="leaves">open leaves.</a>
239	@ The presence of open leaves presumably means
240	@ that the branch is still being extended with new check-ins.</li>
241	@ <li> A <div class="sideboxDescribed"><a href="brlist?closed">
242	@ closed branch</a></div> is a branch with only
243	@ <div class="sideboxDescribed"><a href="leaves?closed">
244	@ closed leaves</a></div>.
245	@ Closed branches are fixed and do not change (unless they are first
246	@ reopened)</li>
247	@ </ol>
248	style_sidebox_end();
249
250	cnt = 0;
251	if( !showClosed ){
252	db_prepare(&q,
253	"SELECT DISTINCT value FROM tagxref"
254	" WHERE tagid=%d AND value NOT NULL"
255	" AND rid IN leaves"
256	" ORDER BY value /sort/",
257	TAG_BRANCH
258	);
259	}else{
260	db_prepare(&q,
261	"SELECT value FROM tagxref"
262	" WHERE tagid=%d AND value NOT NULL"
263	" EXCEPT "
264	"SELECT value FROM tagxref"
265	" WHERE tagid=%d AND value NOT NULL"
266	" AND rid IN leaves"
267	" ORDER BY value /sort/",
268	TAG_BRANCH, TAG_BRANCH
269	);
270	}
271	while( db_step(&q)==SQLITE_ROW ){
272	const char *zBr = db_column_text(&q, 0);
273	if( cnt==0 ){
274	if( showClosed ){
275	@ <h2>Closed Branches:</h2>
276	}else{
277	@ <h2>Open Branches:</h2>
278	}
279	@ <ul>
280	cnt++;











281	}
282	if( g.okHistory ){
283	@ <li><a href="%s(g.zBaseURL)/timeline?r=%T(zBr)">%h(zBr)</a></li>
284	}else{
285	@ <li><b>%h(zBr)</b></li>
	@@ -289,13 +287,11 @@
287	}
288	if( cnt ){
289	@ </ul>
290	}
291	db_finalize(&q);
292	@ <script type="text/JavaScript">


293	@ function xin(id){
294	@ }
295	@ function xout(id){
296	@ }
297	@ </script>
	@@ -346,14 +342,13 @@
342	" ORDER BY event.mtime DESC",
343	timeline_query_for_www(), TAG_BRANCH
344	);
345	www_print_timeline(&q, 0, brtimeline_extra);
346	db_finalize(&q);
347	@ <script type="text/JavaScript">

348	@ function xin(id){
349	@ }
350	@ function xout(id){
351	@ }
352	@ </script>
353	style_footer();
354	}
355

M src/browse.c

+9 -8

		--- src/browse.c
		+++ src/browse.c
		@@ -144,11 +144,11 @@
144	144	char zShort[20];
145	145	memcpy(zShort, zUuid, 10);
146	146	zShort[10] = 0;
147	147	@ <h2>Files of check-in [<a href="vinfo?name=%T(zUuid)">%s(zShort)</a>]
148	148	@ %s(blob_str(&dirname))</h2>
149		- zSubdirLink = mprintf("%s/dir?ci=%S&name=%T", g.zTop, zUuid, zPrefix);
	149	+ zSubdirLink = mprintf("%s/dir?ci=%S&name=%T", g.zTop, zUuid, zPrefix);
150	150	if( zD ){
151	151	style_submenu_element("Top", "Top", "%s/dir?ci=%S", g.zTop, zUuid);
152	152	style_submenu_element("All", "All", "%s/dir?name=%t", g.zTop, zD);
153	153	}else{
154	154	style_submenu_element("All", "All", "%s/dir", g.zBaseURL);
		@@ -157,13 +157,13 @@
157	157	@ <h2>The union of all files from all check-ins
158	158	@ %s(blob_str(&dirname))</h2>
159	159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	160	if( zD ){
161	161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162		- style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
	162	+ style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	163	g.zBaseURL, zD);
164		- style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
	164	+ style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	165	g.zBaseURL,zD);
166	166	}else{
167	167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	169	}
		@@ -216,29 +216,30 @@
216	216	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
217	217	cnt = db_int(0, "SELECT count() FROM localfiles /scan*/");
218	218	nCol = 4;
219	219	nRow = (cnt+nCol-1)/nCol;
220	220	db_prepare(&q, "SELECT x, u FROM localfiles ORDER BY x /scan/");
221		- @ <table border="0" width="100%%"><tr><td valign="top" width="25%%">
	221	+ @ <table class="browser"><tr><td class="browser"><ul class="browser">
222	222	i = 0;
223	223	while( db_step(&q)==SQLITE_ROW ){
224	224	const char *zFN;
225	225	if( i==nRow ){
226		- @ </td><td valign="top" width="25%%">
	226	+ @ </ul></td><td class="browser"><ul class="browser">
227	227	i = 0;
228	228	}
229	229	i++;
230	230	zFN = db_column_text(&q, 0);
231	231	if( zFN[0]=='/' ){
232	232	zFN++;
233	233	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
234	234	}else if( zCI ){
235	235	const char *zUuid = db_column_text(&q, 1);
236		- @ <li><a href="%s(g.zBaseURL)/artifact?name=%s(zUuid)">%h(zFN)</a>
	236	+ @ <li><a href="%s(g.zBaseURL)/artifact?name=%s(zUuid)">%h(zFN)</a></li>
237	237	}else{
238		- @ <li><a href="%s(g.zBaseURL)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)</a>
	238	+ @ <li><a href="%s(g.zBaseURL)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)
	239	+ @ </a></li>
239	240	}
240	241	}
241	242	db_finalize(&q);
242		- @ </td></tr></table>
	243	+ @ </ul></td></tr></table>
243	244	style_footer();
244	245	}
245	246

	--- src/browse.c
	+++ src/browse.c
	@@ -144,11 +144,11 @@
144	char zShort[20];
145	memcpy(zShort, zUuid, 10);
146	zShort[10] = 0;
147	@ <h2>Files of check-in [<a href="vinfo?name=%T(zUuid)">%s(zShort)</a>]
148	@ %s(blob_str(&dirname))</h2>
149	zSubdirLink = mprintf("%s/dir?ci=%S&name=%T", g.zTop, zUuid, zPrefix);
150	if( zD ){
151	style_submenu_element("Top", "Top", "%s/dir?ci=%S", g.zTop, zUuid);
152	style_submenu_element("All", "All", "%s/dir?name=%t", g.zTop, zD);
153	}else{
154	style_submenu_element("All", "All", "%s/dir", g.zBaseURL);
	@@ -157,13 +157,13 @@
157	@ <h2>The union of all files from all check-ins
158	@ %s(blob_str(&dirname))</h2>
159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	if( zD ){
161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162	style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	g.zBaseURL, zD);
164	style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	g.zBaseURL,zD);
166	}else{
167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	}
	@@ -216,29 +216,30 @@
216	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
217	cnt = db_int(0, "SELECT count() FROM localfiles /scan*/");
218	nCol = 4;
219	nRow = (cnt+nCol-1)/nCol;
220	db_prepare(&q, "SELECT x, u FROM localfiles ORDER BY x /scan/");
221	@ <table border="0" width="100%%"><tr><td valign="top" width="25%%">
222	i = 0;
223	while( db_step(&q)==SQLITE_ROW ){
224	const char *zFN;
225	if( i==nRow ){
226	@ </td><td valign="top" width="25%%">
227	i = 0;
228	}
229	i++;
230	zFN = db_column_text(&q, 0);
231	if( zFN[0]=='/' ){
232	zFN++;
233	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
234	}else if( zCI ){
235	const char *zUuid = db_column_text(&q, 1);
236	@ <li><a href="%s(g.zBaseURL)/artifact?name=%s(zUuid)">%h(zFN)</a>
237	}else{
238	@ <li><a href="%s(g.zBaseURL)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)</a>

239	}
240	}
241	db_finalize(&q);
242	@ </td></tr></table>
243	style_footer();
244	}
245

	--- src/browse.c
	+++ src/browse.c
	@@ -144,11 +144,11 @@
144	char zShort[20];
145	memcpy(zShort, zUuid, 10);
146	zShort[10] = 0;
147	@ <h2>Files of check-in [<a href="vinfo?name=%T(zUuid)">%s(zShort)</a>]
148	@ %s(blob_str(&dirname))</h2>
149	zSubdirLink = mprintf("%s/dir?ci=%S&name=%T", g.zTop, zUuid, zPrefix);
150	if( zD ){
151	style_submenu_element("Top", "Top", "%s/dir?ci=%S", g.zTop, zUuid);
152	style_submenu_element("All", "All", "%s/dir?name=%t", g.zTop, zD);
153	}else{
154	style_submenu_element("All", "All", "%s/dir", g.zBaseURL);
	@@ -157,13 +157,13 @@
157	@ <h2>The union of all files from all check-ins
158	@ %s(blob_str(&dirname))</h2>
159	zSubdirLink = mprintf("%s/dir?name=%T", g.zBaseURL, zPrefix);
160	if( zD ){
161	style_submenu_element("Top", "Top", "%s/dir", g.zBaseURL);
162	style_submenu_element("Tip", "Tip", "%s/dir?name=%t&ci=tip",
163	g.zBaseURL, zD);
164	style_submenu_element("Trunk", "Trunk", "%s/dir?name=%t&ci=trunk",
165	g.zBaseURL,zD);
166	}else{
167	style_submenu_element("Tip", "Tip", "%s/dir?ci=tip", g.zBaseURL);
168	style_submenu_element("Trunk", "Trunk", "%s/dir?ci=trunk", g.zBaseURL);
169	}
	@@ -216,29 +216,30 @@
216	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
217	cnt = db_int(0, "SELECT count() FROM localfiles /scan*/");
218	nCol = 4;
219	nRow = (cnt+nCol-1)/nCol;
220	db_prepare(&q, "SELECT x, u FROM localfiles ORDER BY x /scan/");
221	@ <table class="browser"><tr><td class="browser"><ul class="browser">
222	i = 0;
223	while( db_step(&q)==SQLITE_ROW ){
224	const char *zFN;
225	if( i==nRow ){
226	@ </ul></td><td class="browser"><ul class="browser">
227	i = 0;
228	}
229	i++;
230	zFN = db_column_text(&q, 0);
231	if( zFN[0]=='/' ){
232	zFN++;
233	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
234	}else if( zCI ){
235	const char *zUuid = db_column_text(&q, 1);
236	@ <li><a href="%s(g.zBaseURL)/artifact?name=%s(zUuid)">%h(zFN)</a></li>
237	}else{
238	@ <li><a href="%s(g.zBaseURL)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)
239	@ </a></li>
240	}
241	}
242	db_finalize(&q);
243	@ </ul></td></tr></table>
244	style_footer();
245	}
246

M src/captcha.c

+1 -1

		--- src/captcha.c
		+++ src/captcha.c
		@@ -399,11 +399,11 @@
399	399	}
400	400	}
401	401
402	402	/*
403	403	** Compute a seed value for a captcha. The seed is public and is sent
404		-** has a hidden parameter with the page that contains the captcha. Knowledge
	404	+** as a hidden parameter with the page that contains the captcha. Knowledge
405	405	** of the seed is insufficient for determining the captcha without additional
406	406	** information held only on the server and never revealed.
407	407	*/
408	408	unsigned int captcha_seed(void){
409	409	unsigned int x;
410	410

	--- src/captcha.c
	+++ src/captcha.c
	@@ -399,11 +399,11 @@
399	}
400	}
401
402	/*
403	** Compute a seed value for a captcha. The seed is public and is sent
404	** has a hidden parameter with the page that contains the captcha. Knowledge
405	** of the seed is insufficient for determining the captcha without additional
406	** information held only on the server and never revealed.
407	*/
408	unsigned int captcha_seed(void){
409	unsigned int x;
410

	--- src/captcha.c
	+++ src/captcha.c
	@@ -399,11 +399,11 @@
399	}
400	}
401
402	/*
403	** Compute a seed value for a captcha. The seed is public and is sent
404	** as a hidden parameter with the page that contains the captcha. Knowledge
405	** of the seed is insufficient for determining the captcha without additional
406	** information held only on the server and never revealed.
407	*/
408	unsigned int captcha_seed(void){
409	unsigned int x;
410

M src/cgi.c

+34 -150

		--- src/cgi.c
		+++ src/cgi.c
		@@ -20,15 +20,16 @@
20	20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	21	** formatting function and its cousins, and routines to encode and
22	22	** decode strings in HTML or HTTP.
23	23	*/
24	24	#include "config.h"
25		-#ifdef __MINGW32__
	25	+#ifdef _WIN32
26	26	# include <windows.h> /* for Sleep once server works again */
27		-# include <winsock2.h> /* socket operations */
28		-# define sleep Sleep /* windows does not have sleep, but Sleep */
29		-# include <ws2tcpip.h>
	27	+# if defined(__MINGW32__)
	28	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	29	+# include <ws2tcpip.h>
	30	+# endif
30	31	#else
31	32	# include <sys/socket.h>
32	33	# include <netinet/in.h>
33	34	# include <arpa/inet.h>
34	35	# include <sys/times.h>
		@@ -851,145 +852,10 @@
851	852	cgi_printf("%s = %s <br />\n",
852	853	htmlize(aParamQP[i].zName, -1), htmlize(aParamQP[i].zValue, -1));
853	854	}
854	855	}
855	856
856		-/*
857		-** Write HTML text for an option menu to standard output. zParam
858		-** is the query parameter that the option menu sets. zDflt is the
859		-** initial value of the option menu. Addition arguments are name/value
860		-** pairs that define values on the menu. The list is terminated with
861		-** a single NULL argument.
862		-*/
863		-void cgi_optionmenu(int in, const char zP, const char zD, ...){
864		- va_list ap;
865		- char zName, zVal;
866		- int dfltSeen = 0;
867		- cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
868		- va_start(ap, zD);
869		- while( (zName = va_arg(ap, char))!=0 && (zVal = va_arg(ap, char))!=0 ){
870		- if( strcmp(zVal,zD)==0 ){ dfltSeen = 1; break; }
871		- }
872		- va_end(ap);
873		- if( !dfltSeen ){
874		- if( zD[0] ){
875		- cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
876		- in+2, "", zD, zD);
877		- }else{
878		- cgi_printf("%*s<option value=\"\" selected> </option>\n", in+2, "");
879		- }
880		- }
881		- va_start(ap, zD);
882		- while( (zName = va_arg(ap, char))!=0 && (zVal = va_arg(ap, char))!=0 ){
883		- if( zName[0] ){
884		- cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
885		- in+2, "",
886		- zVal,
887		- strcmp(zVal, zD) ? "" : " selected",
888		- zName
889		- );
890		- }else{
891		- cgi_printf("%*s<option value=\"\"%s> </option>\n",
892		- in+2, "",
893		- strcmp(zVal, zD) ? "" : " selected"
894		- );
895		- }
896		- }
897		- va_end(ap);
898		- cgi_printf("%*s</select>\n", in, "");
899		-}
900		-
901		-/*
902		-** This routine works a lot like cgi_optionmenu() except that the list of
903		-** values is contained in an array. Also, the values are just values, not
904		-** name/value pairs as in cgi_optionmenu.
905		-*/
906		-void cgi_v_optionmenu(
907		- int in, /* Indent by this amount */
908		- const char zP, / The query parameter name */
909		- const char zD, / Default value */
910		- const char *az / NULL-terminated list of allowed values */
911		-){
912		- const char *zVal;
913		- int i;
914		- cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
915		- for(i=0; az[i]; i++){
916		- if( strcmp(az[i],zD)==0 ) break;
917		- }
918		- if( az[i]==0 ){
919		- if( zD[0]==0 ){
920		- cgi_printf("%*s<option value=\"\" selected> </option>\n",
921		- in+2, "");
922		- }else{
923		- cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
924		- in+2, "", zD, zD);
925		- }
926		- }
927		- while( (zVal = *(az++))!=0 ){
928		- if( zVal[0] ){
929		- cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
930		- in+2, "",
931		- zVal,
932		- strcmp(zVal, zD) ? "" : " selected",
933		- zVal
934		- );
935		- }else{
936		- cgi_printf("%*s<option value=\"\"%s> </option>\n",
937		- in+2, "",
938		- strcmp(zVal, zD) ? "" : " selected"
939		- );
940		- }
941		- }
942		- cgi_printf("%*s</select>\n", in, "");
943		-}
944		-
945		-/*
946		-** This routine works a lot like cgi_v_optionmenu() except that the list
947		-** is a list of pairs. The first element of each pair is the value used
948		-** internally and the second element is the value displayed to the user.
949		-*/
950		-void cgi_v_optionmenu2(
951		- int in, /* Indent by this amount */
952		- const char zP, / The query parameter name */
953		- const char zD, / Default value */
954		- const char *az / NULL-terminated list of allowed values */
955		-){
956		- const char *zVal;
957		- int i;
958		- cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
959		- for(i=0; az[i]; i+=2){
960		- if( strcmp(az[i],zD)==0 ) break;
961		- }
962		- if( az[i]==0 ){
963		- if( zD[0]==0 ){
964		- cgi_printf("%*s<option value=\"\" selected> </option>\n",
965		- in+2, "");
966		- }else{
967		- cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
968		- in+2, "", zD, zD);
969		- }
970		- }
971		- while( (zVal = *(az++))!=0 ){
972		- const char zName = (az++);
973		- if( zName[0] ){
974		- cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
975		- in+2, "",
976		- zVal,
977		- strcmp(zVal, zD) ? "" : " selected",
978		- zName
979		- );
980		- }else{
981		- cgi_printf("%*s<option value=\"%h\"%s> </option>\n",
982		- in+2, "",
983		- zVal,
984		- strcmp(zVal, zD) ? "" : " selected"
985		- );
986		- }
987		- }
988		- cgi_printf("%*s</select>\n", in, "");
989		-}
990		-
991	857	/*
992	858	** This routine works like "printf" except that it has the
993	859	** extra formatting capabilities such as %h and %t.
994	860	*/
995	861	void cgi_printf(const char *zFormat, ...){
		@@ -1122,32 +988,45 @@
1122	988	while( isspace(*zVal) ){ zVal++; }
1123	989	i = strlen(zVal);
1124	990	while( i>0 && isspace(zVal[i-1]) ){ i--; }
1125	991	zVal[i] = 0;
1126	992	for(i=0; zFieldName[i]; i++){ zFieldName[i] = tolower(zFieldName[i]); }
1127		- if( strcmp(zFieldName,"user-agent:")==0 ){
1128		- cgi_setenv("HTTP_USER_AGENT", zVal);
1129		- }else if( strcmp(zFieldName,"content-length:")==0 ){
	993	+ if( strcmp(zFieldName,"content-length:")==0 ){
1130	994	cgi_setenv("CONTENT_LENGTH", zVal);
1131		- }else if( strcmp(zFieldName,"referer:")==0 ){
1132		- cgi_setenv("HTTP_REFERER", zVal);
1133		- }else if( strcmp(zFieldName,"host:")==0 ){
1134		- cgi_setenv("HTTP_HOST", zVal);
1135	995	}else if( strcmp(zFieldName,"content-type:")==0 ){
1136	996	cgi_setenv("CONTENT_TYPE", zVal);
1137	997	}else if( strcmp(zFieldName,"cookie:")==0 ){
1138	998	cgi_setenv("HTTP_COOKIE", zVal);
	999	+ }else if( strcmp(zFieldName,"https:")==0 ){
	1000	+ cgi_setenv("HTTPS", zVal);
	1001	+ }else if( strcmp(zFieldName,"host:")==0 ){
	1002	+ cgi_setenv("HTTP_HOST", zVal);
1139	1003	}else if( strcmp(zFieldName,"if-none-match:")==0 ){
1140	1004	cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
1141	1005	}else if( strcmp(zFieldName,"if-modified-since:")==0 ){
1142	1006	cgi_setenv("HTTP_IF_MODIFIED_SINCE", zVal);
1143	1007	}
	1008	+#if 0
	1009	+ else if( strcmp(zFieldName,"referer:")==0 ){
	1010	+ cgi_setenv("HTTP_REFERER", zVal);
	1011	+ }else if( strcmp(zFieldName,"user-agent:")==0 ){
	1012	+ cgi_setenv("HTTP_USER_AGENT", zVal);
	1013	+ }
	1014	+#endif
1144	1015	}
1145	1016
1146	1017	cgi_init();
1147	1018	}
1148	1019
	1020	+#if INTERFACE
	1021	+/*
	1022	+** Bitmap values for the flags parameter to cgi_http_server().
	1023	+*/
	1024	+#define HTTP_SERVER_LOCALHOST 0x0001 /* Bind to 127.0.0.1 only */
	1025	+
	1026	+#endif /* INTERFACE */
	1027	+
1149	1028	/*
1150	1029	** Maximum number of child processes that we can have running
1151	1030	** at one time before we start slowing things down.
1152	1031	*/
1153	1032	#define MAX_PARALLEL 2
		@@ -1160,12 +1039,12 @@
1160	1039	** The parent never returns from this procedure.
1161	1040	**
1162	1041	** Return 0 to each child as it runs. If unable to establish a
1163	1042	** listening socket, return non-zero.
1164	1043	*/
1165		-int cgi_http_server(int mnPort, int mxPort, char *zBrowser){
1166		-#ifdef __MINGW32__
	1044	+int cgi_http_server(int mnPort, int mxPort, char *zBrowser, int flags){
	1045	+#if defined(_WIN32)
1167	1046	/* Use win32_http_server() instead */
1168	1047	fossil_exit(1);
1169	1048	#else
1170	1049	int listener = -1; /* The server socket */
1171	1050	int connection; /* A socket for each individual connection */
		@@ -1179,11 +1058,15 @@
1179	1058	int iPort = mnPort;
1180	1059
1181	1060	while( iPort<=mxPort ){
1182	1061	memset(&inaddr, 0, sizeof(inaddr));
1183	1062	inaddr.sin_family = AF_INET;
1184		- inaddr.sin_addr.s_addr = INADDR_ANY;
	1063	+ if( flags & HTTP_SERVER_LOCALHOST ){
	1064	+ inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
	1065	+ }else{
	1066	+ inaddr.sin_addr.s_addr = htonl(INADDR_ANY);
	1067	+ }
1185	1068	inaddr.sin_port = htons(iPort);
1186	1069	listener = socket(AF_INET, SOCK_STREAM, 0);
1187	1070	if( listener<0 ){
1188	1071	iPort++;
1189	1072	continue;
		@@ -1224,11 +1107,12 @@
1224	1107	}
1225	1108	delay.tv_sec = 60;
1226	1109	delay.tv_usec = 0;
1227	1110	FD_ZERO(&readfds);
1228	1111	FD_SET( listener, &readfds);
1229		- if( select( listener+1, &readfds, 0, 0, &delay) ){
	1112	+ select( listener+1, &readfds, 0, 0, &delay);
	1113	+ if( FD_ISSET(listener, &readfds) ){
1230	1114	lenaddr = sizeof(inaddr);
1231	1115	connection = accept(listener, (struct sockaddr*)&inaddr,
1232	1116	(socklen_t*) &lenaddr);
1233	1117	if( connection>=0 ){
1234	1118	child = fork();
1235	1119

	--- src/cgi.c
	+++ src/cgi.c
	@@ -20,15 +20,16 @@
20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef __MINGW32__
26	# include <windows.h> /* for Sleep once server works again */
27	# include <winsock2.h> /* socket operations */
28	# define sleep Sleep /* windows does not have sleep, but Sleep */
29	# include <ws2tcpip.h>

30	#else
31	# include <sys/socket.h>
32	# include <netinet/in.h>
33	# include <arpa/inet.h>
34	# include <sys/times.h>
	@@ -851,145 +852,10 @@
851	cgi_printf("%s = %s <br />\n",
852	htmlize(aParamQP[i].zName, -1), htmlize(aParamQP[i].zValue, -1));
853	}
854	}
855
856	/*
857	** Write HTML text for an option menu to standard output. zParam
858	** is the query parameter that the option menu sets. zDflt is the
859	** initial value of the option menu. Addition arguments are name/value
860	** pairs that define values on the menu. The list is terminated with
861	** a single NULL argument.
862	*/
863	void cgi_optionmenu(int in, const char zP, const char zD, ...){
864	va_list ap;
865	char zName, zVal;
866	int dfltSeen = 0;
867	cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
868	va_start(ap, zD);
869	while( (zName = va_arg(ap, char))!=0 && (zVal = va_arg(ap, char))!=0 ){
870	if( strcmp(zVal,zD)==0 ){ dfltSeen = 1; break; }
871	}
872	va_end(ap);
873	if( !dfltSeen ){
874	if( zD[0] ){
875	cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
876	in+2, "", zD, zD);
877	}else{
878	cgi_printf("%*s<option value=\"\" selected> </option>\n", in+2, "");
879	}
880	}
881	va_start(ap, zD);
882	while( (zName = va_arg(ap, char))!=0 && (zVal = va_arg(ap, char))!=0 ){
883	if( zName[0] ){
884	cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
885	in+2, "",
886	zVal,
887	strcmp(zVal, zD) ? "" : " selected",
888	zName
889	);
890	}else{
891	cgi_printf("%*s<option value=\"\"%s> </option>\n",
892	in+2, "",
893	strcmp(zVal, zD) ? "" : " selected"
894	);
895	}
896	}
897	va_end(ap);
898	cgi_printf("%*s</select>\n", in, "");
899	}
900
901	/*
902	** This routine works a lot like cgi_optionmenu() except that the list of
903	** values is contained in an array. Also, the values are just values, not
904	** name/value pairs as in cgi_optionmenu.
905	*/
906	void cgi_v_optionmenu(
907	int in, /* Indent by this amount */
908	const char zP, / The query parameter name */
909	const char zD, / Default value */
910	const char *az / NULL-terminated list of allowed values */
911	){
912	const char *zVal;
913	int i;
914	cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
915	for(i=0; az[i]; i++){
916	if( strcmp(az[i],zD)==0 ) break;
917	}
918	if( az[i]==0 ){
919	if( zD[0]==0 ){
920	cgi_printf("%*s<option value=\"\" selected> </option>\n",
921	in+2, "");
922	}else{
923	cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
924	in+2, "", zD, zD);
925	}
926	}
927	while( (zVal = *(az++))!=0 ){
928	if( zVal[0] ){
929	cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
930	in+2, "",
931	zVal,
932	strcmp(zVal, zD) ? "" : " selected",
933	zVal
934	);
935	}else{
936	cgi_printf("%*s<option value=\"\"%s> </option>\n",
937	in+2, "",
938	strcmp(zVal, zD) ? "" : " selected"
939	);
940	}
941	}
942	cgi_printf("%*s</select>\n", in, "");
943	}
944
945	/*
946	** This routine works a lot like cgi_v_optionmenu() except that the list
947	** is a list of pairs. The first element of each pair is the value used
948	** internally and the second element is the value displayed to the user.
949	*/
950	void cgi_v_optionmenu2(
951	int in, /* Indent by this amount */
952	const char zP, / The query parameter name */
953	const char zD, / Default value */
954	const char *az / NULL-terminated list of allowed values */
955	){
956	const char *zVal;
957	int i;
958	cgi_printf("%*s<select size=1 name=\"%s\">\n", in, "", zP);
959	for(i=0; az[i]; i+=2){
960	if( strcmp(az[i],zD)==0 ) break;
961	}
962	if( az[i]==0 ){
963	if( zD[0]==0 ){
964	cgi_printf("%*s<option value=\"\" selected> </option>\n",
965	in+2, "");
966	}else{
967	cgi_printf("%*s<option value=\"%h\" selected>%h</option>\n",
968	in+2, "", zD, zD);
969	}
970	}
971	while( (zVal = *(az++))!=0 ){
972	const char zName = (az++);
973	if( zName[0] ){
974	cgi_printf("%*s<option value=\"%h\"%s>%h</option>\n",
975	in+2, "",
976	zVal,
977	strcmp(zVal, zD) ? "" : " selected",
978	zName
979	);
980	}else{
981	cgi_printf("%*s<option value=\"%h\"%s> </option>\n",
982	in+2, "",
983	zVal,
984	strcmp(zVal, zD) ? "" : " selected"
985	);
986	}
987	}
988	cgi_printf("%*s</select>\n", in, "");
989	}
990
991	/*
992	** This routine works like "printf" except that it has the
993	** extra formatting capabilities such as %h and %t.
994	*/
995	void cgi_printf(const char *zFormat, ...){
	@@ -1122,32 +988,45 @@
1122	while( isspace(*zVal) ){ zVal++; }
1123	i = strlen(zVal);
1124	while( i>0 && isspace(zVal[i-1]) ){ i--; }
1125	zVal[i] = 0;
1126	for(i=0; zFieldName[i]; i++){ zFieldName[i] = tolower(zFieldName[i]); }
1127	if( strcmp(zFieldName,"user-agent:")==0 ){
1128	cgi_setenv("HTTP_USER_AGENT", zVal);
1129	}else if( strcmp(zFieldName,"content-length:")==0 ){
1130	cgi_setenv("CONTENT_LENGTH", zVal);
1131	}else if( strcmp(zFieldName,"referer:")==0 ){
1132	cgi_setenv("HTTP_REFERER", zVal);
1133	}else if( strcmp(zFieldName,"host:")==0 ){
1134	cgi_setenv("HTTP_HOST", zVal);
1135	}else if( strcmp(zFieldName,"content-type:")==0 ){
1136	cgi_setenv("CONTENT_TYPE", zVal);
1137	}else if( strcmp(zFieldName,"cookie:")==0 ){
1138	cgi_setenv("HTTP_COOKIE", zVal);




1139	}else if( strcmp(zFieldName,"if-none-match:")==0 ){
1140	cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
1141	}else if( strcmp(zFieldName,"if-modified-since:")==0 ){
1142	cgi_setenv("HTTP_IF_MODIFIED_SINCE", zVal);
1143	}







1144	}
1145
1146	cgi_init();
1147	}
1148








1149	/*
1150	** Maximum number of child processes that we can have running
1151	** at one time before we start slowing things down.
1152	*/
1153	#define MAX_PARALLEL 2
	@@ -1160,12 +1039,12 @@
1160	** The parent never returns from this procedure.
1161	**
1162	** Return 0 to each child as it runs. If unable to establish a
1163	** listening socket, return non-zero.
1164	*/
1165	int cgi_http_server(int mnPort, int mxPort, char *zBrowser){
1166	#ifdef __MINGW32__
1167	/* Use win32_http_server() instead */
1168	fossil_exit(1);
1169	#else
1170	int listener = -1; /* The server socket */
1171	int connection; /* A socket for each individual connection */
	@@ -1179,11 +1058,15 @@
1179	int iPort = mnPort;
1180
1181	while( iPort<=mxPort ){
1182	memset(&inaddr, 0, sizeof(inaddr));
1183	inaddr.sin_family = AF_INET;
1184	inaddr.sin_addr.s_addr = INADDR_ANY;




1185	inaddr.sin_port = htons(iPort);
1186	listener = socket(AF_INET, SOCK_STREAM, 0);
1187	if( listener<0 ){
1188	iPort++;
1189	continue;
	@@ -1224,11 +1107,12 @@
1224	}
1225	delay.tv_sec = 60;
1226	delay.tv_usec = 0;
1227	FD_ZERO(&readfds);
1228	FD_SET( listener, &readfds);
1229	if( select( listener+1, &readfds, 0, 0, &delay) ){

1230	lenaddr = sizeof(inaddr);
1231	connection = accept(listener, (struct sockaddr*)&inaddr,
1232	(socklen_t*) &lenaddr);
1233	if( connection>=0 ){
1234	child = fork();
1235

	--- src/cgi.c
	+++ src/cgi.c
	@@ -20,15 +20,16 @@
20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef _WIN32
26	# include <windows.h> /* for Sleep once server works again */
27	# if defined(__MINGW32__)
28	# define sleep Sleep /* windows does not have sleep, but Sleep */
29	# include <ws2tcpip.h>
30	# endif
31	#else
32	# include <sys/socket.h>
33	# include <netinet/in.h>
34	# include <arpa/inet.h>
35	# include <sys/times.h>
	@@ -851,145 +852,10 @@
852	cgi_printf("%s = %s <br />\n",
853	htmlize(aParamQP[i].zName, -1), htmlize(aParamQP[i].zValue, -1));
854	}
855	}
856







































































































































857	/*
858	** This routine works like "printf" except that it has the
859	** extra formatting capabilities such as %h and %t.
860	*/
861	void cgi_printf(const char *zFormat, ...){
	@@ -1122,32 +988,45 @@
988	while( isspace(*zVal) ){ zVal++; }
989	i = strlen(zVal);
990	while( i>0 && isspace(zVal[i-1]) ){ i--; }
991	zVal[i] = 0;
992	for(i=0; zFieldName[i]; i++){ zFieldName[i] = tolower(zFieldName[i]); }
993	if( strcmp(zFieldName,"content-length:")==0 ){


994	cgi_setenv("CONTENT_LENGTH", zVal);




995	}else if( strcmp(zFieldName,"content-type:")==0 ){
996	cgi_setenv("CONTENT_TYPE", zVal);
997	}else if( strcmp(zFieldName,"cookie:")==0 ){
998	cgi_setenv("HTTP_COOKIE", zVal);
999	}else if( strcmp(zFieldName,"https:")==0 ){
1000	cgi_setenv("HTTPS", zVal);
1001	}else if( strcmp(zFieldName,"host:")==0 ){
1002	cgi_setenv("HTTP_HOST", zVal);
1003	}else if( strcmp(zFieldName,"if-none-match:")==0 ){
1004	cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
1005	}else if( strcmp(zFieldName,"if-modified-since:")==0 ){
1006	cgi_setenv("HTTP_IF_MODIFIED_SINCE", zVal);
1007	}
1008	#if 0
1009	else if( strcmp(zFieldName,"referer:")==0 ){
1010	cgi_setenv("HTTP_REFERER", zVal);
1011	}else if( strcmp(zFieldName,"user-agent:")==0 ){
1012	cgi_setenv("HTTP_USER_AGENT", zVal);
1013	}
1014	#endif
1015	}
1016
1017	cgi_init();
1018	}
1019
1020	#if INTERFACE
1021	/*
1022	** Bitmap values for the flags parameter to cgi_http_server().
1023	*/
1024	#define HTTP_SERVER_LOCALHOST 0x0001 /* Bind to 127.0.0.1 only */
1025
1026	#endif /* INTERFACE */
1027
1028	/*
1029	** Maximum number of child processes that we can have running
1030	** at one time before we start slowing things down.
1031	*/
1032	#define MAX_PARALLEL 2
	@@ -1160,12 +1039,12 @@
1039	** The parent never returns from this procedure.
1040	**
1041	** Return 0 to each child as it runs. If unable to establish a
1042	** listening socket, return non-zero.
1043	*/
1044	int cgi_http_server(int mnPort, int mxPort, char *zBrowser, int flags){
1045	#if defined(_WIN32)
1046	/* Use win32_http_server() instead */
1047	fossil_exit(1);
1048	#else
1049	int listener = -1; /* The server socket */
1050	int connection; /* A socket for each individual connection */
	@@ -1179,11 +1058,15 @@
1058	int iPort = mnPort;
1059
1060	while( iPort<=mxPort ){
1061	memset(&inaddr, 0, sizeof(inaddr));
1062	inaddr.sin_family = AF_INET;
1063	if( flags & HTTP_SERVER_LOCALHOST ){
1064	inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
1065	}else{
1066	inaddr.sin_addr.s_addr = htonl(INADDR_ANY);
1067	}
1068	inaddr.sin_port = htons(iPort);
1069	listener = socket(AF_INET, SOCK_STREAM, 0);
1070	if( listener<0 ){
1071	iPort++;
1072	continue;
	@@ -1224,11 +1107,12 @@
1107	}
1108	delay.tv_sec = 60;
1109	delay.tv_usec = 0;
1110	FD_ZERO(&readfds);
1111	FD_SET( listener, &readfds);
1112	select( listener+1, &readfds, 0, 0, &delay);
1113	if( FD_ISSET(listener, &readfds) ){
1114	lenaddr = sizeof(inaddr);
1115	connection = accept(listener, (struct sockaddr*)&inaddr,
1116	(socklen_t*) &lenaddr);
1117	if( connection>=0 ){
1118	child = fork();
1119

M src/checkin.c

+40 -22

		--- src/checkin.c
		+++ src/checkin.c
		@@ -401,19 +401,19 @@
401	401	}
402	402	if( zEditor==0 ){
403	403	zEditor = getenv("EDITOR");
404	404	}
405	405	if( zEditor==0 ){
406		-#ifdef __MINGW32__
	406	+#if defined(_WIN32)
407	407	zEditor = "notepad";
408	408	#else
409	409	zEditor = "ed";
410	410	#endif
411	411	}
412	412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	413	g.zLocalRoot);
414		-#ifdef __MINGW32__
	414	+#if defined(_WIN32)
415	415	blob_add_cr(&text);
416	416	#endif
417	417	blob_write_to_file(&text, zFile);
418	418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	419	printf("%s\n", zCmd);
		@@ -513,15 +513,32 @@
513	513	" WHERE datetime(mtime)>=%Q"
514	514	" AND type='ci' AND objid=%d",
515	515	zDate, rid
516	516	);
517	517	if( b ){
518		- fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)",
519		- zUuid, zDate);
	518	+ fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)"
	519	+ " Use -f to override.", zUuid, zDate);
520	520	}
521	521	#endif
522	522	}
	523	+
	524	+/*
	525	+** zDate should be a valid date string. Convert this string into the
	526	+** format YYYY-MM-DDTHH:MM:SS. If the string is not a valid date,
	527	+** print a fatal error and quit.
	528	+*/
	529	+char date_in_standard_format(const char zInputDate){
	530	+ char *zDate = db_text(0, "SELECT datetime(%Q)", zInputDate);
	531	+ if( zDate[0]==0 ){
	532	+ fossil_fatal("unrecognized date format (%s): use \"YYYY-MM-DD HH:MM:SS\"",
	533	+ zInputDate);
	534	+ }
	535	+ assert( strlen(zDate)==19 );
	536	+ assert( zDate[10]==' ' );
	537	+ zDate[10] = 'T';
	538	+ return zDate;
	539	+}
523	540
524	541	/*
525	542	** COMMAND: ci
526	543	** COMMAND: commit
527	544	**
		@@ -739,12 +756,11 @@
739	756	blob_zero(&manifest);
740	757	if( blob_size(&comment)==0 ){
741	758	blob_append(&comment, "(no comment)", -1);
742	759	}
743	760	blob_appendf(&manifest, "C %F\n", blob_str(&comment));
744		- zDate = db_text(0, "SELECT datetime('%q')", zDateOvrd ? zDateOvrd : "now");
745		- zDate[10] = 'T';
	761	+ zDate = date_in_standard_format(zDateOvrd ? zDateOvrd : "now");
746	762	blob_appendf(&manifest, "D %s\n", zDate);
747	763	zDate[10] = ' ';
748	764	db_prepare(&q,
749	765	"SELECT pathname, uuid, origname, blob.rid, isexe"
750	766	" FROM vfile JOIN blob ON vfile.mrid=blob.rid"
		@@ -759,11 +775,11 @@
759	775	const char *zOrig = db_column_text(&q, 2);
760	776	int frid = db_column_int(&q, 3);
761	777	int isexe = db_column_int(&q, 4);
762	778	const char *zPerm;
763	779	blob_append(&filename, zName, -1);
764		-#ifndef __MINGW32__
	780	+#if !defined(_WIN32)
765	781	/* For unix, extract the "executable" permission bit directly from
766	782	** the filesystem. On windows, the "executable" bit is retained
767	783	** unchanged from the original. */
768	784	isexe = file_isexe(blob_str(&filename));
769	785	#endif
		@@ -783,25 +799,27 @@
783	799	}
784	800	blob_reset(&filename);
785	801	db_finalize(&q);
786	802	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
787	803	blob_appendf(&manifest, "P %s", zUuid);
788		- checkin_verify_younger(vid, zUuid, zDate);
789		-
790		- db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=:id");
791		- db_bind_int(&q2, ":id", 0);
792		- while( db_step(&q2)==SQLITE_ROW ){
793		- int mid = db_column_int(&q2, 0);
794		- if( !g.markPrivate && content_is_private(mid) ) continue;
795		- zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
796		- if( zUuid ){
797		- blob_appendf(&manifest, " %s", zUuid);
798		- checkin_verify_younger(mid, zUuid, zDate);
799		- free(zUuid);
800		- }
801		- }
802		- db_reset(&q2);
	804	+
	805	+ if( !forceFlag ){
	806	+ checkin_verify_younger(vid, zUuid, zDate);
	807	+ db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=:id");
	808	+ db_bind_int(&q2, ":id", 0);
	809	+ while( db_step(&q2)==SQLITE_ROW ){
	810	+ int mid = db_column_int(&q2, 0);
	811	+ if( !g.markPrivate && content_is_private(mid) ) continue;
	812	+ zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
	813	+ if( zUuid ){
	814	+ blob_appendf(&manifest, " %s", zUuid);
	815	+ checkin_verify_younger(mid, zUuid, zDate);
	816	+ free(zUuid);
	817	+ }
	818	+ }
	819	+ db_finalize(&q2);
	820	+ }
803	821
804	822	blob_appendf(&manifest, "\n");
805	823	blob_appendf(&manifest, "R %b\n", &cksum1);
806	824	if( zBranch && zBranch[0] ){
807	825	Stmt q;
808	826

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#ifdef __MINGW32__
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#ifdef __MINGW32__
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -513,15 +513,32 @@
513	" WHERE datetime(mtime)>=%Q"
514	" AND type='ci' AND objid=%d",
515	zDate, rid
516	);
517	if( b ){
518	fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)",
519	zUuid, zDate);
520	}
521	#endif
522	}

















523
524	/*
525	** COMMAND: ci
526	** COMMAND: commit
527	**
	@@ -739,12 +756,11 @@
739	blob_zero(&manifest);
740	if( blob_size(&comment)==0 ){
741	blob_append(&comment, "(no comment)", -1);
742	}
743	blob_appendf(&manifest, "C %F\n", blob_str(&comment));
744	zDate = db_text(0, "SELECT datetime('%q')", zDateOvrd ? zDateOvrd : "now");
745	zDate[10] = 'T';
746	blob_appendf(&manifest, "D %s\n", zDate);
747	zDate[10] = ' ';
748	db_prepare(&q,
749	"SELECT pathname, uuid, origname, blob.rid, isexe"
750	" FROM vfile JOIN blob ON vfile.mrid=blob.rid"
	@@ -759,11 +775,11 @@
759	const char *zOrig = db_column_text(&q, 2);
760	int frid = db_column_int(&q, 3);
761	int isexe = db_column_int(&q, 4);
762	const char *zPerm;
763	blob_append(&filename, zName, -1);
764	#ifndef __MINGW32__
765	/* For unix, extract the "executable" permission bit directly from
766	** the filesystem. On windows, the "executable" bit is retained
767	** unchanged from the original. */
768	isexe = file_isexe(blob_str(&filename));
769	#endif
	@@ -783,25 +799,27 @@
783	}
784	blob_reset(&filename);
785	db_finalize(&q);
786	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
787	blob_appendf(&manifest, "P %s", zUuid);
788	checkin_verify_younger(vid, zUuid, zDate);
789
790	db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=:id");
791	db_bind_int(&q2, ":id", 0);
792	while( db_step(&q2)==SQLITE_ROW ){
793	int mid = db_column_int(&q2, 0);
794	if( !g.markPrivate && content_is_private(mid) ) continue;
795	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
796	if( zUuid ){
797	blob_appendf(&manifest, " %s", zUuid);
798	checkin_verify_younger(mid, zUuid, zDate);
799	free(zUuid);
800	}
801	}
802	db_reset(&q2);


803
804	blob_appendf(&manifest, "\n");
805	blob_appendf(&manifest, "R %b\n", &cksum1);
806	if( zBranch && zBranch[0] ){
807	Stmt q;
808

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#if defined(_WIN32)
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#if defined(_WIN32)
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -513,15 +513,32 @@
513	" WHERE datetime(mtime)>=%Q"
514	" AND type='ci' AND objid=%d",
515	zDate, rid
516	);
517	if( b ){
518	fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)"
519	" Use -f to override.", zUuid, zDate);
520	}
521	#endif
522	}
523
524	/*
525	** zDate should be a valid date string. Convert this string into the
526	** format YYYY-MM-DDTHH:MM:SS. If the string is not a valid date,
527	** print a fatal error and quit.
528	*/
529	char date_in_standard_format(const char zInputDate){
530	char *zDate = db_text(0, "SELECT datetime(%Q)", zInputDate);
531	if( zDate[0]==0 ){
532	fossil_fatal("unrecognized date format (%s): use \"YYYY-MM-DD HH:MM:SS\"",
533	zInputDate);
534	}
535	assert( strlen(zDate)==19 );
536	assert( zDate[10]==' ' );
537	zDate[10] = 'T';
538	return zDate;
539	}
540
541	/*
542	** COMMAND: ci
543	** COMMAND: commit
544	**
	@@ -739,12 +756,11 @@
756	blob_zero(&manifest);
757	if( blob_size(&comment)==0 ){
758	blob_append(&comment, "(no comment)", -1);
759	}
760	blob_appendf(&manifest, "C %F\n", blob_str(&comment));
761	zDate = date_in_standard_format(zDateOvrd ? zDateOvrd : "now");

762	blob_appendf(&manifest, "D %s\n", zDate);
763	zDate[10] = ' ';
764	db_prepare(&q,
765	"SELECT pathname, uuid, origname, blob.rid, isexe"
766	" FROM vfile JOIN blob ON vfile.mrid=blob.rid"
	@@ -759,11 +775,11 @@
775	const char *zOrig = db_column_text(&q, 2);
776	int frid = db_column_int(&q, 3);
777	int isexe = db_column_int(&q, 4);
778	const char *zPerm;
779	blob_append(&filename, zName, -1);
780	#if !defined(_WIN32)
781	/* For unix, extract the "executable" permission bit directly from
782	** the filesystem. On windows, the "executable" bit is retained
783	** unchanged from the original. */
784	isexe = file_isexe(blob_str(&filename));
785	#endif
	@@ -783,25 +799,27 @@
799	}
800	blob_reset(&filename);
801	db_finalize(&q);
802	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
803	blob_appendf(&manifest, "P %s", zUuid);
804
805	if( !forceFlag ){
806	checkin_verify_younger(vid, zUuid, zDate);
807	db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=:id");
808	db_bind_int(&q2, ":id", 0);
809	while( db_step(&q2)==SQLITE_ROW ){
810	int mid = db_column_int(&q2, 0);
811	if( !g.markPrivate && content_is_private(mid) ) continue;
812	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
813	if( zUuid ){
814	blob_appendf(&manifest, " %s", zUuid);
815	checkin_verify_younger(mid, zUuid, zDate);
816	free(zUuid);
817	}
818	}
819	db_finalize(&q2);
820	}
821
822	blob_appendf(&manifest, "\n");
823	blob_appendf(&manifest, "R %b\n", &cksum1);
824	if( zBranch && zBranch[0] ){
825	Stmt q;
826

M src/config.h

+9 -2

		--- src/config.h
		+++ src/config.h
		@@ -26,13 +26,20 @@
26	26	#include <stdlib.h>
27	27	#include <ctype.h>
28	28	#include <string.h>
29	29	#include <stdarg.h>
30	30	#include <assert.h>
31		-#ifdef __MINGW32__
32		-# include <windows.h>
	31	+#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
	32	+# if defined(__DMC__) \|\| defined(_MSC_VER)
	33	+ typedef int socklen_t;
	34	+# endif
	35	+# ifndef _WIN32
	36	+# define _WIN32
	37	+# endif
33	38	#else
	39	+# include <sys/types.h>
	40	+# include <signal.h>
34	41	# include <pwd.h>
35	42	#endif
36	43
37	44	#include "sqlite3.h"
38	45
39	46

	--- src/config.h
	+++ src/config.h
	@@ -26,13 +26,20 @@
26	#include <stdlib.h>
27	#include <ctype.h>
28	#include <string.h>
29	#include <stdarg.h>
30	#include <assert.h>
31	#ifdef __MINGW32__
32	# include <windows.h>





33	#else


34	# include <pwd.h>
35	#endif
36
37	#include "sqlite3.h"
38
39

	--- src/config.h
	+++ src/config.h
	@@ -26,13 +26,20 @@
26	#include <stdlib.h>
27	#include <ctype.h>
28	#include <string.h>
29	#include <stdarg.h>
30	#include <assert.h>
31	#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
32	# if defined(__DMC__) \|\| defined(_MSC_VER)
33	typedef int socklen_t;
34	# endif
35	# ifndef _WIN32
36	# define _WIN32
37	# endif
38	#else
39	# include <sys/types.h>
40	# include <signal.h>
41	# include <pwd.h>
42	#endif
43
44	#include "sqlite3.h"
45
46

M src/configure.c

		--- src/configure.c
		+++ src/configure.c
		@@ -459,10 +459,11 @@
459	459	zPw = db_get("last-sync-pw", 0);
460	460	}
461	461	url_parse(zServer);
462	462	if( g.urlPasswd==0 && zPw ) g.urlPasswd = mprintf("%s", zPw);
463	463	user_select();
	464	+ url_enable_proxy("via proxy: ");
464	465	if( strncmp(zMethod, "push", n)==0 ){
465	466	client_sync(0,0,0,0,mask);
466	467	}else{
467	468	client_sync(0,0,0,mask,0);
468	469	}
469	470

	--- src/configure.c
	+++ src/configure.c
	@@ -459,10 +459,11 @@
459	zPw = db_get("last-sync-pw", 0);
460	}
461	url_parse(zServer);
462	if( g.urlPasswd==0 && zPw ) g.urlPasswd = mprintf("%s", zPw);
463	user_select();

464	if( strncmp(zMethod, "push", n)==0 ){
465	client_sync(0,0,0,0,mask);
466	}else{
467	client_sync(0,0,0,mask,0);
468	}
469

	--- src/configure.c
	+++ src/configure.c
	@@ -459,10 +459,11 @@
459	zPw = db_get("last-sync-pw", 0);
460	}
461	url_parse(zServer);
462	if( g.urlPasswd==0 && zPw ) g.urlPasswd = mprintf("%s", zPw);
463	user_select();
464	url_enable_proxy("via proxy: ");
465	if( strncmp(zMethod, "push", n)==0 ){
466	client_sync(0,0,0,0,mask);
467	}else{
468	client_sync(0,0,0,mask,0);
469	}
470

M src/db.c

+28 -13

		--- src/db.c
		+++ src/db.c
		@@ -27,10 +27,13 @@
27	27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	28	** and located at the root of the local copy of the source tree.
29	29	**
30	30	*/
31	31	#include "config.h"
	32	+#if ! defined(_WIN32)
	33	+# include <pwd.h>
	34	+#endif
32	35	#include <sqlite3.h>
33	36	#include <sys/types.h>
34	37	#include <sys/stat.h>
35	38	#include <unistd.h>
36	39	#include "db.h"
		@@ -134,16 +137,16 @@
134	137	if( busy \|\| g.db==0 ) return;
135	138	busy = 1;
136	139	undo_rollback();
137	140	if( nBegin ){
138	141	sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0);
	142	+ nBegin = 0;
139	143	if( isNewRepo ){
140	144	db_close();
141	145	unlink(g.zRepositoryName);
142	146	}
143	147	}
144		- nBegin = 0;
145	148	busy = 0;
146	149	}
147	150
148	151	/*
149	152	** Install a commit hook. Hooks are installed in sequence order.
		@@ -534,11 +537,11 @@
534	537	}
535	538	db_finalize(&s);
536	539	return z;
537	540	}
538	541
539		-#ifdef __MINGW32__
	542	+#if defined(_WIN32)
540	543	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	544	#endif
542	545
543	546	/*
544	547	** Initialize a new database file with the given schema. If anything
		@@ -552,11 +555,11 @@
552	555	sqlite3 *db;
553	556	int rc;
554	557	const char *zSql;
555	558	va_list ap;
556	559
557		-#ifdef __MINGW32__
	560	+#if defined(_WIN32)
558	561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	562	#endif
560	563	rc = sqlite3_open(zFileName, &db);
561	564	if( rc!=SQLITE_OK ){
562	565	db_err(sqlite3_errmsg(db));
		@@ -587,11 +590,11 @@
587	590	int rc;
588	591	const char *zVfs;
589	592	sqlite3 *db;
590	593
591	594	zVfs = getenv("FOSSIL_VFS");
592		-#ifdef __MINGW32__
	595	+#if defined(_WIN32)
593	596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	597	#endif
595	598	rc = sqlite3_open_v2(
596	599	zDbName, &db,
597	600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
		@@ -615,11 +618,11 @@
615	618	if( !g.db ){
616	619	g.db = openDatabase(zDbName);
617	620	g.zRepoDb = "main";
618	621	db_connection_init();
619	622	}else{
620		-#ifdef __MINGW32__
	623	+#if defined(_WIN32)
621	624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	625	#endif
623	626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	627	g.zRepoDb = mprintf("%s", zLabel);
625	628	}
		@@ -639,11 +642,11 @@
639	642	*/
640	643	void db_open_config(int useAttach){
641	644	char *zDbName;
642	645	const char *zHome;
643	646	if( g.configOpen ) return;
644		-#ifdef __MINGW32__
	647	+#if defined(_WIN32)
645	648	zHome = getenv("LOCALAPPDATA");
646	649	if( zHome==0 ){
647	650	zHome = getenv("APPDATA");
648	651	if( zHome==0 ){
649	652	zHome = getenv("HOMEPATH");
		@@ -661,17 +664,17 @@
661	664	}
662	665	#endif
663	666	if( file_isdir(zHome)!=1 ){
664	667	fossil_fatal("invalid home directory: %s", zHome);
665	668	}
666		-#ifndef __MINGW32__
	669	+#ifndef _WIN32
667	670	if( access(zHome, W_OK) ){
668	671	fossil_fatal("home directory %s must be writeable", zHome);
669	672	}
670	673	#endif
671	674	g.zHome = mprintf("%/", zHome);
672		-#ifdef __MINGW32__
	675	+#if defined(_WIN32)
673	676	/* . filenames give some window systems problems and many apps problems */
674	677	zDbName = mprintf("%//_fossil", zHome);
675	678	#else
676	679	zDbName = mprintf("%s/.fossil", zHome);
677	680	#endif
		@@ -894,20 +897,30 @@
894	897
895	898	/*
896	899	** Close the database connection.
897	900	*/
898	901	void db_close(void){
	902	+ sqlite3_stmt *pStmt;
899	903	if( g.db==0 ) return;
900	904	while( pAllStmt ){
901	905	db_finalize(pAllStmt);
902	906	}
903	907	db_end_transaction(1);
	908	+ pStmt = 0;
	909	+ while( (pStmt = sqlite3_next_stmt(g.db, pStmt))!=0 ){
	910	+ fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
	911	+ }
904	912	g.repositoryOpen = 0;
905	913	g.localOpen = 0;
906	914	g.configOpen = 0;
	915	+ sqlite3_wal_checkpoint(g.db, 0);
907	916	sqlite3_close(g.db);
908	917	g.db = 0;
	918	+ if( g.dbConfig ){
	919	+ sqlite3_close(g.dbConfig);
	920	+ g.dbConfig = 0;
	921	+ }
909	922	}
910	923
911	924
912	925	/*
913	926	** Create a new empty repository database with the given name.
		@@ -934,11 +947,11 @@
934	947	zUser = db_get("default-user", 0);
935	948	if( zUser==0 ){
936	949	zUser = zDefaultUser;
937	950	}
938	951	if( zUser==0 ){
939		-#ifdef __MINGW32__
	952	+#if defined(_WIN32)
940	953	zUser = getenv("USERNAME");
941	954	#else
942	955	zUser = getenv("USER");
943	956	#endif
944	957	}
		@@ -1000,12 +1013,11 @@
1000	1013
1001	1014	if( zInitialDate ){
1002	1015	int rid;
1003	1016	blob_zero(&manifest);
1004	1017	blob_appendf(&manifest, "C initial\\sempty\\scheck-in\n");
1005		- zDate = db_text(0, "SELECT datetime(%Q)", zInitialDate);
1006		- zDate[10]='T';
	1018	+ zDate = date_in_standard_format(zInitialDate);
1007	1019	blob_appendf(&manifest, "D %s\n", zDate);
1008	1020	blob_appendf(&manifest, "P\n");
1009	1021	md5sum_init();
1010	1022	blob_appendf(&manifest, "R %s\n", md5sum_finish(0));
1011	1023	blob_appendf(&manifest, "T branch trunk\n");
		@@ -1253,11 +1265,10 @@
1253	1265	** so this routine is a no-op.
1254	1266	*/
1255	1267	void db_swap_connections(void){
1256	1268	if( !g.useAttach ){
1257	1269	sqlite3 *dbTemp = g.db;
1258		- assert( g.dbConfig!=0 );
1259	1270	g.db = g.dbConfig;
1260	1271	g.dbConfig = dbTemp;
1261	1272	}
1262	1273	}
1263	1274
		@@ -1374,11 +1385,11 @@
1374	1385	db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
1375	1386	}
1376	1387
1377	1388	/*
1378	1389	** Record the name of a local repository in the global_config() database.
1379		-** The repostiroy filename %s is recorded as an entry with a "name" field
	1390	+** The repository filename %s is recorded as an entry with a "name" field
1380	1391	** of the following form:
1381	1392	**
1382	1393	** repo:%s
1383	1394	**
1384	1395	** The value field is set to 1.
		@@ -1546,10 +1557,13 @@
1546	1557	**
1547	1558	** proxy URL of the HTTP proxy. If undefined or "off" then
1548	1559	** the "http_proxy" environment variable is consulted.
1549	1560	** If the http_proxy environment variable is undefined
1550	1561	** then a direct HTTP connection is used.
	1562	+**
	1563	+** ssh-command Command used to talk to a remote machine with
	1564	+** the "ssh://" protocol.
1551	1565	**
1552	1566	** web-browser A shell command used to launch your preferred
1553	1567	** web browser when given a URL as an argument.
1554	1568	** Defaults to "start" on windows, "open" on Mac,
1555	1569	** and "firefox" on Unix.
		@@ -1569,10 +1583,11 @@
1569	1583	"http-port",
1570	1584	"localauth",
1571	1585	"mtime-changes",
1572	1586	"pgp-command",
1573	1587	"proxy",
	1588	+ "ssh-command",
1574	1589	"web-browser",
1575	1590	};
1576	1591	int i;
1577	1592	int globalFlag = find_option("global","g",0)!=0;
1578	1593	int unsetFlag = g.argv[1][0]=='u';
1579	1594

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"



32	#include <sqlite3.h>
33	#include <sys/types.h>
34	#include <sys/stat.h>
35	#include <unistd.h>
36	#include "db.h"
	@@ -134,16 +137,16 @@
134	if( busy \|\| g.db==0 ) return;
135	busy = 1;
136	undo_rollback();
137	if( nBegin ){
138	sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0);

139	if( isNewRepo ){
140	db_close();
141	unlink(g.zRepositoryName);
142	}
143	}
144	nBegin = 0;
145	busy = 0;
146	}
147
148	/*
149	** Install a commit hook. Hooks are installed in sequence order.
	@@ -534,11 +537,11 @@
534	}
535	db_finalize(&s);
536	return z;
537	}
538
539	#ifdef __MINGW32__
540	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	#endif
542
543	/*
544	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
552	sqlite3 *db;
553	int rc;
554	const char *zSql;
555	va_list ap;
556
557	#ifdef __MINGW32__
558	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	#endif
560	rc = sqlite3_open(zFileName, &db);
561	if( rc!=SQLITE_OK ){
562	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
587	int rc;
588	const char *zVfs;
589	sqlite3 *db;
590
591	zVfs = getenv("FOSSIL_VFS");
592	#ifdef __MINGW32__
593	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	#endif
595	rc = sqlite3_open_v2(
596	zDbName, &db,
597	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
615	if( !g.db ){
616	g.db = openDatabase(zDbName);
617	g.zRepoDb = "main";
618	db_connection_init();
619	}else{
620	#ifdef __MINGW32__
621	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	#endif
623	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	g.zRepoDb = mprintf("%s", zLabel);
625	}
	@@ -639,11 +642,11 @@
639	*/
640	void db_open_config(int useAttach){
641	char *zDbName;
642	const char *zHome;
643	if( g.configOpen ) return;
644	#ifdef __MINGW32__
645	zHome = getenv("LOCALAPPDATA");
646	if( zHome==0 ){
647	zHome = getenv("APPDATA");
648	if( zHome==0 ){
649	zHome = getenv("HOMEPATH");
	@@ -661,17 +664,17 @@
661	}
662	#endif
663	if( file_isdir(zHome)!=1 ){
664	fossil_fatal("invalid home directory: %s", zHome);
665	}
666	#ifndef __MINGW32__
667	if( access(zHome, W_OK) ){
668	fossil_fatal("home directory %s must be writeable", zHome);
669	}
670	#endif
671	g.zHome = mprintf("%/", zHome);
672	#ifdef __MINGW32__
673	/* . filenames give some window systems problems and many apps problems */
674	zDbName = mprintf("%//_fossil", zHome);
675	#else
676	zDbName = mprintf("%s/.fossil", zHome);
677	#endif
	@@ -894,20 +897,30 @@
894
895	/*
896	** Close the database connection.
897	*/
898	void db_close(void){

899	if( g.db==0 ) return;
900	while( pAllStmt ){
901	db_finalize(pAllStmt);
902	}
903	db_end_transaction(1);




904	g.repositoryOpen = 0;
905	g.localOpen = 0;
906	g.configOpen = 0;

907	sqlite3_close(g.db);
908	g.db = 0;




909	}
910
911
912	/*
913	** Create a new empty repository database with the given name.
	@@ -934,11 +947,11 @@
934	zUser = db_get("default-user", 0);
935	if( zUser==0 ){
936	zUser = zDefaultUser;
937	}
938	if( zUser==0 ){
939	#ifdef __MINGW32__
940	zUser = getenv("USERNAME");
941	#else
942	zUser = getenv("USER");
943	#endif
944	}
	@@ -1000,12 +1013,11 @@
1000
1001	if( zInitialDate ){
1002	int rid;
1003	blob_zero(&manifest);
1004	blob_appendf(&manifest, "C initial\\sempty\\scheck-in\n");
1005	zDate = db_text(0, "SELECT datetime(%Q)", zInitialDate);
1006	zDate[10]='T';
1007	blob_appendf(&manifest, "D %s\n", zDate);
1008	blob_appendf(&manifest, "P\n");
1009	md5sum_init();
1010	blob_appendf(&manifest, "R %s\n", md5sum_finish(0));
1011	blob_appendf(&manifest, "T branch trunk\n");
	@@ -1253,11 +1265,10 @@
1253	** so this routine is a no-op.
1254	*/
1255	void db_swap_connections(void){
1256	if( !g.useAttach ){
1257	sqlite3 *dbTemp = g.db;
1258	assert( g.dbConfig!=0 );
1259	g.db = g.dbConfig;
1260	g.dbConfig = dbTemp;
1261	}
1262	}
1263
	@@ -1374,11 +1385,11 @@
1374	db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
1375	}
1376
1377	/*
1378	** Record the name of a local repository in the global_config() database.
1379	** The repostiroy filename %s is recorded as an entry with a "name" field
1380	** of the following form:
1381	**
1382	** repo:%s
1383	**
1384	** The value field is set to 1.
	@@ -1546,10 +1557,13 @@
1546	**
1547	** proxy URL of the HTTP proxy. If undefined or "off" then
1548	** the "http_proxy" environment variable is consulted.
1549	** If the http_proxy environment variable is undefined
1550	** then a direct HTTP connection is used.



1551	**
1552	** web-browser A shell command used to launch your preferred
1553	** web browser when given a URL as an argument.
1554	** Defaults to "start" on windows, "open" on Mac,
1555	** and "firefox" on Unix.
	@@ -1569,10 +1583,11 @@
1569	"http-port",
1570	"localauth",
1571	"mtime-changes",
1572	"pgp-command",
1573	"proxy",

1574	"web-browser",
1575	};
1576	int i;
1577	int globalFlag = find_option("global","g",0)!=0;
1578	int unsetFlag = g.argv[1][0]=='u';
1579

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"
32	#if ! defined(_WIN32)
33	# include <pwd.h>
34	#endif
35	#include <sqlite3.h>
36	#include <sys/types.h>
37	#include <sys/stat.h>
38	#include <unistd.h>
39	#include "db.h"
	@@ -134,16 +137,16 @@
137	if( busy \|\| g.db==0 ) return;
138	busy = 1;
139	undo_rollback();
140	if( nBegin ){
141	sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0);
142	nBegin = 0;
143	if( isNewRepo ){
144	db_close();
145	unlink(g.zRepositoryName);
146	}
147	}

148	busy = 0;
149	}
150
151	/*
152	** Install a commit hook. Hooks are installed in sequence order.
	@@ -534,11 +537,11 @@
537	}
538	db_finalize(&s);
539	return z;
540	}
541
542	#if defined(_WIN32)
543	extern char sqlite3_win32_mbcs_to_utf8(const char);
544	#endif
545
546	/*
547	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
555	sqlite3 *db;
556	int rc;
557	const char *zSql;
558	va_list ap;
559
560	#if defined(_WIN32)
561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
562	#endif
563	rc = sqlite3_open(zFileName, &db);
564	if( rc!=SQLITE_OK ){
565	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
590	int rc;
591	const char *zVfs;
592	sqlite3 *db;
593
594	zVfs = getenv("FOSSIL_VFS");
595	#if defined(_WIN32)
596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
597	#endif
598	rc = sqlite3_open_v2(
599	zDbName, &db,
600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
618	if( !g.db ){
619	g.db = openDatabase(zDbName);
620	g.zRepoDb = "main";
621	db_connection_init();
622	}else{
623	#if defined(_WIN32)
624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
625	#endif
626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
627	g.zRepoDb = mprintf("%s", zLabel);
628	}
	@@ -639,11 +642,11 @@
642	*/
643	void db_open_config(int useAttach){
644	char *zDbName;
645	const char *zHome;
646	if( g.configOpen ) return;
647	#if defined(_WIN32)
648	zHome = getenv("LOCALAPPDATA");
649	if( zHome==0 ){
650	zHome = getenv("APPDATA");
651	if( zHome==0 ){
652	zHome = getenv("HOMEPATH");
	@@ -661,17 +664,17 @@
664	}
665	#endif
666	if( file_isdir(zHome)!=1 ){
667	fossil_fatal("invalid home directory: %s", zHome);
668	}
669	#ifndef _WIN32
670	if( access(zHome, W_OK) ){
671	fossil_fatal("home directory %s must be writeable", zHome);
672	}
673	#endif
674	g.zHome = mprintf("%/", zHome);
675	#if defined(_WIN32)
676	/* . filenames give some window systems problems and many apps problems */
677	zDbName = mprintf("%//_fossil", zHome);
678	#else
679	zDbName = mprintf("%s/.fossil", zHome);
680	#endif
	@@ -894,20 +897,30 @@
897
898	/*
899	** Close the database connection.
900	*/
901	void db_close(void){
902	sqlite3_stmt *pStmt;
903	if( g.db==0 ) return;
904	while( pAllStmt ){
905	db_finalize(pAllStmt);
906	}
907	db_end_transaction(1);
908	pStmt = 0;
909	while( (pStmt = sqlite3_next_stmt(g.db, pStmt))!=0 ){
910	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
911	}
912	g.repositoryOpen = 0;
913	g.localOpen = 0;
914	g.configOpen = 0;
915	sqlite3_wal_checkpoint(g.db, 0);
916	sqlite3_close(g.db);
917	g.db = 0;
918	if( g.dbConfig ){
919	sqlite3_close(g.dbConfig);
920	g.dbConfig = 0;
921	}
922	}
923
924
925	/*
926	** Create a new empty repository database with the given name.
	@@ -934,11 +947,11 @@
947	zUser = db_get("default-user", 0);
948	if( zUser==0 ){
949	zUser = zDefaultUser;
950	}
951	if( zUser==0 ){
952	#if defined(_WIN32)
953	zUser = getenv("USERNAME");
954	#else
955	zUser = getenv("USER");
956	#endif
957	}
	@@ -1000,12 +1013,11 @@
1013
1014	if( zInitialDate ){
1015	int rid;
1016	blob_zero(&manifest);
1017	blob_appendf(&manifest, "C initial\\sempty\\scheck-in\n");
1018	zDate = date_in_standard_format(zInitialDate);

1019	blob_appendf(&manifest, "D %s\n", zDate);
1020	blob_appendf(&manifest, "P\n");
1021	md5sum_init();
1022	blob_appendf(&manifest, "R %s\n", md5sum_finish(0));
1023	blob_appendf(&manifest, "T branch trunk\n");
	@@ -1253,11 +1265,10 @@
1265	** so this routine is a no-op.
1266	*/
1267	void db_swap_connections(void){
1268	if( !g.useAttach ){
1269	sqlite3 *dbTemp = g.db;

1270	g.db = g.dbConfig;
1271	g.dbConfig = dbTemp;
1272	}
1273	}
1274
	@@ -1374,11 +1385,11 @@
1385	db_multi_exec("REPLACE INTO vvar(name,value) VALUES(%Q,%d)", zName, value);
1386	}
1387
1388	/*
1389	** Record the name of a local repository in the global_config() database.
1390	** The repository filename %s is recorded as an entry with a "name" field
1391	** of the following form:
1392	**
1393	** repo:%s
1394	**
1395	** The value field is set to 1.
	@@ -1546,10 +1557,13 @@
1557	**
1558	** proxy URL of the HTTP proxy. If undefined or "off" then
1559	** the "http_proxy" environment variable is consulted.
1560	** If the http_proxy environment variable is undefined
1561	** then a direct HTTP connection is used.
1562	**
1563	** ssh-command Command used to talk to a remote machine with
1564	** the "ssh://" protocol.
1565	**
1566	** web-browser A shell command used to launch your preferred
1567	** web browser when given a URL as an argument.
1568	** Defaults to "start" on windows, "open" on Mac,
1569	** and "firefox" on Unix.
	@@ -1569,10 +1583,11 @@
1583	"http-port",
1584	"localauth",
1585	"mtime-changes",
1586	"pgp-command",
1587	"proxy",
1588	"ssh-command",
1589	"web-browser",
1590	};
1591	int i;
1592	int globalFlag = find_option("global","g",0)!=0;
1593	int unsetFlag = g.argv[1][0]=='u';
1594

M src/descendants.c

+8 -5

		--- src/descendants.c
		+++ src/descendants.c
		@@ -318,14 +318,17 @@
318	318	style_header("Leaves");
319	319	login_anonymous_available();
320	320	compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321	321	style_sidebox_begin("Nomenclature:", "33%");
322	322	@ <ol>
323		- @ <li> A <b>leaf</b> is a check-in with no descendants.</li>
324		- @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag
	323	+ @ <li> A <div class="sideboxDescribed">leaf</div>
	324	+ @ is a check-in with no descendants.</li>
	325	+ @ <li> An <div class="sideboxDescribed">open leaf</div>
	326	+ @ is a leaf that does not have a "closed" tag
325	327	@ and is thus assumed to still be in use.</li>
326		- @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to
	328	+ @ <li> A <div class="sideboxDescribed">closed leaf</div>
	329	+ @ has a "closed" tag and is thus assumed to
327	330	@ be historical and no longer in active use.</li>
328	331	@ </ol>
329	332	style_sidebox_end();
330	333
331	334	if( showAll ){
		@@ -341,14 +344,14 @@
341	344	" ORDER BY event.mtime DESC",
342	345	timeline_query_for_www()
343	346	);
344	347	www_print_timeline(&q, TIMELINE_LEAFONLY, leaves_extra);
345	348	db_finalize(&q);
346		- @ <br clear="both">
347		- @ <script>
	349	+ @ <br />
	350	+ @ <script type="text/JavaScript">
348	351	@ function xin(id){
349	352	@ }
350	353	@ function xout(id){
351	354	@ }
352	355	@ </script>
353	356	style_footer();
354	357	}
355	358

	--- src/descendants.c
	+++ src/descendants.c
	@@ -318,14 +318,17 @@
318	style_header("Leaves");
319	login_anonymous_available();
320	compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321	style_sidebox_begin("Nomenclature:", "33%");
322	@ <ol>
323	@ <li> A <b>leaf</b> is a check-in with no descendants.</li>
324	@ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag


325	@ and is thus assumed to still be in use.</li>
326	@ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to

327	@ be historical and no longer in active use.</li>
328	@ </ol>
329	style_sidebox_end();
330
331	if( showAll ){
	@@ -341,14 +344,14 @@
341	" ORDER BY event.mtime DESC",
342	timeline_query_for_www()
343	);
344	www_print_timeline(&q, TIMELINE_LEAFONLY, leaves_extra);
345	db_finalize(&q);
346	@ <br clear="both">
347	@ <script>
348	@ function xin(id){
349	@ }
350	@ function xout(id){
351	@ }
352	@ </script>
353	style_footer();
354	}
355

	--- src/descendants.c
	+++ src/descendants.c
	@@ -318,14 +318,17 @@
318	style_header("Leaves");
319	login_anonymous_available();
320	compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1);
321	style_sidebox_begin("Nomenclature:", "33%");
322	@ <ol>
323	@ <li> A <div class="sideboxDescribed">leaf</div>
324	@ is a check-in with no descendants.</li>
325	@ <li> An <div class="sideboxDescribed">open leaf</div>
326	@ is a leaf that does not have a "closed" tag
327	@ and is thus assumed to still be in use.</li>
328	@ <li> A <div class="sideboxDescribed">closed leaf</div>
329	@ has a "closed" tag and is thus assumed to
330	@ be historical and no longer in active use.</li>
331	@ </ol>
332	style_sidebox_end();
333
334	if( showAll ){
	@@ -341,14 +344,14 @@
344	" ORDER BY event.mtime DESC",
345	timeline_query_for_www()
346	);
347	www_print_timeline(&q, TIMELINE_LEAFONLY, leaves_extra);
348	db_finalize(&q);
349	@ <br />
350	@ <script type="text/JavaScript">
351	@ function xin(id){
352	@ }
353	@ function xout(id){
354	@ }
355	@ </script>
356	style_footer();
357	}
358

M src/diff.c

+81 -14

		--- src/diff.c
		+++ src/diff.c
		@@ -65,16 +65,18 @@
65	65	/*
66	66	** Return an array of DLine objects containing a pointer to the
67	67	** start of each line and a hash of that line. The lower
68	68	** bits of the hash store the length of each line.
69	69	**
70		-** Trailing whitespace is removed from each line.
	70	+** Trailing whitespace is removed from each line. 2010-08-20: Not any
	71	+** more. If trailing whitespace is ignored, the "patch" command gets
	72	+** confused by the diff output. Ticket [a9f7b23c2e376af5b0e5b]
71	73	**
72	74	** Return 0 if the file is binary or contains a line that is
73	75	** too long.
74	76	*/
75		-static DLine break_into_lines(const char z, int n, int *pnLine){
	77	+static DLine break_into_lines(const char z, int n, int *pnLine, int ignoreWS){
76	78	int nLine, i, j, k, x;
77	79	unsigned int h, h2;
78	80	DLine *a;
79	81
80	82	/* Count the number of lines. Allocate space to hold
		@@ -102,11 +104,12 @@
102	104
103	105	/* Fill in the array */
104	106	for(i=0; i<nLine; i++){
105	107	a[i].z = z;
106	108	for(j=0; z[j] && z[j]!='\n'; j++){}
107		- for(k=j; k>0 && isspace(z[k-1]); k--){}
	109	+ k = j;
	110	+ while( ignoreWS && k>0 && isspace(z[k-1]) ){ k--; }
108	111	for(h=0, x=0; x<k; x++){
109	112	h = h ^ (h<<2) ^ z[x];
110	113	}
111	114	a[i].h = h = (h<<LENGTH_MASK_SZ) \| k;;
112	115	h2 = h % nLine;
		@@ -279,16 +282,70 @@
279	282	for(j=0; j<m; j++){
280	283	appendDiffLine(pOut, " ", &B[b+j]);
281	284	}
282	285	}
283	286	}
	287	+
	288	+/*
	289	+** Compute the optimal longest common subsequence (LCS) using an
	290	+** exhaustive search. This version of the LCS is only used for
	291	+** shorter input strings since runtime is O(N*N) where N is the
	292	+** input string length.
	293	+*/
	294	+static void optimalLCS(
	295	+ DContext p, / Two files being compared */
	296	+ int iS1, int iE1, /* Range of lines in p->aFrom[] */
	297	+ int iS2, int iE2, /* Range of lines in p->aTo[] */
	298	+ int piSX, int piEX, /* Write p->aFrom[] common segment here */
	299	+ int piSY, int piEY /* Write p->aTo[] common segment here */
	300	+){
	301	+ int mxLength = 0; /* Length of longest common subsequence */
	302	+ int i, j; /* Loop counters */
	303	+ int k; /* Length of a candidate subsequence */
	304	+ int iSXb = iS1; /* Best match so far */
	305	+ int iSYb = iS2; /* Best match so far */
	306	+
	307	+ for(i=iS1; i<iE1-mxLength; i++){
	308	+ for(j=iS2; j<iE2-mxLength; j++){
	309	+ if( !same_dline(&p->aFrom[i], &p->aTo[j]) ) continue;
	310	+ if( mxLength && !same_dline(&p->aFrom[i+mxLength], &p->aTo[j+mxLength]) ){
	311	+ continue;
	312	+ }
	313	+ k = 1;
	314	+ while( i+k<iE1 && j+k<iE2 && same_dline(&p->aFrom[i+k],&p->aTo[j+k]) ){
	315	+ k++;
	316	+ }
	317	+ if( k>mxLength ){
	318	+ iSXb = i;
	319	+ iSYb = j;
	320	+ mxLength = k;
	321	+ }
	322	+ }
	323	+ }
	324	+ *piSX = iSXb;
	325	+ *piEX = iSXb + mxLength;
	326	+ *piSY = iSYb;
	327	+ *piEY = iSYb + mxLength;
	328	+}
284	329
285	330	/*
286	331	** Compare two blocks of text on lines iS1 through iE1-1 of the aFrom[]
287	332	** file and lines iS2 through iE2-1 of the aTo[] file. Locate a sequence
288	333	** of lines in these two blocks that are exactly the same. Return
289	334	** the bounds of the matching sequence.
	335	+**
	336	+** If there are two or more possible answers of the same length, the
	337	+** returned sequence should be the one closest to the center of the
	338	+** input range.
	339	+**
	340	+** Ideally, the common sequence should be the longest possible common
	341	+** sequence. However, an exact computation of LCS is O(N*N) which is
	342	+** way too slow for larger files. So this routine uses an O(N)
	343	+** heuristic approximation based on hashing that usually works about
	344	+** as well. But if the O(N) algorithm doesn't get a good solution
	345	+** and N is not too large, we fall back to an exact solution by
	346	+** calling optimalLCS().
290	347	*/
291	348	static void longestCommonSequence(
292	349	DContext p, / Two files being compared */
293	350	int iS1, int iE1, /* Range of lines in p->aFrom[] */
294	351	int iS2, int iE2, /* Range of lines in p->aTo[] */
		@@ -302,10 +359,11 @@
302	359	int skew; /* How lopsided is the match */
303	360	int dist; /* Distance of match from center */
304	361	int mid; /* Center of the span */
305	362	int iSXb, iSYb, iEXb, iEYb; /* Best match so far */
306	363	int iSXp, iSYp, iEXp, iEYp; /* Previous match */
	364	+
307	365
308	366	iSXb = iSXp = iS1;
309	367	iEXb = iEXp = iS1;
310	368	iSYb = iSYp = iS2;
311	369	iEYb = iEYp = iS2;
		@@ -354,14 +412,20 @@
354	412	iSYp = iSY;
355	413	iEXp = iEX;
356	414	iEYp = iEY;
357	415	}
358	416	}
359		- *piSX = iSXb;
360		- *piSY = iSYb;
361		- *piEX = iEXb;
362		- *piEY = iEYb;
	417	+ if( iSXb==iEXb && (iE1-iS1)*(iE2-iS2)<400 ){
	418	+ /* If no common sequence is found using the hashing heuristic and
	419	+ ** the input is not too big, use the expensive exact solution */
	420	+ optimalLCS(p, iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY);
	421	+ }else{
	422	+ *piSX = iSXb;
	423	+ *piSY = iSYb;
	424	+ *piEX = iEXb;
	425	+ *piEY = iEYb;
	426	+ }
363	427	/* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
364	428	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
365	429	}
366	430
367	431	/*
		@@ -472,18 +536,21 @@
472	536	*/
473	537	int *text_diff(
474	538	Blob pA_Blob, / FROM file */
475	539	Blob pB_Blob, / TO file */
476	540	Blob pOut, / Write unified diff here if not NULL */
477		- int nContext /* Amount of context to unified diff */
	541	+ int nContext, /* Amount of context to unified diff */
	542	+ int ignoreEolWs /* Ignore whitespace at the end of lines */
478	543	){
479	544	DContext c;
480	545
481	546	/* Prepare the input files */
482	547	memset(&c, 0, sizeof(c));
483		- c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob), &c.nFrom);
484		- c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob), &c.nTo);
	548	+ c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
	549	+ &c.nFrom, ignoreEolWs);
	550	+ c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
	551	+ &c.nTo, ignoreEolWs);
485	552	if( c.aFrom==0 \|\| c.aTo==0 ){
486	553	free(c.aFrom);
487	554	free(c.aTo);
488	555	if( pOut ){
489	556	blob_appendf(pOut, "cannot compute difference between binary files\n");
		@@ -522,11 +589,11 @@
522	589	if( g.argc<4 ) usage("FILE1 FILE2 ...");
523	590	blob_read_from_file(&a, g.argv[2]);
524	591	for(i=3; i<g.argc; i++){
525	592	if( i>3 ) printf("-------------------------------\n");
526	593	blob_read_from_file(&b, g.argv[i]);
527		- R = text_diff(&a, &b, 0, 0);
	594	+ R = text_diff(&a, &b, 0, 0, 0);
528	595	for(r=0; R[r] \|\| R[r+1] \|\| R[r+2]; r += 3){
529	596	printf(" copy %4d delete %4d insert %4d\n", R[r], R[r+1], R[r+2]);
530	597	}
531	598	/* free(R); */
532	599	blob_reset(&b);
		@@ -540,11 +607,11 @@
540	607	Blob a, b, out;
541	608	if( g.argc!=4 ) usage("FILE1 FILE2");
542	609	blob_read_from_file(&a, g.argv[2]);
543	610	blob_read_from_file(&b, g.argv[3]);
544	611	blob_zero(&out);
545		- text_diff(&a, &b, &out, 3);
	612	+ text_diff(&a, &b, &out, 3, 0);
546	613	blob_write_to_file(&out, "-");
547	614	}
548	615
549	616	/**************************************************************************
550	617	** The basic difference engine is above. What follows is the annotation
		@@ -574,11 +641,11 @@
574	641	*/
575	642	static int annotation_start(Annotator p, Blob pInput){
576	643	int i;
577	644
578	645	memset(p, 0, sizeof(*p));
579		- p->c.aTo = break_into_lines(blob_str(pInput), blob_size(pInput), &p->c.nTo);
	646	+ p->c.aTo = break_into_lines(blob_str(pInput), blob_size(pInput),&p->c.nTo,1);
580	647	if( p->c.aTo==0 ){
581	648	return 1;
582	649	}
583	650	p->aOrig = malloc( sizeof(p->aOrig[0])*p->c.nTo );
584	651	if( p->aOrig==0 ) fossil_panic("out of memory");
		@@ -602,11 +669,11 @@
602	669	int i, j;
603	670	int lnTo;
604	671
605	672	/* Prepare the parent file to be diffed */
606	673	p->c.aFrom = break_into_lines(blob_str(pParent), blob_size(pParent),
607		- &p->c.nFrom);
	674	+ &p->c.nFrom, 1);
608	675	if( p->c.aFrom==0 ){
609	676	return 1;
610	677	}
611	678
612	679	/* Compute the differences going from pParent to the file being
613	680

	--- src/diff.c
	+++ src/diff.c
	@@ -65,16 +65,18 @@
65	/*
66	** Return an array of DLine objects containing a pointer to the
67	** start of each line and a hash of that line. The lower
68	** bits of the hash store the length of each line.
69	**
70	** Trailing whitespace is removed from each line.


71	**
72	** Return 0 if the file is binary or contains a line that is
73	** too long.
74	*/
75	static DLine break_into_lines(const char z, int n, int *pnLine){
76	int nLine, i, j, k, x;
77	unsigned int h, h2;
78	DLine *a;
79
80	/* Count the number of lines. Allocate space to hold
	@@ -102,11 +104,12 @@
102
103	/* Fill in the array */
104	for(i=0; i<nLine; i++){
105	a[i].z = z;
106	for(j=0; z[j] && z[j]!='\n'; j++){}
107	for(k=j; k>0 && isspace(z[k-1]); k--){}

108	for(h=0, x=0; x<k; x++){
109	h = h ^ (h<<2) ^ z[x];
110	}
111	a[i].h = h = (h<<LENGTH_MASK_SZ) \| k;;
112	h2 = h % nLine;
	@@ -279,16 +282,70 @@
279	for(j=0; j<m; j++){
280	appendDiffLine(pOut, " ", &B[b+j]);
281	}
282	}
283	}










































284
285	/*
286	** Compare two blocks of text on lines iS1 through iE1-1 of the aFrom[]
287	** file and lines iS2 through iE2-1 of the aTo[] file. Locate a sequence
288	** of lines in these two blocks that are exactly the same. Return
289	** the bounds of the matching sequence.












290	*/
291	static void longestCommonSequence(
292	DContext p, / Two files being compared */
293	int iS1, int iE1, /* Range of lines in p->aFrom[] */
294	int iS2, int iE2, /* Range of lines in p->aTo[] */
	@@ -302,10 +359,11 @@
302	int skew; /* How lopsided is the match */
303	int dist; /* Distance of match from center */
304	int mid; /* Center of the span */
305	int iSXb, iSYb, iEXb, iEYb; /* Best match so far */
306	int iSXp, iSYp, iEXp, iEYp; /* Previous match */

307
308	iSXb = iSXp = iS1;
309	iEXb = iEXp = iS1;
310	iSYb = iSYp = iS2;
311	iEYb = iEYp = iS2;
	@@ -354,14 +412,20 @@
354	iSYp = iSY;
355	iEXp = iEX;
356	iEYp = iEY;
357	}
358	}
359	*piSX = iSXb;
360	*piSY = iSYb;
361	*piEX = iEXb;
362	*piEY = iEYb;






363	/* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
364	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
365	}
366
367	/*
	@@ -472,18 +536,21 @@
472	*/
473	int *text_diff(
474	Blob pA_Blob, / FROM file */
475	Blob pB_Blob, / TO file */
476	Blob pOut, / Write unified diff here if not NULL */
477	int nContext /* Amount of context to unified diff */

478	){
479	DContext c;
480
481	/* Prepare the input files */
482	memset(&c, 0, sizeof(c));
483	c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob), &c.nFrom);
484	c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob), &c.nTo);


485	if( c.aFrom==0 \|\| c.aTo==0 ){
486	free(c.aFrom);
487	free(c.aTo);
488	if( pOut ){
489	blob_appendf(pOut, "cannot compute difference between binary files\n");
	@@ -522,11 +589,11 @@
522	if( g.argc<4 ) usage("FILE1 FILE2 ...");
523	blob_read_from_file(&a, g.argv[2]);
524	for(i=3; i<g.argc; i++){
525	if( i>3 ) printf("-------------------------------\n");
526	blob_read_from_file(&b, g.argv[i]);
527	R = text_diff(&a, &b, 0, 0);
528	for(r=0; R[r] \|\| R[r+1] \|\| R[r+2]; r += 3){
529	printf(" copy %4d delete %4d insert %4d\n", R[r], R[r+1], R[r+2]);
530	}
531	/* free(R); */
532	blob_reset(&b);
	@@ -540,11 +607,11 @@
540	Blob a, b, out;
541	if( g.argc!=4 ) usage("FILE1 FILE2");
542	blob_read_from_file(&a, g.argv[2]);
543	blob_read_from_file(&b, g.argv[3]);
544	blob_zero(&out);
545	text_diff(&a, &b, &out, 3);
546	blob_write_to_file(&out, "-");
547	}
548
549	/**************************************************************************
550	** The basic difference engine is above. What follows is the annotation
	@@ -574,11 +641,11 @@
574	*/
575	static int annotation_start(Annotator p, Blob pInput){
576	int i;
577
578	memset(p, 0, sizeof(*p));
579	p->c.aTo = break_into_lines(blob_str(pInput), blob_size(pInput), &p->c.nTo);
580	if( p->c.aTo==0 ){
581	return 1;
582	}
583	p->aOrig = malloc( sizeof(p->aOrig[0])*p->c.nTo );
584	if( p->aOrig==0 ) fossil_panic("out of memory");
	@@ -602,11 +669,11 @@
602	int i, j;
603	int lnTo;
604
605	/* Prepare the parent file to be diffed */
606	p->c.aFrom = break_into_lines(blob_str(pParent), blob_size(pParent),
607	&p->c.nFrom);
608	if( p->c.aFrom==0 ){
609	return 1;
610	}
611
612	/* Compute the differences going from pParent to the file being
613

	--- src/diff.c
	+++ src/diff.c
	@@ -65,16 +65,18 @@
65	/*
66	** Return an array of DLine objects containing a pointer to the
67	** start of each line and a hash of that line. The lower
68	** bits of the hash store the length of each line.
69	**
70	** Trailing whitespace is removed from each line. 2010-08-20: Not any
71	** more. If trailing whitespace is ignored, the "patch" command gets
72	** confused by the diff output. Ticket [a9f7b23c2e376af5b0e5b]
73	**
74	** Return 0 if the file is binary or contains a line that is
75	** too long.
76	*/
77	static DLine break_into_lines(const char z, int n, int *pnLine, int ignoreWS){
78	int nLine, i, j, k, x;
79	unsigned int h, h2;
80	DLine *a;
81
82	/* Count the number of lines. Allocate space to hold
	@@ -102,11 +104,12 @@
104
105	/* Fill in the array */
106	for(i=0; i<nLine; i++){
107	a[i].z = z;
108	for(j=0; z[j] && z[j]!='\n'; j++){}
109	k = j;
110	while( ignoreWS && k>0 && isspace(z[k-1]) ){ k--; }
111	for(h=0, x=0; x<k; x++){
112	h = h ^ (h<<2) ^ z[x];
113	}
114	a[i].h = h = (h<<LENGTH_MASK_SZ) \| k;;
115	h2 = h % nLine;
	@@ -279,16 +282,70 @@
282	for(j=0; j<m; j++){
283	appendDiffLine(pOut, " ", &B[b+j]);
284	}
285	}
286	}
287
288	/*
289	** Compute the optimal longest common subsequence (LCS) using an
290	** exhaustive search. This version of the LCS is only used for
291	** shorter input strings since runtime is O(N*N) where N is the
292	** input string length.
293	*/
294	static void optimalLCS(
295	DContext p, / Two files being compared */
296	int iS1, int iE1, /* Range of lines in p->aFrom[] */
297	int iS2, int iE2, /* Range of lines in p->aTo[] */
298	int piSX, int piEX, /* Write p->aFrom[] common segment here */
299	int piSY, int piEY /* Write p->aTo[] common segment here */
300	){
301	int mxLength = 0; /* Length of longest common subsequence */
302	int i, j; /* Loop counters */
303	int k; /* Length of a candidate subsequence */
304	int iSXb = iS1; /* Best match so far */
305	int iSYb = iS2; /* Best match so far */
306
307	for(i=iS1; i<iE1-mxLength; i++){
308	for(j=iS2; j<iE2-mxLength; j++){
309	if( !same_dline(&p->aFrom[i], &p->aTo[j]) ) continue;
310	if( mxLength && !same_dline(&p->aFrom[i+mxLength], &p->aTo[j+mxLength]) ){
311	continue;
312	}
313	k = 1;
314	while( i+k<iE1 && j+k<iE2 && same_dline(&p->aFrom[i+k],&p->aTo[j+k]) ){
315	k++;
316	}
317	if( k>mxLength ){
318	iSXb = i;
319	iSYb = j;
320	mxLength = k;
321	}
322	}
323	}
324	*piSX = iSXb;
325	*piEX = iSXb + mxLength;
326	*piSY = iSYb;
327	*piEY = iSYb + mxLength;
328	}
329
330	/*
331	** Compare two blocks of text on lines iS1 through iE1-1 of the aFrom[]
332	** file and lines iS2 through iE2-1 of the aTo[] file. Locate a sequence
333	** of lines in these two blocks that are exactly the same. Return
334	** the bounds of the matching sequence.
335	**
336	** If there are two or more possible answers of the same length, the
337	** returned sequence should be the one closest to the center of the
338	** input range.
339	**
340	** Ideally, the common sequence should be the longest possible common
341	** sequence. However, an exact computation of LCS is O(N*N) which is
342	** way too slow for larger files. So this routine uses an O(N)
343	** heuristic approximation based on hashing that usually works about
344	** as well. But if the O(N) algorithm doesn't get a good solution
345	** and N is not too large, we fall back to an exact solution by
346	** calling optimalLCS().
347	*/
348	static void longestCommonSequence(
349	DContext p, / Two files being compared */
350	int iS1, int iE1, /* Range of lines in p->aFrom[] */
351	int iS2, int iE2, /* Range of lines in p->aTo[] */
	@@ -302,10 +359,11 @@
359	int skew; /* How lopsided is the match */
360	int dist; /* Distance of match from center */
361	int mid; /* Center of the span */
362	int iSXb, iSYb, iEXb, iEYb; /* Best match so far */
363	int iSXp, iSYp, iEXp, iEYp; /* Previous match */
364
365
366	iSXb = iSXp = iS1;
367	iEXb = iEXp = iS1;
368	iSYb = iSYp = iS2;
369	iEYb = iEYp = iS2;
	@@ -354,14 +412,20 @@
412	iSYp = iSY;
413	iEXp = iEX;
414	iEYp = iEY;
415	}
416	}
417	if( iSXb==iEXb && (iE1-iS1)*(iE2-iS2)<400 ){
418	/* If no common sequence is found using the hashing heuristic and
419	** the input is not too big, use the expensive exact solution */
420	optimalLCS(p, iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY);
421	}else{
422	*piSX = iSXb;
423	*piSY = iSYb;
424	*piEX = iEXb;
425	*piEY = iEYb;
426	}
427	/* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
428	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
429	}
430
431	/*
	@@ -472,18 +536,21 @@
536	*/
537	int *text_diff(
538	Blob pA_Blob, / FROM file */
539	Blob pB_Blob, / TO file */
540	Blob pOut, / Write unified diff here if not NULL */
541	int nContext, /* Amount of context to unified diff */
542	int ignoreEolWs /* Ignore whitespace at the end of lines */
543	){
544	DContext c;
545
546	/* Prepare the input files */
547	memset(&c, 0, sizeof(c));
548	c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
549	&c.nFrom, ignoreEolWs);
550	c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
551	&c.nTo, ignoreEolWs);
552	if( c.aFrom==0 \|\| c.aTo==0 ){
553	free(c.aFrom);
554	free(c.aTo);
555	if( pOut ){
556	blob_appendf(pOut, "cannot compute difference between binary files\n");
	@@ -522,11 +589,11 @@
589	if( g.argc<4 ) usage("FILE1 FILE2 ...");
590	blob_read_from_file(&a, g.argv[2]);
591	for(i=3; i<g.argc; i++){
592	if( i>3 ) printf("-------------------------------\n");
593	blob_read_from_file(&b, g.argv[i]);
594	R = text_diff(&a, &b, 0, 0, 0);
595	for(r=0; R[r] \|\| R[r+1] \|\| R[r+2]; r += 3){
596	printf(" copy %4d delete %4d insert %4d\n", R[r], R[r+1], R[r+2]);
597	}
598	/* free(R); */
599	blob_reset(&b);
	@@ -540,11 +607,11 @@
607	Blob a, b, out;
608	if( g.argc!=4 ) usage("FILE1 FILE2");
609	blob_read_from_file(&a, g.argv[2]);
610	blob_read_from_file(&b, g.argv[3]);
611	blob_zero(&out);
612	text_diff(&a, &b, &out, 3, 0);
613	blob_write_to_file(&out, "-");
614	}
615
616	/**************************************************************************
617	** The basic difference engine is above. What follows is the annotation
	@@ -574,11 +641,11 @@
641	*/
642	static int annotation_start(Annotator p, Blob pInput){
643	int i;
644
645	memset(p, 0, sizeof(*p));
646	p->c.aTo = break_into_lines(blob_str(pInput), blob_size(pInput),&p->c.nTo,1);
647	if( p->c.aTo==0 ){
648	return 1;
649	}
650	p->aOrig = malloc( sizeof(p->aOrig[0])*p->c.nTo );
651	if( p->aOrig==0 ) fossil_panic("out of memory");
	@@ -602,11 +669,11 @@
669	int i, j;
670	int lnTo;
671
672	/* Prepare the parent file to be diffed */
673	p->c.aFrom = break_into_lines(blob_str(pParent), blob_size(pParent),
674	&p->c.nFrom, 1);
675	if( p->c.aFrom==0 ){
676	return 1;
677	}
678
679	/* Compute the differences going from pParent to the file being
680

M src/diffcmd.c

+35 -40

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -19,37 +19,16 @@
19	19	*/
20	20	#include "config.h"
21	21	#include "diffcmd.h"
22	22	#include <assert.h>
23	23
24		-/*
25		-** Shell-escape the given string. Append the result to a blob.
26		-*/
27		-static void shell_escape(Blob pBlob, const char zIn){
28		- int n = blob_size(pBlob);
29		- int k = strlen(zIn);
30		- int i, c;
31		- char *z;
32		- for(i=0; (c = zIn[i])!=0; i++){
33		- if( isspace(c) \|\| c=='"' \|\| (c=='\\' && zIn[i+1]!=0) ){
34		- blob_appendf(pBlob, "\"%s\"", zIn);
35		- z = blob_buffer(pBlob);
36		- for(i=n+1; i<=n+k; i++){
37		- if( z[i]=='"' ) z[i] = '_';
38		- }
39		- return;
40		- }
41		- }
42		- blob_append(pBlob, zIn, -1);
43		-}
44		-
45	24	/*
46	25	** This function implements a cross-platform "system()" interface.
47	26	*/
48	27	int portable_system(const char *zOrigCmd){
49	28	int rc;
50		-#ifdef __MINGW32__
	29	+#if defined(_WIN32)
51	30	/* On windows, we have to put double-quotes around the entire command.
52	31	** Who knows why - this is just the way windows works.
53	32	*/
54	33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
55	34	rc = system(zNewCmd);
		@@ -73,11 +52,12 @@
73	52	*/
74	53	static void diff_file(
75	54	Blob pFile1, / In memory content to compare from */
76	55	const char zFile2, / On disk content to compare to */
77	56	const char zName, / Display name of the file */
78		- const char zDiffCmd / Command for comparison */
	57	+ const char zDiffCmd, / Command for comparison */
	58	+ int ignoreEolWs /* Ignore whitespace at end of lines */
79	59	){
80	60	if( zDiffCmd==0 ){
81	61	Blob out; /* Diff output text */
82	62	Blob file2; /* Content of zFile2 */
83	63
		@@ -85,11 +65,11 @@
85	65	blob_zero(&file2);
86	66	blob_read_from_file(&file2, zFile2);
87	67
88	68	/* Compute and output the differences */
89	69	blob_zero(&out);
90		- text_diff(pFile1, &file2, &out, 5);
	70	+ text_diff(pFile1, &file2, &out, 5, ignoreEolWs);
91	71	printf("--- %s\n+++ %s\n", zName, zName);
92	72	printf("%s\n", blob_str(&out));
93	73
94	74	/* Release memory resources */
95	75	blob_reset(&file2);
		@@ -136,17 +116,18 @@
136	116	*/
137	117	static void diff_file_mem(
138	118	Blob pFile1, / In memory content to compare from */
139	119	Blob pFile2, / In memory content to compare to */
140	120	const char zName, / Display name of the file */
141		- const char zDiffCmd / Command for comparison */
	121	+ const char zDiffCmd, / Command for comparison */
	122	+ int ignoreEolWs /* Ignore whitespace at end of lines */
142	123	){
143	124	if( zDiffCmd==0 ){
144	125	Blob out; /* Diff output text */
145	126
146	127	blob_zero(&out);
147		- text_diff(pFile1, pFile2, &out, 5);
	128	+ text_diff(pFile1, pFile2, &out, 5, ignoreEolWs);
148	129	printf("--- %s\n+++ %s\n", zName, zName);
149	130	printf("%s\n", blob_str(&out));
150	131
151	132	/* Release memory resources */
152	133	blob_reset(&out);
		@@ -180,26 +161,34 @@
180	161
181	162	/*
182	163	** Do a diff against a single file named in g.argv[2] from version zFrom
183	164	** against the same file on disk.
184	165	*/
185		-static void diff_one_against_disk(const char zFrom, const char zDiffCmd){
	166	+static void diff_one_against_disk(
	167	+ const char zFrom, / Name of file */
	168	+ const char zDiffCmd, / Use this "diff" command */
	169	+ int ignoreEolWs /* Ignore whitespace changes at end of lines */
	170	+){
186	171	Blob fname;
187	172	Blob content;
188	173	file_tree_name(g.argv[2], &fname, 1);
189	174	historical_version_of_file(zFrom, blob_str(&fname), &content, 0);
190		- diff_file(&content, g.argv[2], g.argv[2], zDiffCmd);
	175	+ diff_file(&content, g.argv[2], g.argv[2], zDiffCmd, ignoreEolWs);
191	176	blob_reset(&content);
192	177	blob_reset(&fname);
193	178	}
194	179
195	180	/*
196	181	** Run a diff between the version zFrom and files on disk. zFrom might
197	182	** be NULL which means to simply show the difference between the edited
198	183	** files on disk and the check-out on which they are based.
199	184	*/
200		-static void diff_all_against_disk(const char zFrom, const char zDiffCmd){
	185	+static void diff_all_against_disk(
	186	+ const char zFrom, / Version to difference from */
	187	+ const char zDiffCmd, / Use this diff command. NULL for built-in */
	188	+ int ignoreEolWs /* Ignore end-of-line whitespace */
	189	+){
201	190	int vid;
202	191	Blob sql;
203	192	Stmt q;
204	193
205	194	vid = db_lget_int("checkout", 0);
		@@ -265,11 +254,11 @@
265	254	content_get(srcid, &content);
266	255	printf("Index: %s\n======================================="
267	256	"============================\n",
268	257	zPathname
269	258	);
270		- diff_file(&content, zFullName, zPathname, zDiffCmd);
	259	+ diff_file(&content, zFullName, zPathname, zDiffCmd, ignoreEolWs);
271	260	blob_reset(&content);
272	261	}
273	262	free(zFullName);
274	263	}
275	264	db_finalize(&q);
		@@ -282,20 +271,21 @@
282	271	** The filename is contained in g.argv[2].
283	272	*/
284	273	static void diff_one_two_versions(
285	274	const char *zFrom,
286	275	const char *zTo,
287		- const char *zDiffCmd
	276	+ const char *zDiffCmd,
	277	+ int ignoreEolWs
288	278	){
289	279	char *zName;
290	280	Blob fname;
291	281	Blob v1, v2;
292	282	file_tree_name(g.argv[2], &fname, 1);
293	283	zName = blob_str(&fname);
294	284	historical_version_of_file(zFrom, zName, &v1, 0);
295	285	historical_version_of_file(zTo, zName, &v2, 0);
296		- diff_file_mem(&v1, &v2, zName, zDiffCmd);
	286	+ diff_file_mem(&v1, &v2, zName, zDiffCmd, ignoreEolWs);
297	287	blob_reset(&v1);
298	288	blob_reset(&v2);
299	289	blob_reset(&fname);
300	290	}
301	291
		@@ -303,11 +293,12 @@
303	293	** Output the differences between two check-ins.
304	294	*/
305	295	static void diff_all_two_versions(
306	296	const char *zFrom,
307	297	const char *zTo,
308		- const char *zDiffCmd
	298	+ const char *zDiffCmd,
	299	+ int ignoreEolWs
309	300	){
310	301	Manifest mFrom, mTo;
311	302	int iFrom, iTo;
312	303
313	304	manifest_from_name(zFrom, &mFrom);
		@@ -334,15 +325,19 @@
334	325	iTo++;
335	326	}else{
336	327	Blob f1, f2;
337	328	int rid;
338	329	printf("CHANGED %s\n", mFrom.aFile[iFrom].zName);
	330	+ printf("Index: %s\n======================================="
	331	+ "============================\n",
	332	+ mFrom.aFile[iFrom].zName
	333	+ );
339	334	rid = uuid_to_rid(mFrom.aFile[iFrom].zUuid, 0);
340	335	content_get(rid, &f1);
341	336	rid = uuid_to_rid(mTo.aFile[iTo].zUuid, 0);
342	337	content_get(rid, &f2);
343		- diff_file_mem(&f1, &f2, mFrom.aFile[iFrom].zName, zDiffCmd);
	338	+ diff_file_mem(&f1, &f2, mFrom.aFile[iFrom].zName, zDiffCmd, ignoreEolWs);
344	339	blob_reset(&f1);
345	340	blob_reset(&f2);
346	341	iFrom++;
347	342	iTo++;
348	343	}
		@@ -389,28 +384,28 @@
389	384	zTo = find_option("to", 0, 1);
390	385
391	386	if( zTo==0 ){
392	387	db_must_be_within_tree();
393	388	verify_all_options();
394		- if( !isInternDiff && g.argc==3 ){
	389	+ if( !isInternDiff ){
395	390	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
396	391	}
397	392	if( g.argc==3 ){
398		- diff_one_against_disk(zFrom, zDiffCmd);
	393	+ diff_one_against_disk(zFrom, zDiffCmd, 0);
399	394	}else{
400		- diff_all_against_disk(zFrom, zDiffCmd);
	395	+ diff_all_against_disk(zFrom, zDiffCmd, 0);
401	396	}
402	397	}else if( zFrom==0 ){
403	398	fossil_fatal("must use --from if --to is present");
404	399	}else{
405	400	db_find_and_open_repository(1);
406	401	verify_all_options();
407		- if( !isInternDiff && g.argc==3 ){
	402	+ if( !isInternDiff ){
408	403	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
409	404	}
410	405	if( g.argc==3 ){
411		- diff_one_two_versions(zFrom, zTo, zDiffCmd);
	406	+ diff_one_two_versions(zFrom, zTo, zDiffCmd, 0);
412	407	}else{
413		- diff_all_two_versions(zFrom, zTo, zDiffCmd);
	408	+ diff_all_two_versions(zFrom, zTo, zDiffCmd, 0);
414	409	}
415	410	}
416	411	}
417	412

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -19,37 +19,16 @@
19	*/
20	#include "config.h"
21	#include "diffcmd.h"
22	#include <assert.h>
23
24	/*
25	** Shell-escape the given string. Append the result to a blob.
26	*/
27	static void shell_escape(Blob pBlob, const char zIn){
28	int n = blob_size(pBlob);
29	int k = strlen(zIn);
30	int i, c;
31	char *z;
32	for(i=0; (c = zIn[i])!=0; i++){
33	if( isspace(c) \|\| c=='"' \|\| (c=='\\' && zIn[i+1]!=0) ){
34	blob_appendf(pBlob, "\"%s\"", zIn);
35	z = blob_buffer(pBlob);
36	for(i=n+1; i<=n+k; i++){
37	if( z[i]=='"' ) z[i] = '_';
38	}
39	return;
40	}
41	}
42	blob_append(pBlob, zIn, -1);
43	}
44
45	/*
46	** This function implements a cross-platform "system()" interface.
47	*/
48	int portable_system(const char *zOrigCmd){
49	int rc;
50	#ifdef __MINGW32__
51	/* On windows, we have to put double-quotes around the entire command.
52	** Who knows why - this is just the way windows works.
53	*/
54	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
55	rc = system(zNewCmd);
	@@ -73,11 +52,12 @@
73	*/
74	static void diff_file(
75	Blob pFile1, / In memory content to compare from */
76	const char zFile2, / On disk content to compare to */
77	const char zName, / Display name of the file */
78	const char zDiffCmd / Command for comparison */

79	){
80	if( zDiffCmd==0 ){
81	Blob out; /* Diff output text */
82	Blob file2; /* Content of zFile2 */
83
	@@ -85,11 +65,11 @@
85	blob_zero(&file2);
86	blob_read_from_file(&file2, zFile2);
87
88	/* Compute and output the differences */
89	blob_zero(&out);
90	text_diff(pFile1, &file2, &out, 5);
91	printf("--- %s\n+++ %s\n", zName, zName);
92	printf("%s\n", blob_str(&out));
93
94	/* Release memory resources */
95	blob_reset(&file2);
	@@ -136,17 +116,18 @@
136	*/
137	static void diff_file_mem(
138	Blob pFile1, / In memory content to compare from */
139	Blob pFile2, / In memory content to compare to */
140	const char zName, / Display name of the file */
141	const char zDiffCmd / Command for comparison */

142	){
143	if( zDiffCmd==0 ){
144	Blob out; /* Diff output text */
145
146	blob_zero(&out);
147	text_diff(pFile1, pFile2, &out, 5);
148	printf("--- %s\n+++ %s\n", zName, zName);
149	printf("%s\n", blob_str(&out));
150
151	/* Release memory resources */
152	blob_reset(&out);
	@@ -180,26 +161,34 @@
180
181	/*
182	** Do a diff against a single file named in g.argv[2] from version zFrom
183	** against the same file on disk.
184	*/
185	static void diff_one_against_disk(const char zFrom, const char zDiffCmd){




186	Blob fname;
187	Blob content;
188	file_tree_name(g.argv[2], &fname, 1);
189	historical_version_of_file(zFrom, blob_str(&fname), &content, 0);
190	diff_file(&content, g.argv[2], g.argv[2], zDiffCmd);
191	blob_reset(&content);
192	blob_reset(&fname);
193	}
194
195	/*
196	** Run a diff between the version zFrom and files on disk. zFrom might
197	** be NULL which means to simply show the difference between the edited
198	** files on disk and the check-out on which they are based.
199	*/
200	static void diff_all_against_disk(const char zFrom, const char zDiffCmd){




201	int vid;
202	Blob sql;
203	Stmt q;
204
205	vid = db_lget_int("checkout", 0);
	@@ -265,11 +254,11 @@
265	content_get(srcid, &content);
266	printf("Index: %s\n======================================="
267	"============================\n",
268	zPathname
269	);
270	diff_file(&content, zFullName, zPathname, zDiffCmd);
271	blob_reset(&content);
272	}
273	free(zFullName);
274	}
275	db_finalize(&q);
	@@ -282,20 +271,21 @@
282	** The filename is contained in g.argv[2].
283	*/
284	static void diff_one_two_versions(
285	const char *zFrom,
286	const char *zTo,
287	const char *zDiffCmd

288	){
289	char *zName;
290	Blob fname;
291	Blob v1, v2;
292	file_tree_name(g.argv[2], &fname, 1);
293	zName = blob_str(&fname);
294	historical_version_of_file(zFrom, zName, &v1, 0);
295	historical_version_of_file(zTo, zName, &v2, 0);
296	diff_file_mem(&v1, &v2, zName, zDiffCmd);
297	blob_reset(&v1);
298	blob_reset(&v2);
299	blob_reset(&fname);
300	}
301
	@@ -303,11 +293,12 @@
303	** Output the differences between two check-ins.
304	*/
305	static void diff_all_two_versions(
306	const char *zFrom,
307	const char *zTo,
308	const char *zDiffCmd

309	){
310	Manifest mFrom, mTo;
311	int iFrom, iTo;
312
313	manifest_from_name(zFrom, &mFrom);
	@@ -334,15 +325,19 @@
334	iTo++;
335	}else{
336	Blob f1, f2;
337	int rid;
338	printf("CHANGED %s\n", mFrom.aFile[iFrom].zName);




339	rid = uuid_to_rid(mFrom.aFile[iFrom].zUuid, 0);
340	content_get(rid, &f1);
341	rid = uuid_to_rid(mTo.aFile[iTo].zUuid, 0);
342	content_get(rid, &f2);
343	diff_file_mem(&f1, &f2, mFrom.aFile[iFrom].zName, zDiffCmd);
344	blob_reset(&f1);
345	blob_reset(&f2);
346	iFrom++;
347	iTo++;
348	}
	@@ -389,28 +384,28 @@
389	zTo = find_option("to", 0, 1);
390
391	if( zTo==0 ){
392	db_must_be_within_tree();
393	verify_all_options();
394	if( !isInternDiff && g.argc==3 ){
395	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
396	}
397	if( g.argc==3 ){
398	diff_one_against_disk(zFrom, zDiffCmd);
399	}else{
400	diff_all_against_disk(zFrom, zDiffCmd);
401	}
402	}else if( zFrom==0 ){
403	fossil_fatal("must use --from if --to is present");
404	}else{
405	db_find_and_open_repository(1);
406	verify_all_options();
407	if( !isInternDiff && g.argc==3 ){
408	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
409	}
410	if( g.argc==3 ){
411	diff_one_two_versions(zFrom, zTo, zDiffCmd);
412	}else{
413	diff_all_two_versions(zFrom, zTo, zDiffCmd);
414	}
415	}
416	}
417

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -19,37 +19,16 @@
19	*/
20	#include "config.h"
21	#include "diffcmd.h"
22	#include <assert.h>
23





















24	/*
25	** This function implements a cross-platform "system()" interface.
26	*/
27	int portable_system(const char *zOrigCmd){
28	int rc;
29	#if defined(_WIN32)
30	/* On windows, we have to put double-quotes around the entire command.
31	** Who knows why - this is just the way windows works.
32	*/
33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	rc = system(zNewCmd);
	@@ -73,11 +52,12 @@
52	*/
53	static void diff_file(
54	Blob pFile1, / In memory content to compare from */
55	const char zFile2, / On disk content to compare to */
56	const char zName, / Display name of the file */
57	const char zDiffCmd, / Command for comparison */
58	int ignoreEolWs /* Ignore whitespace at end of lines */
59	){
60	if( zDiffCmd==0 ){
61	Blob out; /* Diff output text */
62	Blob file2; /* Content of zFile2 */
63
	@@ -85,11 +65,11 @@
65	blob_zero(&file2);
66	blob_read_from_file(&file2, zFile2);
67
68	/* Compute and output the differences */
69	blob_zero(&out);
70	text_diff(pFile1, &file2, &out, 5, ignoreEolWs);
71	printf("--- %s\n+++ %s\n", zName, zName);
72	printf("%s\n", blob_str(&out));
73
74	/* Release memory resources */
75	blob_reset(&file2);
	@@ -136,17 +116,18 @@
116	*/
117	static void diff_file_mem(
118	Blob pFile1, / In memory content to compare from */
119	Blob pFile2, / In memory content to compare to */
120	const char zName, / Display name of the file */
121	const char zDiffCmd, / Command for comparison */
122	int ignoreEolWs /* Ignore whitespace at end of lines */
123	){
124	if( zDiffCmd==0 ){
125	Blob out; /* Diff output text */
126
127	blob_zero(&out);
128	text_diff(pFile1, pFile2, &out, 5, ignoreEolWs);
129	printf("--- %s\n+++ %s\n", zName, zName);
130	printf("%s\n", blob_str(&out));
131
132	/* Release memory resources */
133	blob_reset(&out);
	@@ -180,26 +161,34 @@
161
162	/*
163	** Do a diff against a single file named in g.argv[2] from version zFrom
164	** against the same file on disk.
165	*/
166	static void diff_one_against_disk(
167	const char zFrom, / Name of file */
168	const char zDiffCmd, / Use this "diff" command */
169	int ignoreEolWs /* Ignore whitespace changes at end of lines */
170	){
171	Blob fname;
172	Blob content;
173	file_tree_name(g.argv[2], &fname, 1);
174	historical_version_of_file(zFrom, blob_str(&fname), &content, 0);
175	diff_file(&content, g.argv[2], g.argv[2], zDiffCmd, ignoreEolWs);
176	blob_reset(&content);
177	blob_reset(&fname);
178	}
179
180	/*
181	** Run a diff between the version zFrom and files on disk. zFrom might
182	** be NULL which means to simply show the difference between the edited
183	** files on disk and the check-out on which they are based.
184	*/
185	static void diff_all_against_disk(
186	const char zFrom, / Version to difference from */
187	const char zDiffCmd, / Use this diff command. NULL for built-in */
188	int ignoreEolWs /* Ignore end-of-line whitespace */
189	){
190	int vid;
191	Blob sql;
192	Stmt q;
193
194	vid = db_lget_int("checkout", 0);
	@@ -265,11 +254,11 @@
254	content_get(srcid, &content);
255	printf("Index: %s\n======================================="
256	"============================\n",
257	zPathname
258	);
259	diff_file(&content, zFullName, zPathname, zDiffCmd, ignoreEolWs);
260	blob_reset(&content);
261	}
262	free(zFullName);
263	}
264	db_finalize(&q);
	@@ -282,20 +271,21 @@
271	** The filename is contained in g.argv[2].
272	*/
273	static void diff_one_two_versions(
274	const char *zFrom,
275	const char *zTo,
276	const char *zDiffCmd,
277	int ignoreEolWs
278	){
279	char *zName;
280	Blob fname;
281	Blob v1, v2;
282	file_tree_name(g.argv[2], &fname, 1);
283	zName = blob_str(&fname);
284	historical_version_of_file(zFrom, zName, &v1, 0);
285	historical_version_of_file(zTo, zName, &v2, 0);
286	diff_file_mem(&v1, &v2, zName, zDiffCmd, ignoreEolWs);
287	blob_reset(&v1);
288	blob_reset(&v2);
289	blob_reset(&fname);
290	}
291
	@@ -303,11 +293,12 @@
293	** Output the differences between two check-ins.
294	*/
295	static void diff_all_two_versions(
296	const char *zFrom,
297	const char *zTo,
298	const char *zDiffCmd,
299	int ignoreEolWs
300	){
301	Manifest mFrom, mTo;
302	int iFrom, iTo;
303
304	manifest_from_name(zFrom, &mFrom);
	@@ -334,15 +325,19 @@
325	iTo++;
326	}else{
327	Blob f1, f2;
328	int rid;
329	printf("CHANGED %s\n", mFrom.aFile[iFrom].zName);
330	printf("Index: %s\n======================================="
331	"============================\n",
332	mFrom.aFile[iFrom].zName
333	);
334	rid = uuid_to_rid(mFrom.aFile[iFrom].zUuid, 0);
335	content_get(rid, &f1);
336	rid = uuid_to_rid(mTo.aFile[iTo].zUuid, 0);
337	content_get(rid, &f2);
338	diff_file_mem(&f1, &f2, mFrom.aFile[iFrom].zName, zDiffCmd, ignoreEolWs);
339	blob_reset(&f1);
340	blob_reset(&f2);
341	iFrom++;
342	iTo++;
343	}
	@@ -389,28 +384,28 @@
384	zTo = find_option("to", 0, 1);
385
386	if( zTo==0 ){
387	db_must_be_within_tree();
388	verify_all_options();
389	if( !isInternDiff ){
390	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
391	}
392	if( g.argc==3 ){
393	diff_one_against_disk(zFrom, zDiffCmd, 0);
394	}else{
395	diff_all_against_disk(zFrom, zDiffCmd, 0);
396	}
397	}else if( zFrom==0 ){
398	fossil_fatal("must use --from if --to is present");
399	}else{
400	db_find_and_open_repository(1);
401	verify_all_options();
402	if( !isInternDiff ){
403	zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0);
404	}
405	if( g.argc==3 ){
406	diff_one_two_versions(zFrom, zTo, zDiffCmd, 0);
407	}else{
408	diff_all_two_versions(zFrom, zTo, zDiffCmd, 0);
409	}
410	}
411	}
412

M src/encode.c

+2 -1

		--- src/encode.c
		+++ src/encode.c
		@@ -100,11 +100,12 @@
100	100	int i = 0;
101	101	int count = 0;
102	102	char *zOut;
103	103	int other;
104	104	# define IsSafeChar(X) \
105		- (isalnum(X) \|\| (X)=='.' \|\| (X)=='$' \|\| (X)=='-' \|\| (X)=='_' \|\| (X)==other)
	105	+ (isalnum(X) \|\| (X)=='.' \|\| (X)=='$' \
	106	+ \|\| (X)=='~' \|\| (X)=='-' \|\| (X)=='_' \|\| (X)==other)
106	107
107	108	if( zIn==0 ) return 0;
108	109	if( n<0 ) n = strlen(zIn);
109	110	other = encodeSlash ? 'a' : '/';
110	111	while( i<n && (c = zIn[i])!=0 ){
111	112

	--- src/encode.c
	+++ src/encode.c
	@@ -100,11 +100,12 @@
100	int i = 0;
101	int count = 0;
102	char *zOut;
103	int other;
104	# define IsSafeChar(X) \
105	(isalnum(X) \|\| (X)=='.' \|\| (X)=='$' \|\| (X)=='-' \|\| (X)=='_' \|\| (X)==other)

106
107	if( zIn==0 ) return 0;
108	if( n<0 ) n = strlen(zIn);
109	other = encodeSlash ? 'a' : '/';
110	while( i<n && (c = zIn[i])!=0 ){
111

	--- src/encode.c
	+++ src/encode.c
	@@ -100,11 +100,12 @@
100	int i = 0;
101	int count = 0;
102	char *zOut;
103	int other;
104	# define IsSafeChar(X) \
105	(isalnum(X) \|\| (X)=='.' \|\| (X)=='$' \
106	\|\| (X)=='~' \|\| (X)=='-' \|\| (X)=='_' \|\| (X)==other)
107
108	if( zIn==0 ) return 0;
109	if( n<0 ) n = strlen(zIn);
110	other = encodeSlash ? 'a' : '/';
111	while( i<n && (c = zIn[i])!=0 ){
112

M src/file.c

+10 -7

		--- src/file.c
		+++ src/file.c
		@@ -83,11 +83,14 @@
83	83	** Return TRUE if the named file is an executable. Return false
84	84	** for directories, devices, fifos, symlinks, etc.
85	85	*/
86	86	int file_isexe(const char *zFilename){
87	87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88		-#ifdef __MINGW32__
	88	+#if defined(_WIN32)
	89	+# if defined(__DMC__) \|\| defined(_MSC_VER)
	90	+# define S_IXUSR _S_IEXEC
	91	+# endif
89	92	return ((S_IXUSR)&fileStat.st_mode)!=0;
90	93	#else
91	94	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
92	95	#endif
93	96	}
		@@ -145,11 +148,11 @@
145	148
146	149	/*
147	150	** Set or clear the execute bit on a file.
148	151	*/
149	152	void file_setexe(const char *zFilename, int onoff){
150		-#ifndef __MINGW32__
	153	+#if !defined(_WIN32)
151	154	struct stat buf;
152	155	if( stat(zFilename, &buf)!=0 ) return;
153	156	if( onoff ){
154	157	if( (buf.st_mode & 0111)!=0111 ){
155	158	chmod(zFilename, buf.st_mode \| 0111);
		@@ -157,11 +160,11 @@
157	160	}else{
158	161	if( (buf.st_mode & 0111)!=0 ){
159	162	chmod(zFilename, buf.st_mode & ~0111);
160	163	}
161	164	}
162		-#endif /* __MINGW32__ */
	165	+#endif /* _WIN32 */
163	166	}
164	167
165	168	/*
166	169	** Create the directory named in the argument, if it does not already
167	170	** exist. If forceFlag is 1, delete any prior non-directory object
		@@ -174,11 +177,11 @@
174	177	if( rc==2 ){
175	178	if( !forceFlag ) return 1;
176	179	unlink(zName);
177	180	}
178	181	if( rc!=1 ){
179		-#ifdef __MINGW32__
	182	+#if defined(_WIN32)
180	183	return mkdir(zName);
181	184	#else
182	185	return mkdir(zName, 0755);
183	186	#endif
184	187	}
		@@ -231,11 +234,11 @@
231	234	** Changes are made in-place. Return the new name length.
232	235	*/
233	236	int file_simplify_name(char *z, int n){
234	237	int i, j;
235	238	if( n<0 ) n = strlen(z);
236		-#ifdef __MINGW32__
	239	+#if defined(_WIN32)
237	240	for(i=0; i<n; i++){
238	241	if( z[i]=='\\' ) z[i] = '/';
239	242	}
240	243	#endif
241	244	while( n>1 && z[n-1]=='/' ){ n--; }
		@@ -266,11 +269,11 @@
266	269	** Remove all /./ path elements.
267	270	** Convert /A/../ to just /
268	271	*/
269	272	void file_canonical_name(const char zOrigName, Blob pOut){
270	273	if( zOrigName[0]=='/'
271		-#ifdef __MINGW32__
	274	+#if defined(_WIN32)
272	275	\|\| zOrigName[0]=='\\'
273	276	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
274	277	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
275	278	#endif
276	279	){
		@@ -311,11 +314,11 @@
311	314	** contain no "/./" or "/../" terms.
312	315	*/
313	316	int file_is_canonical(const char *z){
314	317	int i;
315	318	if( z[0]!='/'
316		-#ifdef __MINGW32__
	319	+#if defined(_WIN32)
317	320	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
318	321	#endif
319	322	) return 0;
320	323
321	324	for(i=0; z[i]; i++){
322	325

	--- src/file.c
	+++ src/file.c
	@@ -83,11 +83,14 @@
83	** Return TRUE if the named file is an executable. Return false
84	** for directories, devices, fifos, symlinks, etc.
85	*/
86	int file_isexe(const char *zFilename){
87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88	#ifdef __MINGW32__



89	return ((S_IXUSR)&fileStat.st_mode)!=0;
90	#else
91	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
92	#endif
93	}
	@@ -145,11 +148,11 @@
145
146	/*
147	** Set or clear the execute bit on a file.
148	*/
149	void file_setexe(const char *zFilename, int onoff){
150	#ifndef __MINGW32__
151	struct stat buf;
152	if( stat(zFilename, &buf)!=0 ) return;
153	if( onoff ){
154	if( (buf.st_mode & 0111)!=0111 ){
155	chmod(zFilename, buf.st_mode \| 0111);
	@@ -157,11 +160,11 @@
157	}else{
158	if( (buf.st_mode & 0111)!=0 ){
159	chmod(zFilename, buf.st_mode & ~0111);
160	}
161	}
162	#endif /* __MINGW32__ */
163	}
164
165	/*
166	** Create the directory named in the argument, if it does not already
167	** exist. If forceFlag is 1, delete any prior non-directory object
	@@ -174,11 +177,11 @@
174	if( rc==2 ){
175	if( !forceFlag ) return 1;
176	unlink(zName);
177	}
178	if( rc!=1 ){
179	#ifdef __MINGW32__
180	return mkdir(zName);
181	#else
182	return mkdir(zName, 0755);
183	#endif
184	}
	@@ -231,11 +234,11 @@
231	** Changes are made in-place. Return the new name length.
232	*/
233	int file_simplify_name(char *z, int n){
234	int i, j;
235	if( n<0 ) n = strlen(z);
236	#ifdef __MINGW32__
237	for(i=0; i<n; i++){
238	if( z[i]=='\\' ) z[i] = '/';
239	}
240	#endif
241	while( n>1 && z[n-1]=='/' ){ n--; }
	@@ -266,11 +269,11 @@
266	** Remove all /./ path elements.
267	** Convert /A/../ to just /
268	*/
269	void file_canonical_name(const char zOrigName, Blob pOut){
270	if( zOrigName[0]=='/'
271	#ifdef __MINGW32__
272	\|\| zOrigName[0]=='\\'
273	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
274	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
275	#endif
276	){
	@@ -311,11 +314,11 @@
311	** contain no "/./" or "/../" terms.
312	*/
313	int file_is_canonical(const char *z){
314	int i;
315	if( z[0]!='/'
316	#ifdef __MINGW32__
317	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
318	#endif
319	) return 0;
320
321	for(i=0; z[i]; i++){
322

	--- src/file.c
	+++ src/file.c
	@@ -83,11 +83,14 @@
83	** Return TRUE if the named file is an executable. Return false
84	** for directories, devices, fifos, symlinks, etc.
85	*/
86	int file_isexe(const char *zFilename){
87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88	#if defined(_WIN32)
89	# if defined(__DMC__) \|\| defined(_MSC_VER)
90	# define S_IXUSR _S_IEXEC
91	# endif
92	return ((S_IXUSR)&fileStat.st_mode)!=0;
93	#else
94	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
95	#endif
96	}
	@@ -145,11 +148,11 @@
148
149	/*
150	** Set or clear the execute bit on a file.
151	*/
152	void file_setexe(const char *zFilename, int onoff){
153	#if !defined(_WIN32)
154	struct stat buf;
155	if( stat(zFilename, &buf)!=0 ) return;
156	if( onoff ){
157	if( (buf.st_mode & 0111)!=0111 ){
158	chmod(zFilename, buf.st_mode \| 0111);
	@@ -157,11 +160,11 @@
160	}else{
161	if( (buf.st_mode & 0111)!=0 ){
162	chmod(zFilename, buf.st_mode & ~0111);
163	}
164	}
165	#endif /* _WIN32 */
166	}
167
168	/*
169	** Create the directory named in the argument, if it does not already
170	** exist. If forceFlag is 1, delete any prior non-directory object
	@@ -174,11 +177,11 @@
177	if( rc==2 ){
178	if( !forceFlag ) return 1;
179	unlink(zName);
180	}
181	if( rc!=1 ){
182	#if defined(_WIN32)
183	return mkdir(zName);
184	#else
185	return mkdir(zName, 0755);
186	#endif
187	}
	@@ -231,11 +234,11 @@
234	** Changes are made in-place. Return the new name length.
235	*/
236	int file_simplify_name(char *z, int n){
237	int i, j;
238	if( n<0 ) n = strlen(z);
239	#if defined(_WIN32)
240	for(i=0; i<n; i++){
241	if( z[i]=='\\' ) z[i] = '/';
242	}
243	#endif
244	while( n>1 && z[n-1]=='/' ){ n--; }
	@@ -266,11 +269,11 @@
269	** Remove all /./ path elements.
270	** Convert /A/../ to just /
271	*/
272	void file_canonical_name(const char zOrigName, Blob pOut){
273	if( zOrigName[0]=='/'
274	#if defined(_WIN32)
275	\|\| zOrigName[0]=='\\'
276	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
277	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
278	#endif
279	){
	@@ -311,11 +314,11 @@
314	** contain no "/./" or "/../" terms.
315	*/
316	int file_is_canonical(const char *z){
317	int i;
318	if( z[0]!='/'
319	#if defined(_WIN32)
320	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
321	#endif
322	) return 0;
323
324	for(i=0; z[i]; i++){
325

M src/finfo.c

+11 -9

		--- src/finfo.c
		+++ src/finfo.c
		@@ -136,11 +136,11 @@
136	136	hyperlinked_path(zFilename, &title);
137	137	@ <h2>%b(&title)</h2>
138	138	blob_reset(&title);
139	139	pGraph = graph_init();
140	140	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
141		- @ <table cellspacing=0 border=0 cellpadding=0>
	141	+ @ <table class="timelineTable">
142	142	while( db_step(&q)==SQLITE_ROW ){
143	143	const char *zDate = db_column_text(&q, 0);
144	144	const char *zCom = db_column_text(&q, 1);
145	145	const char *zUser = db_column_text(&q, 2);
146	146	int fpid = db_column_int(&q, 3);
		@@ -157,22 +157,22 @@
157	157	if( zBr==0 ) zBr = "trunk";
158	158	gidx = graph_add_row(pGraph, frid, fpid>0 ? 1 : 0, &fpid, zBr, zBgClr);
159	159	if( memcmp(zDate, zPrevDate, 10) ){
160	160	sprintf(zPrevDate, "%.10s", zDate);
161	161	@ <tr><td>
162		- @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
	162	+ @ <div class="divider">%s(zPrevDate)</div>
163	163	@ </td></tr>
164	164	}
165	165	memcpy(zTime, &zDate[11], 5);
166	166	zTime[5] = 0;
167		- @ <tr><td valign="top" align="right">
	167	+ @ <tr><td class="timelineTime">
168	168	@ <a href="%s(g.zTop)/timeline?c=%t(zDate)">%s(zTime)</a></td>
169		- @ <td width="20" align="left" valign="top"><div id="m%d(gidx)"></div></td>
	169	+ @ <td class="timelineGraph"><div id="m%d(gidx)"></div></td>
170	170	if( zBgClr && zBgClr[0] ){
171		- @ <td valign="top" align="left" bgcolor="%h(zBgClr)">
	171	+ @ <td class="timelineTableCell" style="background-color: %h(zBgClr);">
172	172	}else{
173		- @ <td valign="top" align="left">
	173	+ @ <td class="timelineTableCell">
174	174	}
175	175	sqlite3_snprintf(sizeof(zShort), zShort, "%.10s", zUuid);
176	176	sqlite3_snprintf(sizeof(zShortCkin), zShortCkin, "%.10s", zCkin);
177	177	if( zUuid ){
178	178	if( g.okHistory ){
		@@ -187,27 +187,29 @@
187	187	hyperlink_to_uuid(zShortCkin);
188	188	@ %h(zCom) (user:
189	189	hyperlink_to_user(zUser, zDate, "");
190	190	@ branch: %h(zBr))
191	191	if( g.okHistory && zUuid ){
	192	+ const char *z = zFilename;
192	193	if( fpid ){
193	194	@ <a href="%s(g.zTop)/fdiff?v1=%s(zPUuid)&v2=%s(zUuid)">[diff]</a>
194	195	}
195		- @ <a href="%s(g.zTop)/annotate?checkin=%S(zCkin)&filename=%h(zFilename)">
	196	+ @ <a href="%s(g.zTop)/annotate?checkin=%S(zCkin)&filename=%h(z)">
196	197	@ [annotate]</a>
197	198	}
198		- @ </td>
	199	+ @ </td></tr>
199	200	}
200	201	db_finalize(&q);
201	202	if( pGraph ){
202	203	graph_finish(pGraph, 1);
203	204	if( pGraph->nErr ){
204	205	graph_free(pGraph);
205	206	pGraph = 0;
206	207	}else{
207		- @ <tr><td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>
	208	+ @ <tr><td></td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>
	209	+ @ </td></tr>
208	210	}
209	211	}
210	212	@ </table>
211	213	timeline_output_graph_javascript(pGraph);
212	214	style_footer();
213	215	}
214	216

	--- src/finfo.c
	+++ src/finfo.c
	@@ -136,11 +136,11 @@
136	hyperlinked_path(zFilename, &title);
137	@ <h2>%b(&title)</h2>
138	blob_reset(&title);
139	pGraph = graph_init();
140	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
141	@ <table cellspacing=0 border=0 cellpadding=0>
142	while( db_step(&q)==SQLITE_ROW ){
143	const char *zDate = db_column_text(&q, 0);
144	const char *zCom = db_column_text(&q, 1);
145	const char *zUser = db_column_text(&q, 2);
146	int fpid = db_column_int(&q, 3);
	@@ -157,22 +157,22 @@
157	if( zBr==0 ) zBr = "trunk";
158	gidx = graph_add_row(pGraph, frid, fpid>0 ? 1 : 0, &fpid, zBr, zBgClr);
159	if( memcmp(zDate, zPrevDate, 10) ){
160	sprintf(zPrevDate, "%.10s", zDate);
161	@ <tr><td>
162	@ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
163	@ </td></tr>
164	}
165	memcpy(zTime, &zDate[11], 5);
166	zTime[5] = 0;
167	@ <tr><td valign="top" align="right">
168	@ <a href="%s(g.zTop)/timeline?c=%t(zDate)">%s(zTime)</a></td>
169	@ <td width="20" align="left" valign="top"><div id="m%d(gidx)"></div></td>
170	if( zBgClr && zBgClr[0] ){
171	@ <td valign="top" align="left" bgcolor="%h(zBgClr)">
172	}else{
173	@ <td valign="top" align="left">
174	}
175	sqlite3_snprintf(sizeof(zShort), zShort, "%.10s", zUuid);
176	sqlite3_snprintf(sizeof(zShortCkin), zShortCkin, "%.10s", zCkin);
177	if( zUuid ){
178	if( g.okHistory ){
	@@ -187,27 +187,29 @@
187	hyperlink_to_uuid(zShortCkin);
188	@ %h(zCom) (user:
189	hyperlink_to_user(zUser, zDate, "");
190	@ branch: %h(zBr))
191	if( g.okHistory && zUuid ){

192	if( fpid ){
193	@ <a href="%s(g.zTop)/fdiff?v1=%s(zPUuid)&v2=%s(zUuid)">[diff]</a>
194	}
195	@ <a href="%s(g.zTop)/annotate?checkin=%S(zCkin)&filename=%h(zFilename)">
196	@ [annotate]</a>
197	}
198	@ </td>
199	}
200	db_finalize(&q);
201	if( pGraph ){
202	graph_finish(pGraph, 1);
203	if( pGraph->nErr ){
204	graph_free(pGraph);
205	pGraph = 0;
206	}else{
207	@ <tr><td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>

208	}
209	}
210	@ </table>
211	timeline_output_graph_javascript(pGraph);
212	style_footer();
213	}
214

	--- src/finfo.c
	+++ src/finfo.c
	@@ -136,11 +136,11 @@
136	hyperlinked_path(zFilename, &title);
137	@ <h2>%b(&title)</h2>
138	blob_reset(&title);
139	pGraph = graph_init();
140	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
141	@ <table class="timelineTable">
142	while( db_step(&q)==SQLITE_ROW ){
143	const char *zDate = db_column_text(&q, 0);
144	const char *zCom = db_column_text(&q, 1);
145	const char *zUser = db_column_text(&q, 2);
146	int fpid = db_column_int(&q, 3);
	@@ -157,22 +157,22 @@
157	if( zBr==0 ) zBr = "trunk";
158	gidx = graph_add_row(pGraph, frid, fpid>0 ? 1 : 0, &fpid, zBr, zBgClr);
159	if( memcmp(zDate, zPrevDate, 10) ){
160	sprintf(zPrevDate, "%.10s", zDate);
161	@ <tr><td>
162	@ <div class="divider">%s(zPrevDate)</div>
163	@ </td></tr>
164	}
165	memcpy(zTime, &zDate[11], 5);
166	zTime[5] = 0;
167	@ <tr><td class="timelineTime">
168	@ <a href="%s(g.zTop)/timeline?c=%t(zDate)">%s(zTime)</a></td>
169	@ <td class="timelineGraph"><div id="m%d(gidx)"></div></td>
170	if( zBgClr && zBgClr[0] ){
171	@ <td class="timelineTableCell" style="background-color: %h(zBgClr);">
172	}else{
173	@ <td class="timelineTableCell">
174	}
175	sqlite3_snprintf(sizeof(zShort), zShort, "%.10s", zUuid);
176	sqlite3_snprintf(sizeof(zShortCkin), zShortCkin, "%.10s", zCkin);
177	if( zUuid ){
178	if( g.okHistory ){
	@@ -187,27 +187,29 @@
187	hyperlink_to_uuid(zShortCkin);
188	@ %h(zCom) (user:
189	hyperlink_to_user(zUser, zDate, "");
190	@ branch: %h(zBr))
191	if( g.okHistory && zUuid ){
192	const char *z = zFilename;
193	if( fpid ){
194	@ <a href="%s(g.zTop)/fdiff?v1=%s(zPUuid)&v2=%s(zUuid)">[diff]</a>
195	}
196	@ <a href="%s(g.zTop)/annotate?checkin=%S(zCkin)&filename=%h(z)">
197	@ [annotate]</a>
198	}
199	@ </td></tr>
200	}
201	db_finalize(&q);
202	if( pGraph ){
203	graph_finish(pGraph, 1);
204	if( pGraph->nErr ){
205	graph_free(pGraph);
206	pGraph = 0;
207	}else{
208	@ <tr><td></td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>
209	@ </td></tr>
210	}
211	}
212	@ </table>
213	timeline_output_graph_javascript(pGraph);
214	style_footer();
215	}
216

M src/graph.c

+104 -58

		--- src/graph.c
		+++ src/graph.c
		@@ -21,12 +21,12 @@
21	21	#include "graph.h"
22	22	#include <assert.h>
23	23
24	24	#if INTERFACE
25	25
26		-#define GR_MAX_PARENT 10
27		-#define GR_MAX_RAIL 32
	26	+#define GR_MAX_PARENT 10 /* Most parents for any one node */
	27	+#define GR_MAX_RAIL 32 /* Max number of "rails" to display */
28	28
29	29	/* The graph appears vertically beside a timeline. Each row in the
30	30	** timeline corresponds to a row in the graph.
31	31	*/
32	32	struct GraphRow {
		@@ -38,11 +38,12 @@
38	38
39	39	GraphRow pNext; / Next row down in the list of all rows */
40	40	GraphRow pPrev; / Previous row */
41	41
42	42	int idx; /* Row index. First is 1. 0 used for "none" */
43		- u8 isLeaf; /* True if no direct child nodes */
	43	+ int idxTop; /* Direct descendent highest up on the graph */
	44	+ GraphRow pChild; / Child immediately above this node */
44	45	u8 isDup; /* True if this is duplicate of a prior entry */
45	46	int iRail; /* Which rail this check-in appears on. 0-based.*/
46	47	int aiRaiser[GR_MAX_RAIL]; /* Raisers from this node to a higher row. */
47	48	int bDescender; /* Raiser from bottom of graph to here. */
48	49	u32 mergeIn; /* Merge in from other rails */
		@@ -53,20 +54,19 @@
53	54	};
54	55
55	56	/* Context while building a graph
56	57	*/
57	58	struct GraphContext {
58		- int nErr; /* Number of errors encountered */
59		- int mxRail; /* Number of rails required to render the graph */
60		- GraphRow pFirst; / First row in the list */
61		- GraphRow pLast; / Last row in the list */
62		- int nBranch; /* Number of distinct branches */
63		- char *azBranch; / Names of the branches */
	59	+ int nErr; /* Number of errors encountered */
	60	+ int mxRail; /* Number of rails required to render the graph */
	61	+ GraphRow pFirst; / First row in the list */
	62	+ GraphRow pLast; / Last row in the list */
	63	+ int nBranch; /* Number of distinct branches */
	64	+ char *azBranch; / Names of the branches */
64	65	int nRow; /* Number of rows */
65		- int railMap[GR_MAX_RAIL]; /* Rail order mapping */
66	66	int nHash; /* Number of slots in apHash[] */
67		- GraphRow *apHash; / Hash table of rows */
	67	+ GraphRow *apHash; / Hash table of GraphRow objects. Key: rid */
68	68	};
69	69
70	70	#endif
71	71
72	72	/*
		@@ -103,13 +103,13 @@
103	103	free(p->apHash);
104	104	free(p);
105	105	}
106	106
107	107	/*
108		-** Insert a row into the hash table. If there is already another
109		-** row with the same rid, overwrite the prior entry if the overwrite
110		-** flag is set.
	108	+** Insert a row into the hash table. pRow->rid is the key. Keys must
	109	+** be unique. If there is already another row with the same rid,
	110	+** overwrite the prior entry if and only if the overwrite flag is set.
111	111	*/
112	112	static void hashInsert(GraphContext p, GraphRow pRow, int overwrite){
113	113	int h;
114	114	h = pRow->rid % p->nHash;
115	115	while( p->apHash[h] && p->apHash[h]->rid!=pRow->rid ){
		@@ -135,10 +135,14 @@
135	135
136	136	/*
137	137	** Return the canonical pointer for a given branch name.
138	138	** Multiple calls to this routine with equivalent strings
139	139	** will return the same pointer.
	140	+**
	141	+** The returned value is a pointer to a (readonly) string that
	142	+** has the useful property that strings can be checked for
	143	+** equality by comparing pointers.
140	144	**
141	145	** Note: also used for background color names.
142	146	*/
143	147	static char persistBranchName(GraphContext p, const char *zBranch){
144	148	int i;
		@@ -151,11 +155,11 @@
151	155	p->azBranch[p->nBranch-1] = mprintf("%s", zBranch);
152	156	return p->azBranch[p->nBranch-1];
153	157	}
154	158
155	159	/*
156		-** Add a new row t the graph context. Rows are added from top to bottom.
	160	+** Add a new row to the graph context. Rows are added from top to bottom.
157	161	*/
158	162	int graph_add_row(
159	163	GraphContext p, / The context to which the row is added */
160	164	int rid, /* RID for the check-in */
161	165	int nParent, /* Number of parents */
		@@ -179,11 +183,11 @@
179	183	}else{
180	184	p->pLast->pNext = pRow;
181	185	}
182	186	p->pLast = pRow;
183	187	p->nRow++;
184		- pRow->idx = p->nRow;
	188	+ pRow->idx = pRow->idxTop = p->nRow;
185	189	return pRow->idx;
186	190	}
187	191
188	192	/*
189	193	** Return the index of a rail currently not in use for any row between
		@@ -219,16 +223,46 @@
219	223	}
220	224	}
221	225	if( iBestDist>1000 ) p->nErr++;
222	226	return iBest;
223	227	}
	228	+
	229	+/*
	230	+** Assign all children of node pBottom to the same rail as pBottom.
	231	+*/
	232	+static void assignChildrenToRail(GraphRow *pBottom){
	233	+ int iRail = pBottom->iRail;
	234	+ GraphRow *pCurrent;
	235	+ GraphRow *pPrior;
	236	+ u32 mask = 1<<iRail;
	237	+
	238	+ pBottom->iRail = iRail;
	239	+ pBottom->railInUse \|= mask;
	240	+ pPrior = pBottom;
	241	+ for(pCurrent=pBottom->pChild; pCurrent; pCurrent=pCurrent->pChild){
	242	+ assert( pPrior->idx > pCurrent->idx );
	243	+ assert( pCurrent->iRail<0 );
	244	+ pCurrent->iRail = iRail;
	245	+ pCurrent->railInUse \|= mask;
	246	+ pPrior->aiRaiser[iRail] = pCurrent->idx;
	247	+ while( pPrior->idx > pCurrent->idx ){
	248	+ pPrior->railInUse \|= mask;
	249	+ pPrior = pPrior->pPrev;
	250	+ assert( pPrior!=0 );
	251	+ }
	252	+ if( pCurrent->pPrev ){
	253	+ pCurrent->pPrev->railInUse \|= mask;
	254	+ }
	255	+ }
	256	+}
	257	+
224	258
225	259	/*
226	260	** Compute the complete graph
227	261	*/
228	262	void graph_finish(GraphContext *p, int omitDescenders){
229		- GraphRow pRow, pDesc, pDup, pLoop;
	263	+ GraphRow pRow, pDesc, pDup, pLoop, *pParent;
230	264	int i;
231	265	u32 mask;
232	266	u32 inUse;
233	267	int hasDup = 0; /* True if one or more isDup entries */
234	268	const char *zTrunk;
		@@ -248,11 +282,17 @@
248	282	}
249	283	hashInsert(p, pRow, 1);
250	284	}
251	285	p->mxRail = -1;
252	286
253		- /* Purge merge-parents that are out-of-graph
	287	+ /* Purge merge-parents that are out-of-graph.
	288	+ **
	289	+ ** Each node has one primary parent and zero or more "merge" parents.
	290	+ ** A merge parent is a prior checkin from which changes were merged into
	291	+ ** the current check-in. If a merge parent is not in the visible section
	292	+ ** of this graph, then no arrows will be drawn for it, so remove it from
	293	+ ** the aParent[] array.
254	294	*/
255	295	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
256	296	for(i=1; i<pRow->nParent; i++){
257	297	if( hashFind(p, pRow->aParent[i])==0 ){
258	298	pRow->aParent[i] = pRow->aParent[--pRow->nParent];
		@@ -259,99 +299,106 @@
259	299	i--;
260	300	}
261	301	}
262	302	}
263	303
264		- /* Figure out which nodes have no direct children (children on
265		- ** the same rail). Mark such nodes as isLeaf.
	304	+ /* Find the pChild pointer for each node.
	305	+ **
	306	+ ** The pChild points to node directly above on the same rail.
	307	+ ** The pChild must be in the same branch. Leaf nodes have a NULL
	308	+ ** pChild.
	309	+ **
	310	+ ** In the case of a fork, choose the pChild that results in the
	311	+ ** longest rail.
266	312	*/
267		- memset(p->apHash, 0, sizeof(p->apHash[0])*p->nHash);
268		- for(pRow=p->pLast; pRow; pRow=pRow->pPrev) pRow->isLeaf = 1;
269		- for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
270		- GraphRow *pParent;
271		- hashInsert(p, pRow, 0);
272		- if( !pRow->isDup
273		- && pRow->nParent>0
274		- && (pParent = hashFind(p, pRow->aParent[0]))!=0
275		- && pRow->zBranch==pParent->zBranch
276		- ){
277		- pParent->isLeaf = 0;
	313	+ for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
	314	+ if( pRow->isDup ) continue;
	315	+ if( pRow->nParent==0 ) continue;
	316	+ pParent = hashFind(p, pRow->aParent[0]);
	317	+ if( pParent==0 ) continue;
	318	+ if( pParent->zBranch!=pRow->zBranch ) continue;
	319	+ if( pParent->idx <= pRow->idx ) continue;
	320	+ if( pRow->idxTop < pParent->idxTop ){
	321	+ pParent->pChild = pRow;
	322	+ pParent->idxTop = pRow->idxTop;
278	323	}
279	324	}
280	325
281	326	/* Identify rows where the primary parent is off screen. Assign
282	327	** each to a rail and draw descenders to the bottom of the screen.
	328	+ **
	329	+ ** Strive to put the "trunk" branch on far left.
283	330	*/
284	331	zTrunk = persistBranchName(p, "trunk");
285	332	for(i=0; i<2; i++){
286		- for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
	333	+ for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
287	334	if( i==0 ){
288	335	if( pRow->zBranch!=zTrunk ) continue;
289	336	}else {
290	337	if( pRow->iRail>=0 ) continue;
291	338	}
292	339	if( pRow->nParent==0 \|\| hashFind(p,pRow->aParent[0])==0 ){
293	340	if( omitDescenders ){
294		- pRow->iRail = findFreeRail(p, pRow->idx, pRow->idx, 0, 0);
	341	+ pRow->iRail = findFreeRail(p, pRow->idxTop, pRow->idx, 0, 0);
295	342	}else{
296	343	pRow->iRail = ++p->mxRail;
297	344	}
298	345	mask = 1<<(pRow->iRail);
299	346	if( omitDescenders ){
300	347	if( pRow->pNext ) pRow->pNext->railInUse \|= mask;
301		- for(pDesc=pRow; pDesc; pDesc=pDesc->pPrev){
302		- pDesc->railInUse \|= mask;
303		- if( pDesc->zBranch==pRow->zBranch && pDesc->isLeaf ) break;
304		- }
305	348	}else{
306	349	pRow->bDescender = pRow->nParent>0;
307		- for(pDesc=pRow; pDesc; pDesc=pDesc->pNext){
308		- pDesc->railInUse \|= mask;
	350	+ for(pLoop=pRow; pLoop; pLoop=pLoop->pNext){
	351	+ pLoop->railInUse \|= mask;
309	352	}
310	353	}
	354	+ assignChildrenToRail(pRow);
311	355	}
312	356	}
313	357	}
314	358
315	359	/* Assign rails to all rows that are still unassigned.
316		- ** The first primary child of a row goes on the same rail as
317		- ** that row.
318	360	*/
319	361	inUse = (1<<(p->mxRail+1))-1;
320	362	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
321	363	int parentRid;
322		- if( pRow->iRail>=0 ) continue;
	364	+
	365	+ if( pRow->iRail>=0 ){
	366	+ if( pRow->pChild==0 ) inUse &= ~(1<<pRow->iRail);
	367	+ continue;
	368	+ }
323	369	if( pRow->isDup ){
324	370	pRow->iRail = findFreeRail(p, pRow->idx, pRow->idx, inUse, 0);
325	371	pDesc = pRow;
	372	+ pParent = 0;
326	373	}else{
327	374	assert( pRow->nParent>0 );
328	375	parentRid = pRow->aParent[0];
329		- pDesc = hashFind(p, parentRid);
330		- if( pDesc==0 ){
	376	+ pParent = hashFind(p, parentRid);
	377	+ if( pParent==0 ){
331	378	/* Time skew */
332	379	pRow->iRail = ++p->mxRail;
333	380	pRow->railInUse = 1<<pRow->iRail;
334	381	continue;
335	382	}
336		- if( pDesc->aiRaiser[pDesc->iRail]==0 && pDesc->zBranch==pRow->zBranch ){
337		- pRow->iRail = pDesc->iRail;
338		- }else{
339		- pRow->iRail = findFreeRail(p, 0, pDesc->idx, inUse, pDesc->iRail);
340		- }
341		- pDesc->aiRaiser[pRow->iRail] = pRow->idx;
	383	+ pRow->iRail = findFreeRail(p, 0, pParent->idx, inUse, pParent->iRail);
	384	+ pParent->aiRaiser[pRow->iRail] = pRow->idx;
342	385	}
343	386	mask = 1<<pRow->iRail;
344		- if( pRow->isLeaf ){
	387	+ if( pRow->pPrev ) pRow->pPrev->railInUse \|= mask;
	388	+ if( pRow->pNext ) pRow->pNext->railInUse \|= mask;
	389	+ if( pRow->pChild==0 ){
345	390	inUse &= ~mask;
346	391	}else{
347	392	inUse \|= mask;
	393	+ assignChildrenToRail(pRow);
348	394	}
349		- for(pLoop=pRow; pLoop && pLoop!=pDesc; pLoop=pLoop->pNext){
350		- pLoop->railInUse \|= mask;
	395	+ if( pParent ){
	396	+ for(pLoop=pParent; pLoop && pLoop!=pRow; pLoop=pLoop->pPrev){
	397	+ pLoop->railInUse \|= mask;
	398	+ }
351	399	}
352		- pDesc->railInUse \|= mask;
353	400	}
354	401
355	402	/*
356	403	** Insert merge rails and merge arrows
357	404	*/
		@@ -364,13 +411,13 @@
364	411	int iTarget = (pRow->iRail + pDesc->iRail)/2;
365	412	pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0, iTarget);
366	413	pDesc->mergeUpto = pRow->idx;
367	414	mask = 1<<pDesc->mergeOut;
368	415	pDesc->railInUse \|= mask;
369		- for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid;
370		- pDesc=pDesc->pNext){
371		- pDesc->railInUse \|= mask;
	416	+ for(pLoop=pRow->pNext; pLoop && pLoop->rid!=parentRid;
	417	+ pLoop=pLoop->pNext){
	418	+ pLoop->railInUse \|= mask;
372	419	}
373	420	}
374	421	pRow->mergeIn \|= 1<<pDesc->mergeOut;
375	422	}
376	423	}
		@@ -398,12 +445,11 @@
398	445	}
399	446
400	447	/*
401	448	** Find the maximum rail number.
402	449	*/
403		- for(i=0; i<GR_MAX_RAIL; i++) p->railMap[i] = i;
404	450	p->mxRail = 0;
405	451	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
406	452	if( pRow->iRail>p->mxRail ) p->mxRail = pRow->iRail;
407	453	if( pRow->mergeOut>p->mxRail ) p->mxRail = pRow->mergeOut;
408	454	}
409	455	}
410	456

	--- src/graph.c
	+++ src/graph.c
	@@ -21,12 +21,12 @@
21	#include "graph.h"
22	#include <assert.h>
23
24	#if INTERFACE
25
26	#define GR_MAX_PARENT 10
27	#define GR_MAX_RAIL 32
28
29	/* The graph appears vertically beside a timeline. Each row in the
30	** timeline corresponds to a row in the graph.
31	*/
32	struct GraphRow {
	@@ -38,11 +38,12 @@
38
39	GraphRow pNext; / Next row down in the list of all rows */
40	GraphRow pPrev; / Previous row */
41
42	int idx; /* Row index. First is 1. 0 used for "none" */
43	u8 isLeaf; /* True if no direct child nodes */

44	u8 isDup; /* True if this is duplicate of a prior entry */
45	int iRail; /* Which rail this check-in appears on. 0-based.*/
46	int aiRaiser[GR_MAX_RAIL]; /* Raisers from this node to a higher row. */
47	int bDescender; /* Raiser from bottom of graph to here. */
48	u32 mergeIn; /* Merge in from other rails */
	@@ -53,20 +54,19 @@
53	};
54
55	/* Context while building a graph
56	*/
57	struct GraphContext {
58	int nErr; /* Number of errors encountered */
59	int mxRail; /* Number of rails required to render the graph */
60	GraphRow pFirst; / First row in the list */
61	GraphRow pLast; / Last row in the list */
62	int nBranch; /* Number of distinct branches */
63	char *azBranch; / Names of the branches */
64	int nRow; /* Number of rows */
65	int railMap[GR_MAX_RAIL]; /* Rail order mapping */
66	int nHash; /* Number of slots in apHash[] */
67	GraphRow *apHash; / Hash table of rows */
68	};
69
70	#endif
71
72	/*
	@@ -103,13 +103,13 @@
103	free(p->apHash);
104	free(p);
105	}
106
107	/*
108	** Insert a row into the hash table. If there is already another
109	** row with the same rid, overwrite the prior entry if the overwrite
110	** flag is set.
111	*/
112	static void hashInsert(GraphContext p, GraphRow pRow, int overwrite){
113	int h;
114	h = pRow->rid % p->nHash;
115	while( p->apHash[h] && p->apHash[h]->rid!=pRow->rid ){
	@@ -135,10 +135,14 @@
135
136	/*
137	** Return the canonical pointer for a given branch name.
138	** Multiple calls to this routine with equivalent strings
139	** will return the same pointer.




140	**
141	** Note: also used for background color names.
142	*/
143	static char persistBranchName(GraphContext p, const char *zBranch){
144	int i;
	@@ -151,11 +155,11 @@
151	p->azBranch[p->nBranch-1] = mprintf("%s", zBranch);
152	return p->azBranch[p->nBranch-1];
153	}
154
155	/*
156	** Add a new row t the graph context. Rows are added from top to bottom.
157	*/
158	int graph_add_row(
159	GraphContext p, / The context to which the row is added */
160	int rid, /* RID for the check-in */
161	int nParent, /* Number of parents */
	@@ -179,11 +183,11 @@
179	}else{
180	p->pLast->pNext = pRow;
181	}
182	p->pLast = pRow;
183	p->nRow++;
184	pRow->idx = p->nRow;
185	return pRow->idx;
186	}
187
188	/*
189	** Return the index of a rail currently not in use for any row between
	@@ -219,16 +223,46 @@
219	}
220	}
221	if( iBestDist>1000 ) p->nErr++;
222	return iBest;
223	}






























224
225	/*
226	** Compute the complete graph
227	*/
228	void graph_finish(GraphContext *p, int omitDescenders){
229	GraphRow pRow, pDesc, pDup, pLoop;
230	int i;
231	u32 mask;
232	u32 inUse;
233	int hasDup = 0; /* True if one or more isDup entries */
234	const char *zTrunk;
	@@ -248,11 +282,17 @@
248	}
249	hashInsert(p, pRow, 1);
250	}
251	p->mxRail = -1;
252
253	/* Purge merge-parents that are out-of-graph






254	*/
255	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
256	for(i=1; i<pRow->nParent; i++){
257	if( hashFind(p, pRow->aParent[i])==0 ){
258	pRow->aParent[i] = pRow->aParent[--pRow->nParent];
	@@ -259,99 +299,106 @@
259	i--;
260	}
261	}
262	}
263
264	/* Figure out which nodes have no direct children (children on
265	** the same rail). Mark such nodes as isLeaf.






266	*/
267	memset(p->apHash, 0, sizeof(p->apHash[0])*p->nHash);
268	for(pRow=p->pLast; pRow; pRow=pRow->pPrev) pRow->isLeaf = 1;
269	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
270	GraphRow *pParent;
271	hashInsert(p, pRow, 0);
272	if( !pRow->isDup
273	&& pRow->nParent>0
274	&& (pParent = hashFind(p, pRow->aParent[0]))!=0
275	&& pRow->zBranch==pParent->zBranch
276	){
277	pParent->isLeaf = 0;
278	}
279	}
280
281	/* Identify rows where the primary parent is off screen. Assign
282	** each to a rail and draw descenders to the bottom of the screen.


283	*/
284	zTrunk = persistBranchName(p, "trunk");
285	for(i=0; i<2; i++){
286	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
287	if( i==0 ){
288	if( pRow->zBranch!=zTrunk ) continue;
289	}else {
290	if( pRow->iRail>=0 ) continue;
291	}
292	if( pRow->nParent==0 \|\| hashFind(p,pRow->aParent[0])==0 ){
293	if( omitDescenders ){
294	pRow->iRail = findFreeRail(p, pRow->idx, pRow->idx, 0, 0);
295	}else{
296	pRow->iRail = ++p->mxRail;
297	}
298	mask = 1<<(pRow->iRail);
299	if( omitDescenders ){
300	if( pRow->pNext ) pRow->pNext->railInUse \|= mask;
301	for(pDesc=pRow; pDesc; pDesc=pDesc->pPrev){
302	pDesc->railInUse \|= mask;
303	if( pDesc->zBranch==pRow->zBranch && pDesc->isLeaf ) break;
304	}
305	}else{
306	pRow->bDescender = pRow->nParent>0;
307	for(pDesc=pRow; pDesc; pDesc=pDesc->pNext){
308	pDesc->railInUse \|= mask;
309	}
310	}

311	}
312	}
313	}
314
315	/* Assign rails to all rows that are still unassigned.
316	** The first primary child of a row goes on the same rail as
317	** that row.
318	*/
319	inUse = (1<<(p->mxRail+1))-1;
320	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
321	int parentRid;
322	if( pRow->iRail>=0 ) continue;




323	if( pRow->isDup ){
324	pRow->iRail = findFreeRail(p, pRow->idx, pRow->idx, inUse, 0);
325	pDesc = pRow;

326	}else{
327	assert( pRow->nParent>0 );
328	parentRid = pRow->aParent[0];
329	pDesc = hashFind(p, parentRid);
330	if( pDesc==0 ){
331	/* Time skew */
332	pRow->iRail = ++p->mxRail;
333	pRow->railInUse = 1<<pRow->iRail;
334	continue;
335	}
336	if( pDesc->aiRaiser[pDesc->iRail]==0 && pDesc->zBranch==pRow->zBranch ){
337	pRow->iRail = pDesc->iRail;
338	}else{
339	pRow->iRail = findFreeRail(p, 0, pDesc->idx, inUse, pDesc->iRail);
340	}
341	pDesc->aiRaiser[pRow->iRail] = pRow->idx;
342	}
343	mask = 1<<pRow->iRail;
344	if( pRow->isLeaf ){


345	inUse &= ~mask;
346	}else{
347	inUse \|= mask;

348	}
349	for(pLoop=pRow; pLoop && pLoop!=pDesc; pLoop=pLoop->pNext){
350	pLoop->railInUse \|= mask;


351	}
352	pDesc->railInUse \|= mask;
353	}
354
355	/*
356	** Insert merge rails and merge arrows
357	*/
	@@ -364,13 +411,13 @@
364	int iTarget = (pRow->iRail + pDesc->iRail)/2;
365	pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0, iTarget);
366	pDesc->mergeUpto = pRow->idx;
367	mask = 1<<pDesc->mergeOut;
368	pDesc->railInUse \|= mask;
369	for(pDesc=pRow->pNext; pDesc && pDesc->rid!=parentRid;
370	pDesc=pDesc->pNext){
371	pDesc->railInUse \|= mask;
372	}
373	}
374	pRow->mergeIn \|= 1<<pDesc->mergeOut;
375	}
376	}
	@@ -398,12 +445,11 @@
398	}
399
400	/*
401	** Find the maximum rail number.
402	*/
403	for(i=0; i<GR_MAX_RAIL; i++) p->railMap[i] = i;
404	p->mxRail = 0;
405	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
406	if( pRow->iRail>p->mxRail ) p->mxRail = pRow->iRail;
407	if( pRow->mergeOut>p->mxRail ) p->mxRail = pRow->mergeOut;
408	}
409	}
410

	--- src/graph.c
	+++ src/graph.c
	@@ -21,12 +21,12 @@
21	#include "graph.h"
22	#include <assert.h>
23
24	#if INTERFACE
25
26	#define GR_MAX_PARENT 10 /* Most parents for any one node */
27	#define GR_MAX_RAIL 32 /* Max number of "rails" to display */
28
29	/* The graph appears vertically beside a timeline. Each row in the
30	** timeline corresponds to a row in the graph.
31	*/
32	struct GraphRow {
	@@ -38,11 +38,12 @@
38
39	GraphRow pNext; / Next row down in the list of all rows */
40	GraphRow pPrev; / Previous row */
41
42	int idx; /* Row index. First is 1. 0 used for "none" */
43	int idxTop; /* Direct descendent highest up on the graph */
44	GraphRow pChild; / Child immediately above this node */
45	u8 isDup; /* True if this is duplicate of a prior entry */
46	int iRail; /* Which rail this check-in appears on. 0-based.*/
47	int aiRaiser[GR_MAX_RAIL]; /* Raisers from this node to a higher row. */
48	int bDescender; /* Raiser from bottom of graph to here. */
49	u32 mergeIn; /* Merge in from other rails */
	@@ -53,20 +54,19 @@
54	};
55
56	/* Context while building a graph
57	*/
58	struct GraphContext {
59	int nErr; /* Number of errors encountered */
60	int mxRail; /* Number of rails required to render the graph */
61	GraphRow pFirst; / First row in the list */
62	GraphRow pLast; / Last row in the list */
63	int nBranch; /* Number of distinct branches */
64	char *azBranch; / Names of the branches */
65	int nRow; /* Number of rows */

66	int nHash; /* Number of slots in apHash[] */
67	GraphRow *apHash; / Hash table of GraphRow objects. Key: rid */
68	};
69
70	#endif
71
72	/*
	@@ -103,13 +103,13 @@
103	free(p->apHash);
104	free(p);
105	}
106
107	/*
108	** Insert a row into the hash table. pRow->rid is the key. Keys must
109	** be unique. If there is already another row with the same rid,
110	** overwrite the prior entry if and only if the overwrite flag is set.
111	*/
112	static void hashInsert(GraphContext p, GraphRow pRow, int overwrite){
113	int h;
114	h = pRow->rid % p->nHash;
115	while( p->apHash[h] && p->apHash[h]->rid!=pRow->rid ){
	@@ -135,10 +135,14 @@
135
136	/*
137	** Return the canonical pointer for a given branch name.
138	** Multiple calls to this routine with equivalent strings
139	** will return the same pointer.
140	**
141	** The returned value is a pointer to a (readonly) string that
142	** has the useful property that strings can be checked for
143	** equality by comparing pointers.
144	**
145	** Note: also used for background color names.
146	*/
147	static char persistBranchName(GraphContext p, const char *zBranch){
148	int i;
	@@ -151,11 +155,11 @@
155	p->azBranch[p->nBranch-1] = mprintf("%s", zBranch);
156	return p->azBranch[p->nBranch-1];
157	}
158
159	/*
160	** Add a new row to the graph context. Rows are added from top to bottom.
161	*/
162	int graph_add_row(
163	GraphContext p, / The context to which the row is added */
164	int rid, /* RID for the check-in */
165	int nParent, /* Number of parents */
	@@ -179,11 +183,11 @@
183	}else{
184	p->pLast->pNext = pRow;
185	}
186	p->pLast = pRow;
187	p->nRow++;
188	pRow->idx = pRow->idxTop = p->nRow;
189	return pRow->idx;
190	}
191
192	/*
193	** Return the index of a rail currently not in use for any row between
	@@ -219,16 +223,46 @@
223	}
224	}
225	if( iBestDist>1000 ) p->nErr++;
226	return iBest;
227	}
228
229	/*
230	** Assign all children of node pBottom to the same rail as pBottom.
231	*/
232	static void assignChildrenToRail(GraphRow *pBottom){
233	int iRail = pBottom->iRail;
234	GraphRow *pCurrent;
235	GraphRow *pPrior;
236	u32 mask = 1<<iRail;
237
238	pBottom->iRail = iRail;
239	pBottom->railInUse \|= mask;
240	pPrior = pBottom;
241	for(pCurrent=pBottom->pChild; pCurrent; pCurrent=pCurrent->pChild){
242	assert( pPrior->idx > pCurrent->idx );
243	assert( pCurrent->iRail<0 );
244	pCurrent->iRail = iRail;
245	pCurrent->railInUse \|= mask;
246	pPrior->aiRaiser[iRail] = pCurrent->idx;
247	while( pPrior->idx > pCurrent->idx ){
248	pPrior->railInUse \|= mask;
249	pPrior = pPrior->pPrev;
250	assert( pPrior!=0 );
251	}
252	if( pCurrent->pPrev ){
253	pCurrent->pPrev->railInUse \|= mask;
254	}
255	}
256	}
257
258
259	/*
260	** Compute the complete graph
261	*/
262	void graph_finish(GraphContext *p, int omitDescenders){
263	GraphRow pRow, pDesc, pDup, pLoop, *pParent;
264	int i;
265	u32 mask;
266	u32 inUse;
267	int hasDup = 0; /* True if one or more isDup entries */
268	const char *zTrunk;
	@@ -248,11 +282,17 @@
282	}
283	hashInsert(p, pRow, 1);
284	}
285	p->mxRail = -1;
286
287	/* Purge merge-parents that are out-of-graph.
288	**
289	** Each node has one primary parent and zero or more "merge" parents.
290	** A merge parent is a prior checkin from which changes were merged into
291	** the current check-in. If a merge parent is not in the visible section
292	** of this graph, then no arrows will be drawn for it, so remove it from
293	** the aParent[] array.
294	*/
295	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
296	for(i=1; i<pRow->nParent; i++){
297	if( hashFind(p, pRow->aParent[i])==0 ){
298	pRow->aParent[i] = pRow->aParent[--pRow->nParent];
	@@ -259,99 +299,106 @@
299	i--;
300	}
301	}
302	}
303
304	/* Find the pChild pointer for each node.
305	**
306	** The pChild points to node directly above on the same rail.
307	** The pChild must be in the same branch. Leaf nodes have a NULL
308	** pChild.
309	**
310	** In the case of a fork, choose the pChild that results in the
311	** longest rail.
312	*/
313	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
314	if( pRow->isDup ) continue;
315	if( pRow->nParent==0 ) continue;
316	pParent = hashFind(p, pRow->aParent[0]);
317	if( pParent==0 ) continue;
318	if( pParent->zBranch!=pRow->zBranch ) continue;
319	if( pParent->idx <= pRow->idx ) continue;
320	if( pRow->idxTop < pParent->idxTop ){
321	pParent->pChild = pRow;
322	pParent->idxTop = pRow->idxTop;

323	}
324	}
325
326	/* Identify rows where the primary parent is off screen. Assign
327	** each to a rail and draw descenders to the bottom of the screen.
328	**
329	** Strive to put the "trunk" branch on far left.
330	*/
331	zTrunk = persistBranchName(p, "trunk");
332	for(i=0; i<2; i++){
333	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
334	if( i==0 ){
335	if( pRow->zBranch!=zTrunk ) continue;
336	}else {
337	if( pRow->iRail>=0 ) continue;
338	}
339	if( pRow->nParent==0 \|\| hashFind(p,pRow->aParent[0])==0 ){
340	if( omitDescenders ){
341	pRow->iRail = findFreeRail(p, pRow->idxTop, pRow->idx, 0, 0);
342	}else{
343	pRow->iRail = ++p->mxRail;
344	}
345	mask = 1<<(pRow->iRail);
346	if( omitDescenders ){
347	if( pRow->pNext ) pRow->pNext->railInUse \|= mask;




348	}else{
349	pRow->bDescender = pRow->nParent>0;
350	for(pLoop=pRow; pLoop; pLoop=pLoop->pNext){
351	pLoop->railInUse \|= mask;
352	}
353	}
354	assignChildrenToRail(pRow);
355	}
356	}
357	}
358
359	/* Assign rails to all rows that are still unassigned.


360	*/
361	inUse = (1<<(p->mxRail+1))-1;
362	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
363	int parentRid;
364
365	if( pRow->iRail>=0 ){
366	if( pRow->pChild==0 ) inUse &= ~(1<<pRow->iRail);
367	continue;
368	}
369	if( pRow->isDup ){
370	pRow->iRail = findFreeRail(p, pRow->idx, pRow->idx, inUse, 0);
371	pDesc = pRow;
372	pParent = 0;
373	}else{
374	assert( pRow->nParent>0 );
375	parentRid = pRow->aParent[0];
376	pParent = hashFind(p, parentRid);
377	if( pParent==0 ){
378	/* Time skew */
379	pRow->iRail = ++p->mxRail;
380	pRow->railInUse = 1<<pRow->iRail;
381	continue;
382	}
383	pRow->iRail = findFreeRail(p, 0, pParent->idx, inUse, pParent->iRail);
384	pParent->aiRaiser[pRow->iRail] = pRow->idx;




385	}
386	mask = 1<<pRow->iRail;
387	if( pRow->pPrev ) pRow->pPrev->railInUse \|= mask;
388	if( pRow->pNext ) pRow->pNext->railInUse \|= mask;
389	if( pRow->pChild==0 ){
390	inUse &= ~mask;
391	}else{
392	inUse \|= mask;
393	assignChildrenToRail(pRow);
394	}
395	if( pParent ){
396	for(pLoop=pParent; pLoop && pLoop!=pRow; pLoop=pLoop->pPrev){
397	pLoop->railInUse \|= mask;
398	}
399	}

400	}
401
402	/*
403	** Insert merge rails and merge arrows
404	*/
	@@ -364,13 +411,13 @@
411	int iTarget = (pRow->iRail + pDesc->iRail)/2;
412	pDesc->mergeOut = findFreeRail(p, pRow->idx, pDesc->idx, 0, iTarget);
413	pDesc->mergeUpto = pRow->idx;
414	mask = 1<<pDesc->mergeOut;
415	pDesc->railInUse \|= mask;
416	for(pLoop=pRow->pNext; pLoop && pLoop->rid!=parentRid;
417	pLoop=pLoop->pNext){
418	pLoop->railInUse \|= mask;
419	}
420	}
421	pRow->mergeIn \|= 1<<pDesc->mergeOut;
422	}
423	}
	@@ -398,12 +445,11 @@
445	}
446
447	/*
448	** Find the maximum rail number.
449	*/

450	p->mxRail = 0;
451	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
452	if( pRow->iRail>p->mxRail ) p->mxRail = pRow->iRail;
453	if( pRow->mergeOut>p->mxRail ) p->mxRail = pRow->mergeOut;
454	}
455	}
456

M src/http.c

+21

		--- src/http.c
		+++ src/http.c
		@@ -42,10 +42,13 @@
42	42
43	43	blob_zero(pLogin);
44	44	if( g.urlUser==0 \|\| strcmp(g.urlUser, "anonymous")==0 ){
45	45	return; /* If no login card for users "nobody" and "anonymous" */
46	46	}
	47	+ if( g.urlIsSsh ){
	48	+ return; /* If no login card for SSH: */
	49	+ }
47	50	blob_zero(&nonce);
48	51	blob_zero(&pw);
49	52	sha1sum_blob(pPayload, &nonce);
50	53	blob_copy(&pw, &nonce);
51	54	zLogin = g.urlUser;
		@@ -134,10 +137,11 @@
134	137	int iLength; /* Length of the reply payload */
135	138	int rc; /* Result code */
136	139	int iHttpVersion; /* Which version of HTTP protocol server uses */
137	140	char zLine; / A single line of the reply header */
138	141	int i; /* Loop counter */
	142	+ int isError = 0; /* True if the reply is an error message */
139	143
140	144	if( transport_open() ){
141	145	fossil_fatal(transport_errmsg());
142	146	}
143	147
		@@ -190,10 +194,11 @@
190	194	** Read and interpret the server reply
191	195	*/
192	196	closeConnection = 1;
193	197	iLength = -1;
194	198	while( (zLine = transport_receive_line())!=0 && zLine[0]!=0 ){
	199	+ /* printf("[%s]\n", zLine); fflush(stdout); */
195	200	if( strncasecmp(zLine, "http/1.", 7)==0 ){
196	201	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
197	202	if( rc!=200 && rc!=302 ){
198	203	int ii;
199	204	for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
		@@ -227,10 +232,12 @@
227	232	fossil_print("redirect to %s\n", &zLine[i]);
228	233	url_parse(&zLine[i]);
229	234	transport_close();
230	235	http_exchange(pSend, pReply, useLogin);
231	236	return;
	237	+ }else if( strncasecmp(zLine, "content-type: text/html", 23)==0 ){
	238	+ isError = 1;
232	239	}
233	240	}
234	241	if( rc!=200 ){
235	242	fossil_fatal("\"location:\" missing from 302 redirect reply");
236	243	goto write_err;
		@@ -245,10 +252,24 @@
245	252	}
246	253	blob_zero(pReply);
247	254	blob_resize(pReply, iLength);
248	255	iLength = transport_receive(blob_buffer(pReply), iLength);
249	256	blob_resize(pReply, iLength);
	257	+ if( isError ){
	258	+ char *z;
	259	+ int i, j;
	260	+ z = blob_str(pReply);
	261	+ for(i=j=0; z[i]; i++, j++){
	262	+ if( z[i]=='<' ){
	263	+ while( z[i] && z[i]!='>' ) i++;
	264	+ if( z[i]==0 ) break;
	265	+ }
	266	+ z[j] = z[i];
	267	+ }
	268	+ z[j] = 0;
	269	+ fossil_fatal("server sends error: %s", z);
	270	+ }
250	271	if( g.fHttpTrace ){
251	272	printf("HTTP RECEIVE:\n%s\n=======================\n", blob_str(pReply));
252	273	}else{
253	274	blob_uncompress(pReply, pReply);
254	275	}
255	276

	--- src/http.c
	+++ src/http.c
	@@ -42,10 +42,13 @@
42
43	blob_zero(pLogin);
44	if( g.urlUser==0 \|\| strcmp(g.urlUser, "anonymous")==0 ){
45	return; /* If no login card for users "nobody" and "anonymous" */
46	}



47	blob_zero(&nonce);
48	blob_zero(&pw);
49	sha1sum_blob(pPayload, &nonce);
50	blob_copy(&pw, &nonce);
51	zLogin = g.urlUser;
	@@ -134,10 +137,11 @@
134	int iLength; /* Length of the reply payload */
135	int rc; /* Result code */
136	int iHttpVersion; /* Which version of HTTP protocol server uses */
137	char zLine; / A single line of the reply header */
138	int i; /* Loop counter */

139
140	if( transport_open() ){
141	fossil_fatal(transport_errmsg());
142	}
143
	@@ -190,10 +194,11 @@
190	** Read and interpret the server reply
191	*/
192	closeConnection = 1;
193	iLength = -1;
194	while( (zLine = transport_receive_line())!=0 && zLine[0]!=0 ){

195	if( strncasecmp(zLine, "http/1.", 7)==0 ){
196	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
197	if( rc!=200 && rc!=302 ){
198	int ii;
199	for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
	@@ -227,10 +232,12 @@
227	fossil_print("redirect to %s\n", &zLine[i]);
228	url_parse(&zLine[i]);
229	transport_close();
230	http_exchange(pSend, pReply, useLogin);
231	return;


232	}
233	}
234	if( rc!=200 ){
235	fossil_fatal("\"location:\" missing from 302 redirect reply");
236	goto write_err;
	@@ -245,10 +252,24 @@
245	}
246	blob_zero(pReply);
247	blob_resize(pReply, iLength);
248	iLength = transport_receive(blob_buffer(pReply), iLength);
249	blob_resize(pReply, iLength);














250	if( g.fHttpTrace ){
251	printf("HTTP RECEIVE:\n%s\n=======================\n", blob_str(pReply));
252	}else{
253	blob_uncompress(pReply, pReply);
254	}
255

	--- src/http.c
	+++ src/http.c
	@@ -42,10 +42,13 @@
42
43	blob_zero(pLogin);
44	if( g.urlUser==0 \|\| strcmp(g.urlUser, "anonymous")==0 ){
45	return; /* If no login card for users "nobody" and "anonymous" */
46	}
47	if( g.urlIsSsh ){
48	return; /* If no login card for SSH: */
49	}
50	blob_zero(&nonce);
51	blob_zero(&pw);
52	sha1sum_blob(pPayload, &nonce);
53	blob_copy(&pw, &nonce);
54	zLogin = g.urlUser;
	@@ -134,10 +137,11 @@
137	int iLength; /* Length of the reply payload */
138	int rc; /* Result code */
139	int iHttpVersion; /* Which version of HTTP protocol server uses */
140	char zLine; / A single line of the reply header */
141	int i; /* Loop counter */
142	int isError = 0; /* True if the reply is an error message */
143
144	if( transport_open() ){
145	fossil_fatal(transport_errmsg());
146	}
147
	@@ -190,10 +194,11 @@
194	** Read and interpret the server reply
195	*/
196	closeConnection = 1;
197	iLength = -1;
198	while( (zLine = transport_receive_line())!=0 && zLine[0]!=0 ){
199	/* printf("[%s]\n", zLine); fflush(stdout); */
200	if( strncasecmp(zLine, "http/1.", 7)==0 ){
201	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
202	if( rc!=200 && rc!=302 ){
203	int ii;
204	for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
	@@ -227,10 +232,12 @@
232	fossil_print("redirect to %s\n", &zLine[i]);
233	url_parse(&zLine[i]);
234	transport_close();
235	http_exchange(pSend, pReply, useLogin);
236	return;
237	}else if( strncasecmp(zLine, "content-type: text/html", 23)==0 ){
238	isError = 1;
239	}
240	}
241	if( rc!=200 ){
242	fossil_fatal("\"location:\" missing from 302 redirect reply");
243	goto write_err;
	@@ -245,10 +252,24 @@
252	}
253	blob_zero(pReply);
254	blob_resize(pReply, iLength);
255	iLength = transport_receive(blob_buffer(pReply), iLength);
256	blob_resize(pReply, iLength);
257	if( isError ){
258	char *z;
259	int i, j;
260	z = blob_str(pReply);
261	for(i=j=0; z[i]; i++, j++){
262	if( z[i]=='<' ){
263	while( z[i] && z[i]!='>' ) i++;
264	if( z[i]==0 ) break;
265	}
266	z[j] = z[i];
267	}
268	z[j] = 0;
269	fossil_fatal("server sends error: %s", z);
270	}
271	if( g.fHttpTrace ){
272	printf("HTTP RECEIVE:\n%s\n=======================\n", blob_str(pReply));
273	}else{
274	blob_uncompress(pReply, pReply);
275	}
276

M src/http_socket.c

+11 -8

		--- src/http_socket.c
		+++ src/http_socket.c
		@@ -26,13 +26,16 @@
26	26	** are handled different on Unix and windows.
27	27	*/
28	28
29	29	#include "config.h"
30	30	#include "http_socket.h"
31		-#ifdef __MINGW32__
32		-# include <windows.h>
33		-# include <winsock2.h>
	31	+#if defined(_WIN32)
	32	+# include <windows.h> /* for Sleep once server works again */
	33	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	34	+# if defined(__MINGW32__)
	35	+# include <ws2tcpip.h>
	36	+# endif
34	37	#else
35	38	# include <arpa/inet.h>
36	39	# include <sys/socket.h>
37	40	# include <netdb.h>
38	41	# include <netinet/in.h>
		@@ -45,11 +48,11 @@
45	48	** There can only be a single socket connection open at a time.
46	49	** State information about that socket is stored in the following
47	50	** local variables:
48	51	*/
49	52	static int socketIsInit = 0; /* True after global initialization */
50		-#ifdef __MINGW32__
	53	+#if defined(_WIN32)
51	54	static WSADATA socketInfo; /* Windows socket initialize data */
52	55	#endif
53	56	static int iSocket = -1; /* The socket on which we talk to the server */
54	57	static char socketErrMsg = 0; / Text of most recent socket error */
55	58
		@@ -84,11 +87,11 @@
84	87	** Call this routine once before any other use of the socket interface.
85	88	** This routine does initial configuration of the socket module.
86	89	*/
87	90	void socket_global_init(void){
88	91	if( socketIsInit==0 ){
89		-#ifdef __MINGW32__
	92	+#if defined(_WIN32)
90	93	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
91	94	fossil_panic("can't initialize winsock");
92	95	}
93	96	#endif
94	97	socketIsInit = 1;
		@@ -99,11 +102,11 @@
99	102	** Call this routine to shutdown the socket module prior to program
100	103	** exit.
101	104	*/
102	105	void socket_global_shutdown(void){
103	106	if( socketIsInit ){
104		-#ifdef __MINGW32__
	107	+#if defined(_WIN32)
105	108	WSACleanup();
106	109	#endif
107	110	socket_clear_errmsg();
108	111	socketIsInit = 0;
109	112	}
		@@ -113,11 +116,11 @@
113	116	** Close the currently open socket. If no socket is open, this routine
114	117	** is a no-op.
115	118	*/
116	119	void socket_close(void){
117	120	if( iSocket>=0 ){
118		-#ifdef __MINGW32__
	121	+#if defined(_WIN32)
119	122	closesocket(iSocket);
120	123	#else
121	124	close(iSocket);
122	125	#endif
123	126	iSocket = -1;
		@@ -171,11 +174,11 @@
171	174	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	175	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
173	176	socket_close();
174	177	return 1;
175	178	}
176		-#ifndef __MINGW32__
	179	+#if !defined(_WIN32)
177	180	signal(SIGPIPE, SIG_IGN);
178	181	#endif
179	182	return 0;
180	183	}
181	184
182	185

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -26,13 +26,16 @@
26	** are handled different on Unix and windows.
27	*/
28
29	#include "config.h"
30	#include "http_socket.h"
31	#ifdef __MINGW32__
32	# include <windows.h>
33	# include <winsock2.h>



34	#else
35	# include <arpa/inet.h>
36	# include <sys/socket.h>
37	# include <netdb.h>
38	# include <netinet/in.h>
	@@ -45,11 +48,11 @@
45	** There can only be a single socket connection open at a time.
46	** State information about that socket is stored in the following
47	** local variables:
48	*/
49	static int socketIsInit = 0; /* True after global initialization */
50	#ifdef __MINGW32__
51	static WSADATA socketInfo; /* Windows socket initialize data */
52	#endif
53	static int iSocket = -1; /* The socket on which we talk to the server */
54	static char socketErrMsg = 0; / Text of most recent socket error */
55
	@@ -84,11 +87,11 @@
84	** Call this routine once before any other use of the socket interface.
85	** This routine does initial configuration of the socket module.
86	*/
87	void socket_global_init(void){
88	if( socketIsInit==0 ){
89	#ifdef __MINGW32__
90	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
91	fossil_panic("can't initialize winsock");
92	}
93	#endif
94	socketIsInit = 1;
	@@ -99,11 +102,11 @@
99	** Call this routine to shutdown the socket module prior to program
100	** exit.
101	*/
102	void socket_global_shutdown(void){
103	if( socketIsInit ){
104	#ifdef __MINGW32__
105	WSACleanup();
106	#endif
107	socket_clear_errmsg();
108	socketIsInit = 0;
109	}
	@@ -113,11 +116,11 @@
113	** Close the currently open socket. If no socket is open, this routine
114	** is a no-op.
115	*/
116	void socket_close(void){
117	if( iSocket>=0 ){
118	#ifdef __MINGW32__
119	closesocket(iSocket);
120	#else
121	close(iSocket);
122	#endif
123	iSocket = -1;
	@@ -171,11 +174,11 @@
171	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
173	socket_close();
174	return 1;
175	}
176	#ifndef __MINGW32__
177	signal(SIGPIPE, SIG_IGN);
178	#endif
179	return 0;
180	}
181
182

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -26,13 +26,16 @@
26	** are handled different on Unix and windows.
27	*/
28
29	#include "config.h"
30	#include "http_socket.h"
31	#if defined(_WIN32)
32	# include <windows.h> /* for Sleep once server works again */
33	# define sleep Sleep /* windows does not have sleep, but Sleep */
34	# if defined(__MINGW32__)
35	# include <ws2tcpip.h>
36	# endif
37	#else
38	# include <arpa/inet.h>
39	# include <sys/socket.h>
40	# include <netdb.h>
41	# include <netinet/in.h>
	@@ -45,11 +48,11 @@
48	** There can only be a single socket connection open at a time.
49	** State information about that socket is stored in the following
50	** local variables:
51	*/
52	static int socketIsInit = 0; /* True after global initialization */
53	#if defined(_WIN32)
54	static WSADATA socketInfo; /* Windows socket initialize data */
55	#endif
56	static int iSocket = -1; /* The socket on which we talk to the server */
57	static char socketErrMsg = 0; / Text of most recent socket error */
58
	@@ -84,11 +87,11 @@
87	** Call this routine once before any other use of the socket interface.
88	** This routine does initial configuration of the socket module.
89	*/
90	void socket_global_init(void){
91	if( socketIsInit==0 ){
92	#if defined(_WIN32)
93	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
94	fossil_panic("can't initialize winsock");
95	}
96	#endif
97	socketIsInit = 1;
	@@ -99,11 +102,11 @@
102	** Call this routine to shutdown the socket module prior to program
103	** exit.
104	*/
105	void socket_global_shutdown(void){
106	if( socketIsInit ){
107	#if defined(_WIN32)
108	WSACleanup();
109	#endif
110	socket_clear_errmsg();
111	socketIsInit = 0;
112	}
	@@ -113,11 +116,11 @@
116	** Close the currently open socket. If no socket is open, this routine
117	** is a no-op.
118	*/
119	void socket_close(void){
120	if( iSocket>=0 ){
121	#if defined(_WIN32)
122	closesocket(iSocket);
123	#else
124	close(iSocket);
125	#endif
126	iSocket = -1;
	@@ -171,11 +174,11 @@
174	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
175	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
176	socket_close();
177	return 1;
178	}
179	#if !defined(_WIN32)
180	signal(SIGPIPE, SIG_IGN);
181	#endif
182	return 0;
183	}
184
185

M src/http_ssl.c

+4 -4

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -128,11 +128,11 @@
128	128	** Return the number of errors.
129	129	*/
130	130	int ssl_open(void){
131	131	X509 *cert;
132	132	int hasSavedCertificate = 0;
133		-
	133	+char *connStr ;
134	134	ssl_global_init();
135	135
136	136	/* Get certificate for current server from global config and
137	137	* (if we have it in config) add it to certificate store.
138	138	*/
		@@ -150,11 +150,11 @@
150	150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	151	ERR_reason_error_string(ERR_get_error()));
152	152	return 1;
153	153	}
154	154
155		- char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
	155	+ connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	156	BIO_set_conn_hostname(iBio, connStr);
157	157	free(connStr);
158	158
159	159	if( BIO_do_connect(iBio)<=0 ){
160	160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
		@@ -178,29 +178,29 @@
178	178	return 1;
179	179	}
180	180
181	181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	182	char desc, prompt;
	183	+ char *warning = "";
	184	+ Blob ans;
183	185	BIO *mem;
184	186
185	187	mem = BIO_new(BIO_s_mem());
186	188	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187	189	BIO_puts(mem, "\n\nIssued By:\n\n");
188	190	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189	191	BIO_write(mem, "", 1); // null-terminate mem buffer
190	192	BIO_get_mem_data(mem, &desc);
191	193
192		- char *warning = "";
193	194	if( hasSavedCertificate ){
194	195	warning = "WARNING: Certificate doesn't match the "
195	196	"saved certificate for this host!";
196	197	}
197	198	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198	199	"Accept certificate [a=always/y/N]? ", desc, warning);
199	200	BIO_free(mem);
200	201
201		- Blob ans;
202	202	prompt_user(prompt, &ans);
203	203	free(prompt);
204	204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	205	X509_free(cert);
206	206	ssl_set_errmsg("SSL certificate declined");
207	207

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -128,11 +128,11 @@
128	** Return the number of errors.
129	*/
130	int ssl_open(void){
131	X509 *cert;
132	int hasSavedCertificate = 0;
133
134	ssl_global_init();
135
136	/* Get certificate for current server from global config and
137	* (if we have it in config) add it to certificate store.
138	*/
	@@ -150,11 +150,11 @@
150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	ERR_reason_error_string(ERR_get_error()));
152	return 1;
153	}
154
155	char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	BIO_set_conn_hostname(iBio, connStr);
157	free(connStr);
158
159	if( BIO_do_connect(iBio)<=0 ){
160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
	@@ -178,29 +178,29 @@
178	return 1;
179	}
180
181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	char desc, prompt;


183	BIO *mem;
184
185	mem = BIO_new(BIO_s_mem());
186	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187	BIO_puts(mem, "\n\nIssued By:\n\n");
188	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189	BIO_write(mem, "", 1); // null-terminate mem buffer
190	BIO_get_mem_data(mem, &desc);
191
192	char *warning = "";
193	if( hasSavedCertificate ){
194	warning = "WARNING: Certificate doesn't match the "
195	"saved certificate for this host!";
196	}
197	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198	"Accept certificate [a=always/y/N]? ", desc, warning);
199	BIO_free(mem);
200
201	Blob ans;
202	prompt_user(prompt, &ans);
203	free(prompt);
204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	X509_free(cert);
206	ssl_set_errmsg("SSL certificate declined");
207

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -128,11 +128,11 @@
128	** Return the number of errors.
129	*/
130	int ssl_open(void){
131	X509 *cert;
132	int hasSavedCertificate = 0;
133	char *connStr ;
134	ssl_global_init();
135
136	/* Get certificate for current server from global config and
137	* (if we have it in config) add it to certificate store.
138	*/
	@@ -150,11 +150,11 @@
150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	ERR_reason_error_string(ERR_get_error()));
152	return 1;
153	}
154
155	connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	BIO_set_conn_hostname(iBio, connStr);
157	free(connStr);
158
159	if( BIO_do_connect(iBio)<=0 ){
160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
	@@ -178,29 +178,29 @@
178	return 1;
179	}
180
181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	char desc, prompt;
183	char *warning = "";
184	Blob ans;
185	BIO *mem;
186
187	mem = BIO_new(BIO_s_mem());
188	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
189	BIO_puts(mem, "\n\nIssued By:\n\n");
190	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
191	BIO_write(mem, "", 1); // null-terminate mem buffer
192	BIO_get_mem_data(mem, &desc);
193

194	if( hasSavedCertificate ){
195	warning = "WARNING: Certificate doesn't match the "
196	"saved certificate for this host!";
197	}
198	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
199	"Accept certificate [a=always/y/N]? ", desc, warning);
200	BIO_free(mem);
201

202	prompt_user(prompt, &ans);
203	free(prompt);
204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	X509_free(cert);
206	ssl_set_errmsg("SSL certificate declined");
207

M src/http_transport.c

+164 -19

		--- src/http_transport.c
		+++ src/http_transport.c
		@@ -38,10 +38,19 @@
38	38	char zOutFile; / Name of outbound file for FILE: */
39	39	char zInFile; / Name of inbound file for FILE: */
40	40	} transport = {
41	41	0, 0, 0, 0, 0, 0, 0
42	42	};
	43	+
	44	+/*
	45	+** Information about the connection to the SSH subprocess when
	46	+** using the ssh:// sync method.
	47	+*/
	48	+static int sshPid; /* Process id of ssh subprocess */
	49	+static int sshIn; /* From ssh subprocess to this process */
	50	+static FILE sshOut; / From this to ssh subprocess */
	51	+
43	52
44	53	/*
45	54	** Return the current transport error message.
46	55	*/
47	56	const char *transport_errmsg(void){
		@@ -63,10 +72,102 @@
63	72	if( resetFlag ){
64	73	transport.nSent = 0;
65	74	transport.nRcvd = 0;
66	75	}
67	76	}
	77	+
	78	+/*
	79	+** Read text from sshIn. Zero-terminate and remove trailing
	80	+** whitespace.
	81	+*/
	82	+static void sshin_read(char *zBuf, int szBuf){
	83	+ int got;
	84	+ zBuf[0] = 0;
	85	+ got = read(sshIn, zBuf, szBuf-1);
	86	+ while( got>=0 ){
	87	+ zBuf[got] = 0;
	88	+ if( got==0 \|\| !isspace(zBuf[got-1]) ) break;
	89	+ got--;
	90	+ }
	91	+}
	92	+
	93	+/*
	94	+** Default SSH command
	95	+*/
	96	+#ifdef __MINGW32__
	97	+static char zDefaultSshCmd[] = "ssh -T";
	98	+#else
	99	+static char zDefaultSshCmd[] = "ssh -e none -T";
	100	+#endif
	101	+
	102	+/*
	103	+** Global initialization of the transport layer
	104	+*/
	105	+void transport_global_startup(void){
	106	+ if( g.urlIsSsh ){
	107	+ /* Only SSH requires a global initialization. For SSH we need to create
	108	+ ** and run an SSH command to talk to the remote machine.
	109	+ */
	110	+ const char zSsh; / The base SSH command */
	111	+ Blob zCmd; /* The SSH command */
	112	+ char zHost; / The host name to contact */
	113	+ char zIn[200]; /* An input line received back from remote */
	114	+
	115	+ zSsh = db_get("ssh-command", zDefaultSshCmd);
	116	+ blob_init(&zCmd, zSsh, -1);
	117	+ if( g.urlPort!=g.urlDfltPort ){
	118	+#ifdef __MINGW32__
	119	+ blob_appendf(&zCmd, " -P %d", g.urlPort);
	120	+#else
	121	+ blob_appendf(&zCmd, " -p %d", g.urlPort);
	122	+#endif
	123	+ }
	124	+ if( g.urlUser && g.urlUser[0] ){
	125	+ zHost = mprintf("%s@%s", g.urlUser, g.urlName);
	126	+#ifdef __MINGW32__
	127	+ /* Only win32 (and specifically PLINK.EXE support the -pw option */
	128	+ if( g.urlPasswd && g.urlPasswd[0] ){
	129	+ Blob pw;
	130	+ blob_zero(&pw);
	131	+ if( g.urlPasswd[0]=='*' ){
	132	+ char *zPrompt;
	133	+ zPrompt = mprintf("Password for [%s]: ", zHost);
	134	+ prompt_for_password(zPrompt, &pw, 0);
	135	+ free(zPrompt);
	136	+ }else{
	137	+ blob_init(&pw, g.urlPasswd, -1);
	138	+ }
	139	+ blob_append(&zCmd, " -pw ", -1);
	140	+ shell_escape(&zCmd, blob_str(&pw));
	141	+ blob_reset(&pw);
	142	+ }
	143	+#endif
	144	+ }else{
	145	+ zHost = mprintf("%s", g.urlName);
	146	+ }
	147	+ blob_append(&zCmd, " ", 1);
	148	+ shell_escape(&zCmd, zHost);
	149	+ free(zHost);
	150	+ /* printf("%s\n", blob_str(&zCmd)); */
	151	+ popen2(blob_str(&zCmd), &sshIn, &sshOut, &sshPid);
	152	+ if( sshPid==0 ){
	153	+ fossil_fatal("cannot start ssh tunnel using [%b]", &zCmd);
	154	+ }
	155	+ blob_reset(&zCmd);
	156	+
	157	+ /* Send an "echo" command to the other side to make sure that the
	158	+ ** connection is up and working.
	159	+ */
	160	+ fprintf(sshOut, "echo test\n");
	161	+ fflush(sshOut);
	162	+ sshin_read(zIn, sizeof(zIn));
	163	+ if( memcmp(zIn, "test", 4)!=0 ){
	164	+ pclose2(sshIn, sshOut, sshPid);
	165	+ fossil_fatal("ssh connection failed: [%s]", zIn);
	166	+ }
	167	+ }
	168	+}
68	169
69	170	/*
70	171	** Open a connection to the server. The server is defined by the following
71	172	** global variables:
72	173	**
		@@ -77,11 +178,21 @@
77	178	** Return the number of errors.
78	179	*/
79	180	int transport_open(void){
80	181	int rc = 0;
81	182	if( transport.isOpen==0 ){
82		- if( g.urlIsHttps ){
	183	+ if( g.urlIsSsh ){
	184	+ Blob cmd;
	185	+ blob_zero(&cmd);
	186	+ shell_escape(&cmd, g.urlFossil);
	187	+ blob_append(&cmd, " test-http ", -1);
	188	+ shell_escape(&cmd, g.urlPath);
	189	+ /* fprintf(stdout, "%s\n", blob_str(&cmd)); */
	190	+ fprintf(sshOut, "%s\n", blob_str(&cmd));
	191	+ fflush(sshOut);
	192	+ blob_reset(&cmd);
	193	+ }else if( g.urlIsHttps ){
83	194	#ifdef FOSSIL_ENABLE_SSL
84	195	rc = ssl_open();
85	196	if( rc==0 ) transport.isOpen = 1;
86	197	#else
87	198	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
		@@ -115,11 +226,13 @@
115	226	free(transport.pBuf);
116	227	transport.pBuf = 0;
117	228	transport.nAlloc = 0;
118	229	transport.nUsed = 0;
119	230	transport.iCursor = 0;
120		- if( g.urlIsHttps ){
	231	+ if( g.urlIsSsh ){
	232	+ /* No-op */
	233	+ }else if( g.urlIsHttps ){
121	234	#ifdef FOSSIL_ENABLE_SSL
122	235	ssl_close();
123	236	#endif
124	237	}else if( g.urlIsFile ){
125	238	if( transport.pFile ){
		@@ -142,11 +255,16 @@
142	255	*/
143	256	void transport_send(Blob *toSend){
144	257	char *z = blob_buffer(toSend);
145	258	int n = blob_size(toSend);
146	259	transport.nSent += n;
147		- if( g.urlIsHttps ){
	260	+ if( g.urlIsSsh ){
	261	+ int sent;
	262	+ sent = fwrite(z, 1, n, sshOut);
	263	+ fflush(sshOut);
	264	+ /* printf("sent %d of %d bytes\n", sent, n); fflush(stdout); */
	265	+ }else if( g.urlIsHttps ){
148	266	#ifdef FOSSIL_ENABLE_SSL
149	267	int sent;
150	268	while( n>0 ){
151	269	sent = ssl_send(0, z, n);
152	270	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
		@@ -170,11 +288,13 @@
170	288	/*
171	289	** This routine is called when the outbound message is complete and
172	290	** it is time to being recieving a reply.
173	291	*/
174	292	void transport_flip(void){
175		- if( g.urlIsFile ){
	293	+ if( g.urlIsSsh ){
	294	+ fprintf(sshOut, "\n\n");
	295	+ }else if( g.urlIsFile ){
176	296	char *zCmd;
177	297	fclose(transport.pFile);
178	298	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1",
179	299	g.argv[0], g.urlName, transport.zOutFile, transport.zInFile
180	300	);
		@@ -191,10 +311,41 @@
191	311	void transport_rewind(void){
192	312	if( g.urlIsFile ){
193	313	transport_close();
194	314	}
195	315	}
	316	+
	317	+/*
	318	+** Read N bytes of content directly from the wire and write into
	319	+** the buffer.
	320	+*/
	321	+static int transport_fetch(char *zBuf, int N){
	322	+ int got;
	323	+ if( sshIn ){
	324	+ int x;
	325	+ int wanted = N;
	326	+ got = 0;
	327	+ while( wanted>0 ){
	328	+ x = read(sshIn, &zBuf[got], wanted);
	329	+ if( x<=0 ) break;
	330	+ got += x;
	331	+ wanted -= x;
	332	+ }
	333	+ }else if( g.urlIsHttps ){
	334	+ #ifdef FOSSIL_ENABLE_SSL
	335	+ got = ssl_receive(0, zBuf, N);
	336	+ #else
	337	+ got = 0;
	338	+ #endif
	339	+ }else if( g.urlIsFile ){
	340	+ got = fread(zBuf, 1, N, transport.pFile);
	341	+ }else{
	342	+ got = socket_receive(0, zBuf, N);
	343	+ }
	344	+ /* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
	345	+ return got;
	346	+}
196	347
197	348	/*
198	349	** Read N bytes of content from the wire and store in the supplied buffer.
199	350	** Return the number of bytes actually received.
200	351	*/
		@@ -201,10 +352,11 @@
201	352	int transport_receive(char *zBuf, int N){
202	353	int onHand; /* Bytes current held in the transport buffer */
203	354	int nByte = 0; /* Bytes of content received */
204	355
205	356	onHand = transport.nUsed - transport.iCursor;
	357	+ /* printf("request %d with %d on hand\n", N, onHand); fflush(stdout); */
206	358	if( onHand>0 ){
207	359	int toMove = onHand;
208	360	if( toMove>N ) toMove = N;
209	361	/* printf("bytes on hand: %d of %d\n", toMove, N); fflush(stdout); */
210	362	memcpy(zBuf, &transport.pBuf[transport.iCursor], toMove);
		@@ -216,24 +368,11 @@
216	368	N -= toMove;
217	369	zBuf += toMove;
218	370	nByte += toMove;
219	371	}
220	372	if( N>0 ){
221		- int got;
222		- if( g.urlIsHttps ){
223		- #ifdef FOSSIL_ENABLE_SSL
224		- got = ssl_receive(0, zBuf, N);
225		- /* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
226		- #else
227		- got = 0;
228		- #endif
229		- }else if( g.urlIsFile ){
230		- got = fread(zBuf, 1, N, transport.pFile);
231		- }else{
232		- got = socket_receive(0, zBuf, N);
233		- /* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
234		- }
	373	+ int got = transport_fetch(zBuf, N);
235	374	if( got>0 ){
236	375	nByte += got;
237	376	transport.nRcvd += got;
238	377	}
239	378	}
		@@ -267,11 +406,11 @@
267	406	pNew = realloc(transport.pBuf, transport.nAlloc);
268	407	if( pNew==0 ) fossil_panic("out of memory");
269	408	transport.pBuf = pNew;
270	409	}
271	410	if( N>0 ){
272		- i = transport_receive(&transport.pBuf[transport.nUsed], N);
	411	+ i = transport_fetch(&transport.pBuf[transport.nUsed], N);
273	412	if( i>0 ){
274	413	transport.nUsed += i;
275	414	}
276	415	}
277	416	}
		@@ -313,13 +452,19 @@
313	452	/* printf("Got line: [%s]\n", &transport.pBuf[iStart]); */
314	453	return &transport.pBuf[iStart];
315	454	}
316	455
317	456	void transport_global_shutdown(void){
	457	+ if( g.urlIsSsh && sshPid ){
	458	+ printf("Closing SSH tunnel: ");
	459	+ fflush(stdout);
	460	+ pclose2(sshIn, sshOut, sshPid);
	461	+ sshPid = 0;
	462	+ }
318	463	if( g.urlIsHttps ){
319	464	#ifdef FOSSIL_ENABLE_SSL
320	465	ssl_global_shutdown();
321	466	#endif
322	467	}else{
323	468	socket_global_shutdown();
324	469	}
325	470	}
326	471

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -38,10 +38,19 @@
38	char zOutFile; / Name of outbound file for FILE: */
39	char zInFile; / Name of inbound file for FILE: */
40	} transport = {
41	0, 0, 0, 0, 0, 0, 0
42	};









43
44	/*
45	** Return the current transport error message.
46	*/
47	const char *transport_errmsg(void){
	@@ -63,10 +72,102 @@
63	if( resetFlag ){
64	transport.nSent = 0;
65	transport.nRcvd = 0;
66	}
67	}




























































































68
69	/*
70	** Open a connection to the server. The server is defined by the following
71	** global variables:
72	**
	@@ -77,11 +178,21 @@
77	** Return the number of errors.
78	*/
79	int transport_open(void){
80	int rc = 0;
81	if( transport.isOpen==0 ){
82	if( g.urlIsHttps ){










83	#ifdef FOSSIL_ENABLE_SSL
84	rc = ssl_open();
85	if( rc==0 ) transport.isOpen = 1;
86	#else
87	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
	@@ -115,11 +226,13 @@
115	free(transport.pBuf);
116	transport.pBuf = 0;
117	transport.nAlloc = 0;
118	transport.nUsed = 0;
119	transport.iCursor = 0;
120	if( g.urlIsHttps ){


121	#ifdef FOSSIL_ENABLE_SSL
122	ssl_close();
123	#endif
124	}else if( g.urlIsFile ){
125	if( transport.pFile ){
	@@ -142,11 +255,16 @@
142	*/
143	void transport_send(Blob *toSend){
144	char *z = blob_buffer(toSend);
145	int n = blob_size(toSend);
146	transport.nSent += n;
147	if( g.urlIsHttps ){





148	#ifdef FOSSIL_ENABLE_SSL
149	int sent;
150	while( n>0 ){
151	sent = ssl_send(0, z, n);
152	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
	@@ -170,11 +288,13 @@
170	/*
171	** This routine is called when the outbound message is complete and
172	** it is time to being recieving a reply.
173	*/
174	void transport_flip(void){
175	if( g.urlIsFile ){


176	char *zCmd;
177	fclose(transport.pFile);
178	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1",
179	g.argv[0], g.urlName, transport.zOutFile, transport.zInFile
180	);
	@@ -191,10 +311,41 @@
191	void transport_rewind(void){
192	if( g.urlIsFile ){
193	transport_close();
194	}
195	}































196
197	/*
198	** Read N bytes of content from the wire and store in the supplied buffer.
199	** Return the number of bytes actually received.
200	*/
	@@ -201,10 +352,11 @@
201	int transport_receive(char *zBuf, int N){
202	int onHand; /* Bytes current held in the transport buffer */
203	int nByte = 0; /* Bytes of content received */
204
205	onHand = transport.nUsed - transport.iCursor;

206	if( onHand>0 ){
207	int toMove = onHand;
208	if( toMove>N ) toMove = N;
209	/* printf("bytes on hand: %d of %d\n", toMove, N); fflush(stdout); */
210	memcpy(zBuf, &transport.pBuf[transport.iCursor], toMove);
	@@ -216,24 +368,11 @@
216	N -= toMove;
217	zBuf += toMove;
218	nByte += toMove;
219	}
220	if( N>0 ){
221	int got;
222	if( g.urlIsHttps ){
223	#ifdef FOSSIL_ENABLE_SSL
224	got = ssl_receive(0, zBuf, N);
225	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
226	#else
227	got = 0;
228	#endif
229	}else if( g.urlIsFile ){
230	got = fread(zBuf, 1, N, transport.pFile);
231	}else{
232	got = socket_receive(0, zBuf, N);
233	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
234	}
235	if( got>0 ){
236	nByte += got;
237	transport.nRcvd += got;
238	}
239	}
	@@ -267,11 +406,11 @@
267	pNew = realloc(transport.pBuf, transport.nAlloc);
268	if( pNew==0 ) fossil_panic("out of memory");
269	transport.pBuf = pNew;
270	}
271	if( N>0 ){
272	i = transport_receive(&transport.pBuf[transport.nUsed], N);
273	if( i>0 ){
274	transport.nUsed += i;
275	}
276	}
277	}
	@@ -313,13 +452,19 @@
313	/* printf("Got line: [%s]\n", &transport.pBuf[iStart]); */
314	return &transport.pBuf[iStart];
315	}
316
317	void transport_global_shutdown(void){






318	if( g.urlIsHttps ){
319	#ifdef FOSSIL_ENABLE_SSL
320	ssl_global_shutdown();
321	#endif
322	}else{
323	socket_global_shutdown();
324	}
325	}
326

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -38,10 +38,19 @@
38	char zOutFile; / Name of outbound file for FILE: */
39	char zInFile; / Name of inbound file for FILE: */
40	} transport = {
41	0, 0, 0, 0, 0, 0, 0
42	};
43
44	/*
45	** Information about the connection to the SSH subprocess when
46	** using the ssh:// sync method.
47	*/
48	static int sshPid; /* Process id of ssh subprocess */
49	static int sshIn; /* From ssh subprocess to this process */
50	static FILE sshOut; / From this to ssh subprocess */
51
52
53	/*
54	** Return the current transport error message.
55	*/
56	const char *transport_errmsg(void){
	@@ -63,10 +72,102 @@
72	if( resetFlag ){
73	transport.nSent = 0;
74	transport.nRcvd = 0;
75	}
76	}
77
78	/*
79	** Read text from sshIn. Zero-terminate and remove trailing
80	** whitespace.
81	*/
82	static void sshin_read(char *zBuf, int szBuf){
83	int got;
84	zBuf[0] = 0;
85	got = read(sshIn, zBuf, szBuf-1);
86	while( got>=0 ){
87	zBuf[got] = 0;
88	if( got==0 \|\| !isspace(zBuf[got-1]) ) break;
89	got--;
90	}
91	}
92
93	/*
94	** Default SSH command
95	*/
96	#ifdef __MINGW32__
97	static char zDefaultSshCmd[] = "ssh -T";
98	#else
99	static char zDefaultSshCmd[] = "ssh -e none -T";
100	#endif
101
102	/*
103	** Global initialization of the transport layer
104	*/
105	void transport_global_startup(void){
106	if( g.urlIsSsh ){
107	/* Only SSH requires a global initialization. For SSH we need to create
108	** and run an SSH command to talk to the remote machine.
109	*/
110	const char zSsh; / The base SSH command */
111	Blob zCmd; /* The SSH command */
112	char zHost; / The host name to contact */
113	char zIn[200]; /* An input line received back from remote */
114
115	zSsh = db_get("ssh-command", zDefaultSshCmd);
116	blob_init(&zCmd, zSsh, -1);
117	if( g.urlPort!=g.urlDfltPort ){
118	#ifdef __MINGW32__
119	blob_appendf(&zCmd, " -P %d", g.urlPort);
120	#else
121	blob_appendf(&zCmd, " -p %d", g.urlPort);
122	#endif
123	}
124	if( g.urlUser && g.urlUser[0] ){
125	zHost = mprintf("%s@%s", g.urlUser, g.urlName);
126	#ifdef __MINGW32__
127	/* Only win32 (and specifically PLINK.EXE support the -pw option */
128	if( g.urlPasswd && g.urlPasswd[0] ){
129	Blob pw;
130	blob_zero(&pw);
131	if( g.urlPasswd[0]=='*' ){
132	char *zPrompt;
133	zPrompt = mprintf("Password for [%s]: ", zHost);
134	prompt_for_password(zPrompt, &pw, 0);
135	free(zPrompt);
136	}else{
137	blob_init(&pw, g.urlPasswd, -1);
138	}
139	blob_append(&zCmd, " -pw ", -1);
140	shell_escape(&zCmd, blob_str(&pw));
141	blob_reset(&pw);
142	}
143	#endif
144	}else{
145	zHost = mprintf("%s", g.urlName);
146	}
147	blob_append(&zCmd, " ", 1);
148	shell_escape(&zCmd, zHost);
149	free(zHost);
150	/* printf("%s\n", blob_str(&zCmd)); */
151	popen2(blob_str(&zCmd), &sshIn, &sshOut, &sshPid);
152	if( sshPid==0 ){
153	fossil_fatal("cannot start ssh tunnel using [%b]", &zCmd);
154	}
155	blob_reset(&zCmd);
156
157	/* Send an "echo" command to the other side to make sure that the
158	** connection is up and working.
159	*/
160	fprintf(sshOut, "echo test\n");
161	fflush(sshOut);
162	sshin_read(zIn, sizeof(zIn));
163	if( memcmp(zIn, "test", 4)!=0 ){
164	pclose2(sshIn, sshOut, sshPid);
165	fossil_fatal("ssh connection failed: [%s]", zIn);
166	}
167	}
168	}
169
170	/*
171	** Open a connection to the server. The server is defined by the following
172	** global variables:
173	**
	@@ -77,11 +178,21 @@
178	** Return the number of errors.
179	*/
180	int transport_open(void){
181	int rc = 0;
182	if( transport.isOpen==0 ){
183	if( g.urlIsSsh ){
184	Blob cmd;
185	blob_zero(&cmd);
186	shell_escape(&cmd, g.urlFossil);
187	blob_append(&cmd, " test-http ", -1);
188	shell_escape(&cmd, g.urlPath);
189	/* fprintf(stdout, "%s\n", blob_str(&cmd)); */
190	fprintf(sshOut, "%s\n", blob_str(&cmd));
191	fflush(sshOut);
192	blob_reset(&cmd);
193	}else if( g.urlIsHttps ){
194	#ifdef FOSSIL_ENABLE_SSL
195	rc = ssl_open();
196	if( rc==0 ) transport.isOpen = 1;
197	#else
198	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
	@@ -115,11 +226,13 @@
226	free(transport.pBuf);
227	transport.pBuf = 0;
228	transport.nAlloc = 0;
229	transport.nUsed = 0;
230	transport.iCursor = 0;
231	if( g.urlIsSsh ){
232	/* No-op */
233	}else if( g.urlIsHttps ){
234	#ifdef FOSSIL_ENABLE_SSL
235	ssl_close();
236	#endif
237	}else if( g.urlIsFile ){
238	if( transport.pFile ){
	@@ -142,11 +255,16 @@
255	*/
256	void transport_send(Blob *toSend){
257	char *z = blob_buffer(toSend);
258	int n = blob_size(toSend);
259	transport.nSent += n;
260	if( g.urlIsSsh ){
261	int sent;
262	sent = fwrite(z, 1, n, sshOut);
263	fflush(sshOut);
264	/* printf("sent %d of %d bytes\n", sent, n); fflush(stdout); */
265	}else if( g.urlIsHttps ){
266	#ifdef FOSSIL_ENABLE_SSL
267	int sent;
268	while( n>0 ){
269	sent = ssl_send(0, z, n);
270	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
	@@ -170,11 +288,13 @@
288	/*
289	** This routine is called when the outbound message is complete and
290	** it is time to being recieving a reply.
291	*/
292	void transport_flip(void){
293	if( g.urlIsSsh ){
294	fprintf(sshOut, "\n\n");
295	}else if( g.urlIsFile ){
296	char *zCmd;
297	fclose(transport.pFile);
298	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1",
299	g.argv[0], g.urlName, transport.zOutFile, transport.zInFile
300	);
	@@ -191,10 +311,41 @@
311	void transport_rewind(void){
312	if( g.urlIsFile ){
313	transport_close();
314	}
315	}
316
317	/*
318	** Read N bytes of content directly from the wire and write into
319	** the buffer.
320	*/
321	static int transport_fetch(char *zBuf, int N){
322	int got;
323	if( sshIn ){
324	int x;
325	int wanted = N;
326	got = 0;
327	while( wanted>0 ){
328	x = read(sshIn, &zBuf[got], wanted);
329	if( x<=0 ) break;
330	got += x;
331	wanted -= x;
332	}
333	}else if( g.urlIsHttps ){
334	#ifdef FOSSIL_ENABLE_SSL
335	got = ssl_receive(0, zBuf, N);
336	#else
337	got = 0;
338	#endif
339	}else if( g.urlIsFile ){
340	got = fread(zBuf, 1, N, transport.pFile);
341	}else{
342	got = socket_receive(0, zBuf, N);
343	}
344	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
345	return got;
346	}
347
348	/*
349	** Read N bytes of content from the wire and store in the supplied buffer.
350	** Return the number of bytes actually received.
351	*/
	@@ -201,10 +352,11 @@
352	int transport_receive(char *zBuf, int N){
353	int onHand; /* Bytes current held in the transport buffer */
354	int nByte = 0; /* Bytes of content received */
355
356	onHand = transport.nUsed - transport.iCursor;
357	/* printf("request %d with %d on hand\n", N, onHand); fflush(stdout); */
358	if( onHand>0 ){
359	int toMove = onHand;
360	if( toMove>N ) toMove = N;
361	/* printf("bytes on hand: %d of %d\n", toMove, N); fflush(stdout); */
362	memcpy(zBuf, &transport.pBuf[transport.iCursor], toMove);
	@@ -216,24 +368,11 @@
368	N -= toMove;
369	zBuf += toMove;
370	nByte += toMove;
371	}
372	if( N>0 ){
373	int got = transport_fetch(zBuf, N);













374	if( got>0 ){
375	nByte += got;
376	transport.nRcvd += got;
377	}
378	}
	@@ -267,11 +406,11 @@
406	pNew = realloc(transport.pBuf, transport.nAlloc);
407	if( pNew==0 ) fossil_panic("out of memory");
408	transport.pBuf = pNew;
409	}
410	if( N>0 ){
411	i = transport_fetch(&transport.pBuf[transport.nUsed], N);
412	if( i>0 ){
413	transport.nUsed += i;
414	}
415	}
416	}
	@@ -313,13 +452,19 @@
452	/* printf("Got line: [%s]\n", &transport.pBuf[iStart]); */
453	return &transport.pBuf[iStart];
454	}
455
456	void transport_global_shutdown(void){
457	if( g.urlIsSsh && sshPid ){
458	printf("Closing SSH tunnel: ");
459	fflush(stdout);
460	pclose2(sshIn, sshOut, sshPid);
461	sshPid = 0;
462	}
463	if( g.urlIsHttps ){
464	#ifdef FOSSIL_ENABLE_SSL
465	ssl_global_shutdown();
466	#endif
467	}else{
468	socket_global_shutdown();
469	}
470	}
471

M src/info.c

+57 -39

		--- src/info.c
		+++ src/info.c
		@@ -65,10 +65,16 @@
65	65	);
66	66	/* 01234567890123 */
67	67	printf("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : "");
68	68	free(zUuid);
69	69	free(zDate);
	70	+ }
	71	+ if( zUuid && showComment ){
	72	+ zComment = db_text(0,
	73	+ "SELECT coalesce(ecomment,comment) \|\| ' (user: ' \|\| coalesce(euser,user,'?') \|\| ')' FROM event WHERE objid=%d",
	74	+ rid
	75	+ );
70	76	}
71	77	db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid "
72	78	" WHERE cid=%d", rid);
73	79	while( db_step(&q)==SQLITE_ROW ){
74	80	const char *zUuid = db_column_text(&q, 0);
		@@ -96,11 +102,12 @@
96	102	if( zTags && zTags[0] ){
97	103	printf("tags: %s\n", zTags);
98	104	}
99	105	free(zTags);
100	106	if( zComment ){
101		- printf("comment:\n%s\n", zComment);
	107	+ printf("comment: ");
	108	+ comment_print(zComment, 14, 79);
102	109	free(zComment);
103	110	}
104	111	}
105	112
106	113
		@@ -135,11 +142,11 @@
135	142	/* 012345678901234 */
136	143	db_record_repository_filename(0);
137	144	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
138	145	printf("repository: %s\n", db_lget("repository", ""));
139	146	printf("local-root: %s\n", g.zLocalRoot);
140		-#ifdef __MINGW32__
	147	+#if defined(_WIN32)
141	148	if( g.zHome ){
142	149	printf("user-home: %s\n", g.zHome);
143	150	}
144	151	#endif
145	152	printf("project-code: %s\n", db_get("project-code", ""));
		@@ -187,15 +194,15 @@
187	194	@ <div class="section">Tags And Properties</div>
188	195	@ <ul>
189	196	}
190	197	@ <li>
191	198	if( tagtype==0 ){
192		- @ <b><s>%h(zTagname)</s></b> cancelled
	199	+ @ <span class="infoTagCancelled">%h(zTagname)</span> cancelled
193	200	}else if( zValue ){
194		- @ <b>%h(zTagname)=%h(zValue)</b>
	201	+ @ <span class="infoTag">%h(zTagname)=%h(zValue)</span>
195	202	}else {
196		- @ <b>%h(zTagname)</b>
	203	+ @ <span class="infoTag">%h(zTagname)</span>
197	204	}
198	205	if( tagtype==2 ){
199	206	if( zOrigUuid && zOrigUuid[0] ){
200	207	@ inherited from
201	208	hyperlink_to_uuid(zOrigUuid);
		@@ -215,10 +222,11 @@
215	222	}
216	223	hyperlink_to_uuid(zSrcUuid);
217	224	@ on
218	225	hyperlink_to_date(zDate,0);
219	226	}
	227	+ @ </li>
220	228	}
221	229	db_finalize(&q);
222	230	if( cnt ){
223	231	@ </ul>
224	232	}
		@@ -231,11 +239,11 @@
231	239	static void append_diff(int fromid, int toid){
232	240	Blob from, to, out;
233	241	content_get(fromid, &from);
234	242	content_get(toid, &to);
235	243	blob_zero(&out);
236		- text_diff(&from, &to, &out, 5);
	244	+ text_diff(&from, &to, &out, 5, 1);
237	245	@ %h(blob_str(&out))
238	246	blob_reset(&from);
239	247	blob_reset(&to);
240	248	blob_reset(&out);
241	249	}
		@@ -255,25 +263,33 @@
255	263	@ <p>Deleted %h(zName)</p>
256	264	}else if( zOld==0 ){
257	265	@ <p>Added %h(zName)</p>
258	266	}else{
259	267	@ <p>Changes to %h(zName)</p>
	268	+ if( showDiff ){
	269	+ int rid1 = uuid_to_rid(zOld, 0);
	270	+ int rid2 = uuid_to_rid(zNew, 0);
	271	+ @ <blockquote><pre>
	272	+ append_diff(rid1, rid2);
	273	+ @ </pre></blockquote>
	274	+ }
260	275	}
261	276	}else if( zOld && zNew ){
262	277	@ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
263	278	@ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a>
264	279	@ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a>
265	280	if( !showDiff ){
266	281	@
267		- @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a>
	282	+ @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a>
268	283	}else{
269	284	int rid1 = uuid_to_rid(zOld, 0);
270	285	int rid2 = uuid_to_rid(zNew, 0);
271	286	@ <blockquote><pre>
272	287	append_diff(rid1, rid2);
273	288	@ </pre></blockquote>
274	289	}
	290	+ @ </p>
275	291	}else if( zOld ){
276	292	@ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
277	293	@ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a></p>
278	294	}else{
279	295	@ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
		@@ -340,11 +356,11 @@
340	356	TAG_COMMENT, rid);
341	357	zUser = db_column_text(&q, 2);
342	358	zComment = db_column_text(&q, 3);
343	359	zDate = db_column_text(&q,1);
344	360	@ <div class="section">Overview</div>
345		- @ <p><table class="label-value">
	361	+ @ <table class="label-value">
346	362	@ <tr><th>SHA1 Hash:</th><td>%s(zUuid)
347	363	if( g.okSetup ){
348	364	@ (Record ID: %d(rid))
349	365	}
350	366	@ </td></tr>
		@@ -383,13 +399,13 @@
383	399	db_finalize(&q);
384	400	}
385	401	if( g.okHistory ){
386	402	const char *zProjName = db_get("project-name", "unnamed");
387	403	@ <tr><th>Timelines:</th><td>
388		- @ <a href="%s(g.zBaseURL)/timeline?p=%S(zUuid)">ancestors</a>
389		- @ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)">descendants</a>
390		- @ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)&p=%S(zUuid)">both</a>
	404	+ @ <a href="%s(g.zBaseURL)/timeline?p=%S(zUuid)">ancestors</a>
	405	+ @ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)">descendants</a>
	406	+ @ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)&p=%S(zUuid)">both</a>
391	407	db_prepare(&q, "SELECT substr(tag.tagname,5) FROM tagxref, tag "
392	408	" WHERE rid=%d AND tagtype>0 "
393	409	" AND tag.tagid=tagxref.tagid "
394	410	" AND +tag.tagname GLOB 'sym-*'", rid);
395	411	while( db_step(&q)==SQLITE_ROW ){
		@@ -399,20 +415,22 @@
399	415	db_finalize(&q);
400	416	@ </td></tr>
401	417	@ <tr><th>Other Links:</th>
402	418	@ <td>
403	419	@ <a href="%s(g.zTop)/dir?ci=%S(zUuid)">files</a>
404		- @ \| <a href="%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)">
405		- @ ZIP archive</a>
	420	+ if( g.okZip ){
	421	+ @ \| <a href="%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)">
	422	+ @ ZIP archive</a>
	423	+ }
406	424	@ \| <a href="%s(g.zTop)/artifact/%S(zUuid)">manifest</a>
407	425	if( g.okWrite ){
408	426	@ \| <a href="%s(g.zTop)/ci_edit?r=%S(zUuid)">edit</a>
409	427	}
410	428	@ </td>
411	429	@ </tr>
412	430	}
413		- @ </table></p>
	431	+ @ </table>
414	432	}else{
415	433	style_header("Check-in Information");
416	434	login_anonymous_available();
417	435	}
418	436	db_finalize(&q);
		@@ -600,11 +618,11 @@
600	618	}
601	619
602	620
603	621	/*
604	622	** WEBPAGE: vdiff
605		-** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
	623	+** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
606	624	**
607	625	** Show all differences between two checkins.
608	626	*/
609	627	void vdiff_page(void){
610	628	int ridFrom, ridTo;
		@@ -622,11 +640,11 @@
622	640	style_header("Check-in Differences");
623	641	@ <h2>Difference From:</h2><blockquote>
624	642	checkin_description(ridFrom);
625	643	@ </blockquote><h2>To:</h2><blockquote>
626	644	checkin_description(ridTo);
627		- @ </blockquote><hr><p>
	645	+ @ </blockquote><hr /><p>
628	646
629	647	iFrom = iTo = 0;
630	648	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
631	649	int cmp;
632	650	if( iFrom>=mFrom.nFile ){
		@@ -864,23 +882,23 @@
864	882	v1 = name_to_rid_www("v1");
865	883	v2 = name_to_rid_www("v2");
866	884	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
867	885	style_header("Diff");
868	886	@ <h2>Differences From:</h2>
869		- @ <blockquote>
	887	+ @ <blockquote><p>
870	888	object_description(v1, 1, 0);
871		- @ </blockquote>
	889	+ @ </p></blockquote>
872	890	@ <h2>To:</h2>
873		- @ <blockquote>
	891	+ @ <blockquote><p>
874	892	object_description(v2, 1, 0);
875		- @ </blockquote>
876		- @ <hr>
	893	+ @ </p></blockquote>
	894	+ @ <hr />
877	895	@ <blockquote><pre>
878	896	content_get(v1, &c1);
879	897	content_get(v2, &c2);
880	898	blob_zero(&diff);
881		- text_diff(&c1, &c2, &diff, 4);
	899	+ text_diff(&c1, &c2, &diff, 4, 1);
882	900	blob_reset(&c1);
883	901	blob_reset(&c2);
884	902	@ %h(blob_str(&diff))
885	903	@ </pre></blockquote>
886	904	blob_reset(&diff);
		@@ -978,27 +996,27 @@
978	996	if( !g.okRead ){ login_needed(); return; }
979	997	if( rid==0 ) fossil_redirect_home();
980	998	if( g.okAdmin ){
981	999	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
982	1000	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
983		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1001	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
984	1002	g.zTop, zUuid);
985	1003	}else{
986	1004	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
987	1005	g.zTop, zUuid);
988	1006	}
989	1007	}
990	1008	style_header("Hex Artifact Content");
991	1009	zUuid = db_text("?","SELECT uuid FROM blob WHERE rid=%d", rid);
992	1010	@ <h2>Artifact %s(zUuid):</h2>
993		- @ <blockquote>
	1011	+ @ <blockquote><p>
994	1012	blob_zero(&downloadName);
995	1013	object_description(rid, 0, &downloadName);
996	1014	style_submenu_element("Download", "Download",
997	1015	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
998		- @ </blockquote>
999		- @ <hr>
	1016	+ @ </p></blockquote>
	1017	+ @ <hr />
1000	1018	content_get(rid, &content);
1001	1019	@ <blockquote><pre>
1002	1020	hexdump(&content);
1003	1021	@ </pre></blockquote>
1004	1022	style_footer();
		@@ -1060,21 +1078,21 @@
1060	1078	if( !g.okRead ){ login_needed(); return; }
1061	1079	if( rid==0 ) fossil_redirect_home();
1062	1080	if( g.okAdmin ){
1063	1081	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1064	1082	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1065		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1083	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1066	1084	g.zTop, zUuid);
1067	1085	}else{
1068	1086	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1069	1087	g.zTop, zUuid);
1070	1088	}
1071	1089	}
1072	1090	style_header("Artifact Content");
1073	1091	zUuid = db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid);
1074	1092	@ <h2>Artifact %s(zUuid)</h2>
1075		- @ <blockquote>
	1093	+ @ <blockquote><p>
1076	1094	blob_zero(&downloadName);
1077	1095	object_description(rid, 0, &downloadName);
1078	1096	style_submenu_element("Download", "Download",
1079	1097	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1080	1098	zMime = mimetype_from_name(blob_str(&downloadName));
		@@ -1084,25 +1102,25 @@
1084	1102	style_submenu_element("Html", "Html",
1085	1103	"%s/artifact?name=%s", g.zTop, zUuid);
1086	1104	}else{
1087	1105	renderAsHtml = 1;
1088	1106	style_submenu_element("Text", "Text",
1089		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1107	+ "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1090	1108	}
1091	1109	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1092	1110	if( P("txt") ){
1093	1111	style_submenu_element("Wiki", "Wiki",
1094	1112	"%s/artifact?name=%s", g.zTop, zUuid);
1095	1113	}else{
1096	1114	renderAsWiki = 1;
1097	1115	style_submenu_element("Text", "Text",
1098		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1116	+ "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1099	1117	}
1100	1118	}
1101	1119	}
1102		- @ </blockquote>
1103		- @ <hr>
	1120	+ @ </p></blockquote>
	1121	+ @ <hr />
1104	1122	content_get(rid, &content);
1105	1123	if( renderAsWiki ){
1106	1124	wiki_convert(&content, 0, 0);
1107	1125	}else if( renderAsHtml ){
1108	1126	@ <div>
		@@ -1115,11 +1133,11 @@
1115	1133	@ <pre>
1116	1134	@ %h(blob_str(&content))
1117	1135	@ </pre>
1118	1136	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1119	1137	}else if( strncmp(zMime, "image/", 6)==0 ){
1120		- @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
	1138	+ @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1121	1139	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1122	1140	}else{
1123	1141	@ <pre>
1124	1142	hexdump(&content);
1125	1143	@ </pre>
		@@ -1148,11 +1166,11 @@
1148	1166	rid = name_to_rid_www("name");
1149	1167	if( rid==0 ){ fossil_redirect_home(); }
1150	1168	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1151	1169	if( g.okAdmin ){
1152	1170	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1153		- style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
	1171	+ style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1154	1172	g.zTop, zUuid);
1155	1173	}else{
1156	1174	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1157	1175	g.zTop, zUuid);
1158	1176	}
		@@ -1426,11 +1444,11 @@
1426	1444	int nTag = 0;
1427	1445	@ <b>Preview:</b>
1428	1446	@ <blockquote>
1429	1447	@ <table border=0>
1430	1448	if( zNewColor && zNewColor[0] ){
1431		- @ <tr><td bgcolor="%h(zNewColor)">
	1449	+ @ <tr><td style="background-color: %h(zNewColor);">
1432	1450	}else{
1433	1451	@ <tr><td>
1434	1452	}
1435	1453	wiki_convert(&comment, 0, WIKI_INLINE);
1436	1454	blob_zero(&suffix);
		@@ -1451,11 +1469,11 @@
1451	1469	db_finalize(&q);
1452	1470	blob_appendf(&suffix, ")");
1453	1471	@ %s(blob_str(&suffix))
1454	1472	@ </td></tr></table>
1455	1473	@ </blockquote>
1456		- @ <hr>
	1474	+ @ <hr />
1457	1475	blob_reset(&suffix);
1458	1476	}
1459	1477	@ <p>Make changes to attributes of check-in
1460	1478	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1461	1479	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
		@@ -1489,11 +1507,11 @@
1489	1507	}
1490	1508	@ Propagate color to descendants</input></td></tr>
1491	1509	@ <tr>
1492	1510	for(i=0; i<nColor; i++){
1493	1511	if( aColor[i].zColor[0] ){
1494		- @ <td bgcolor="%h(aColor[i].zColor)">
	1512	+ @ <td style="background-color: %h(aColor[i].zColor);">
1495	1513	}else{
1496	1514	@ <td>
1497	1515	}
1498	1516	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1499	1517	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
		@@ -1525,13 +1543,13 @@
1525	1543	int tagid = db_column_int(&q, 0);
1526	1544	const char *zTagName = db_column_text(&q, 1);
1527	1545	char zLabel[30];
1528	1546	sprintf(zLabel, "c%d", tagid);
1529	1547	if( P(zLabel) ){
1530		- @ <br><input type="checkbox" name="c%d(tagid)" checked>
	1548	+ @ <br /><input type="checkbox" name="c%d(tagid)" checked>
1531	1549	}else{
1532		- @ <br><input type="checkbox" name="c%d(tagid)">
	1550	+ @ <br /><input type="checkbox" name="c%d(tagid)">
1533	1551	}
1534	1552	if( strncmp(zTagName, "sym-", 4)==0 ){
1535	1553	@ Cancel tag <b>%h(&zTagName[4])</b>
1536	1554	}else{
1537	1555	@ Cancel special tag <b>%h(zTagName)</b>
1538	1556

	--- src/info.c
	+++ src/info.c
	@@ -65,10 +65,16 @@
65	);
66	/* 01234567890123 */
67	printf("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : "");
68	free(zUuid);
69	free(zDate);






70	}
71	db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid "
72	" WHERE cid=%d", rid);
73	while( db_step(&q)==SQLITE_ROW ){
74	const char *zUuid = db_column_text(&q, 0);
	@@ -96,11 +102,12 @@
96	if( zTags && zTags[0] ){
97	printf("tags: %s\n", zTags);
98	}
99	free(zTags);
100	if( zComment ){
101	printf("comment:\n%s\n", zComment);

102	free(zComment);
103	}
104	}
105
106
	@@ -135,11 +142,11 @@
135	/* 012345678901234 */
136	db_record_repository_filename(0);
137	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
138	printf("repository: %s\n", db_lget("repository", ""));
139	printf("local-root: %s\n", g.zLocalRoot);
140	#ifdef __MINGW32__
141	if( g.zHome ){
142	printf("user-home: %s\n", g.zHome);
143	}
144	#endif
145	printf("project-code: %s\n", db_get("project-code", ""));
	@@ -187,15 +194,15 @@
187	@ <div class="section">Tags And Properties</div>
188	@ <ul>
189	}
190	@ <li>
191	if( tagtype==0 ){
192	@ <b><s>%h(zTagname)</s></b> cancelled
193	}else if( zValue ){
194	@ <b>%h(zTagname)=%h(zValue)</b>
195	}else {
196	@ <b>%h(zTagname)</b>
197	}
198	if( tagtype==2 ){
199	if( zOrigUuid && zOrigUuid[0] ){
200	@ inherited from
201	hyperlink_to_uuid(zOrigUuid);
	@@ -215,10 +222,11 @@
215	}
216	hyperlink_to_uuid(zSrcUuid);
217	@ on
218	hyperlink_to_date(zDate,0);
219	}

220	}
221	db_finalize(&q);
222	if( cnt ){
223	@ </ul>
224	}
	@@ -231,11 +239,11 @@
231	static void append_diff(int fromid, int toid){
232	Blob from, to, out;
233	content_get(fromid, &from);
234	content_get(toid, &to);
235	blob_zero(&out);
236	text_diff(&from, &to, &out, 5);
237	@ %h(blob_str(&out))
238	blob_reset(&from);
239	blob_reset(&to);
240	blob_reset(&out);
241	}
	@@ -255,25 +263,33 @@
255	@ <p>Deleted %h(zName)</p>
256	}else if( zOld==0 ){
257	@ <p>Added %h(zName)</p>
258	}else{
259	@ <p>Changes to %h(zName)</p>







260	}
261	}else if( zOld && zNew ){
262	@ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
263	@ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a>
264	@ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a>
265	if( !showDiff ){
266	@
267	@ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a>
268	}else{
269	int rid1 = uuid_to_rid(zOld, 0);
270	int rid2 = uuid_to_rid(zNew, 0);
271	@ <blockquote><pre>
272	append_diff(rid1, rid2);
273	@ </pre></blockquote>
274	}

275	}else if( zOld ){
276	@ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
277	@ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a></p>
278	}else{
279	@ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
	@@ -340,11 +356,11 @@
340	TAG_COMMENT, rid);
341	zUser = db_column_text(&q, 2);
342	zComment = db_column_text(&q, 3);
343	zDate = db_column_text(&q,1);
344	@ <div class="section">Overview</div>
345	@ <p><table class="label-value">
346	@ <tr><th>SHA1 Hash:</th><td>%s(zUuid)
347	if( g.okSetup ){
348	@ (Record ID: %d(rid))
349	}
350	@ </td></tr>
	@@ -383,13 +399,13 @@
383	db_finalize(&q);
384	}
385	if( g.okHistory ){
386	const char *zProjName = db_get("project-name", "unnamed");
387	@ <tr><th>Timelines:</th><td>
388	@ <a href="%s(g.zBaseURL)/timeline?p=%S(zUuid)">ancestors</a>
389	@ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)">descendants</a>
390	@ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)&p=%S(zUuid)">both</a>
391	db_prepare(&q, "SELECT substr(tag.tagname,5) FROM tagxref, tag "
392	" WHERE rid=%d AND tagtype>0 "
393	" AND tag.tagid=tagxref.tagid "
394	" AND +tag.tagname GLOB 'sym-*'", rid);
395	while( db_step(&q)==SQLITE_ROW ){
	@@ -399,20 +415,22 @@
399	db_finalize(&q);
400	@ </td></tr>
401	@ <tr><th>Other Links:</th>
402	@ <td>
403	@ <a href="%s(g.zTop)/dir?ci=%S(zUuid)">files</a>
404	@ \| <a href="%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)">
405	@ ZIP archive</a>


406	@ \| <a href="%s(g.zTop)/artifact/%S(zUuid)">manifest</a>
407	if( g.okWrite ){
408	@ \| <a href="%s(g.zTop)/ci_edit?r=%S(zUuid)">edit</a>
409	}
410	@ </td>
411	@ </tr>
412	}
413	@ </table></p>
414	}else{
415	style_header("Check-in Information");
416	login_anonymous_available();
417	}
418	db_finalize(&q);
	@@ -600,11 +618,11 @@
600	}
601
602
603	/*
604	** WEBPAGE: vdiff
605	** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
606	**
607	** Show all differences between two checkins.
608	*/
609	void vdiff_page(void){
610	int ridFrom, ridTo;
	@@ -622,11 +640,11 @@
622	style_header("Check-in Differences");
623	@ <h2>Difference From:</h2><blockquote>
624	checkin_description(ridFrom);
625	@ </blockquote><h2>To:</h2><blockquote>
626	checkin_description(ridTo);
627	@ </blockquote><hr><p>
628
629	iFrom = iTo = 0;
630	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
631	int cmp;
632	if( iFrom>=mFrom.nFile ){
	@@ -864,23 +882,23 @@
864	v1 = name_to_rid_www("v1");
865	v2 = name_to_rid_www("v2");
866	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
867	style_header("Diff");
868	@ <h2>Differences From:</h2>
869	@ <blockquote>
870	object_description(v1, 1, 0);
871	@ </blockquote>
872	@ <h2>To:</h2>
873	@ <blockquote>
874	object_description(v2, 1, 0);
875	@ </blockquote>
876	@ <hr>
877	@ <blockquote><pre>
878	content_get(v1, &c1);
879	content_get(v2, &c2);
880	blob_zero(&diff);
881	text_diff(&c1, &c2, &diff, 4);
882	blob_reset(&c1);
883	blob_reset(&c2);
884	@ %h(blob_str(&diff))
885	@ </pre></blockquote>
886	blob_reset(&diff);
	@@ -978,27 +996,27 @@
978	if( !g.okRead ){ login_needed(); return; }
979	if( rid==0 ) fossil_redirect_home();
980	if( g.okAdmin ){
981	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
982	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
983	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
984	g.zTop, zUuid);
985	}else{
986	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
987	g.zTop, zUuid);
988	}
989	}
990	style_header("Hex Artifact Content");
991	zUuid = db_text("?","SELECT uuid FROM blob WHERE rid=%d", rid);
992	@ <h2>Artifact %s(zUuid):</h2>
993	@ <blockquote>
994	blob_zero(&downloadName);
995	object_description(rid, 0, &downloadName);
996	style_submenu_element("Download", "Download",
997	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
998	@ </blockquote>
999	@ <hr>
1000	content_get(rid, &content);
1001	@ <blockquote><pre>
1002	hexdump(&content);
1003	@ </pre></blockquote>
1004	style_footer();
	@@ -1060,21 +1078,21 @@
1060	if( !g.okRead ){ login_needed(); return; }
1061	if( rid==0 ) fossil_redirect_home();
1062	if( g.okAdmin ){
1063	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1064	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1065	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1066	g.zTop, zUuid);
1067	}else{
1068	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1069	g.zTop, zUuid);
1070	}
1071	}
1072	style_header("Artifact Content");
1073	zUuid = db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid);
1074	@ <h2>Artifact %s(zUuid)</h2>
1075	@ <blockquote>
1076	blob_zero(&downloadName);
1077	object_description(rid, 0, &downloadName);
1078	style_submenu_element("Download", "Download",
1079	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1080	zMime = mimetype_from_name(blob_str(&downloadName));
	@@ -1084,25 +1102,25 @@
1084	style_submenu_element("Html", "Html",
1085	"%s/artifact?name=%s", g.zTop, zUuid);
1086	}else{
1087	renderAsHtml = 1;
1088	style_submenu_element("Text", "Text",
1089	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1090	}
1091	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1092	if( P("txt") ){
1093	style_submenu_element("Wiki", "Wiki",
1094	"%s/artifact?name=%s", g.zTop, zUuid);
1095	}else{
1096	renderAsWiki = 1;
1097	style_submenu_element("Text", "Text",
1098	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1099	}
1100	}
1101	}
1102	@ </blockquote>
1103	@ <hr>
1104	content_get(rid, &content);
1105	if( renderAsWiki ){
1106	wiki_convert(&content, 0, 0);
1107	}else if( renderAsHtml ){
1108	@ <div>
	@@ -1115,11 +1133,11 @@
1115	@ <pre>
1116	@ %h(blob_str(&content))
1117	@ </pre>
1118	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1119	}else if( strncmp(zMime, "image/", 6)==0 ){
1120	@ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1121	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1122	}else{
1123	@ <pre>
1124	hexdump(&content);
1125	@ </pre>
	@@ -1148,11 +1166,11 @@
1148	rid = name_to_rid_www("name");
1149	if( rid==0 ){ fossil_redirect_home(); }
1150	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1151	if( g.okAdmin ){
1152	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1153	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1154	g.zTop, zUuid);
1155	}else{
1156	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1157	g.zTop, zUuid);
1158	}
	@@ -1426,11 +1444,11 @@
1426	int nTag = 0;
1427	@ <b>Preview:</b>
1428	@ <blockquote>
1429	@ <table border=0>
1430	if( zNewColor && zNewColor[0] ){
1431	@ <tr><td bgcolor="%h(zNewColor)">
1432	}else{
1433	@ <tr><td>
1434	}
1435	wiki_convert(&comment, 0, WIKI_INLINE);
1436	blob_zero(&suffix);
	@@ -1451,11 +1469,11 @@
1451	db_finalize(&q);
1452	blob_appendf(&suffix, ")");
1453	@ %s(blob_str(&suffix))
1454	@ </td></tr></table>
1455	@ </blockquote>
1456	@ <hr>
1457	blob_reset(&suffix);
1458	}
1459	@ <p>Make changes to attributes of check-in
1460	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1461	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
	@@ -1489,11 +1507,11 @@
1489	}
1490	@ Propagate color to descendants</input></td></tr>
1491	@ <tr>
1492	for(i=0; i<nColor; i++){
1493	if( aColor[i].zColor[0] ){
1494	@ <td bgcolor="%h(aColor[i].zColor)">
1495	}else{
1496	@ <td>
1497	}
1498	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1499	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
	@@ -1525,13 +1543,13 @@
1525	int tagid = db_column_int(&q, 0);
1526	const char *zTagName = db_column_text(&q, 1);
1527	char zLabel[30];
1528	sprintf(zLabel, "c%d", tagid);
1529	if( P(zLabel) ){
1530	@ <br><input type="checkbox" name="c%d(tagid)" checked>
1531	}else{
1532	@ <br><input type="checkbox" name="c%d(tagid)">
1533	}
1534	if( strncmp(zTagName, "sym-", 4)==0 ){
1535	@ Cancel tag <b>%h(&zTagName[4])</b>
1536	}else{
1537	@ Cancel special tag <b>%h(zTagName)</b>
1538

	--- src/info.c
	+++ src/info.c
	@@ -65,10 +65,16 @@
65	);
66	/* 01234567890123 */
67	printf("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : "");
68	free(zUuid);
69	free(zDate);
70	}
71	if( zUuid && showComment ){
72	zComment = db_text(0,
73	"SELECT coalesce(ecomment,comment) \|\| ' (user: ' \|\| coalesce(euser,user,'?') \|\| ')' FROM event WHERE objid=%d",
74	rid
75	);
76	}
77	db_prepare(&q, "SELECT uuid, pid FROM plink JOIN blob ON pid=rid "
78	" WHERE cid=%d", rid);
79	while( db_step(&q)==SQLITE_ROW ){
80	const char *zUuid = db_column_text(&q, 0);
	@@ -96,11 +102,12 @@
102	if( zTags && zTags[0] ){
103	printf("tags: %s\n", zTags);
104	}
105	free(zTags);
106	if( zComment ){
107	printf("comment: ");
108	comment_print(zComment, 14, 79);
109	free(zComment);
110	}
111	}
112
113
	@@ -135,11 +142,11 @@
142	/* 012345678901234 */
143	db_record_repository_filename(0);
144	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
145	printf("repository: %s\n", db_lget("repository", ""));
146	printf("local-root: %s\n", g.zLocalRoot);
147	#if defined(_WIN32)
148	if( g.zHome ){
149	printf("user-home: %s\n", g.zHome);
150	}
151	#endif
152	printf("project-code: %s\n", db_get("project-code", ""));
	@@ -187,15 +194,15 @@
194	@ <div class="section">Tags And Properties</div>
195	@ <ul>
196	}
197	@ <li>
198	if( tagtype==0 ){
199	@ <span class="infoTagCancelled">%h(zTagname)</span> cancelled
200	}else if( zValue ){
201	@ <span class="infoTag">%h(zTagname)=%h(zValue)</span>
202	}else {
203	@ <span class="infoTag">%h(zTagname)</span>
204	}
205	if( tagtype==2 ){
206	if( zOrigUuid && zOrigUuid[0] ){
207	@ inherited from
208	hyperlink_to_uuid(zOrigUuid);
	@@ -215,10 +222,11 @@
222	}
223	hyperlink_to_uuid(zSrcUuid);
224	@ on
225	hyperlink_to_date(zDate,0);
226	}
227	@ </li>
228	}
229	db_finalize(&q);
230	if( cnt ){
231	@ </ul>
232	}
	@@ -231,11 +239,11 @@
239	static void append_diff(int fromid, int toid){
240	Blob from, to, out;
241	content_get(fromid, &from);
242	content_get(toid, &to);
243	blob_zero(&out);
244	text_diff(&from, &to, &out, 5, 1);
245	@ %h(blob_str(&out))
246	blob_reset(&from);
247	blob_reset(&to);
248	blob_reset(&out);
249	}
	@@ -255,25 +263,33 @@
263	@ <p>Deleted %h(zName)</p>
264	}else if( zOld==0 ){
265	@ <p>Added %h(zName)</p>
266	}else{
267	@ <p>Changes to %h(zName)</p>
268	if( showDiff ){
269	int rid1 = uuid_to_rid(zOld, 0);
270	int rid2 = uuid_to_rid(zNew, 0);
271	@ <blockquote><pre>
272	append_diff(rid1, rid2);
273	@ </pre></blockquote>
274	}
275	}
276	}else if( zOld && zNew ){
277	@ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
278	@ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a>
279	@ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a>
280	if( !showDiff ){
281	@
282	@ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a>
283	}else{
284	int rid1 = uuid_to_rid(zOld, 0);
285	int rid2 = uuid_to_rid(zNew, 0);
286	@ <blockquote><pre>
287	append_diff(rid1, rid2);
288	@ </pre></blockquote>
289	}
290	@ </p>
291	}else if( zOld ){
292	@ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
293	@ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a></p>
294	}else{
295	@ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a>
	@@ -340,11 +356,11 @@
356	TAG_COMMENT, rid);
357	zUser = db_column_text(&q, 2);
358	zComment = db_column_text(&q, 3);
359	zDate = db_column_text(&q,1);
360	@ <div class="section">Overview</div>
361	@ <table class="label-value">
362	@ <tr><th>SHA1 Hash:</th><td>%s(zUuid)
363	if( g.okSetup ){
364	@ (Record ID: %d(rid))
365	}
366	@ </td></tr>
	@@ -383,13 +399,13 @@
399	db_finalize(&q);
400	}
401	if( g.okHistory ){
402	const char *zProjName = db_get("project-name", "unnamed");
403	@ <tr><th>Timelines:</th><td>
404	@ <a href="%s(g.zBaseURL)/timeline?p=%S(zUuid)">ancestors</a>
405	@ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)">descendants</a>
406	@ \| <a href="%s(g.zBaseURL)/timeline?d=%S(zUuid)&p=%S(zUuid)">both</a>
407	db_prepare(&q, "SELECT substr(tag.tagname,5) FROM tagxref, tag "
408	" WHERE rid=%d AND tagtype>0 "
409	" AND tag.tagid=tagxref.tagid "
410	" AND +tag.tagname GLOB 'sym-*'", rid);
411	while( db_step(&q)==SQLITE_ROW ){
	@@ -399,20 +415,22 @@
415	db_finalize(&q);
416	@ </td></tr>
417	@ <tr><th>Other Links:</th>
418	@ <td>
419	@ <a href="%s(g.zTop)/dir?ci=%S(zUuid)">files</a>
420	if( g.okZip ){
421	@ \| <a href="%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)">
422	@ ZIP archive</a>
423	}
424	@ \| <a href="%s(g.zTop)/artifact/%S(zUuid)">manifest</a>
425	if( g.okWrite ){
426	@ \| <a href="%s(g.zTop)/ci_edit?r=%S(zUuid)">edit</a>
427	}
428	@ </td>
429	@ </tr>
430	}
431	@ </table>
432	}else{
433	style_header("Check-in Information");
434	login_anonymous_available();
435	}
436	db_finalize(&q);
	@@ -600,11 +618,11 @@
618	}
619
620
621	/*
622	** WEBPAGE: vdiff
623	** URL: /vdiff?from=UUID&to=UUID&detail=BOOLEAN
624	**
625	** Show all differences between two checkins.
626	*/
627	void vdiff_page(void){
628	int ridFrom, ridTo;
	@@ -622,11 +640,11 @@
640	style_header("Check-in Differences");
641	@ <h2>Difference From:</h2><blockquote>
642	checkin_description(ridFrom);
643	@ </blockquote><h2>To:</h2><blockquote>
644	checkin_description(ridTo);
645	@ </blockquote><hr /><p>
646
647	iFrom = iTo = 0;
648	while( iFrom<mFrom.nFile && iTo<mTo.nFile ){
649	int cmp;
650	if( iFrom>=mFrom.nFile ){
	@@ -864,23 +882,23 @@
882	v1 = name_to_rid_www("v1");
883	v2 = name_to_rid_www("v2");
884	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
885	style_header("Diff");
886	@ <h2>Differences From:</h2>
887	@ <blockquote><p>
888	object_description(v1, 1, 0);
889	@ </p></blockquote>
890	@ <h2>To:</h2>
891	@ <blockquote><p>
892	object_description(v2, 1, 0);
893	@ </p></blockquote>
894	@ <hr />
895	@ <blockquote><pre>
896	content_get(v1, &c1);
897	content_get(v2, &c2);
898	blob_zero(&diff);
899	text_diff(&c1, &c2, &diff, 4, 1);
900	blob_reset(&c1);
901	blob_reset(&c2);
902	@ %h(blob_str(&diff))
903	@ </pre></blockquote>
904	blob_reset(&diff);
	@@ -978,27 +996,27 @@
996	if( !g.okRead ){ login_needed(); return; }
997	if( rid==0 ) fossil_redirect_home();
998	if( g.okAdmin ){
999	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1000	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1001	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1002	g.zTop, zUuid);
1003	}else{
1004	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1005	g.zTop, zUuid);
1006	}
1007	}
1008	style_header("Hex Artifact Content");
1009	zUuid = db_text("?","SELECT uuid FROM blob WHERE rid=%d", rid);
1010	@ <h2>Artifact %s(zUuid):</h2>
1011	@ <blockquote><p>
1012	blob_zero(&downloadName);
1013	object_description(rid, 0, &downloadName);
1014	style_submenu_element("Download", "Download",
1015	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1016	@ </p></blockquote>
1017	@ <hr />
1018	content_get(rid, &content);
1019	@ <blockquote><pre>
1020	hexdump(&content);
1021	@ </pre></blockquote>
1022	style_footer();
	@@ -1060,21 +1078,21 @@
1078	if( !g.okRead ){ login_needed(); return; }
1079	if( rid==0 ) fossil_redirect_home();
1080	if( g.okAdmin ){
1081	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1082	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1083	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1084	g.zTop, zUuid);
1085	}else{
1086	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1087	g.zTop, zUuid);
1088	}
1089	}
1090	style_header("Artifact Content");
1091	zUuid = db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid);
1092	@ <h2>Artifact %s(zUuid)</h2>
1093	@ <blockquote><p>
1094	blob_zero(&downloadName);
1095	object_description(rid, 0, &downloadName);
1096	style_submenu_element("Download", "Download",
1097	"%s/raw/%T?name=%s", g.zTop, blob_str(&downloadName), zUuid);
1098	zMime = mimetype_from_name(blob_str(&downloadName));
	@@ -1084,25 +1102,25 @@
1102	style_submenu_element("Html", "Html",
1103	"%s/artifact?name=%s", g.zTop, zUuid);
1104	}else{
1105	renderAsHtml = 1;
1106	style_submenu_element("Text", "Text",
1107	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1108	}
1109	}else if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
1110	if( P("txt") ){
1111	style_submenu_element("Wiki", "Wiki",
1112	"%s/artifact?name=%s", g.zTop, zUuid);
1113	}else{
1114	renderAsWiki = 1;
1115	style_submenu_element("Text", "Text",
1116	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1117	}
1118	}
1119	}
1120	@ </p></blockquote>
1121	@ <hr />
1122	content_get(rid, &content);
1123	if( renderAsWiki ){
1124	wiki_convert(&content, 0, 0);
1125	}else if( renderAsHtml ){
1126	@ <div>
	@@ -1115,11 +1133,11 @@
1133	@ <pre>
1134	@ %h(blob_str(&content))
1135	@ </pre>
1136	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1137	}else if( strncmp(zMime, "image/", 6)==0 ){
1138	@ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img>
1139	style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1140	}else{
1141	@ <pre>
1142	hexdump(&content);
1143	@ </pre>
	@@ -1148,11 +1166,11 @@
1166	rid = name_to_rid_www("name");
1167	if( rid==0 ){ fossil_redirect_home(); }
1168	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
1169	if( g.okAdmin ){
1170	if( db_exists("SELECT 1 FROM shun WHERE uuid='%s'", zUuid) ){
1171	style_submenu_element("Unshun","Unshun", "%s/shun?uuid=%s&sub=1",
1172	g.zTop, zUuid);
1173	}else{
1174	style_submenu_element("Shun","Shun", "%s/shun?shun=%s#addshun",
1175	g.zTop, zUuid);
1176	}
	@@ -1426,11 +1444,11 @@
1444	int nTag = 0;
1445	@ <b>Preview:</b>
1446	@ <blockquote>
1447	@ <table border=0>
1448	if( zNewColor && zNewColor[0] ){
1449	@ <tr><td style="background-color: %h(zNewColor);">
1450	}else{
1451	@ <tr><td>
1452	}
1453	wiki_convert(&comment, 0, WIKI_INLINE);
1454	blob_zero(&suffix);
	@@ -1451,11 +1469,11 @@
1469	db_finalize(&q);
1470	blob_appendf(&suffix, ")");
1471	@ %s(blob_str(&suffix))
1472	@ </td></tr></table>
1473	@ </blockquote>
1474	@ <hr />
1475	blob_reset(&suffix);
1476	}
1477	@ <p>Make changes to attributes of check-in
1478	@ [<a href="ci?name=%s(zUuid)">%s(zUuid)</a>]:</p>
1479	@ <form action="%s(g.zBaseURL)/ci_edit" method="POST">
	@@ -1489,11 +1507,11 @@
1507	}
1508	@ Propagate color to descendants</input></td></tr>
1509	@ <tr>
1510	for(i=0; i<nColor; i++){
1511	if( aColor[i].zColor[0] ){
1512	@ <td style="background-color: %h(aColor[i].zColor);">
1513	}else{
1514	@ <td>
1515	}
1516	if( strcmp(zNewColor, aColor[i].zColor)==0 ){
1517	@ <input type="radio" name="clr" value="%h(aColor[i].zColor)" checked>
	@@ -1525,13 +1543,13 @@
1543	int tagid = db_column_int(&q, 0);
1544	const char *zTagName = db_column_text(&q, 1);
1545	char zLabel[30];
1546	sprintf(zLabel, "c%d", tagid);
1547	if( P(zLabel) ){
1548	@ <br /><input type="checkbox" name="c%d(tagid)" checked>
1549	}else{
1550	@ <br /><input type="checkbox" name="c%d(tagid)">
1551	}
1552	if( strncmp(zTagName, "sym-", 4)==0 ){
1553	@ Cancel tag <b>%h(&zTagName[4])</b>
1554	}else{
1555	@ Cancel special tag <b>%h(zTagName)</b>
1556

M src/login.c

+40 -38

		--- src/login.c
		+++ src/login.c
		@@ -37,13 +37,15 @@
37	37	** logs and downloading diffs of very version of the archive that
38	38	** has ever existed, and things like that.
39	39	*/
40	40	#include "config.h"
41	41	#include "login.h"
42		-#ifdef __MINGW32__
	42	+#if defined(_WIN32)
43	43	# include <windows.h> /* for Sleep */
44		-# define sleep Sleep /* windows does not have sleep, but Sleep */
	44	+# if defined(__MINGW32__) \|\| defined(_MSC_VER)
	45	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	46	+# endif
45	47	#endif
46	48	#include <time.h>
47	49
48	50	/*
49	51	** Return the name of the login cookie
		@@ -151,21 +153,21 @@
151	153	if( db_int(1, "SELECT 0 FROM user"
152	154	" WHERE uid=%d AND (pw=%Q OR pw=%Q)",
153	155	g.userUid, zPasswd, zSha1Pw) ){
154	156	sleep(1);
155	157	zErrMsg =
156		- @ <p><font color="red">
	158	+ @ <p><span class="loginError">
157	159	@ You entered an incorrect old password while attempting to change
158	160	@ your password. Your password is unchanged.
159		- @ </font></p>
	161	+ @ </span></p>
160	162	;
161	163	}else if( strcmp(zNew1,zNew2)!=0 ){
162	164	zErrMsg =
163		- @ <p><font color="red">
	165	+ @ <p><span class="loginError">
164	166	@ The two copies of your new passwords do not match.
165	167	@ Your password is unchanged.
166		- @ </font></p>
	168	+ @ </span></p>
167	169	;
168	170	}else{
169	171	char *zNewPw = sha1_shared_secret(zNew1, g.zLogin);
170	172	db_multi_exec(
171	173	"UPDATE user SET pw=%Q WHERE uid=%d", zNewPw, g.userUid
		@@ -204,13 +206,13 @@
204	206	zUsername, zPasswd, zSha1Pw
205	207	);
206	208	if( uid<=0 ){
207	209	sleep(1);
208	210	zErrMsg =
209		- @ <p><font color="red">
	211	+ @ <p><span class="loginError">
210	212	@ You entered an unknown user or an incorrect password.
211		- @ </font></p>
	213	+ @ </span></p>
212	214	;
213	215	}else{
214	216	char *zCookie;
215	217	const char *zCookieName = login_cookie_name();
216	218	const char *zExpire = db_get("cookie-expire","8766");
		@@ -227,38 +229,38 @@
227	229	redirect_to_g();
228	230	}
229	231	}
230	232	style_header("Login/Logout");
231	233	@ %s(zErrMsg)
232		- @ <form action="login" method="POST">
	234	+ @ <form action="login" method="post">
233	235	if( P("g") ){
234		- @ <input type="hidden" name="g" value="%h(P("g"))">
	236	+ @ <input type="hidden" name="g" value="%h(P("g"))" />
235	237	}
236		- @ <table align="left" hspace="10">
	238	+ @ <table class="login_out">
237	239	@ <tr>
238		- @ <td align="right">User ID:</td>
	240	+ @ <td class="login_out_label">User ID:</td>
239	241	if( anonFlag ){
240		- @ <td><input type="text" id="u" name="u" value="anonymous" size=30></td>
	242	+ @ <td><input type="text" id="u" name="u" value="anonymous" size="30" /></td>
241	243	}else{
242		- @ <td><input type="text" id="u" name="u" value="" size=30></td>
	244	+ @ <td><input type="text" id="u" name="u" value="" size="30" /></td>
243	245	}
244	246	@ </tr>
245	247	@ <tr>
246		- @ <td align="right">Password:</td>
247		- @ <td><input type="password" id="p" name="p" value="" size=30></td>
	248	+ @ <td class="login_out_label">Password:</td>
	249	+ @ <td><input type="password" id="p" name="p" value="" size="30" /></td>
248	250	@ </tr>
249	251	if( g.zLogin==0 ){
250	252	zAnonPw = db_text(0, "SELECT pw FROM user"
251	253	" WHERE login='anonymous'"
252	254	" AND cap!=''");
253	255	}
254	256	@ <tr>
255	257	@ <td></td>
256		- @ <td><input type="submit" name="in" value="Login"></td>
	258	+ @ <td><input type="submit" name="in" value="Login" /></td>
257	259	@ </tr>
258	260	@ </table>
259		- @ <script>document.getElementById('u').focus()</script>
	261	+ @ <script type="text/JavaScript">document.getElementById('u').focus()</script>
260	262	if( g.zLogin==0 ){
261	263	@ <p>Enter
262	264	}else{
263	265	@ <p>You are currently logged in as <b>%h(g.zLogin)</b></p>
264	266	@ <p>To change your login to a different user, enter
		@@ -271,46 +273,46 @@
271	273	unsigned int uSeed = captcha_seed();
272	274	char const *zDecoded = captcha_decode(uSeed);
273	275	int bAutoCaptcha = db_get_boolean("auto-captcha", 1);
274	276	char *zCaptcha = captcha_render(zDecoded);
275	277
276		- @ <input type="hidden" name="cs" value="%u(uSeed)"/>
277		- @ <p>Visitors may enter <b>anonymous</b> as the user-ID with
	278	+ @ <p><input type="hidden" name="cs" value="%u(uSeed)" />
	279	+ @ Visitors may enter <b>anonymous</b> as the user-ID with
278	280	@ the 8-character hexadecimal password shown below:</p>
279		- @ <center><table border="1" cellpadding="10"><tr><td><pre>
	281	+ @ <div class="captcha"><table class="captcha"><tr><td><pre>
280	282	@ %s(zCaptcha)
281	283	@ </pre></td></tr></table>
282	284	if( bAutoCaptcha ) {
283	285	@ <input type="button" value="Fill out captcha"
284	286	@ onclick="document.getElementById('u').value='anonymous';
285		- @ document.getElementById('p').value='%s(zDecoded)';"/>
	287	+ @ document.getElementById('p').value='%s(zDecoded)';" />
286	288	}
287		- @ </center>
	289	+ @ </div>
288	290	free(zCaptcha);
289	291	}
290	292	if( g.zLogin ){
291		- @ <br clear="both"><hr>
	293	+ @ <hr />
292	294	@ <p>To log off the system (and delete your login cookie)
293		- @ press the following button:<br>
294		- @ <input type="submit" name="out" value="Logout"></p>
	295	+ @ press the following button:<br />
	296	+ @ <input type="submit" name="out" value="Logout" /></p>
295	297	}
296	298	@ </form>
297	299	if( g.okPassword ){
298		- @ <br clear="both"><hr>
	300	+ @ <hr />
299	301	@ <p>To change your password, enter your old password and your
300	302	@ new password twice below then press the "Change Password"
301	303	@ button.</p>
302		- @ <form action="login" method="POST">
	304	+ @ <form action="login" method="post">
303	305	@ <table>
304		- @ <tr><td align="right">Old Password:</td>
305		- @ <td><input type="password" name="p" size=30></td></tr>
306		- @ <tr><td align="right">New Password:</td>
307		- @ <td><input type="password" name="n1" size=30></td></tr>
308		- @ <tr><td align="right">Repeat New Password:</td>
309		- @ <td><input type="password" name="n2" size=30></td></tr>
	306	+ @ <tr><td class="login_out_label">Old Password:</td>
	307	+ @ <td><input type="password" name="p" size="30" /></td></tr>
	308	+ @ <tr><td class="login_out_label">New Password:</td>
	309	+ @ <td><input type="password" name="n1" size="30" /></td></tr>
	310	+ @ <tr><td class="login_out_label">Repeat New Password:</td>
	311	+ @ <td><input type="password" name="n2" size="30" /></td></tr>
310	312	@ <tr><td></td>
311		- @ <td><input type="submit" value="Change Password"></td></tr>
	313	+ @ <td><input type="submit" value="Change Password" /></td></tr>
312	314	@ </table>
313	315	@ </form>
314	316	}
315	317	style_footer();
316	318	}
		@@ -594,22 +596,22 @@
594	596	if( !g.okHistory &&
595	597	db_exists("SELECT 1 FROM user"
596	598	" WHERE login='anonymous'"
597	599	" AND cap LIKE '%%h%%'") ){
598	600	const char *zUrl = PD("REQUEST_URI", "index");
599		- @ <p>Many <font color="red">hyperlinks are disabled.</font><br />
600		- @ Use <a href="%s(g.zTop)/login?anon=1&g=%T(zUrl)">anonymous login</a>
	601	+ @ <p>Many <span class="disabled">hyperlinks are disabled.</span><br />
	602	+ @ Use <a href="%s(g.zTop)/login?anon=1&g=%T(zUrl)">anonymous login</a>
601	603	@ to enable hyperlinks.</p>
602	604	}
603	605	}
604	606
605	607	/*
606	608	** While rendering a form, call this routine to add the Anti-CSRF token
607	609	** as a hidden element of the form.
608	610	*/
609	611	void login_insert_csrf_secret(void){
610		- @ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)">
	612	+ @ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)" />
611	613	}
612	614
613	615	/*
614	616	** Before using the results of a form, first call this routine to verify
615	617	** that ths Anti-CSRF token is present and is valid. If the Anti-CSRF token
616	618

	--- src/login.c
	+++ src/login.c
	@@ -37,13 +37,15 @@
37	** logs and downloading diffs of very version of the archive that
38	** has ever existed, and things like that.
39	*/
40	#include "config.h"
41	#include "login.h"
42	#ifdef __MINGW32__
43	# include <windows.h> /* for Sleep */
44	# define sleep Sleep /* windows does not have sleep, but Sleep */


45	#endif
46	#include <time.h>
47
48	/*
49	** Return the name of the login cookie
	@@ -151,21 +153,21 @@
151	if( db_int(1, "SELECT 0 FROM user"
152	" WHERE uid=%d AND (pw=%Q OR pw=%Q)",
153	g.userUid, zPasswd, zSha1Pw) ){
154	sleep(1);
155	zErrMsg =
156	@ <p><font color="red">
157	@ You entered an incorrect old password while attempting to change
158	@ your password. Your password is unchanged.
159	@ </font></p>
160	;
161	}else if( strcmp(zNew1,zNew2)!=0 ){
162	zErrMsg =
163	@ <p><font color="red">
164	@ The two copies of your new passwords do not match.
165	@ Your password is unchanged.
166	@ </font></p>
167	;
168	}else{
169	char *zNewPw = sha1_shared_secret(zNew1, g.zLogin);
170	db_multi_exec(
171	"UPDATE user SET pw=%Q WHERE uid=%d", zNewPw, g.userUid
	@@ -204,13 +206,13 @@
204	zUsername, zPasswd, zSha1Pw
205	);
206	if( uid<=0 ){
207	sleep(1);
208	zErrMsg =
209	@ <p><font color="red">
210	@ You entered an unknown user or an incorrect password.
211	@ </font></p>
212	;
213	}else{
214	char *zCookie;
215	const char *zCookieName = login_cookie_name();
216	const char *zExpire = db_get("cookie-expire","8766");
	@@ -227,38 +229,38 @@
227	redirect_to_g();
228	}
229	}
230	style_header("Login/Logout");
231	@ %s(zErrMsg)
232	@ <form action="login" method="POST">
233	if( P("g") ){
234	@ <input type="hidden" name="g" value="%h(P("g"))">
235	}
236	@ <table align="left" hspace="10">
237	@ <tr>
238	@ <td align="right">User ID:</td>
239	if( anonFlag ){
240	@ <td><input type="text" id="u" name="u" value="anonymous" size=30></td>
241	}else{
242	@ <td><input type="text" id="u" name="u" value="" size=30></td>
243	}
244	@ </tr>
245	@ <tr>
246	@ <td align="right">Password:</td>
247	@ <td><input type="password" id="p" name="p" value="" size=30></td>
248	@ </tr>
249	if( g.zLogin==0 ){
250	zAnonPw = db_text(0, "SELECT pw FROM user"
251	" WHERE login='anonymous'"
252	" AND cap!=''");
253	}
254	@ <tr>
255	@ <td></td>
256	@ <td><input type="submit" name="in" value="Login"></td>
257	@ </tr>
258	@ </table>
259	@ <script>document.getElementById('u').focus()</script>
260	if( g.zLogin==0 ){
261	@ <p>Enter
262	}else{
263	@ <p>You are currently logged in as <b>%h(g.zLogin)</b></p>
264	@ <p>To change your login to a different user, enter
	@@ -271,46 +273,46 @@
271	unsigned int uSeed = captcha_seed();
272	char const *zDecoded = captcha_decode(uSeed);
273	int bAutoCaptcha = db_get_boolean("auto-captcha", 1);
274	char *zCaptcha = captcha_render(zDecoded);
275
276	@ <input type="hidden" name="cs" value="%u(uSeed)"/>
277	@ <p>Visitors may enter <b>anonymous</b> as the user-ID with
278	@ the 8-character hexadecimal password shown below:</p>
279	@ <center><table border="1" cellpadding="10"><tr><td><pre>
280	@ %s(zCaptcha)
281	@ </pre></td></tr></table>
282	if( bAutoCaptcha ) {
283	@ <input type="button" value="Fill out captcha"
284	@ onclick="document.getElementById('u').value='anonymous';
285	@ document.getElementById('p').value='%s(zDecoded)';"/>
286	}
287	@ </center>
288	free(zCaptcha);
289	}
290	if( g.zLogin ){
291	@ <br clear="both"><hr>
292	@ <p>To log off the system (and delete your login cookie)
293	@ press the following button:<br>
294	@ <input type="submit" name="out" value="Logout"></p>
295	}
296	@ </form>
297	if( g.okPassword ){
298	@ <br clear="both"><hr>
299	@ <p>To change your password, enter your old password and your
300	@ new password twice below then press the "Change Password"
301	@ button.</p>
302	@ <form action="login" method="POST">
303	@ <table>
304	@ <tr><td align="right">Old Password:</td>
305	@ <td><input type="password" name="p" size=30></td></tr>
306	@ <tr><td align="right">New Password:</td>
307	@ <td><input type="password" name="n1" size=30></td></tr>
308	@ <tr><td align="right">Repeat New Password:</td>
309	@ <td><input type="password" name="n2" size=30></td></tr>
310	@ <tr><td></td>
311	@ <td><input type="submit" value="Change Password"></td></tr>
312	@ </table>
313	@ </form>
314	}
315	style_footer();
316	}
	@@ -594,22 +596,22 @@
594	if( !g.okHistory &&
595	db_exists("SELECT 1 FROM user"
596	" WHERE login='anonymous'"
597	" AND cap LIKE '%%h%%'") ){
598	const char *zUrl = PD("REQUEST_URI", "index");
599	@ <p>Many <font color="red">hyperlinks are disabled.</font><br />
600	@ Use <a href="%s(g.zTop)/login?anon=1&g=%T(zUrl)">anonymous login</a>
601	@ to enable hyperlinks.</p>
602	}
603	}
604
605	/*
606	** While rendering a form, call this routine to add the Anti-CSRF token
607	** as a hidden element of the form.
608	*/
609	void login_insert_csrf_secret(void){
610	@ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)">
611	}
612
613	/*
614	** Before using the results of a form, first call this routine to verify
615	** that ths Anti-CSRF token is present and is valid. If the Anti-CSRF token
616

	--- src/login.c
	+++ src/login.c
	@@ -37,13 +37,15 @@
37	** logs and downloading diffs of very version of the archive that
38	** has ever existed, and things like that.
39	*/
40	#include "config.h"
41	#include "login.h"
42	#if defined(_WIN32)
43	# include <windows.h> /* for Sleep */
44	# if defined(__MINGW32__) \|\| defined(_MSC_VER)
45	# define sleep Sleep /* windows does not have sleep, but Sleep */
46	# endif
47	#endif
48	#include <time.h>
49
50	/*
51	** Return the name of the login cookie
	@@ -151,21 +153,21 @@
153	if( db_int(1, "SELECT 0 FROM user"
154	" WHERE uid=%d AND (pw=%Q OR pw=%Q)",
155	g.userUid, zPasswd, zSha1Pw) ){
156	sleep(1);
157	zErrMsg =
158	@ <p><span class="loginError">
159	@ You entered an incorrect old password while attempting to change
160	@ your password. Your password is unchanged.
161	@ </span></p>
162	;
163	}else if( strcmp(zNew1,zNew2)!=0 ){
164	zErrMsg =
165	@ <p><span class="loginError">
166	@ The two copies of your new passwords do not match.
167	@ Your password is unchanged.
168	@ </span></p>
169	;
170	}else{
171	char *zNewPw = sha1_shared_secret(zNew1, g.zLogin);
172	db_multi_exec(
173	"UPDATE user SET pw=%Q WHERE uid=%d", zNewPw, g.userUid
	@@ -204,13 +206,13 @@
206	zUsername, zPasswd, zSha1Pw
207	);
208	if( uid<=0 ){
209	sleep(1);
210	zErrMsg =
211	@ <p><span class="loginError">
212	@ You entered an unknown user or an incorrect password.
213	@ </span></p>
214	;
215	}else{
216	char *zCookie;
217	const char *zCookieName = login_cookie_name();
218	const char *zExpire = db_get("cookie-expire","8766");
	@@ -227,38 +229,38 @@
229	redirect_to_g();
230	}
231	}
232	style_header("Login/Logout");
233	@ %s(zErrMsg)
234	@ <form action="login" method="post">
235	if( P("g") ){
236	@ <input type="hidden" name="g" value="%h(P("g"))" />
237	}
238	@ <table class="login_out">
239	@ <tr>
240	@ <td class="login_out_label">User ID:</td>
241	if( anonFlag ){
242	@ <td><input type="text" id="u" name="u" value="anonymous" size="30" /></td>
243	}else{
244	@ <td><input type="text" id="u" name="u" value="" size="30" /></td>
245	}
246	@ </tr>
247	@ <tr>
248	@ <td class="login_out_label">Password:</td>
249	@ <td><input type="password" id="p" name="p" value="" size="30" /></td>
250	@ </tr>
251	if( g.zLogin==0 ){
252	zAnonPw = db_text(0, "SELECT pw FROM user"
253	" WHERE login='anonymous'"
254	" AND cap!=''");
255	}
256	@ <tr>
257	@ <td></td>
258	@ <td><input type="submit" name="in" value="Login" /></td>
259	@ </tr>
260	@ </table>
261	@ <script type="text/JavaScript">document.getElementById('u').focus()</script>
262	if( g.zLogin==0 ){
263	@ <p>Enter
264	}else{
265	@ <p>You are currently logged in as <b>%h(g.zLogin)</b></p>
266	@ <p>To change your login to a different user, enter
	@@ -271,46 +273,46 @@
273	unsigned int uSeed = captcha_seed();
274	char const *zDecoded = captcha_decode(uSeed);
275	int bAutoCaptcha = db_get_boolean("auto-captcha", 1);
276	char *zCaptcha = captcha_render(zDecoded);
277
278	@ <p><input type="hidden" name="cs" value="%u(uSeed)" />
279	@ Visitors may enter <b>anonymous</b> as the user-ID with
280	@ the 8-character hexadecimal password shown below:</p>
281	@ <div class="captcha"><table class="captcha"><tr><td><pre>
282	@ %s(zCaptcha)
283	@ </pre></td></tr></table>
284	if( bAutoCaptcha ) {
285	@ <input type="button" value="Fill out captcha"
286	@ onclick="document.getElementById('u').value='anonymous';
287	@ document.getElementById('p').value='%s(zDecoded)';" />
288	}
289	@ </div>
290	free(zCaptcha);
291	}
292	if( g.zLogin ){
293	@ <hr />
294	@ <p>To log off the system (and delete your login cookie)
295	@ press the following button:<br />
296	@ <input type="submit" name="out" value="Logout" /></p>
297	}
298	@ </form>
299	if( g.okPassword ){
300	@ <hr />
301	@ <p>To change your password, enter your old password and your
302	@ new password twice below then press the "Change Password"
303	@ button.</p>
304	@ <form action="login" method="post">
305	@ <table>
306	@ <tr><td class="login_out_label">Old Password:</td>
307	@ <td><input type="password" name="p" size="30" /></td></tr>
308	@ <tr><td class="login_out_label">New Password:</td>
309	@ <td><input type="password" name="n1" size="30" /></td></tr>
310	@ <tr><td class="login_out_label">Repeat New Password:</td>
311	@ <td><input type="password" name="n2" size="30" /></td></tr>
312	@ <tr><td></td>
313	@ <td><input type="submit" value="Change Password" /></td></tr>
314	@ </table>
315	@ </form>
316	}
317	style_footer();
318	}
	@@ -594,22 +596,22 @@
596	if( !g.okHistory &&
597	db_exists("SELECT 1 FROM user"
598	" WHERE login='anonymous'"
599	" AND cap LIKE '%%h%%'") ){
600	const char *zUrl = PD("REQUEST_URI", "index");
601	@ <p>Many <span class="disabled">hyperlinks are disabled.</span><br />
602	@ Use <a href="%s(g.zTop)/login?anon=1&g=%T(zUrl)">anonymous login</a>
603	@ to enable hyperlinks.</p>
604	}
605	}
606
607	/*
608	** While rendering a form, call this routine to add the Anti-CSRF token
609	** as a hidden element of the form.
610	*/
611	void login_insert_csrf_secret(void){
612	@ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)" />
613	}
614
615	/*
616	** Before using the results of a form, first call this routine to verify
617	** that ths Anti-CSRF token is present and is valid. If the Anti-CSRF token
618

M src/main.c

+24 -11

		--- src/main.c
		+++ src/main.c
		@@ -86,10 +86,11 @@
86	86	int aCommitFile; / Array of files to be committed */
87	87	int markPrivate; /* All new artifacts are private if true */
88	88
89	89	int urlIsFile; /* True if a "file:" url */
90	90	int urlIsHttps; /* True if a "https:" url */
	91	+ int urlIsSsh; /* True if an "ssh:" url */
91	92	char urlName; / Hostname for http: or filename for file: */
92	93	char urlHostname; / The HOST: parameter on http headers */
93	94	char urlProtocol; / "http" or "https" */
94	95	int urlPort; /* TCP port number for http: or https: */
95	96	int urlDfltPort; /* The default port for the given protocol */
		@@ -96,10 +97,11 @@
96	97	char urlPath; / Pathname for http: */
97	98	char urlUser; / User id for http: */
98	99	char urlPasswd; / Password for http: */
99	100	char urlCanonical; / Canonical representation of the URL */
100	101	char urlProxyAuth; / Proxy-Authorizer: string */
	102	+ char urlFossil; / The path of the ?fossil=path suffix on ssh: */
101	103	int dontKeepUrl; /* Do not persist the URL */
102	104
103	105	const char zLogin; / Login name. "" if not logged in. */
104	106	int noPswd; /* Logged in without password (on 127.0.0.1) */
105	107	int userUid; /* Integer user id */
		@@ -630,11 +632,11 @@
630	632	**
631	633	** Assume the user-id and group-id of the repository, or if zRepo
632	634	** is a directory, of that directory.
633	635	*/
634	636	static char enter_chroot_jail(char zRepo){
635		-#if !defined(__MINGW32__)
	637	+#if !defined(_WIN32)
636	638	if( getuid()==0 ){
637	639	int i;
638	640	struct stat sStat;
639	641	Blob dir;
640	642	char *zDir;
		@@ -808,11 +810,11 @@
808	810	}else{
809	811	zFile = g.argv[1];
810	812	}
811	813	g.httpOut = stdout;
812	814	g.httpIn = stdin;
813		-#ifdef __MINGW32__
	815	+#if defined(_WIN32)
814	816	/* Set binary mode on windows to avoid undesired translations
815	817	** between \n and \r\n. */
816	818	setmode(_fileno(g.httpOut), _O_BINARY);
817	819	setmode(_fileno(g.httpIn), _O_BINARY);
818	820	#endif
		@@ -914,14 +916,14 @@
914	916	*/
915	917	void cmd_http(void){
916	918	const char *zIpAddr;
917	919	const char *zNotFound;
918	920	zNotFound = find_option("notfound", 0, 1);
	921	+ g.cgiOutput = 1;
919	922	if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
920		- cgi_panic("no repository specified");
	923	+ fossil_fatal("no repository specified");
921	924	}
922		- g.cgiOutput = 1;
923	925	g.fullHttpReply = 1;
924	926	if( g.argc==6 ){
925	927	g.httpIn = fopen(g.argv[3], "rb");
926	928	g.httpOut = fopen(g.argv[4], "wb");
927	929	zIpAddr = g.argv[5];
		@@ -935,19 +937,27 @@
935	937	cgi_handle_http_request(zIpAddr);
936	938	process_one_web_page(zNotFound);
937	939	}
938	940
939	941	/*
	942	+** Note that the following command is used by ssh:// processing.
	943	+**
940	944	** COMMAND: test-http
941	945	** Works like the http command but gives setup permission to all users.
942	946	*/
943	947	void cmd_test_http(void){
944	948	login_set_capabilities("s");
945		- cmd_http();
	949	+ g.httpIn = stdin;
	950	+ g.httpOut = stdout;
	951	+ find_server_repository(0);
	952	+ g.cgiOutput = 1;
	953	+ g.fullHttpReply = 1;
	954	+ cgi_handle_http_request(0);
	955	+ process_one_web_page(0);
946	956	}
947	957
948		-#ifndef __MINGW32__
	958	+#if !defined(_WIN32)
949	959	#if !defined(__DARWIN__) && !defined(__APPLE__)
950	960	/*
951	961	** Search for an executable on the PATH environment variable.
952	962	** Return true (1) if found and false (0) if not found.
953	963	*/
		@@ -982,11 +992,12 @@
982	992	** --port option. The optional argument is the name of the repository.
983	993	** The repository argument may be omitted if the working directory is
984	994	** within an open checkout.
985	995	**
986	996	** The "ui" command automatically starts a web browser after initializing
987		-** the web server.
	997	+** the web server. The "ui" command also binds to 127.0.0.1 and so will
	998	+** only process HTTP traffic from the local machine.
988	999	**
989	1000	** In the "server" command, the REPOSITORY can be a directory (aka folder)
990	1001	** that contains one or more respositories with names ending in ".fossil".
991	1002	** In that case, the first element of the URL is used to select among the
992	1003	** various repositories.
		@@ -996,12 +1007,13 @@
996	1007	const char zPort; / Value of the --port option */
997	1008	char zBrowser; / Name of web browser program */
998	1009	char zBrowserCmd = 0; / Command to launch the web browser */
999	1010	int isUiCmd; /* True if command is "ui", not "server' */
1000	1011	const char zNotFound; / The --notfound option or NULL */
	1012	+ int flags = 0; /* Server flags */
1001	1013
1002		-#ifdef __MINGW32__
	1014	+#if defined(_WIN32)
1003	1015	const char zStopperFile; / Name of file used to terminate server */
1004	1016	zStopperFile = find_option("stopper", 0, 1);
1005	1017	#endif
1006	1018
1007	1019	g.thTrace = find_option("th-trace", 0, 0)!=0;
		@@ -1010,18 +1022,19 @@
1010	1022	}
1011	1023	zPort = find_option("port", "P", 1);
1012	1024	zNotFound = find_option("notfound", 0, 1);
1013	1025	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
1014	1026	isUiCmd = g.argv[1][0]=='u';
	1027	+ if( isUiCmd ) flags \|= HTTP_SERVER_LOCALHOST;
1015	1028	find_server_repository(isUiCmd);
1016	1029	if( zPort ){
1017	1030	iPort = mxPort = atoi(zPort);
1018	1031	}else{
1019	1032	iPort = db_get_int("http-port", 8080);
1020	1033	mxPort = iPort+100;
1021	1034	}
1022		-#ifndef __MINGW32__
	1035	+#if !defined(_WIN32)
1023	1036	/* Unix implementation */
1024	1037	if( isUiCmd ){
1025	1038	#if !defined(__DARWIN__) && !defined(__APPLE__)
1026	1039	zBrowser = db_get("web-browser", 0);
1027	1040	if( zBrowser==0 ){
		@@ -1039,11 +1052,11 @@
1039	1052	zBrowser = db_get("web-browser", "open");
1040	1053	#endif
1041	1054	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
1042	1055	}
1043	1056	db_close();
1044		- if( cgi_http_server(iPort, mxPort, zBrowserCmd) ){
	1057	+ if( cgi_http_server(iPort, mxPort, zBrowserCmd, flags) ){
1045	1058	fossil_fatal("unable to listen on TCP socket %d", iPort);
1046	1059	}
1047	1060	g.httpIn = stdin;
1048	1061	g.httpOut = stdout;
1049	1062	if( g.fHttpTrace \|\| g.fSqlTrace ){
		@@ -1059,8 +1072,8 @@
1059	1072	if( isUiCmd ){
1060	1073	zBrowser = db_get("web-browser", "start");
1061	1074	zBrowserCmd = mprintf("%s http://127.0.0.1:%%d/", zBrowser);
1062	1075	}
1063	1076	db_close();
1064		- win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound);
	1077	+ win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1065	1078	#endif
1066	1079	}
1067	1080

	--- src/main.c
	+++ src/main.c
	@@ -86,10 +86,11 @@
86	int aCommitFile; / Array of files to be committed */
87	int markPrivate; /* All new artifacts are private if true */
88
89	int urlIsFile; /* True if a "file:" url */
90	int urlIsHttps; /* True if a "https:" url */

91	char urlName; / Hostname for http: or filename for file: */
92	char urlHostname; / The HOST: parameter on http headers */
93	char urlProtocol; / "http" or "https" */
94	int urlPort; /* TCP port number for http: or https: */
95	int urlDfltPort; /* The default port for the given protocol */
	@@ -96,10 +97,11 @@
96	char urlPath; / Pathname for http: */
97	char urlUser; / User id for http: */
98	char urlPasswd; / Password for http: */
99	char urlCanonical; / Canonical representation of the URL */
100	char urlProxyAuth; / Proxy-Authorizer: string */

101	int dontKeepUrl; /* Do not persist the URL */
102
103	const char zLogin; / Login name. "" if not logged in. */
104	int noPswd; /* Logged in without password (on 127.0.0.1) */
105	int userUid; /* Integer user id */
	@@ -630,11 +632,11 @@
630	**
631	** Assume the user-id and group-id of the repository, or if zRepo
632	** is a directory, of that directory.
633	*/
634	static char enter_chroot_jail(char zRepo){
635	#if !defined(__MINGW32__)
636	if( getuid()==0 ){
637	int i;
638	struct stat sStat;
639	Blob dir;
640	char *zDir;
	@@ -808,11 +810,11 @@
808	}else{
809	zFile = g.argv[1];
810	}
811	g.httpOut = stdout;
812	g.httpIn = stdin;
813	#ifdef __MINGW32__
814	/* Set binary mode on windows to avoid undesired translations
815	** between \n and \r\n. */
816	setmode(_fileno(g.httpOut), _O_BINARY);
817	setmode(_fileno(g.httpIn), _O_BINARY);
818	#endif
	@@ -914,14 +916,14 @@
914	*/
915	void cmd_http(void){
916	const char *zIpAddr;
917	const char *zNotFound;
918	zNotFound = find_option("notfound", 0, 1);

919	if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
920	cgi_panic("no repository specified");
921	}
922	g.cgiOutput = 1;
923	g.fullHttpReply = 1;
924	if( g.argc==6 ){
925	g.httpIn = fopen(g.argv[3], "rb");
926	g.httpOut = fopen(g.argv[4], "wb");
927	zIpAddr = g.argv[5];
	@@ -935,19 +937,27 @@
935	cgi_handle_http_request(zIpAddr);
936	process_one_web_page(zNotFound);
937	}
938
939	/*


940	** COMMAND: test-http
941	** Works like the http command but gives setup permission to all users.
942	*/
943	void cmd_test_http(void){
944	login_set_capabilities("s");
945	cmd_http();






946	}
947
948	#ifndef __MINGW32__
949	#if !defined(__DARWIN__) && !defined(__APPLE__)
950	/*
951	** Search for an executable on the PATH environment variable.
952	** Return true (1) if found and false (0) if not found.
953	*/
	@@ -982,11 +992,12 @@
982	** --port option. The optional argument is the name of the repository.
983	** The repository argument may be omitted if the working directory is
984	** within an open checkout.
985	**
986	** The "ui" command automatically starts a web browser after initializing
987	** the web server.

988	**
989	** In the "server" command, the REPOSITORY can be a directory (aka folder)
990	** that contains one or more respositories with names ending in ".fossil".
991	** In that case, the first element of the URL is used to select among the
992	** various repositories.
	@@ -996,12 +1007,13 @@
996	const char zPort; / Value of the --port option */
997	char zBrowser; / Name of web browser program */
998	char zBrowserCmd = 0; / Command to launch the web browser */
999	int isUiCmd; /* True if command is "ui", not "server' */
1000	const char zNotFound; / The --notfound option or NULL */

1001
1002	#ifdef __MINGW32__
1003	const char zStopperFile; / Name of file used to terminate server */
1004	zStopperFile = find_option("stopper", 0, 1);
1005	#endif
1006
1007	g.thTrace = find_option("th-trace", 0, 0)!=0;
	@@ -1010,18 +1022,19 @@
1010	}
1011	zPort = find_option("port", "P", 1);
1012	zNotFound = find_option("notfound", 0, 1);
1013	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
1014	isUiCmd = g.argv[1][0]=='u';

1015	find_server_repository(isUiCmd);
1016	if( zPort ){
1017	iPort = mxPort = atoi(zPort);
1018	}else{
1019	iPort = db_get_int("http-port", 8080);
1020	mxPort = iPort+100;
1021	}
1022	#ifndef __MINGW32__
1023	/* Unix implementation */
1024	if( isUiCmd ){
1025	#if !defined(__DARWIN__) && !defined(__APPLE__)
1026	zBrowser = db_get("web-browser", 0);
1027	if( zBrowser==0 ){
	@@ -1039,11 +1052,11 @@
1039	zBrowser = db_get("web-browser", "open");
1040	#endif
1041	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
1042	}
1043	db_close();
1044	if( cgi_http_server(iPort, mxPort, zBrowserCmd) ){
1045	fossil_fatal("unable to listen on TCP socket %d", iPort);
1046	}
1047	g.httpIn = stdin;
1048	g.httpOut = stdout;
1049	if( g.fHttpTrace \|\| g.fSqlTrace ){
	@@ -1059,8 +1072,8 @@
1059	if( isUiCmd ){
1060	zBrowser = db_get("web-browser", "start");
1061	zBrowserCmd = mprintf("%s http://127.0.0.1:%%d/", zBrowser);
1062	}
1063	db_close();
1064	win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound);
1065	#endif
1066	}
1067

	--- src/main.c
	+++ src/main.c
	@@ -86,10 +86,11 @@
86	int aCommitFile; / Array of files to be committed */
87	int markPrivate; /* All new artifacts are private if true */
88
89	int urlIsFile; /* True if a "file:" url */
90	int urlIsHttps; /* True if a "https:" url */
91	int urlIsSsh; /* True if an "ssh:" url */
92	char urlName; / Hostname for http: or filename for file: */
93	char urlHostname; / The HOST: parameter on http headers */
94	char urlProtocol; / "http" or "https" */
95	int urlPort; /* TCP port number for http: or https: */
96	int urlDfltPort; /* The default port for the given protocol */
	@@ -96,10 +97,11 @@
97	char urlPath; / Pathname for http: */
98	char urlUser; / User id for http: */
99	char urlPasswd; / Password for http: */
100	char urlCanonical; / Canonical representation of the URL */
101	char urlProxyAuth; / Proxy-Authorizer: string */
102	char urlFossil; / The path of the ?fossil=path suffix on ssh: */
103	int dontKeepUrl; /* Do not persist the URL */
104
105	const char zLogin; / Login name. "" if not logged in. */
106	int noPswd; /* Logged in without password (on 127.0.0.1) */
107	int userUid; /* Integer user id */
	@@ -630,11 +632,11 @@
632	**
633	** Assume the user-id and group-id of the repository, or if zRepo
634	** is a directory, of that directory.
635	*/
636	static char enter_chroot_jail(char zRepo){
637	#if !defined(_WIN32)
638	if( getuid()==0 ){
639	int i;
640	struct stat sStat;
641	Blob dir;
642	char *zDir;
	@@ -808,11 +810,11 @@
810	}else{
811	zFile = g.argv[1];
812	}
813	g.httpOut = stdout;
814	g.httpIn = stdin;
815	#if defined(_WIN32)
816	/* Set binary mode on windows to avoid undesired translations
817	** between \n and \r\n. */
818	setmode(_fileno(g.httpOut), _O_BINARY);
819	setmode(_fileno(g.httpIn), _O_BINARY);
820	#endif
	@@ -914,14 +916,14 @@
916	*/
917	void cmd_http(void){
918	const char *zIpAddr;
919	const char *zNotFound;
920	zNotFound = find_option("notfound", 0, 1);
921	g.cgiOutput = 1;
922	if( g.argc!=2 && g.argc!=3 && g.argc!=6 ){
923	fossil_fatal("no repository specified");
924	}

925	g.fullHttpReply = 1;
926	if( g.argc==6 ){
927	g.httpIn = fopen(g.argv[3], "rb");
928	g.httpOut = fopen(g.argv[4], "wb");
929	zIpAddr = g.argv[5];
	@@ -935,19 +937,27 @@
937	cgi_handle_http_request(zIpAddr);
938	process_one_web_page(zNotFound);
939	}
940
941	/*
942	** Note that the following command is used by ssh:// processing.
943	**
944	** COMMAND: test-http
945	** Works like the http command but gives setup permission to all users.
946	*/
947	void cmd_test_http(void){
948	login_set_capabilities("s");
949	g.httpIn = stdin;
950	g.httpOut = stdout;
951	find_server_repository(0);
952	g.cgiOutput = 1;
953	g.fullHttpReply = 1;
954	cgi_handle_http_request(0);
955	process_one_web_page(0);
956	}
957
958	#if !defined(_WIN32)
959	#if !defined(__DARWIN__) && !defined(__APPLE__)
960	/*
961	** Search for an executable on the PATH environment variable.
962	** Return true (1) if found and false (0) if not found.
963	*/
	@@ -982,11 +992,12 @@
992	** --port option. The optional argument is the name of the repository.
993	** The repository argument may be omitted if the working directory is
994	** within an open checkout.
995	**
996	** The "ui" command automatically starts a web browser after initializing
997	** the web server. The "ui" command also binds to 127.0.0.1 and so will
998	** only process HTTP traffic from the local machine.
999	**
1000	** In the "server" command, the REPOSITORY can be a directory (aka folder)
1001	** that contains one or more respositories with names ending in ".fossil".
1002	** In that case, the first element of the URL is used to select among the
1003	** various repositories.
	@@ -996,12 +1007,13 @@
1007	const char zPort; / Value of the --port option */
1008	char zBrowser; / Name of web browser program */
1009	char zBrowserCmd = 0; / Command to launch the web browser */
1010	int isUiCmd; /* True if command is "ui", not "server' */
1011	const char zNotFound; / The --notfound option or NULL */
1012	int flags = 0; /* Server flags */
1013
1014	#if defined(_WIN32)
1015	const char zStopperFile; / Name of file used to terminate server */
1016	zStopperFile = find_option("stopper", 0, 1);
1017	#endif
1018
1019	g.thTrace = find_option("th-trace", 0, 0)!=0;
	@@ -1010,18 +1022,19 @@
1022	}
1023	zPort = find_option("port", "P", 1);
1024	zNotFound = find_option("notfound", 0, 1);
1025	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
1026	isUiCmd = g.argv[1][0]=='u';
1027	if( isUiCmd ) flags \|= HTTP_SERVER_LOCALHOST;
1028	find_server_repository(isUiCmd);
1029	if( zPort ){
1030	iPort = mxPort = atoi(zPort);
1031	}else{
1032	iPort = db_get_int("http-port", 8080);
1033	mxPort = iPort+100;
1034	}
1035	#if !defined(_WIN32)
1036	/* Unix implementation */
1037	if( isUiCmd ){
1038	#if !defined(__DARWIN__) && !defined(__APPLE__)
1039	zBrowser = db_get("web-browser", 0);
1040	if( zBrowser==0 ){
	@@ -1039,11 +1052,11 @@
1052	zBrowser = db_get("web-browser", "open");
1053	#endif
1054	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
1055	}
1056	db_close();
1057	if( cgi_http_server(iPort, mxPort, zBrowserCmd, flags) ){
1058	fossil_fatal("unable to listen on TCP socket %d", iPort);
1059	}
1060	g.httpIn = stdin;
1061	g.httpOut = stdout;
1062	if( g.fHttpTrace \|\| g.fSqlTrace ){
	@@ -1059,8 +1072,8 @@
1072	if( isUiCmd ){
1073	zBrowser = db_get("web-browser", "start");
1074	zBrowserCmd = mprintf("%s http://127.0.0.1:%%d/", zBrowser);
1075	}
1076	db_close();
1077	win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1078	#endif
1079	}
1080

M src/main.mk

+12 -2

		--- src/main.mk
		+++ src/main.mk
		@@ -51,10 +51,11 @@
51	51	$(SRCDIR)/md5.c \
52	52	$(SRCDIR)/merge.c \
53	53	$(SRCDIR)/merge3.c \
54	54	$(SRCDIR)/name.c \
55	55	$(SRCDIR)/pivot.c \
	56	+ $(SRCDIR)/popen.c \
56	57	$(SRCDIR)/pqueue.c \
57	58	$(SRCDIR)/printf.c \
58	59	$(SRCDIR)/rebuild.c \
59	60	$(SRCDIR)/report.c \
60	61	$(SRCDIR)/rss.c \
		@@ -123,10 +124,11 @@
123	124	md5_.c \
124	125	merge_.c \
125	126	merge3_.c \
126	127	name_.c \
127	128	pivot_.c \
	129	+ popen_.c \
128	130	pqueue_.c \
129	131	printf_.c \
130	132	rebuild_.c \
131	133	report_.c \
132	134	rss_.c \
		@@ -195,10 +197,11 @@
195	197	$(OBJDIR)/md5.o \
196	198	$(OBJDIR)/merge.o \
197	199	$(OBJDIR)/merge3.o \
198	200	$(OBJDIR)/name.o \
199	201	$(OBJDIR)/pivot.o \
	202	+ $(OBJDIR)/popen.o \
200	203	$(OBJDIR)/pqueue.o \
201	204	$(OBJDIR)/printf.o \
202	205	$(OBJDIR)/rebuild.o \
203	206	$(OBJDIR)/report.o \
204	207	$(OBJDIR)/rss.o \
		@@ -270,16 +273,16 @@
270	273	# noop
271	274
272	275	clean:
273	276	rm -f $(OBJDIR)/.o _.c $(APPNAME) VERSION.h
274	277	rm -f translate makeheaders mkindex page_index.h headers
275		- rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
	278	+ rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
276	279
277	280	page_index.h: $(TRANS_SRC) mkindex
278	281	./mkindex $(TRANS_SRC) >$@
279	282	headers: page_index.h makeheaders VERSION.h
280		- ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
	283	+ ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
281	284	touch headers
282	285	headers: Makefile
283	286	Makefile:
284	287	add_.c: $(SRCDIR)/add.c translate
285	288	./translate $(SRCDIR)/add.c >add_.c
		@@ -559,10 +562,17 @@
559	562
560	563	$(OBJDIR)/pivot.o: pivot_.c pivot.h $(SRCDIR)/config.h
561	564	$(XTCC) -o $(OBJDIR)/pivot.o -c pivot_.c
562	565
563	566	pivot.h: headers
	567	+popen_.c: $(SRCDIR)/popen.c translate
	568	+ ./translate $(SRCDIR)/popen.c >popen_.c
	569	+
	570	+$(OBJDIR)/popen.o: popen_.c popen.h $(SRCDIR)/config.h
	571	+ $(XTCC) -o $(OBJDIR)/popen.o -c popen_.c
	572	+
	573	+popen.h: headers
564	574	pqueue_.c: $(SRCDIR)/pqueue.c translate
565	575	./translate $(SRCDIR)/pqueue.c >pqueue_.c
566	576
567	577	$(OBJDIR)/pqueue.o: pqueue_.c pqueue.h $(SRCDIR)/config.h
568	578	$(XTCC) -o $(OBJDIR)/pqueue.o -c pqueue_.c
569	579

	--- src/main.mk
	+++ src/main.mk
	@@ -51,10 +51,11 @@
51	$(SRCDIR)/md5.c \
52	$(SRCDIR)/merge.c \
53	$(SRCDIR)/merge3.c \
54	$(SRCDIR)/name.c \
55	$(SRCDIR)/pivot.c \

56	$(SRCDIR)/pqueue.c \
57	$(SRCDIR)/printf.c \
58	$(SRCDIR)/rebuild.c \
59	$(SRCDIR)/report.c \
60	$(SRCDIR)/rss.c \
	@@ -123,10 +124,11 @@
123	md5_.c \
124	merge_.c \
125	merge3_.c \
126	name_.c \
127	pivot_.c \

128	pqueue_.c \
129	printf_.c \
130	rebuild_.c \
131	report_.c \
132	rss_.c \
	@@ -195,10 +197,11 @@
195	$(OBJDIR)/md5.o \
196	$(OBJDIR)/merge.o \
197	$(OBJDIR)/merge3.o \
198	$(OBJDIR)/name.o \
199	$(OBJDIR)/pivot.o \

200	$(OBJDIR)/pqueue.o \
201	$(OBJDIR)/printf.o \
202	$(OBJDIR)/rebuild.o \
203	$(OBJDIR)/report.o \
204	$(OBJDIR)/rss.o \
	@@ -270,16 +273,16 @@
270	# noop
271
272	clean:
273	rm -f $(OBJDIR)/.o _.c $(APPNAME) VERSION.h
274	rm -f translate makeheaders mkindex page_index.h headers
275	rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
276
277	page_index.h: $(TRANS_SRC) mkindex
278	./mkindex $(TRANS_SRC) >$@
279	headers: page_index.h makeheaders VERSION.h
280	./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
281	touch headers
282	headers: Makefile
283	Makefile:
284	add_.c: $(SRCDIR)/add.c translate
285	./translate $(SRCDIR)/add.c >add_.c
	@@ -559,10 +562,17 @@
559
560	$(OBJDIR)/pivot.o: pivot_.c pivot.h $(SRCDIR)/config.h
561	$(XTCC) -o $(OBJDIR)/pivot.o -c pivot_.c
562
563	pivot.h: headers







564	pqueue_.c: $(SRCDIR)/pqueue.c translate
565	./translate $(SRCDIR)/pqueue.c >pqueue_.c
566
567	$(OBJDIR)/pqueue.o: pqueue_.c pqueue.h $(SRCDIR)/config.h
568	$(XTCC) -o $(OBJDIR)/pqueue.o -c pqueue_.c
569

	--- src/main.mk
	+++ src/main.mk
	@@ -51,10 +51,11 @@
51	$(SRCDIR)/md5.c \
52	$(SRCDIR)/merge.c \
53	$(SRCDIR)/merge3.c \
54	$(SRCDIR)/name.c \
55	$(SRCDIR)/pivot.c \
56	$(SRCDIR)/popen.c \
57	$(SRCDIR)/pqueue.c \
58	$(SRCDIR)/printf.c \
59	$(SRCDIR)/rebuild.c \
60	$(SRCDIR)/report.c \
61	$(SRCDIR)/rss.c \
	@@ -123,10 +124,11 @@
124	md5_.c \
125	merge_.c \
126	merge3_.c \
127	name_.c \
128	pivot_.c \
129	popen_.c \
130	pqueue_.c \
131	printf_.c \
132	rebuild_.c \
133	report_.c \
134	rss_.c \
	@@ -195,10 +197,11 @@
197	$(OBJDIR)/md5.o \
198	$(OBJDIR)/merge.o \
199	$(OBJDIR)/merge3.o \
200	$(OBJDIR)/name.o \
201	$(OBJDIR)/pivot.o \
202	$(OBJDIR)/popen.o \
203	$(OBJDIR)/pqueue.o \
204	$(OBJDIR)/printf.o \
205	$(OBJDIR)/rebuild.o \
206	$(OBJDIR)/report.o \
207	$(OBJDIR)/rss.o \
	@@ -270,16 +273,16 @@
273	# noop
274
275	clean:
276	rm -f $(OBJDIR)/.o _.c $(APPNAME) VERSION.h
277	rm -f translate makeheaders mkindex page_index.h headers
278	rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
279
280	page_index.h: $(TRANS_SRC) mkindex
281	./mkindex $(TRANS_SRC) >$@
282	headers: page_index.h makeheaders VERSION.h
283	./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
284	touch headers
285	headers: Makefile
286	Makefile:
287	add_.c: $(SRCDIR)/add.c translate
288	./translate $(SRCDIR)/add.c >add_.c
	@@ -559,10 +562,17 @@
562
563	$(OBJDIR)/pivot.o: pivot_.c pivot.h $(SRCDIR)/config.h
564	$(XTCC) -o $(OBJDIR)/pivot.o -c pivot_.c
565
566	pivot.h: headers
567	popen_.c: $(SRCDIR)/popen.c translate
568	./translate $(SRCDIR)/popen.c >popen_.c
569
570	$(OBJDIR)/popen.o: popen_.c popen.h $(SRCDIR)/config.h
571	$(XTCC) -o $(OBJDIR)/popen.o -c popen_.c
572
573	popen.h: headers
574	pqueue_.c: $(SRCDIR)/pqueue.c translate
575	./translate $(SRCDIR)/pqueue.c >pqueue_.c
576
577	$(OBJDIR)/pqueue.o: pqueue_.c pqueue.h $(SRCDIR)/config.h
578	$(XTCC) -o $(OBJDIR)/pqueue.o -c pqueue_.c
579

M src/makeheaders.c

+14 -11

		--- src/makeheaders.c
		+++ src/makeheaders.c
		@@ -13,14 +13,17 @@
13	13	#include <stdlib.h>
14	14	#include <ctype.h>
15	15	#include <memory.h>
16	16	#include <sys/stat.h>
17	17	#include <assert.h>
18		-#ifndef WIN32
19		-# include <unistd.h>
20		-#else
	18	+#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
	19	+# ifndef WIN32
	20	+# define WIN32
	21	+# endif
21	22	# include <string.h>
	23	+#else
	24	+# include <unistd.h>
22	25	#endif
23	26
24	27	/*
25	28	** Macros for debugging.
26	29	*/
		@@ -2141,11 +2144,11 @@
2141	2144	zArg = &zCmd[2];
2142	2145	while( zArg && isspace(zArg) && *zArg!='\n' ){
2143	2146	zArg++;
2144	2147	}
2145	2148	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2146		- nArg = pToken->nText + (int)pToken->zText - (int)zArg;
	2149	+ nArg = pToken->nText + (int)(pToken->zText - zArg);
2147	2150	if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){
2148	2151	PushIfMacro(0,0,0,pToken->nLine,PS_Interface);
2149	2152	}else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){
2150	2153	PushIfMacro(0,0,0,pToken->nLine,PS_Export);
2151	2154	}else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){
		@@ -2160,11 +2163,11 @@
2160	2163	zArg = &zCmd[5];
2161	2164	while( zArg && isspace(zArg) && *zArg!='\n' ){
2162	2165	zArg++;
2163	2166	}
2164	2167	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2165		- nArg = pToken->nText + (int)pToken->zText - (int)zArg;
	2168	+ nArg = pToken->nText + (int)(pToken->zText - zArg);
2166	2169	PushIfMacro("defined",zArg,nArg,pToken->nLine,0);
2167	2170	}else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){
2168	2171	/*
2169	2172	** Push an #ifndef.
2170	2173	*/
		@@ -2171,11 +2174,11 @@
2171	2174	zArg = &zCmd[6];
2172	2175	while( zArg && isspace(zArg) && *zArg!='\n' ){
2173	2176	zArg++;
2174	2177	}
2175	2178	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2176		- nArg = pToken->nText + (int)pToken->zText - (int)zArg;
	2179	+ nArg = pToken->nText + (int)(pToken->zText - zArg);
2177	2180	PushIfMacro("!defined",zArg,nArg,pToken->nLine,0);
2178	2181	}else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){
2179	2182	/*
2180	2183	** Invert the #if on the top of the stack
2181	2184	*/
		@@ -2797,11 +2800,11 @@
2797	2800	}else if( strncmp(zOldVersion,zTopLine,nTopLine)!=0 ){
2798	2801	if( report ) fprintf(report,"error!\n");
2799	2802	fprintf(stderr,
2800	2803	"%s: Can't overwrite this file because it wasn't previously\n"
2801	2804	"%*s generated by 'makeheaders'.\n",
2802		- pFile->zHdr, strlen(pFile->zHdr), "");
	2805	+ pFile->zHdr, (int)strlen(pFile->zHdr), "");
2803	2806	nErr++;
2804	2807	}else if( strcmp(zOldVersion,zNewVersion)!=0 ){
2805	2808	if( report ) fprintf(report,"updated\n");
2806	2809	if( WriteFile(pFile->zHdr,zNewVersion) ){
2807	2810	fprintf(stderr,"%s: Can't write to file\n",pFile->zHdr);
		@@ -2952,18 +2955,18 @@
2952	2955	if( nLabel==0 ) continue;
2953	2956	zLabel[nLabel] = 0;
2954	2957	InsertExtraDecl(pDecl);
2955	2958	zDecl = pDecl->zDecl;
2956	2959	if( zDecl==0 ) zDecl = pDecl->zFwd;
2957		- printf("%s %s %s %d %d %d %d %d %d\n",
	2960	+ printf("%s %s %s %p %d %d %d %d %d\n",
2958	2961	pDecl->zName,
2959	2962	zLabel,
2960	2963	pDecl->zFile,
2961		- pDecl->pComment ? (int)pDecl->pComment/sizeof(Token) : 0,
	2964	+ pDecl->pComment,
2962	2965	pDecl->pComment ? pDecl->pComment->nText+1 : 0,
2963		- pDecl->zIf ? strlen(pDecl->zIf)+1 : 0,
2964		- zDecl ? strlen(zDecl) : 0,
	2966	+ pDecl->zIf ? (int)strlen(pDecl->zIf)+1 : 0,
	2967	+ zDecl ? (int)strlen(zDecl) : 0,
2965	2968	pDecl->pComment ? pDecl->pComment->nLine : 0,
2966	2969	pDecl->tokenCode.nText ? pDecl->tokenCode.nText+1 : 0
2967	2970	);
2968	2971	if( pDecl->pComment ){
2969	2972	printf("%.*s\n",pDecl->pComment->nText, pDecl->pComment->zText);
2970	2973

	--- src/makeheaders.c
	+++ src/makeheaders.c
	@@ -13,14 +13,17 @@
13	#include <stdlib.h>
14	#include <ctype.h>
15	#include <memory.h>
16	#include <sys/stat.h>
17	#include <assert.h>
18	#ifndef WIN32
19	# include <unistd.h>
20	#else

21	# include <string.h>


22	#endif
23
24	/*
25	** Macros for debugging.
26	*/
	@@ -2141,11 +2144,11 @@
2141	zArg = &zCmd[2];
2142	while( zArg && isspace(zArg) && *zArg!='\n' ){
2143	zArg++;
2144	}
2145	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2146	nArg = pToken->nText + (int)pToken->zText - (int)zArg;
2147	if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){
2148	PushIfMacro(0,0,0,pToken->nLine,PS_Interface);
2149	}else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){
2150	PushIfMacro(0,0,0,pToken->nLine,PS_Export);
2151	}else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){
	@@ -2160,11 +2163,11 @@
2160	zArg = &zCmd[5];
2161	while( zArg && isspace(zArg) && *zArg!='\n' ){
2162	zArg++;
2163	}
2164	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2165	nArg = pToken->nText + (int)pToken->zText - (int)zArg;
2166	PushIfMacro("defined",zArg,nArg,pToken->nLine,0);
2167	}else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){
2168	/*
2169	** Push an #ifndef.
2170	*/
	@@ -2171,11 +2174,11 @@
2171	zArg = &zCmd[6];
2172	while( zArg && isspace(zArg) && *zArg!='\n' ){
2173	zArg++;
2174	}
2175	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2176	nArg = pToken->nText + (int)pToken->zText - (int)zArg;
2177	PushIfMacro("!defined",zArg,nArg,pToken->nLine,0);
2178	}else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){
2179	/*
2180	** Invert the #if on the top of the stack
2181	*/
	@@ -2797,11 +2800,11 @@
2797	}else if( strncmp(zOldVersion,zTopLine,nTopLine)!=0 ){
2798	if( report ) fprintf(report,"error!\n");
2799	fprintf(stderr,
2800	"%s: Can't overwrite this file because it wasn't previously\n"
2801	"%*s generated by 'makeheaders'.\n",
2802	pFile->zHdr, strlen(pFile->zHdr), "");
2803	nErr++;
2804	}else if( strcmp(zOldVersion,zNewVersion)!=0 ){
2805	if( report ) fprintf(report,"updated\n");
2806	if( WriteFile(pFile->zHdr,zNewVersion) ){
2807	fprintf(stderr,"%s: Can't write to file\n",pFile->zHdr);
	@@ -2952,18 +2955,18 @@
2952	if( nLabel==0 ) continue;
2953	zLabel[nLabel] = 0;
2954	InsertExtraDecl(pDecl);
2955	zDecl = pDecl->zDecl;
2956	if( zDecl==0 ) zDecl = pDecl->zFwd;
2957	printf("%s %s %s %d %d %d %d %d %d\n",
2958	pDecl->zName,
2959	zLabel,
2960	pDecl->zFile,
2961	pDecl->pComment ? (int)pDecl->pComment/sizeof(Token) : 0,
2962	pDecl->pComment ? pDecl->pComment->nText+1 : 0,
2963	pDecl->zIf ? strlen(pDecl->zIf)+1 : 0,
2964	zDecl ? strlen(zDecl) : 0,
2965	pDecl->pComment ? pDecl->pComment->nLine : 0,
2966	pDecl->tokenCode.nText ? pDecl->tokenCode.nText+1 : 0
2967	);
2968	if( pDecl->pComment ){
2969	printf("%.*s\n",pDecl->pComment->nText, pDecl->pComment->zText);
2970

	--- src/makeheaders.c
	+++ src/makeheaders.c
	@@ -13,14 +13,17 @@
13	#include <stdlib.h>
14	#include <ctype.h>
15	#include <memory.h>
16	#include <sys/stat.h>
17	#include <assert.h>
18	#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
19	# ifndef WIN32
20	# define WIN32
21	# endif
22	# include <string.h>
23	#else
24	# include <unistd.h>
25	#endif
26
27	/*
28	** Macros for debugging.
29	*/
	@@ -2141,11 +2144,11 @@
2144	zArg = &zCmd[2];
2145	while( zArg && isspace(zArg) && *zArg!='\n' ){
2146	zArg++;
2147	}
2148	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2149	nArg = pToken->nText + (int)(pToken->zText - zArg);
2150	if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){
2151	PushIfMacro(0,0,0,pToken->nLine,PS_Interface);
2152	}else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){
2153	PushIfMacro(0,0,0,pToken->nLine,PS_Export);
2154	}else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){
	@@ -2160,11 +2163,11 @@
2163	zArg = &zCmd[5];
2164	while( zArg && isspace(zArg) && *zArg!='\n' ){
2165	zArg++;
2166	}
2167	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2168	nArg = pToken->nText + (int)(pToken->zText - zArg);
2169	PushIfMacro("defined",zArg,nArg,pToken->nLine,0);
2170	}else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){
2171	/*
2172	** Push an #ifndef.
2173	*/
	@@ -2171,11 +2174,11 @@
2174	zArg = &zCmd[6];
2175	while( zArg && isspace(zArg) && *zArg!='\n' ){
2176	zArg++;
2177	}
2178	if( zArg==0 \|\| zArg=='\n' ){ return 0; }
2179	nArg = pToken->nText + (int)(pToken->zText - zArg);
2180	PushIfMacro("!defined",zArg,nArg,pToken->nLine,0);
2181	}else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){
2182	/*
2183	** Invert the #if on the top of the stack
2184	*/
	@@ -2797,11 +2800,11 @@
2800	}else if( strncmp(zOldVersion,zTopLine,nTopLine)!=0 ){
2801	if( report ) fprintf(report,"error!\n");
2802	fprintf(stderr,
2803	"%s: Can't overwrite this file because it wasn't previously\n"
2804	"%*s generated by 'makeheaders'.\n",
2805	pFile->zHdr, (int)strlen(pFile->zHdr), "");
2806	nErr++;
2807	}else if( strcmp(zOldVersion,zNewVersion)!=0 ){
2808	if( report ) fprintf(report,"updated\n");
2809	if( WriteFile(pFile->zHdr,zNewVersion) ){
2810	fprintf(stderr,"%s: Can't write to file\n",pFile->zHdr);
	@@ -2952,18 +2955,18 @@
2955	if( nLabel==0 ) continue;
2956	zLabel[nLabel] = 0;
2957	InsertExtraDecl(pDecl);
2958	zDecl = pDecl->zDecl;
2959	if( zDecl==0 ) zDecl = pDecl->zFwd;
2960	printf("%s %s %s %p %d %d %d %d %d\n",
2961	pDecl->zName,
2962	zLabel,
2963	pDecl->zFile,
2964	pDecl->pComment,
2965	pDecl->pComment ? pDecl->pComment->nText+1 : 0,
2966	pDecl->zIf ? (int)strlen(pDecl->zIf)+1 : 0,
2967	zDecl ? (int)strlen(zDecl) : 0,
2968	pDecl->pComment ? pDecl->pComment->nLine : 0,
2969	pDecl->tokenCode.nText ? pDecl->tokenCode.nText+1 : 0
2970	);
2971	if( pDecl->pComment ){
2972	printf("%.*s\n",pDecl->pComment->nText, pDecl->pComment->zText);
2973

M src/makemake.tcl

+243 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -44,10 +44,11 @@
44	44	md5
45	45	merge
46	46	merge3
47	47	name
48	48	pivot
	49	+ popen
49	50	pqueue
50	51	printf
51	52	rebuild
52	53	report
53	54	rss
		@@ -80,11 +81,11 @@
80	81	}
81	82
82	83	# Name of the final application
83	84	#
84	85	set name fossil
85		-
	86	+if { 0 == $argc } {
86	87	puts {# DO NOT EDIT
87	88	#
88	89	# This file is automatically generated. Instead of editing this
89	90	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
90	91	# to regenerate this file.
		@@ -204,5 +205,246 @@
204	205	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
205	206	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
206	207
207	208	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
208	209	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
	210	+exit
	211	+}
	212	+if { "dmc" == [lindex $argv 0] } {
	213	+
	214	+puts {# DO NOT EDIT
	215	+#
	216	+# This file is automatically generated. Instead of editing this
	217	+# file, edit "makemake.tcl" then run
	218	+# "tclsh src/makemake.tcl dmc > win/Makefile.dmc"
	219	+# to regenerate this file.
	220	+B = ..
	221	+SRCDIR = $B\src
	222	+OBJDIR = .
	223	+O = .obj
	224	+E = .exe
	225	+
	226	+
	227	+# Maybe DMDIR, SSL or INCL needs adjustment
	228	+DMDIR = c:\DM
	229	+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
	230	+
	231	+#SSL = -DFOSSIL_ENABLE_SSL=1
	232	+SSL =
	233	+
	234	+DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
	235	+I18N = -DFOSSIL_I18N=0
	236	+
	237	+CFLAGS = -o
	238	+BCC = $(DMDIR)\bin\dmc $(CFLAGS)
	239	+TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
	240	+LIBS = $(DMDIR)\extra\lib\ zlib wsock32
	241	+}
	242	+puts -nonewline "SRC = "
	243	+foreach s [lsort $src] {
	244	+ puts -nonewline "${s}_.c "
	245	+}
	246	+puts "\n"
	247	+puts -nonewline "OBJ = "
	248	+foreach s [lsort $src] {
	249	+ puts -nonewline "\$(OBJDIR)\\$s\$O "
	250	+}
	251	+puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
	252	+puts {
	253	+
	254	+APPNAME = $(OBJDIR)\fossil$(E)
	255	+
	256	+all: $(APPNAME)
	257	+
	258	+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
	259	+ cd $(OBJDIR)
	260	+ $(DMDIR)\bin\link @link
	261	+
	262	+$(OBJDIR)\link: $B\win\Makefile.dmc}
	263	+puts -nonewline "\t+echo "
	264	+foreach s [lsort $src] {
	265	+ puts -nonewline "$s "
	266	+}
	267	+puts "sqlite3 th th_lang > \$@"
	268	+puts "\t+echo fossil >> \$@"
	269	+puts "\t+echo fossil >> \$@"
	270	+puts "\t+echo \$(LIBS) >> \$@\n\n"
	271	+
	272	+puts {
	273	+translate$E: $(SRCDIR)\translate.c
	274	+ $(BCC) -o$@ $**
	275	+
	276	+makeheaders$E: $(SRCDIR)\makeheaders.c
	277	+ $(BCC) -o$@ $**
	278	+
	279	+mkindex$E: $(SRCDIR)\mkindex.c
	280	+ $(BCC) -o$@ $**
	281	+
	282	+version$E: $B\win\version.c
	283	+ $(BCC) -o$@ $**
	284	+
	285	+$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
	286	+ $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
	287	+
	288	+$(OBJDIR)\th$O : $(SRCDIR)\th.c
	289	+ $(TCC) -o$@ -c $**
	290	+
	291	+$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	292	+ $(TCC) -o$@ -c $**
	293	+
	294	+VERSION.h : version$E $B\manifest.uuid $B\manifest
	295	+ +$** > $@
	296	+
	297	+page_index.h: mkindex$E $(SRC)
	298	+ +$** > $@
	299	+
	300	+clean:
	301	+ -del $(OBJDIR)\*.obj
	302	+ -del .obj _.c .h .map
	303	+
	304	+realclean:
	305	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
	306	+
	307	+}
	308	+foreach s [lsort $src] {
	309	+ puts "\$(OBJDIR)\\$s\$O : ${s}_.c ${s}.h"
	310	+ puts "\t\$(TCC) -o\$@ -c ${s}_.c\n"
	311	+ puts "${s}_.c : \$(SRCDIR)\\$s.c"
	312	+ puts "\t+translate\$E \$** > \$@\n"
	313	+}
	314	+
	315	+puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
	316	+foreach s [lsort $src] {
	317	+ puts -nonewline "${s}_.c:$s.h "
	318	+}
	319	+puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
	320	+puts "\t@copy /Y nul: headers"
	321	+exit
	322	+}
	323	+
	324	+if { "msc" == [lindex $argv 0] } {
	325	+
	326	+puts {# DO NOT EDIT
	327	+#
	328	+# This file is automatically generated. Instead of editing this
	329	+# file, edit "makemake.tcl" then run
	330	+# "tclsh src/makemake.tcl msc > win/Makefile.msc"
	331	+# to regenerate this file.
	332	+B = ..
	333	+SRCDIR = $B\src
	334	+OBJDIR = .
	335	+O = .obj
	336	+E = .exe
	337	+
	338	+# Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
	339	+MSCDIR = c:\msc
	340	+
	341	+# Uncomment below for SSL support
	342	+SSL =
	343	+SSLLIB =
	344	+#SSL = -DFOSSIL_ENABLE_SSL=1
	345	+#SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
	346	+
	347	+# zlib options
	348	+# When using precompiled from http://zlib.net/zlib125-dll.zip
	349	+#ZINCDIR = C:\zlib125-dll\include
	350	+#ZLIBDIR = C:\zlib125-dll\lib
	351	+#ZLIB = zdll.lib
	352	+ZINCDIR = $(MSCDIR)\extra\include
	353	+ZLIBDIR = $(MSCDIR)\extra\lib
	354	+ZLIB = zlib.lib
	355	+
	356	+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
	357	+
	358	+MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
	359	+I18N = -DFOSSIL_I18N=0
	360	+
	361	+CFLAGS = -nologo -MT -O2
	362	+BCC = $(CC) $(CFLAGS)
	363	+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
	364	+LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
	365	+LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
	366	+}
	367	+puts -nonewline "SRC = "
	368	+foreach s [lsort $src] {
	369	+ puts -nonewline "${s}_.c "
	370	+}
	371	+puts "\n"
	372	+puts -nonewline "OBJ = "
	373	+foreach s [lsort $src] {
	374	+ puts -nonewline "\$(OBJDIR)\\$s\$O "
	375	+}
	376	+puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
	377	+puts {
	378	+
	379	+APPNAME = $(OBJDIR)\fossil$(E)
	380	+
	381	+all: $(OBJDIR) $(APPNAME)
	382	+
	383	+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
	384	+ cd $(OBJDIR)
	385	+ link -LINK -OUT:$@ $(LIBDIR) @linkopts
	386	+
	387	+$(OBJDIR)\linkopts: $B\win\Makefile.msc}
	388	+puts -nonewline "\techo "
	389	+foreach s [lsort $src] {
	390	+ puts -nonewline "$s "
	391	+}
	392	+puts "sqlite3 th th_lang > \$@"
	393	+puts "\techo \$(LIBS) >> \$@\n\n"
	394	+
	395	+puts {
	396	+
	397	+$(OBJDIR):
	398	+ @-mkdir $@
	399	+
	400	+translate$E: $(SRCDIR)\translate.c
	401	+ $(BCC) $**
	402	+
	403	+makeheaders$E: $(SRCDIR)\makeheaders.c
	404	+ $(BCC) $**
	405	+
	406	+mkindex$E: $(SRCDIR)\mkindex.c
	407	+ $(BCC) $**
	408	+
	409	+version$E: $B\win\version.c
	410	+ $(BCC) $**
	411	+
	412	+$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
	413	+ $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
	414	+
	415	+$(OBJDIR)\th$O : $(SRCDIR)\th.c
	416	+ $(TCC) /Fo$@ -c $**
	417	+
	418	+$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	419	+ $(TCC) /Fo$@ -c $**
	420	+
	421	+VERSION.h : version$E $B\manifest.uuid $B\manifest
	422	+ $** > $@
	423	+
	424	+page_index.h: mkindex$E $(SRC)
	425	+ $** > $@
	426	+
	427	+clean:
	428	+ -del $(OBJDIR)\*.obj
	429	+ -del .obj _.c .h .map
	430	+ -del headers linkopts
	431	+
	432	+realclean:
	433	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
	434	+
	435	+}
	436	+foreach s [lsort $src] {
	437	+ puts "\$(OBJDIR)\\$s\$O : ${s}_.c ${s}.h"
	438	+ puts "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
	439	+ puts "${s}_.c : \$(SRCDIR)\\$s.c"
	440	+ puts "\ttranslate\$E \$** > \$@\n"
	441	+}
	442	+
	443	+puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E "
	444	+foreach s [lsort $src] {
	445	+ puts -nonewline "${s}_.c:$s.h "
	446	+}
	447	+puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
	448	+puts "\t@copy /Y nul: headers"
	449	+
	450	+}
209	451

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -44,10 +44,11 @@
44	md5
45	merge
46	merge3
47	name
48	pivot

49	pqueue
50	printf
51	rebuild
52	report
53	rss
	@@ -80,11 +81,11 @@
80	}
81
82	# Name of the final application
83	#
84	set name fossil
85
86	puts {# DO NOT EDIT
87	#
88	# This file is automatically generated. Instead of editing this
89	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
90	# to regenerate this file.
	@@ -204,5 +205,246 @@
204	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
205	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
206
207	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
208	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"

















































































































































































































































209

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -44,10 +44,11 @@
44	md5
45	merge
46	merge3
47	name
48	pivot
49	popen
50	pqueue
51	printf
52	rebuild
53	report
54	rss
	@@ -80,11 +81,11 @@
81	}
82
83	# Name of the final application
84	#
85	set name fossil
86	if { 0 == $argc } {
87	puts {# DO NOT EDIT
88	#
89	# This file is automatically generated. Instead of editing this
90	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
91	# to regenerate this file.
	@@ -204,5 +205,246 @@
205	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
206	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
207
208	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
209	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
210	exit
211	}
212	if { "dmc" == [lindex $argv 0] } {
213
214	puts {# DO NOT EDIT
215	#
216	# This file is automatically generated. Instead of editing this
217	# file, edit "makemake.tcl" then run
218	# "tclsh src/makemake.tcl dmc > win/Makefile.dmc"
219	# to regenerate this file.
220	B = ..
221	SRCDIR = $B\src
222	OBJDIR = .
223	O = .obj
224	E = .exe
225
226
227	# Maybe DMDIR, SSL or INCL needs adjustment
228	DMDIR = c:\DM
229	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
230
231	#SSL = -DFOSSIL_ENABLE_SSL=1
232	SSL =
233
234	DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
235	I18N = -DFOSSIL_I18N=0
236
237	CFLAGS = -o
238	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
239	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
240	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
241	}
242	puts -nonewline "SRC = "
243	foreach s [lsort $src] {
244	puts -nonewline "${s}_.c "
245	}
246	puts "\n"
247	puts -nonewline "OBJ = "
248	foreach s [lsort $src] {
249	puts -nonewline "\$(OBJDIR)\\$s\$O "
250	}
251	puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
252	puts {
253
254	APPNAME = $(OBJDIR)\fossil$(E)
255
256	all: $(APPNAME)
257
258	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
259	cd $(OBJDIR)
260	$(DMDIR)\bin\link @link
261
262	$(OBJDIR)\link: $B\win\Makefile.dmc}
263	puts -nonewline "\t+echo "
264	foreach s [lsort $src] {
265	puts -nonewline "$s "
266	}
267	puts "sqlite3 th th_lang > \$@"
268	puts "\t+echo fossil >> \$@"
269	puts "\t+echo fossil >> \$@"
270	puts "\t+echo \$(LIBS) >> \$@\n\n"
271
272	puts {
273	translate$E: $(SRCDIR)\translate.c
274	$(BCC) -o$@ $**
275
276	makeheaders$E: $(SRCDIR)\makeheaders.c
277	$(BCC) -o$@ $**
278
279	mkindex$E: $(SRCDIR)\mkindex.c
280	$(BCC) -o$@ $**
281
282	version$E: $B\win\version.c
283	$(BCC) -o$@ $**
284
285	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
286	$(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
287
288	$(OBJDIR)\th$O : $(SRCDIR)\th.c
289	$(TCC) -o$@ -c $**
290
291	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
292	$(TCC) -o$@ -c $**
293
294	VERSION.h : version$E $B\manifest.uuid $B\manifest
295	+$** > $@
296
297	page_index.h: mkindex$E $(SRC)
298	+$** > $@
299
300	clean:
301	-del $(OBJDIR)\*.obj
302	-del .obj _.c .h .map
303
304	realclean:
305	-del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
306
307	}
308	foreach s [lsort $src] {
309	puts "\$(OBJDIR)\\$s\$O : ${s}_.c ${s}.h"
310	puts "\t\$(TCC) -o\$@ -c ${s}_.c\n"
311	puts "${s}_.c : \$(SRCDIR)\\$s.c"
312	puts "\t+translate\$E \$** > \$@\n"
313	}
314
315	puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
316	foreach s [lsort $src] {
317	puts -nonewline "${s}_.c:$s.h "
318	}
319	puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
320	puts "\t@copy /Y nul: headers"
321	exit
322	}
323
324	if { "msc" == [lindex $argv 0] } {
325
326	puts {# DO NOT EDIT
327	#
328	# This file is automatically generated. Instead of editing this
329	# file, edit "makemake.tcl" then run
330	# "tclsh src/makemake.tcl msc > win/Makefile.msc"
331	# to regenerate this file.
332	B = ..
333	SRCDIR = $B\src
334	OBJDIR = .
335	O = .obj
336	E = .exe
337
338	# Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
339	MSCDIR = c:\msc
340
341	# Uncomment below for SSL support
342	SSL =
343	SSLLIB =
344	#SSL = -DFOSSIL_ENABLE_SSL=1
345	#SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
346
347	# zlib options
348	# When using precompiled from http://zlib.net/zlib125-dll.zip
349	#ZINCDIR = C:\zlib125-dll\include
350	#ZLIBDIR = C:\zlib125-dll\lib
351	#ZLIB = zdll.lib
352	ZINCDIR = $(MSCDIR)\extra\include
353	ZLIBDIR = $(MSCDIR)\extra\lib
354	ZLIB = zlib.lib
355
356	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
357
358	MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
359	I18N = -DFOSSIL_I18N=0
360
361	CFLAGS = -nologo -MT -O2
362	BCC = $(CC) $(CFLAGS)
363	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
364	LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
365	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
366	}
367	puts -nonewline "SRC = "
368	foreach s [lsort $src] {
369	puts -nonewline "${s}_.c "
370	}
371	puts "\n"
372	puts -nonewline "OBJ = "
373	foreach s [lsort $src] {
374	puts -nonewline "\$(OBJDIR)\\$s\$O "
375	}
376	puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
377	puts {
378
379	APPNAME = $(OBJDIR)\fossil$(E)
380
381	all: $(OBJDIR) $(APPNAME)
382
383	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
384	cd $(OBJDIR)
385	link -LINK -OUT:$@ $(LIBDIR) @linkopts
386
387	$(OBJDIR)\linkopts: $B\win\Makefile.msc}
388	puts -nonewline "\techo "
389	foreach s [lsort $src] {
390	puts -nonewline "$s "
391	}
392	puts "sqlite3 th th_lang > \$@"
393	puts "\techo \$(LIBS) >> \$@\n\n"
394
395	puts {
396
397	$(OBJDIR):
398	@-mkdir $@
399
400	translate$E: $(SRCDIR)\translate.c
401	$(BCC) $**
402
403	makeheaders$E: $(SRCDIR)\makeheaders.c
404	$(BCC) $**
405
406	mkindex$E: $(SRCDIR)\mkindex.c
407	$(BCC) $**
408
409	version$E: $B\win\version.c
410	$(BCC) $**
411
412	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
413	$(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
414
415	$(OBJDIR)\th$O : $(SRCDIR)\th.c
416	$(TCC) /Fo$@ -c $**
417
418	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
419	$(TCC) /Fo$@ -c $**
420
421	VERSION.h : version$E $B\manifest.uuid $B\manifest
422	$** > $@
423
424	page_index.h: mkindex$E $(SRC)
425	$** > $@
426
427	clean:
428	-del $(OBJDIR)\*.obj
429	-del .obj _.c .h .map
430	-del headers linkopts
431
432	realclean:
433	-del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
434
435	}
436	foreach s [lsort $src] {
437	puts "\$(OBJDIR)\\$s\$O : ${s}_.c ${s}.h"
438	puts "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
439	puts "${s}_.c : \$(SRCDIR)\\$s.c"
440	puts "\ttranslate\$E \$** > \$@\n"
441	}
442
443	puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E "
444	foreach s [lsort $src] {
445	puts -nonewline "${s}_.c:$s.h "
446	}
447	puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
448	puts "\t@copy /Y nul: headers"
449
450	}
451

M src/merge3.c

+2 -2

		--- src/merge3.c
		+++ src/merge3.c
		@@ -165,12 +165,12 @@
165	165	** is the number of lines of text to copy directly from the pivot,
166	166	** the second integer is the number of lines of text to omit from the
167	167	** pivot, and the third integer is the number of lines of text that are
168	168	** inserted. The edit array ends with a triple of 0,0,0.
169	169	*/
170		- aC1 = text_diff(pPivot, pV1, 0, 0);
171		- aC2 = text_diff(pPivot, pV2, 0, 0);
	170	+ aC1 = text_diff(pPivot, pV1, 0, 0, 1);
	171	+ aC2 = text_diff(pPivot, pV2, 0, 0, 1);
172	172	if( aC1==0 \|\| aC2==0 ){
173	173	free(aC1);
174	174	free(aC2);
175	175	return -1;
176	176	}
177	177
178	178	ADDED src/popen.c

	--- src/merge3.c
	+++ src/merge3.c
	@@ -165,12 +165,12 @@
165	** is the number of lines of text to copy directly from the pivot,
166	** the second integer is the number of lines of text to omit from the
167	** pivot, and the third integer is the number of lines of text that are
168	** inserted. The edit array ends with a triple of 0,0,0.
169	*/
170	aC1 = text_diff(pPivot, pV1, 0, 0);
171	aC2 = text_diff(pPivot, pV2, 0, 0);
172	if( aC1==0 \|\| aC2==0 ){
173	free(aC1);
174	free(aC2);
175	return -1;
176	}
177
178	DDED src/popen.c

	--- src/merge3.c
	+++ src/merge3.c
	@@ -165,12 +165,12 @@
165	** is the number of lines of text to copy directly from the pivot,
166	** the second integer is the number of lines of text to omit from the
167	** pivot, and the third integer is the number of lines of text that are
168	** inserted. The edit array ends with a triple of 0,0,0.
169	*/
170	aC1 = text_diff(pPivot, pV1, 0, 0, 1);
171	aC2 = text_diff(pPivot, pV2, 0, 0, 1);
172	if( aC1==0 \|\| aC2==0 ){
173	free(aC1);
174	free(aC2);
175	return -1;
176	}
177
178	DDED src/popen.c

M src/popen.c

+11

		--- a/src/popen.c
		+++ b/src/popen.c
		@@ -0,0 +1,11 @@
	1	+TCHAR *zCmd, mb(c)zCmd),
	2	+wchar_t charTCHAR *zCmd, mb(c)zCmd),
	3	+wchar_t TCHAR zCmd, TCHAR zCmd, mb©zCmd),
	4	+wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
	5	+mWunicodemd),
	6	+wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
	7	+mWunicodeCmd),
	8	+wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
	9	+mWunicodeTCHAR *zCmd, #elsembcs#endif mb(c)zCmd),
	10	+dupclose(1);
	11	+ (intptr_t)hStdoutRd(intptr_t)hStdinWrlonglong

	--- a/src/popen.c
	+++ b/src/popen.c
	@@ -0,0 +1,11 @@

	--- a/src/popen.c
	+++ b/src/popen.c
	@@ -0,0 +1,11 @@
1	TCHAR *zCmd, mb(c)zCmd),
2	wchar_t charTCHAR *zCmd, mb(c)zCmd),
3	wchar_t TCHAR zCmd, TCHAR zCmd, mb©zCmd),
4	wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
5	mWunicodemd),
6	wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
7	mWunicodeCmd),
8	wchar_t zCmd,TCHAR zCmd, mbcs(zCmd),
9	mWunicodeTCHAR *zCmd, #elsembcs#endif mb(c)zCmd),
10	dupclose(1);
11	(intptr_t)hStdoutRd(intptr_t)hStdinWrlonglong

M src/rebuild.c

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -446,10 +446,12 @@
446	446	blob_appendf(&path, "%s/%s", g.argv[3], pEntry->d_name);
447	447	if( blob_read_from_file(&aContent, blob_str(&path))==-1 ){
448	448	fossil_panic("Some unknown error occurred while reading \"%s\"", blob_str(&path));
449	449	}
450	450	content_put(&aContent, 0, 0);
	451	+ blob_reset(&path);
	452	+ blob_reset(&aContent);
451	453	}
452	454	}
453	455	else {
454	456	fossil_panic("Encountered error %d while trying to open \"%s\".", errno, g.argv[3]);
455	457	}
456	458

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -446,10 +446,12 @@
446	blob_appendf(&path, "%s/%s", g.argv[3], pEntry->d_name);
447	if( blob_read_from_file(&aContent, blob_str(&path))==-1 ){
448	fossil_panic("Some unknown error occurred while reading \"%s\"", blob_str(&path));
449	}
450	content_put(&aContent, 0, 0);


451	}
452	}
453	else {
454	fossil_panic("Encountered error %d while trying to open \"%s\".", errno, g.argv[3]);
455	}
456

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -446,10 +446,12 @@
446	blob_appendf(&path, "%s/%s", g.argv[3], pEntry->d_name);
447	if( blob_read_from_file(&aContent, blob_str(&path))==-1 ){
448	fossil_panic("Some unknown error occurred while reading \"%s\"", blob_str(&path));
449	}
450	content_put(&aContent, 0, 0);
451	blob_reset(&path);
452	blob_reset(&aContent);
453	}
454	}
455	else {
456	fossil_panic("Encountered error %d while trying to open \"%s\".", errno, g.argv[3]);
457	}
458

M src/report.c

+12 -12

		--- src/report.c
		+++ src/report.c
		@@ -277,13 +277,13 @@
277	277	zSQL = db_column_text(&q, 1);
278	278	zOwner = db_column_text(&q, 2);
279	279	zClrKey = db_column_text(&q, 3);
280	280	@ <table cellpadding=0 cellspacing=0 border=0>
281	281	@ <tr><td valign="top" align="right">Title:</td><td width=15></td>
282		- @ <td colspan=3>%h(zTitle)</td></tr>
	282	+ @ <td colspan="3">%h(zTitle)</td></tr>
283	283	@ <tr><td valign="top" align="right">Owner:</td><td></td>
284		- @ <td colspan=3>%h(zOwner)</td></tr>
	284	+ @ <td colspan="3">%h(zOwner)</td></tr>
285	285	@ <tr><td valign="top" align="right">SQL:</td><td></td>
286	286	@ <td valign="top"><pre>
287	287	@ %h(zSQL)
288	288	@ </pre></td>
289	289	@ <td width=15></td><td valign="top">
		@@ -393,21 +393,21 @@
393	393	}
394	394	}
395	395	if( zOwner==0 ) zOwner = g.zLogin;
396	396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	397	if( rn>0 ){
398		- style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
	398	+ style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	399	}
400	400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	401	if( zErr ){
402	402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	403	}
404	404	@ <form action="rptedit" method="POST">
405	405	@ <input type="hidden" name="rn" value="%d(rn)">
406		- @ <p>Report Title:<br>
	406	+ @ <p>Report Title:<br />
407	407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408		- @ <p>Enter a complete SQL query statement against the "TICKET" table:<br>
	408	+ @ <p>Enter a complete SQL query statement against the "TICKET" table:<br />
409	409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	410	@ </p>
411	411	login_insert_csrf_secret();
412	412	if( g.okAdmin ){
413	413	@ <p>Report owner:
		@@ -417,11 +417,11 @@
417	417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	418	}
419	419	@ <p>Enter an optional color key in the following box. (If blank, no
420	420	@ color key is displayed.) Each line contains the text for a single
421	421	@ entry in the key. The first token of each line is the background
422		- @ color for that line.<br>
	422	+ @ color for that line.<br />
423	423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	424	@ </p>
425	425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	427	@ to change it.</p>
		@@ -448,11 +448,11 @@
448	448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	449	if( zSchema==0 ){
450	450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	451	" WHERE name='ticket'");
452	452	}
453		- @ <hr><h3>TICKET Schema</h3>
	453	+ @ <hr /><h3>TICKET Schema</h3>
454	454	@ <blockquote><pre>
455	455	@ %h(zSchema)
456	456	@ </pre></blockquote>
457	457	@ <h3>Notes</h3>
458	458	@ <ul>
		@@ -829,14 +829,14 @@
829	829	while( isspace(*zSafeKey) ) zSafeKey++;
830	830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	831	for(j=i; isspace(zSafeKey[j]); j++){}
832	832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	833	if( !horiz ){
834		- cgi_printf("<tr bgcolor=\"%.s\"><td>%.s</td></tr>\n",
	834	+ cgi_printf("<tr style=\"background-color: %.s;\"><td>%.s</td></tr>\n",
835	835	i, zSafeKey, k-j, &zSafeKey[j]);
836	836	}else{
837		- cgi_printf("<td bgcolor=\"%.s\">%.s</td>\n",
	837	+ cgi_printf("<td style=\"background-color: %.s;\">%.s</td>\n",
838	838	i, zSafeKey, k-j, &zSafeKey[j]);
839	839	}
840	840	zSafeKey += k;
841	841	}
842	842	free(zToFree);
		@@ -907,11 +907,11 @@
907	907	if( !tabs ){
908	908	struct GenerateHTML sState;
909	909
910	910	db_multi_exec("PRAGMA empty_result_callbacks=ON");
911	911	style_submenu_element("Raw", "Raw",
912		- "rptview?tablist=1&%s", PD("QUERY_STRING",""));
	912	+ "rptview?tablist=1&%s", PD("QUERY_STRING",""));
913	913	if( g.okAdmin
914	914	\|\| (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915	915	style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916	916	}
917	917	if( g.okTktFmt ){
		@@ -921,12 +921,12 @@
921	921	style_submenu_element("New Ticket", "Create a new ticket",
922	922	"%s/tktnew", g.zTop);
923	923	}
924	924	style_header(zTitle);
925	925	output_color_key(zClrKey, 1,
926		- "border=0 cellpadding=3 cellspacing=0 class=\"report\"");
927		- @ <table border=1 cellpadding=2 cellspacing=0 class="report">
	926	+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" class=\"report\"");
	927	+ @ <table border="1" cellpadding="2" cellspacing="0" class="report">
928	928	sState.rn = rn;
929	929	sState.nCount = 0;
930	930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	932	sqlite3_set_authorizer(g.db, 0, 0);
933	933

	--- src/report.c
	+++ src/report.c
	@@ -277,13 +277,13 @@
277	zSQL = db_column_text(&q, 1);
278	zOwner = db_column_text(&q, 2);
279	zClrKey = db_column_text(&q, 3);
280	@ <table cellpadding=0 cellspacing=0 border=0>
281	@ <tr><td valign="top" align="right">Title:</td><td width=15></td>
282	@ <td colspan=3>%h(zTitle)</td></tr>
283	@ <tr><td valign="top" align="right">Owner:</td><td></td>
284	@ <td colspan=3>%h(zOwner)</td></tr>
285	@ <tr><td valign="top" align="right">SQL:</td><td></td>
286	@ <td valign="top"><pre>
287	@ %h(zSQL)
288	@ </pre></td>
289	@ <td width=15></td><td valign="top">
	@@ -393,21 +393,21 @@
393	}
394	}
395	if( zOwner==0 ) zOwner = g.zLogin;
396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	if( rn>0 ){
398	style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	}
400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
404	@ <form action="rptedit" method="POST">
405	@ <input type="hidden" name="rn" value="%d(rn)">
406	@ <p>Report Title:<br>
407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408	@ <p>Enter a complete SQL query statement against the "TICKET" table:<br>
409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	@ </p>
411	login_insert_csrf_secret();
412	if( g.okAdmin ){
413	@ <p>Report owner:
	@@ -417,11 +417,11 @@
417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	}
419	@ <p>Enter an optional color key in the following box. (If blank, no
420	@ color key is displayed.) Each line contains the text for a single
421	@ entry in the key. The first token of each line is the background
422	@ color for that line.<br>
423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	@ </p>
425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	@ to change it.</p>
	@@ -448,11 +448,11 @@
448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	if( zSchema==0 ){
450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	" WHERE name='ticket'");
452	}
453	@ <hr><h3>TICKET Schema</h3>
454	@ <blockquote><pre>
455	@ %h(zSchema)
456	@ </pre></blockquote>
457	@ <h3>Notes</h3>
458	@ <ul>
	@@ -829,14 +829,14 @@
829	while( isspace(*zSafeKey) ) zSafeKey++;
830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	for(j=i; isspace(zSafeKey[j]); j++){}
832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	if( !horiz ){
834	cgi_printf("<tr bgcolor=\"%.s\"><td>%.s</td></tr>\n",
835	i, zSafeKey, k-j, &zSafeKey[j]);
836	}else{
837	cgi_printf("<td bgcolor=\"%.s\">%.s</td>\n",
838	i, zSafeKey, k-j, &zSafeKey[j]);
839	}
840	zSafeKey += k;
841	}
842	free(zToFree);
	@@ -907,11 +907,11 @@
907	if( !tabs ){
908	struct GenerateHTML sState;
909
910	db_multi_exec("PRAGMA empty_result_callbacks=ON");
911	style_submenu_element("Raw", "Raw",
912	"rptview?tablist=1&%s", PD("QUERY_STRING",""));
913	if( g.okAdmin
914	\|\| (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915	style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916	}
917	if( g.okTktFmt ){
	@@ -921,12 +921,12 @@
921	style_submenu_element("New Ticket", "Create a new ticket",
922	"%s/tktnew", g.zTop);
923	}
924	style_header(zTitle);
925	output_color_key(zClrKey, 1,
926	"border=0 cellpadding=3 cellspacing=0 class=\"report\"");
927	@ <table border=1 cellpadding=2 cellspacing=0 class="report">
928	sState.rn = rn;
929	sState.nCount = 0;
930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	sqlite3_set_authorizer(g.db, 0, 0);
933

	--- src/report.c
	+++ src/report.c
	@@ -277,13 +277,13 @@
277	zSQL = db_column_text(&q, 1);
278	zOwner = db_column_text(&q, 2);
279	zClrKey = db_column_text(&q, 3);
280	@ <table cellpadding=0 cellspacing=0 border=0>
281	@ <tr><td valign="top" align="right">Title:</td><td width=15></td>
282	@ <td colspan="3">%h(zTitle)</td></tr>
283	@ <tr><td valign="top" align="right">Owner:</td><td></td>
284	@ <td colspan="3">%h(zOwner)</td></tr>
285	@ <tr><td valign="top" align="right">SQL:</td><td></td>
286	@ <td valign="top"><pre>
287	@ %h(zSQL)
288	@ </pre></td>
289	@ <td width=15></td><td valign="top">
	@@ -393,21 +393,21 @@
393	}
394	}
395	if( zOwner==0 ) zOwner = g.zLogin;
396	style_submenu_element("Cancel", "Cancel", "reportlist");
397	if( rn>0 ){
398	style_submenu_element("Delete", "Delete", "rptedit?rn=%d&del1=1", rn);
399	}
400	style_header(rn>0 ? "Edit Report Format":"Create New Report Format");
401	if( zErr ){
402	@ <blockquote><font color="#ff0000"><b>%h(zErr)</b></font></blockquote>
403	}
404	@ <form action="rptedit" method="POST">
405	@ <input type="hidden" name="rn" value="%d(rn)">
406	@ <p>Report Title:<br />
407	@ <input type="text" name="t" value="%h(zTitle)" size="60"></p>
408	@ <p>Enter a complete SQL query statement against the "TICKET" table:<br />
409	@ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea>
410	@ </p>
411	login_insert_csrf_secret();
412	if( g.okAdmin ){
413	@ <p>Report owner:
	@@ -417,11 +417,11 @@
417	@ <input type="hidden" name="w" value="%h(zOwner)">
418	}
419	@ <p>Enter an optional color key in the following box. (If blank, no
420	@ color key is displayed.) Each line contains the text for a single
421	@ entry in the key. The first token of each line is the background
422	@ color for that line.<br />
423	@ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea>
424	@ </p>
425	if( !g.okAdmin && strcmp(zOwner,g.zLogin)!=0 ){
426	@ <p>This report format is owned by %h(zOwner). You are not allowed
427	@ to change it.</p>
	@@ -448,11 +448,11 @@
448	zSchema = db_text(0,"SELECT sql FROM sqlite_master WHERE name='ticket'");
449	if( zSchema==0 ){
450	zSchema = db_text(0,"SELECT sql FROM repository.sqlite_master"
451	" WHERE name='ticket'");
452	}
453	@ <hr /><h3>TICKET Schema</h3>
454	@ <blockquote><pre>
455	@ %h(zSchema)
456	@ </pre></blockquote>
457	@ <h3>Notes</h3>
458	@ <ul>
	@@ -829,14 +829,14 @@
829	while( isspace(*zSafeKey) ) zSafeKey++;
830	for(i=0; zSafeKey[i] && !isspace(zSafeKey[i]); i++){}
831	for(j=i; isspace(zSafeKey[j]); j++){}
832	for(k=j; zSafeKey[k] && zSafeKey[k]!='\n' && zSafeKey[k]!='\r'; k++){}
833	if( !horiz ){
834	cgi_printf("<tr style=\"background-color: %.s;\"><td>%.s</td></tr>\n",
835	i, zSafeKey, k-j, &zSafeKey[j]);
836	}else{
837	cgi_printf("<td style=\"background-color: %.s;\">%.s</td>\n",
838	i, zSafeKey, k-j, &zSafeKey[j]);
839	}
840	zSafeKey += k;
841	}
842	free(zToFree);
	@@ -907,11 +907,11 @@
907	if( !tabs ){
908	struct GenerateHTML sState;
909
910	db_multi_exec("PRAGMA empty_result_callbacks=ON");
911	style_submenu_element("Raw", "Raw",
912	"rptview?tablist=1&%s", PD("QUERY_STRING",""));
913	if( g.okAdmin
914	\|\| (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915	style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916	}
917	if( g.okTktFmt ){
	@@ -921,12 +921,12 @@
921	style_submenu_element("New Ticket", "Create a new ticket",
922	"%s/tktnew", g.zTop);
923	}
924	style_header(zTitle);
925	output_color_key(zClrKey, 1,
926	"border=\"0\" cellpadding=\"3\" cellspacing=\"0\" class=\"report\"");
927	@ <table border="1" cellpadding="2" cellspacing="0" class="report">
928	sState.rn = rn;
929	sState.nCount = 0;
930	sqlite3_set_authorizer(g.db, report_query_authorizer, (void*)&zErr1);
931	sqlite3_exec(g.db, zSql, generate_html, &sState, &zErr2);
932	sqlite3_set_authorizer(g.db, 0, 0);
933

M src/rss.c

+1 -1

		--- src/rss.c
		+++ src/rss.c
		@@ -16,13 +16,13 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to create a RSS feed for the CGI interface.
19	19	*/
20	20	#include "config.h"
	21	+#include <time.h>
21	22	#include "rss.h"
22	23	#include <assert.h>
23		-#include <time.h>
24	24
25	25	/*
26	26	** WEBPAGE: timeline.rss
27	27	*/
28	28	void page_timeline_rss(void){
29	29

	--- src/rss.c
	+++ src/rss.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code used to create a RSS feed for the CGI interface.
19	*/
20	#include "config.h"

21	#include "rss.h"
22	#include <assert.h>
23	#include <time.h>
24
25	/*
26	** WEBPAGE: timeline.rss
27	*/
28	void page_timeline_rss(void){
29

	--- src/rss.c
	+++ src/rss.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code used to create a RSS feed for the CGI interface.
19	*/
20	#include "config.h"
21	#include <time.h>
22	#include "rss.h"
23	#include <assert.h>

24
25	/*
26	** WEBPAGE: timeline.rss
27	*/
28	void page_timeline_rss(void){
29

M src/setup.c

+309 -275

		--- src/setup.c
		+++ src/setup.c
		@@ -99,42 +99,40 @@
99	99	return;
100	100	}
101	101
102	102	style_submenu_element("Add", "Add User", "setup_uedit");
103	103	style_header("User List");
104		- @ <table border="0" cellpadding="0" cellspacing="25">
105		- @ <tr><td valign="top">
106		- @ <b>Users:</b>
107		- @ <table border="1" cellpadding="10"><tr><td>
108		- @ <table cellspacing=0 cellpadding=0 border=0>
	104	+ @ <table class="usetupLayoutTable">
	105	+ @ <tr><td class="usetupColumnLayout">
	106	+ @ <span class="note">Users:</span>
	107	+ @ <table class="usetupUserList">
109	108	@ <tr>
110		- @ <th align="right">User ID</th><td width="20"> </td>
111		- @ <th>Capabilities</th><td width="15"> </td>
112		- @ <th>Contact Info</th>
	109	+ @ <th class="usetupListUser" style="text-align: right;padding-right: 20px;">User ID</th>
	110	+ @ <th class="usetupListCap" style="text-align: center;padding-right: 15px;">Capabilities</th>
	111	+ @ <th class="usetupListCon" style="text-align: left;">Contact Info</th>
113	112	@ </tr>
114	113	db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login");
115	114	while( db_step(&s)==SQLITE_ROW ){
116	115	const char *zCap = db_column_text(&s, 2);
117	116	if( strstr(zCap, "s") ) zCap = "s";
118	117	@ <tr>
119		- @ <td align="right">
	118	+ @ <td class="usetupListUser" style="text-align: right;padding-right: 20px;white-space:nowrap;">
120	119	if( g.okAdmin && (zCap[0]!='s' \|\| g.okSetup) ){
121	120	@ <a href="setup_uedit?id=%d(db_column_int(&s,0))">
122	121	}
123		- @ <nobr>%h(db_column_text(&s,1))</nobr>
	122	+ @ %h(db_column_text(&s,1))
124	123	if( g.okAdmin ){
125	124	@ </a>
126	125	}
127		- @ </td><td>   </td>
128		- @ <td align="center">%s(zCap)</td>
129		- @ <td>   </td>
130		- @ <td align="left">%s(db_column_text(&s,3))</td>
	126	+ @ </td>
	127	+ @ <td class="usetupListCap" style="text-align: center;padding-right: 15px;">%s(zCap)</td>
	128	+ @ <td class="usetupListCon" style="text-align: left;">%s(db_column_text(&s,3))</td>
131	129	@ </tr>
132	130	}
133		- @ </table></td></tr></table>
134		- @ <td valign="top">
135		- @ <b>Notes:</b>
	131	+ @ </table>
	132	+ @ </td><td class="usetupColumnLayout">
	133	+ @ <span class="note">Notes:</span>
136	134	@ <ol>
137	135	@ <li><p>The permission flags are as follows:</p>
138	136	@ <table>
139	137	@ <tr><td valign="top"><b>a</b></td>
140	138	@ <td><i>Admin:</i> Create and delete users</td></tr>
		@@ -181,31 +179,35 @@
181	179	@ user <tt>developer</tt></td></tr>
182	180	@ <tr><td valign="top"><b>w</b></td>
183	181	@ <td><i>Write-Tkt:</i> Edit tickets</td></tr>
184	182	@ <tr><td valign="top"><b>z</b></td>
185	183	@ <td><i>Zip download:</i> Download a baseline via the
186		- @ <tt>/zip</tt> URL even without check<b>o</b>ut
187		- @ and <b>h</b>istory permissions</td></tr>
	184	+ @ <tt>/zip</tt> URL even without
	185	+ @ check<span class="capability">o</span>ut
	186	+ @ and <span class="capability">h</span>istory permissions</td></tr>
188	187	@ </table>
189	188	@ </li>
190	189	@
191	190	@ <li><p>
192		- @ Every user, logged in or not, inherits the privileges of <b>nobody</b>.
	191	+ @ Every user, logged in or not, inherits the privileges of
	192	+ @ <span class="usertype">nobody</span>.
193	193	@ </p></li>
194	194	@
195	195	@ <li><p>
196		- @ Any human can login as <b>anonymous</b> since the password is
197		- @ clearly displayed on the login page for them to type. The purpose
198		- @ of requiring anonymous to log in is to prevent access by spiders.
	196	+ @ Any human can login as <span class="usertype">anonymous</span> since the
	197	+ @ password is clearly displayed on the login page for them to type. The
	198	+ @ purpose of requiring anonymous to log in is to prevent access by spiders.
199	199	@ Every logged-in user inherits the combined privileges of
200		- @ <b>anonymous</b> and
201		- @ <b>nobody</b>.
	200	+ @ <span class="usertype">anonymous</span> and
	201	+ @ <span class="usertype">nobody</span>.
202	202	@ </p></li>
203	203	@
204	204	@ <li><p>
205		- @ Users with privilege <b>v</b> inherit the combined privileges of
206		- @ <b>developer</b>, <b>anonymous</b>, and <b>nobody</b>.
	205	+ @ Users with privilege <span class="capability">v</span> inherit the combined
	206	+ @ privileges of <span class="usertype">developer</span>,
	207	+ @ <span class="usertype">anonymous</span>, and
	208	+ @ <span class="usertype">nobody</span>.
207	209	@ </p></li>
208	210	@
209	211	@ </ol>
210	212	@ </td></tr></table>
211	213	style_footer();
		@@ -323,12 +325,12 @@
323	325	}
324	326	if( uid>0 &&
325	327	db_exists("SELECT 1 FROM user WHERE login=%Q AND uid!=%d", zLogin, uid)
326	328	){
327	329	style_header("User Creation Error");
328		- @ <font color="red">Login "%h(zLogin)" is already used by a different
329		- @ user.</font>
	330	+ @ <span class="loginError">Login "%h(zLogin)" is already used by
	331	+ @ a different user.</span>
330	332	@
331	333	@ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
332	334	style_footer();
333	335	return;
334	336	}
		@@ -353,65 +355,69 @@
353	355	if( uid ){
354	356	zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid);
355	357	zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
356	358	zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
357	359	zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
358		- if( strchr(zCap, 'a') ) oaa = " checked";
359		- if( strchr(zCap, 'b') ) oab = " checked";
360		- if( strchr(zCap, 'c') ) oac = " checked";
361		- if( strchr(zCap, 'd') ) oad = " checked";
362		- if( strchr(zCap, 'e') ) oae = " checked";
363		- if( strchr(zCap, 'f') ) oaf = " checked";
364		- if( strchr(zCap, 'g') ) oag = " checked";
365		- if( strchr(zCap, 'h') ) oah = " checked";
366		- if( strchr(zCap, 'i') ) oai = " checked";
367		- if( strchr(zCap, 'j') ) oaj = " checked";
368		- if( strchr(zCap, 'k') ) oak = " checked";
369		- if( strchr(zCap, 'm') ) oam = " checked";
370		- if( strchr(zCap, 'n') ) oan = " checked";
371		- if( strchr(zCap, 'o') ) oao = " checked";
372		- if( strchr(zCap, 'p') ) oap = " checked";
373		- if( strchr(zCap, 'r') ) oar = " checked";
374		- if( strchr(zCap, 's') ) oas = " checked";
375		- if( strchr(zCap, 't') ) oat = " checked";
376		- if( strchr(zCap, 'u') ) oau = " checked";
377		- if( strchr(zCap, 'v') ) oav = " checked";
378		- if( strchr(zCap, 'w') ) oaw = " checked";
379		- if( strchr(zCap, 'z') ) oaz = " checked";
	360	+ if( strchr(zCap, 'a') ) oaa = " checked=\"checked\"";
	361	+ if( strchr(zCap, 'b') ) oab = " checked=\"checked\"";
	362	+ if( strchr(zCap, 'c') ) oac = " checked=\"checked\"";
	363	+ if( strchr(zCap, 'd') ) oad = " checked=\"checked\"";
	364	+ if( strchr(zCap, 'e') ) oae = " checked=\"checked\"";
	365	+ if( strchr(zCap, 'f') ) oaf = " checked=\"checked\"";
	366	+ if( strchr(zCap, 'g') ) oag = " checked=\"checked\"";
	367	+ if( strchr(zCap, 'h') ) oah = " checked=\"checked\"";
	368	+ if( strchr(zCap, 'i') ) oai = " checked=\"checked\"";
	369	+ if( strchr(zCap, 'j') ) oaj = " checked=\"checked\"";
	370	+ if( strchr(zCap, 'k') ) oak = " checked=\"checked\"";
	371	+ if( strchr(zCap, 'm') ) oam = " checked=\"checked\"";
	372	+ if( strchr(zCap, 'n') ) oan = " checked=\"checked\"";
	373	+ if( strchr(zCap, 'o') ) oao = " checked=\"checked\"";
	374	+ if( strchr(zCap, 'p') ) oap = " checked=\"checked\"";
	375	+ if( strchr(zCap, 'r') ) oar = " checked=\"checked\"";
	376	+ if( strchr(zCap, 's') ) oas = " checked=\"checked\"";
	377	+ if( strchr(zCap, 't') ) oat = " checked=\"checked\"";
	378	+ if( strchr(zCap, 'u') ) oau = " checked=\"checked\"";
	379	+ if( strchr(zCap, 'v') ) oav = " checked=\"checked\"";
	380	+ if( strchr(zCap, 'w') ) oaw = " checked=\"checked\"";
	381	+ if( strchr(zCap, 'z') ) oaz = " checked=\"checked\"";
380	382	}
381	383
382	384	/* figure out inherited permissions */
383	385	memset(inherit, 0, sizeof(inherit));
384	386	if( strcmp(zLogin, "developer") ){
385	387	char z1, z2;
386	388	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='developer'");
387	389	while( z1 && *z1 ){
388		- inherit[0x7f & *(z1++)] = "<font color=\"red\">•</font>";
	390	+ inherit[0x7f & *(z1++)] =
	391	+ "<span class=\"ueditInheritDeveloper\">•</span>";
389	392	}
390	393	free(z2);
391	394	}
392	395	if( strcmp(zLogin, "reader") ){
393	396	char z1, z2;
394	397	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='reader'");
395	398	while( z1 && *z1 ){
396		- inherit[0x7f & *(z1++)] = "<font color=\"black\">•</font>";
	399	+ inherit[0x7f & *(z1++)] =
	400	+ "<span class=\"ueditInheritReader\">•</span>";
397	401	}
398	402	free(z2);
399	403	}
400	404	if( strcmp(zLogin, "anonymous") ){
401	405	char z1, z2;
402	406	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='anonymous'");
403	407	while( z1 && *z1 ){
404		- inherit[0x7f & *(z1++)] = "<font color=\"blue\">•</font>";
	408	+ inherit[0x7f & *(z1++)] =
	409	+ "<span class=\"ueditInheritAnonymous\">•</span>";
405	410	}
406	411	free(z2);
407	412	}
408	413	if( strcmp(zLogin, "nobody") ){
409	414	char z1, z2;
410	415	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='nobody'");
411	416	while( z1 && *z1 ){
412		- inherit[0x7f & *(z1++)] = "<font color=\"green\">•</font>";
	417	+ inherit[0x7f & *(z1++)] =
	418	+ "<span class=\"ueditInheritNobody\">•</span>";
413	419	}
414	420	free(z2);
415	421	}
416	422
417	423	/* Begin generating the page
		@@ -420,77 +426,79 @@
420	426	if( uid ){
421	427	style_header(mprintf("Edit User %h", zLogin));
422	428	}else{
423	429	style_header("Add A New User");
424	430	}
425		- @ <table align="left" hspace="20" vspace="10"><tr><td>
426		- @ <form action="%s(g.zPath)" method="POST">
	431	+ @ <div class="ueditCapBox">
	432	+ @ <form action="%s(g.zPath)" method="post"><div>
427	433	login_insert_csrf_secret();
428	434	@ <table>
429	435	@ <tr>
430		- @ <td align="right"><nobr>User ID:</nobr></td>
431		- if( uid ){
432		- @ <td>%d(uid) <input type="hidden" name="id" value="%d(uid)"></td>
433		- }else{
434		- @ <td>(new user)<input type="hidden" name="id" value=0></td>
435		- }
436		- @ </tr>
437		- @ <tr>
438		- @ <td align="right"><nobr>Login:</nobr></td>
439		- @ <td><input type="text" name="login" value="%h(zLogin)"></td>
440		- @ </tr>
441		- @ <tr>
442		- @ <td align="right"><nobr>Contact Info:</nobr></td>
443		- @ <td><input type="text" name="info" size=40 value="%h(zInfo)"></td>
444		- @ </tr>
445		- @ <tr>
446		- @ <td align="right" valign="top">Capabilities:</td>
	436	+ @ <td class="usetupEditLabel">User ID:</td>
	437	+ if( uid ){
	438	+ @ <td>%d(uid) <input type="hidden" name="id" value="%d(uid)" /></td>
	439	+ }else{
	440	+ @ <td>(new user)<input type="hidden" name="id" value="0" /></td>
	441	+ }
	442	+ @ </tr>
	443	+ @ <tr>
	444	+ @ <td class="usetupEditLabel">Login:</td>
	445	+ @ <td><input type="text" name="login" value="%h(zLogin)" /></td>
	446	+ @ </tr>
	447	+ @ <tr>
	448	+ @ <td class="usetupEditLabel">Contact Info:</td>
	449	+ @ <td><input type="text" name="info" size="40" value="%h(zInfo)" /></td>
	450	+ @ </tr>
	451	+ @ <tr>
	452	+ @ <td class="usetupEditLabel">Capabilities:</td>
447	453	@ <td>
448	454	#define B(x) inherit[x]
449	455	if( g.okSetup ){
450		- @ <input type="checkbox" name="as"%s(oas)/>%s(B('s'))Setup<br>
451		- }
452		- @ <input type="checkbox" name="aa"%s(oaa)/>%s(B('a'))Admin<br>
453		- @ <input type="checkbox" name="ad"%s(oad)/>%s(B('d'))Delete<br>
454		- @ <input type="checkbox" name="ae"%s(oae)/>%s(B('e'))Email<br>
455		- @ <input type="checkbox" name="ap"%s(oap)/>%s(B('p'))Password<br>
456		- @ <input type="checkbox" name="ai"%s(oai)/>%s(B('i'))Check-In<br>
457		- @ <input type="checkbox" name="ao"%s(oao)/>%s(B('o'))Check-Out<br>
458		- @ <input type="checkbox" name="ah"%s(oah)/>%s(B('h'))History<br>
459		- @ <input type="checkbox" name="au"%s(oau)/>%s(B('u'))Reader<br>
460		- @ <input type="checkbox" name="av"%s(oav)/>%s(B('v'))Developer<br>
461		- @ <input type="checkbox" name="ag"%s(oag)/>%s(B('g'))Clone<br>
462		- @ <input type="checkbox" name="aj"%s(oaj)/>%s(B('j'))Read Wiki<br>
463		- @ <input type="checkbox" name="af"%s(oaf)/>%s(B('f'))New Wiki<br>
464		- @ <input type="checkbox" name="am"%s(oam)/>%s(B('m'))Append Wiki<br>
465		- @ <input type="checkbox" name="ak"%s(oak)/>%s(B('k'))Write Wiki<br>
466		- @ <input type="checkbox" name="ab"%s(oab)/>%s(B('b'))Attachments<br>
467		- @ <input type="checkbox" name="ar"%s(oar)/>%s(B('r'))Read Ticket<br>
468		- @ <input type="checkbox" name="an"%s(oan)/>%s(B('n'))New Ticket<br>
469		- @ <input type="checkbox" name="ac"%s(oac)/>%s(B('c'))Append Ticket<br>
470		- @ <input type="checkbox" name="aw"%s(oaw)/>%s(B('w'))Write Ticket<br>
471		- @ <input type="checkbox" name="at"%s(oat)/>%s(B('t'))Ticket Report<br>
472		- @ <input type="checkbox" name="az"%s(oaz)/>%s(B('z'))Download Zip
	456	+ @ <input type="checkbox" name="as"%s(oas) />%s(B('s'))Setup<br />
	457	+ }
	458	+ @ <input type="checkbox" name="aa"%s(oaa) />%s(B('a'))Admin<br />
	459	+ @ <input type="checkbox" name="ad"%s(oad) />%s(B('d'))Delete<br />
	460	+ @ <input type="checkbox" name="ae"%s(oae) />%s(B('e'))Email<br />
	461	+ @ <input type="checkbox" name="ap"%s(oap) />%s(B('p'))Password<br />
	462	+ @ <input type="checkbox" name="ai"%s(oai) />%s(B('i'))Check-In<br />
	463	+ @ <input type="checkbox" name="ao"%s(oao) />%s(B('o'))Check-Out<br />
	464	+ @ <input type="checkbox" name="ah"%s(oah) />%s(B('h'))History<br />
	465	+ @ <input type="checkbox" name="au"%s(oau) />%s(B('u'))Reader<br />
	466	+ @ <input type="checkbox" name="av"%s(oav) />%s(B('v'))Developer<br />
	467	+ @ <input type="checkbox" name="ag"%s(oag) />%s(B('g'))Clone<br />
	468	+ @ <input type="checkbox" name="aj"%s(oaj) />%s(B('j'))Read Wiki<br />
	469	+ @ <input type="checkbox" name="af"%s(oaf) />%s(B('f'))New Wiki<br />
	470	+ @ <input type="checkbox" name="am"%s(oam) />%s(B('m'))Append Wiki<br />
	471	+ @ <input type="checkbox" name="ak"%s(oak) />%s(B('k'))Write Wiki<br />
	472	+ @ <input type="checkbox" name="ab"%s(oab) />%s(B('b'))Attachments<br />
	473	+ @ <input type="checkbox" name="ar"%s(oar) />%s(B('r'))Read Ticket<br />
	474	+ @ <input type="checkbox" name="an"%s(oan) />%s(B('n'))New Ticket<br />
	475	+ @ <input type="checkbox" name="ac"%s(oac) />%s(B('c'))Append Ticket<br />
	476	+ @ <input type="checkbox" name="aw"%s(oaw) />%s(B('w'))Write Ticket<br />
	477	+ @ <input type="checkbox" name="at"%s(oat) />%s(B('t'))Ticket Report<br />
	478	+ @ <input type="checkbox" name="az"%s(oaz) />%s(B('z'))Download Zip
473	479	@ </td>
474	480	@ </tr>
475	481	@ <tr>
476	482	@ <td align="right">Password:</td>
477	483	if( zPw[0] ){
478	484	/* Obscure the password for all users */
479		- @ <td><input type="password" name="pw" value="**********"></td>
	485	+ @ <td><input type="password" name="pw" value="**********" /></td>
480	486	}else{
481	487	/* Show an empty password as an empty input field */
482		- @ <td><input type="password" name="pw" value=""></td>
	488	+ @ <td><input type="password" name="pw" value="" /></td>
483	489	}
484	490	@ </tr>
485	491	if( !higherUser ){
486	492	@ <tr>
487		- @ <td>&nbsp</td>
488		- @ <td><input type="submit" name="submit" value="Apply Changes">
	493	+ @ <td> </td>
	494	+ @ <td><input type="submit" name="submit" value="Apply Changes" /></td>
489	495	@ </tr>
490	496	}
491		- @ </table></td></tr></table>
	497	+ @ </table>
	498	+ @ </div></form>
	499	+ @ </div>
492	500	@ <h2>Privileges And Capabilities:</h2>
493	501	@ <ul>
494	502	if( higherUser ){
495	503	@ <li><p><font color="blue"><b>
496	504	@ User %h(zLogin) has Setup privileges and you only have Admin privileges
		@@ -497,95 +505,114 @@
497	505	@ so you are not permitted to make changes to %h(zLogin).
498	506	@ </b></font></p></li>
499	507	@
500	508	}
501	509	@ <li><p>
502		- @ The <b>Setup</b> user can make arbitrary configuration changes.
503		- @ An <b>Admin</b> user can add other users and change user privileges
	510	+ @ The <span class="capability">Setup</span> user can make arbitrary
	511	+ @ configuration changes. An <span class="usertype">Admin</span> user
	512	+ @ can add other users and change user privileges
504	513	@ and reset user passwords. Both automatically get all other privileges
505	514	@ listed below. Use these two settings with discretion.
506	515	@ </p></li>
507	516	@
508	517	@ <li><p>
509		- @ The "<font color="green"><big>•</big></font>" mark indicates
510		- @ the privileges of "nobody" that are available to all users
511		- @ regardless of whether or not they are logged in.
512		- @ </p></li>
513		- @
514		- @ <li><p>
515		- @ The "<font color="blue"><big>•</big></font>" mark indicates
516		- @ the privileges of "anonymous" that are inherited by all logged-in users.
517		- @ </p></li>
518		- @
519		- @ <li><p>
520		- @ The "<font color="red"><big>•</big></font>" mark indicates
521		- @ the privileges of "developer" that are inherited by all users with
522		- @ the <b>Developer</b> privilege.
523		- @ </p></li>
524		- @
525		- @ <li><p>
526		- @ The "<font color="black"><big>•</big></font>" mark indicates
527		- @ the privileges of "reader" that are inherited by all users with
528		- @ the <b>Reader</b> privilege.
529		- @ </p></li>
530		- @
531		- @ <li><p>
532		- @ The <b>Delete</b> privilege give the user the ability to erase
533		- @ wiki, tickets, and attachments that have been added by anonymous
534		- @ users. This capability is intended for deletion of spam. The
535		- @ delete capability is only in effect for 24 hours after the item
536		- @ is first posted. The Setup user can delete anything at any time.
537		- @ </p></li>
538		- @
539		- @ <li><p>
540		- @ The <b>History</b> privilege allows a user to see most hyperlinks.
541		- @ This is recommended ON for most logged-in users but OFF for
542		- @ user "nobody" to avoid problems with spiders trying to walk every
543		- @ historical version of every baseline and file.
544		- @ </p></li>
545		- @
546		- @ <li><p>
547		- @ The <b>Zip</b> privilege allows a user to see the "download as ZIP"
548		- @ hyperlink and permits access to the <tt>/zip</tt> page. This allows
549		- @ users to download ZIP archives without granting other rights like
550		- @ <b>Read</b> or <b>History</b>. This privilege is recommended for
551		- @ user <b>nobody</b> so that automatic package downloaders can obtain
552		- @ the sources without going through the login procedure.
553		- @ </p></li>
554		- @
555		- @ <li><p>
556		- @ The <b>Check-in</b> privilege allows remote users to "push".
557		- @ The <b>Check-out</b> privilege allows remote users to "pull".
558		- @ The <b>Clone</b> privilege allows remote users to "clone".
559		- @ </li><p>
560		- @
561		- @ <li><p>
562		- @ The <b>Read Wiki</b>, <b>New Wiki</b>, <b>Append Wiki</b>, and
563		- @ <b>Write Wiki</b> privileges control access to wiki pages. The
564		- @ <b>Read Ticket</b>, <b>New Ticket</b>, <b>Append Ticket</b>, and
565		- @ <b>Write Ticket</b> privileges control access to trouble tickets.
566		- @ The <b>Ticket Report</b> privilege allows the user to create or edit
567		- @ ticket report formats.
568		- @ </p></li>
569		- @
570		- @ <li><p>
571		- @ Users with the <b>Password</b> privilege are allowed to change their
572		- @ own password. Recommended ON for most users but OFF for special
573		- @ users "developer", "anonymous", and "nobody".
574		- @ </p></li>
575		- @
576		- @ <li><p>
577		- @ The <b>EMail</b> privilege allows the display of sensitive information
578		- @ such as the email address of users and contact information on tickets.
579		- @ Recommended OFF for "anonymous" and for "nobody" but ON for
580		- @ "developer".
581		- @ </p></li>
582		- @
583		- @ <li><p>
584		- @ The <b>Attachment</b> privilege is needed in order to add attachments
585		- @ to tickets or wiki. Write privilege on the ticket or wiki is also
586		- @ required.</p></li>
	518	+ @ The "<span class="ueditInheritNobody"><big>•</big></span>" mark
	519	+ @ indicates the privileges of <span class="usertype">nobody</span> that
	520	+ @ are available to all users regardless of whether or not they are logged in.
	521	+ @ </p></li>
	522	+ @
	523	+ @ <li><p>
	524	+ @ The "<span class="ueditInheritAnonymous"><big>•</big></span>" mark
	525	+ @ indicates the privileges of <span class="usertype">anonymous</span> that
	526	+ @ are inherited by all logged-in users.
	527	+ @ </p></li>
	528	+ @
	529	+ @ <li><p>
	530	+ @ The "<span class="ueditInheritDeveloper"><big>•</big></span>" mark
	531	+ @ indicates the privileges of <span class="usertype">developer</span> that
	532	+ @ are inherited by all users with the
	533	+ @ <span class="capability">Developer</span> privilege.
	534	+ @ </p></li>
	535	+ @
	536	+ @ <li><p>
	537	+ @ The "<span class="ueditInheritReader"><big>•</big></span>" mark
	538	+ @ indicates the privileges of <span class="usertype">reader</span> that
	539	+ @ are inherited by all users with the <span class="capability">Reader</span>
	540	+ @ privilege.
	541	+ @ </p></li>
	542	+ @
	543	+ @ <li><p>
	544	+ @ The <span class="capability">Delete</span> privilege give the user the
	545	+ @ ability to erase wiki, tickets, and attachments that have been added
	546	+ @ by anonymous users. This capability is intended for deletion of spam.
	547	+ @ The delete capability is only in effect for 24 hours after the item
	548	+ @ is first posted. The <span class="usertype">Setup</span> user can
	549	+ @ delete anything at any time.
	550	+ @ </p></li>
	551	+ @
	552	+ @ <li><p>
	553	+ @ The <span class="capability">History</span> privilege allows a user
	554	+ @ to see most hyperlinks. This is recommended ON for most logged-in users
	555	+ @ but OFF for user "nobody" to avoid problems with spiders trying to walk
	556	+ @ every historical version of every baseline and file.
	557	+ @ </p></li>
	558	+ @
	559	+ @ <li><p>
	560	+ @ The <span class="capability">Zip</span> privilege allows a user to
	561	+ @ see the "download as ZIP"
	562	+ @ hyperlink and permits access to the <tt>/zip</tt> page. This allows
	563	+ @ users to download ZIP archives without granting other rights like
	564	+ @ <span class="capability">Read</span> or
	565	+ @ <span class="capability">History</span>. This privilege is recommended for
	566	+ @ user <span class="usertype">nobody</span> so that automatic package
	567	+ @ downloaders can obtain the sources without going through the login
	568	+ @ procedure.
	569	+ @ </p></li>
	570	+ @
	571	+ @ <li><p>
	572	+ @ The <span class="capability">Check-in</span> privilege allows remote
	573	+ @ users to "push". The <span class="capability">Check-out</span> privilege
	574	+ @ allows remote users to "pull". The <span class="capability">Clone</span>
	575	+ @ privilege allows remote users to "clone".
	576	+ @ </p></li>
	577	+ @
	578	+ @ <li><p>
	579	+ @ The <span class="capability">Read Wiki</span>,
	580	+ @ <span class="capability">New Wiki</span>,
	581	+ @ <span class="capability">Append Wiki</span>, and
	582	+ @ <b>Write Wiki</b> privileges control access to wiki pages. The
	583	+ @ <span class="capability">Read Ticket</span>,
	584	+ @ <span class="capability">New Ticket</span>,
	585	+ @ <span class="capability">Append Ticket</span>, and
	586	+ @ <span class="capability">Write Ticket</span> privileges control access
	587	+ @ to trouble tickets.
	588	+ @ The <span class="capability">Ticket Report</span> privilege allows
	589	+ @ the user to create or edit ticket report formats.
	590	+ @ </p></li>
	591	+ @
	592	+ @ <li><p>
	593	+ @ Users with the <span class="capability">Password</span> privilege
	594	+ @ are allowed to change their own password. Recommended ON for most
	595	+ @ users but OFF for special users <span class="usertype">developer</span>,
	596	+ @ <span class="usertype">anonymous</span>,
	597	+ @ and <span class="usertype">nobody</span>.
	598	+ @ </p></li>
	599	+ @
	600	+ @ <li><p>
	601	+ @ The <span class="capability">EMail</span> privilege allows the display of
	602	+ @ sensitive information such as the email address of users and contact
	603	+ @ information on tickets. Recommended OFF for
	604	+ @ <span class="usertype">anonymousy</span> and for
	605	+ @ <span class="usertype">nobody</span> but ON for
	606	+ @ <span class="usertype">developer</span>.
	607	+ @ </p></li>
	608	+ @
	609	+ @ <li><p>
	610	+ @ The <span class="capability">Attachment</span> privilege is needed in
	611	+ @ order to add attachments to tickets or wiki. Write privilege on the
	612	+ @ ticket or wiki is also required.
	613	+ @ </p></li>
587	614	@
588	615	@ <li><p>
589	616	@ Login is prohibited if the password is an empty string.
590	617	@ </p></li>
591	618	@ </ul>
		@@ -592,42 +619,46 @@
592	619	@
593	620	@ <h2>Special Logins</h2>
594	621	@
595	622	@ <ul>
596	623	@ <li><p>
597		- @ No login is required for user "<b>nobody</b>". The capabilities
598		- @ of the <b>nobody</b> user are inherited by all users, regardless of
599		- @ whether or not they are logged in. To disable universal access
600		- @ to the repository, make sure no user named "<b>nobody</b>" exists or
601		- @ that the <b>nobody</b> user has no capabilities enabled.
602		- @ The password for <b>nobody</b> is ignore. To avoid problems with
603		- @ spiders overloading the server, it is recommended
604		- @ that the 'h' (History) capability be turned off for the <b>nobody</b>
605		- @ user.
606		- @ </p></li>
607		- @
608		- @ <li><p>
609		- @ Login is required for user "<b>anonymous</b>" but the password
610		- @ is displayed on the login screen beside the password entry box
611		- @ so anybody who can read should be able to login as anonymous.
612		- @ On the other hand, spiders and web-crawlers will typically not
613		- @ be able to login. Set the capabilities of the anonymous user
614		- @ to things that you want any human to be able to do, but not any
615		- @ spider. Every other logged-in user inherits the privileges of
616		- @ <b>anonymous</b>.
617		- @ </p></li>
618		- @
619		- @ <li><p>
620		- @ The "<b>developer</b>" user is intended as a template for trusted users
621		- @ with check-in privileges. When adding new trusted users, simply
622		- @ select the <b>Developer</b> privilege to cause the new user to inherit
623		- @ all privileges of the "developer" user. Similarly, the "<b>reader</b>"
624		- @ user is a template for users who are allowed more access than anonymous,
625		- @ but less than a developer.
626		- @ </p></li>
627		- @ </ul>
628		- @ </form>
	624	+ @ No login is required for user <span class="usertype">nobody</span>. The
	625	+ @ capabilities of the <span class="usertype">nobody</span> user are
	626	+ @ inherited by all users, regardless of whether or not they are logged in.
	627	+ @ To disable universal access to the repository, make sure no user named
	628	+ @ <span class="usertype">nobody</span> exists or that the
	629	+ @ <span class="usertype">nobody</span> user has no capabilities
	630	+ @ enabled. The password for <span class="usertype">nobody</span> is ignore.
	631	+ @ To avoid problems with spiders overloading the server, it is recommended
	632	+ @ that the <span class="capability">h</span> (History) capability be turned
	633	+ @ off for the <span class="usertype">nobody</span> user.
	634	+ @ </p></li>
	635	+ @
	636	+ @ <li><p>
	637	+ @ Login is required for user <span class="usertype">anonymous</span> but the
	638	+ @ password is displayed on the login screen beside the password entry box
	639	+ @ so anybody who can read should be able to login as anonymous.
	640	+ @ On the other hand, spiders and web-crawlers will typically not
	641	+ @ be able to login. Set the capabilities of the
	642	+ @ <span class="usertype">anonymous</span>
	643	+ @ user to things that you want any human to be able to do, but not any
	644	+ @ spider. Every other logged-in user inherits the privileges of
	645	+ @ <span class="usertype">anonymous</span>.
	646	+ @ </p></li>
	647	+ @
	648	+ @ <li><p>
	649	+ @ The <span class="usertype">developer</span> user is intended as a template
	650	+ @ for trusted users with check-in privileges. When adding new trusted users,
	651	+ @ simply select the <span class="capability">developer</span> privilege to
	652	+ @ cause the new user to inherit all privileges of the
	653	+ @ <span class="usertype">developer</span>
	654	+ @ user. Similarly, the <span class="usertype">reader</span> user is a
	655	+ @ template for users who are allowed more access than
	656	+ @ <span class="usertype">anonymous</span>,
	657	+ @ but less than a <span class="usertype">developer</span>.
	658	+ @ </p></li>
	659	+ @ </ul>
629	660	style_footer();
630	661	}
631	662
632	663
633	664	/*
		@@ -651,13 +682,14 @@
651	682	db_set(zVar, iQ ? "1" : "0", 0);
652	683	iVal = iQ;
653	684	}
654	685	}
655	686	if( iVal ){
656		- @ <input type="checkbox" name="%s(zQParm)" checked><b>%s(zLabel)</b></input>
	687	+ @ <input type="checkbox" name="%s(zQParm)" checked="checked" />
	688	+ @ <b>%s(zLabel)</b>
657	689	}else{
658		- @ <input type="checkbox" name="%s(zQParm)"><b>%s(zLabel)</b></input>
	690	+ @ <input type="checkbox" name="%s(zQParm)" /><b>%s(zLabel)</b>
659	691	}
660	692	}
661	693
662	694	/*
663	695	** Generate an entry box for an attribute.
		@@ -674,11 +706,11 @@
674	706	if( zQ && strcmp(zQ,zVal)!=0 ){
675	707	login_verify_csrf_secret();
676	708	db_set(zVar, zQ, 0);
677	709	zVal = zQ;
678	710	}
679		- @ <input type="text" name="%s(zQParm)" value="%h(zVal)" size="%d(width)">
	711	+ @ <input type="text" name="%s(zQParm)" value="%h(zVal)" size="%d(width)" />
680	712	@ <b>%s(zLabel)</b>
681	713	}
682	714
683	715	/*
684	716	** Generate a text box for an attribute.
		@@ -698,11 +730,12 @@
698	730	db_set(zVar, zQ, 0);
699	731	z = zQ;
700	732	}
701	733	if( rows>0 && cols>0 ){
702	734	@ <textarea name="%s(zQP)" rows="%d(rows)" cols="%d(cols)">%h(z)</textarea>
703		- @ <b>%s(zLabel)</b>
	735	+ if (zLabel && *zLabel)
	736	+ @ <span class="textareaLabel">%s(zLabel)</span>
704	737	}
705	738	}
706	739
707	740
708	741	/*
		@@ -714,57 +747,57 @@
714	747	login_needed();
715	748	}
716	749
717	750	style_header("Access Control Settings");
718	751	db_begin_transaction();
719		- @ <form action="%s(g.zBaseURL)/setup_access" method="POST">
	752	+ @ <form action="%s(g.zBaseURL)/setup_access" method="post"><div>
720	753	login_insert_csrf_secret();
721		- @ <hr>
	754	+ @ <hr />
722	755	onoff_attribute("Require password for local access",
723	756	"localauth", "localauth", 0);
724	757	@ <p>When enabled, the password sign-in is required for
725	758	@ web access coming from 127.0.0.1. When disabled, web access
726	759	@ from 127.0.0.1 is allows without any login - the user id is selected
727	760	@ from the ~/.fossil database. Password login is always required
728	761	@ for incoming web connections on internet addresses other than
729		- @ 127.0.0.1.</p></li>
	762	+ @ 127.0.0.1.</p>
730	763
731		- @ <hr>
	764	+ @ <hr />
732	765	onoff_attribute("Allow REMOTE_USER authentication",
733	766	"remote_user_ok", "remote_user_ok", 0);
734	767	@ <p>When enabled, if the REMOTE_USER environment variable is set to the
735	768	@ login name of a valid user and no other login credentials are available,
736	769	@ then the REMOTE_USER is accepted as an authenticated user.
737		- @ </p></li>
	770	+ @ </p>
738	771
739		- @ <hr>
	772	+ @ <hr />
740	773	entry_attribute("Login expiration time", 6, "cookie-expire", "cex", "8766");
741	774	@ <p>The number of hours for which a login is valid. This must be a
742	775	@ positive number. The default is 8760 hours which is approximately equal
743	776	@ to a year.</p>
744	777
745		- @ <hr>
	778	+ @ <hr />
746	779	entry_attribute("Download packet limit", 10, "max-download", "mxdwn",
747	780	"5000000");
748	781	@ <p>Fossil tries to limit out-bound sync, clone, and pull packets
749	782	@ to this many bytes, uncompressed. If the client requires more data
750	783	@ than this, then the client will issue multiple HTTP requests.
751	784	@ Values below 1 million are not recommended. 5 million is a
752	785	@ reasonable number.</p>
753	786
754		- @ <hr>
	787	+ @ <hr />
755	788	onoff_attribute("Show javascript button to fill in CAPTCHA",
756	789	"auto-captcha", "autocaptcha", 0);
757	790	@ <p>When enabled, a button appears on the login screen for user
758	791	@ "anonymous" that will automatically fill in the CAPTCHA password.
759	792	@ This is less secure that forcing the user to do it manually, but is
760	793	@ probably secure enough and it is certainly more convenient for
761	794	@ anonymous users.</p>
762	795
763		- @ <hr>
764		- @ <p><input type="submit" name="submit" value="Apply Changes"></p>
765		- @ </form>
	796	+ @ <hr />
	797	+ @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
	798	+ @ </div></form>
766	799	db_end_transaction(0);
767	800	style_footer();
768	801	}
769	802
770	803	/*
		@@ -776,42 +809,42 @@
776	809	login_needed();
777	810	}
778	811
779	812	style_header("Timeline Display Preferences");
780	813	db_begin_transaction();
781		- @ <form action="%s(g.zBaseURL)/setup_timeline" method="POST">
	814	+ @ <form action="%s(g.zBaseURL)/setup_timeline" method="post"><div>
782	815	login_insert_csrf_secret();
783	816
784		- @ <hr>
	817	+ @ <hr />
785	818	onoff_attribute("Allow block-markup in timeline",
786	819	"timeline-block-markup", "tbm", 0);
787	820	@ <p>In timeline displays, check-in comments can be displayed with or
788	821	@ without block markup (paragraphs, tables, etc.)</p>
789	822
790		- @ <hr>
	823	+ @ <hr />
791	824	onoff_attribute("Use Universal Coordinated Time (UTC)",
792	825	"timeline-utc", "utc", 1);
793	826	@ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
794	827	@ Zulu) instead of in local time.</p>
795	828
796		- @ <hr>
	829	+ @ <hr />
797	830	onoff_attribute("Show version differences by default",
798	831	"show-version-diffs", "vdiff", 0);
799	832	@ <p>On the version-information pages linked from the timeline can either
800	833	@ show complete diffs of all file changes, or can just list the names of
801	834	@ the files that have changed. Users can get to either page by
802	835	@ clicking. This setting selects the default.</p>
803	836
804		- @ <hr>
	837	+ @ <hr />
805	838	entry_attribute("Max timeline comment length", 6,
806	839	"timeline-max-comment", "tmc", "0");
807	840	@ <p>The maximum length of a comment to be displayed in a timeline.
808	841	@ "0" there is no length limit.</p>
809	842
810		- @ <hr>
811		- @ <p><input type="submit" name="submit" value="Apply Changes"></p>
812		- @ </form>
	843	+ @ <hr />
	844	+ @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
	845	+ @ </div></form>
813	846	db_end_transaction(0);
814	847	style_footer();
815	848	}
816	849
817	850	/*
		@@ -823,11 +856,11 @@
823	856	login_needed();
824	857	}
825	858
826	859	style_header("WWW Configuration");
827	860	db_begin_transaction();
828		- @ <form action="%s(g.zBaseURL)/setup_config" method="POST">
	861	+ @ <form action="%s(g.zBaseURL)/setup_config" method="post"><div>
829	862	login_insert_csrf_secret();
830	863	@ <hr />
831	864	entry_attribute("Project Name", 60, "project-name", "pn", "");
832	865	@ <p>Give your project a name so visitors know what this site is about.
833	866	@ The project name will also be used as the RSS feed title.</p>
		@@ -840,36 +873,37 @@
840	873	entry_attribute("Index Page", 60, "index-page", "idxpg", "/home");
841	874	@ <p>Enter the pathname of the page to display when the "Home" menu
842	875	@ option is selected and when no pathname is
843	876	@ specified in the URL. For example, if you visit the url:</p>
844	877	@
845		- @ <blockquote>%h(g.zBaseURL)</blockquote>
	878	+ @ <blockquote><p>%h(g.zBaseURL)</p></blockquote>
846	879	@
847	880	@ <p>And you have specified an index page of "/home" the above will
848	881	@ automatically redirect to:</p>
849	882	@
850		- @ <blockquote>%h(g.zBaseURL)/home</blockquote>
	883	+ @ <blockquote><p>%h(g.zBaseURL)/home</p></blockquote>
851	884	@
852	885	@ <p>The default "/home" page displays a Wiki page with the same name
853	886	@ as the Project Name specified above. Some sites prefer to redirect
854	887	@ to a documentation page (ex: "/doc/tip/index.wiki") or to "/timeline".</p>
855	888	@ <hr />
856	889	onoff_attribute("Use HTML as wiki markup language",
857	890	"wiki-use-html", "wiki-use-html", 0);
858		- @ <p>Use HTML as the wiki markup language. Wiki links will still be parsed but
859		- @ all other wiki formatting will be ignored. This option is helpful if you have
860		- @ chosen to use a rich HTML editor for wiki markup such as TinyMCE.</p>
	891	+ @ <p>Use HTML as the wiki markup language. Wiki links will still be parsed
	892	+ @ but all other wiki formatting will be ignored. This option is helpful
	893	+ @ if you have chosen to use a rich HTML editor for wiki markup such as
	894	+ @ TinyMCE.</p>
861	895	@ <p><strong>CAUTION:</strong> when
862	896	@ enabling, <i>all</i> HTML tags and attributes are accepted in the wiki.
863	897	@ No sanitization is done. This means that it is very possible for malicious
864	898	@ users to inject dangerous HTML, CSS and JavaScript code into your wiki.</p>
865	899	@ <p>This should <strong>only</strong> be enabled when wiki editing is limited
866	900	@ to trusted users. It should <strong>not</strong> be used on a publically
867	901	@ editable wiki.</p>
868	902	@ <hr />
869		- @ <p><input type="submit" name="submit" value="Apply Changes"></p>
870		- @ </form>
	903	+ @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
	904	+ @ </div></form>
871	905	db_end_transaction(0);
872	906	style_footer();
873	907	}
874	908
875	909	/*
		@@ -892,27 +926,27 @@
892	926	if( P("submit")!=0 ){
893	927	db_end_transaction(0);
894	928	cgi_redirect("setup_editcss");
895	929	}
896	930	style_header("Edit CSS");
897		- @ <form action="%s(g.zBaseURL)/setup_editcss" method="POST">
	931	+ @ <form action="%s(g.zBaseURL)/setup_editcss" method="post"><div>
898	932	login_insert_csrf_secret();
899	933	@ Edit the CSS below:<br />
900	934	textarea_attribute("", 40, 80, "css", "css", zDefaultCSS);
901	935	@ <br />
902		- @ <input type="submit" name="submit" value="Apply Changes">
903		- @ <input type="submit" name="clear" value="Revert To Default">
904		- @ </form>
905		- @ <p><b>Note:</b> Press your browser Reload button after modifying the
906		- @ CSS in order to pull in the modified CSS file.</p>
907		- @ <hr>
	936	+ @ <input type="submit" name="submit" value="Apply Changes" />
	937	+ @ <input type="submit" name="clear" value="Revert To Default" />
	938	+ @ </div></form>
	939	+ @ <p><span class="note">Note:</span> Press your browser Reload button after
	940	+ @ modifying the CSS in order to pull in the modified CSS file.</p>
	941	+ @ <hr />
908	942	@ The default CSS is shown below for reference. Other examples
909	943	@ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
910	944	@ See also the <a href="setup_header">header</a> and
911	945	@ <a href="setup_footer">footer</a> editing screens.
912	946	@ <blockquote><pre>
913		- @ %h(zDefaultCSS)
	947	+ cgi_append_default_css();
914	948	@ </pre></blockquote>
915	949	style_footer();
916	950	db_end_transaction(0);
917	951	}
918	952
		@@ -930,21 +964,21 @@
930	964	cgi_replace_parameter("header", zDefaultHeader);
931	965	}else{
932	966	textarea_attribute(0, 0, 0, "header", "header", zDefaultHeader);
933	967	}
934	968	style_header("Edit Page Header");
935		- @ <form action="%s(g.zBaseURL)/setup_header" method="POST">
	969	+ @ <form action="%s(g.zBaseURL)/setup_header" method="post"><div>
936	970	login_insert_csrf_secret();
937	971	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
938	972	@ generate the beginning of every page through start of the main
939	973	@ menu.</p>
940	974	textarea_attribute("", 40, 80, "header", "header", zDefaultHeader);
941	975	@ <br />
942		- @ <input type="submit" name="submit" value="Apply Changes">
943		- @ <input type="submit" name="clear" value="Revert To Default">
944		- @ </form>
945		- @ <hr>
	976	+ @ <input type="submit" name="submit" value="Apply Changes" />
	977	+ @ <input type="submit" name="clear" value="Revert To Default" />
	978	+ @ </div></form>
	979	+ @ <hr />
946	980	@ The default header is shown below for reference. Other examples
947	981	@ of headers can be seen on the <a href="setup_skin">skins page</a>.
948	982	@ See also the <a href="setup_editcss">CSS</a> and
949	983	@ <a href="setup_footer">footer</a> editing screeens.
950	984	@ <blockquote><pre>
		@@ -968,20 +1002,20 @@
968	1002	cgi_replace_parameter("footer", zDefaultFooter);
969	1003	}else{
970	1004	textarea_attribute(0, 0, 0, "footer", "footer", zDefaultFooter);
971	1005	}
972	1006	style_header("Edit Page Footer");
973		- @ <form action="%s(g.zBaseURL)/setup_footer" method="POST">
	1007	+ @ <form action="%s(g.zBaseURL)/setup_footer" method="post"><div>
974	1008	login_insert_csrf_secret();
975	1009	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
976	1010	@ generate the end of every page.</p>
977	1011	textarea_attribute("", 20, 80, "footer", "footer", zDefaultFooter);
978	1012	@ <br />
979		- @ <input type="submit" name="submit" value="Apply Changes">
980		- @ <input type="submit" name="clear" value="Revert To Default">
981		- @ </form>
982		- @ <hr>
	1013	+ @ <input type="submit" name="submit" value="Apply Changes" />
	1014	+ @ <input type="submit" name="clear" value="Revert To Default" />
	1015	+ @ </div></form>
	1016	+ @ <hr />
983	1017	@ The default footer is shown below for reference. Other examples
984	1018	@ of footers can be seen on the <a href="setup_skin">skins page</a>.
985	1019	@ See also the <a href="setup_editcss">CSS</a> and
986	1020	@ <a href="setup_header">header</a> editing screens.
987	1021	@ <blockquote><pre>
		@@ -1031,31 +1065,31 @@
1031	1065	cgi_redirect("setup_logo");
1032	1066	}
1033	1067	style_header("Edit Project Logo");
1034	1068	@ <p>The current project logo has a MIME-Type of <b>%h(zMime)</b> and looks
1035	1069	@ like this:</p>
1036		- @ <blockquote><img src="%s(g.zTop)/logo" alt="logo"></blockquote>
	1070	+ @ <blockquote><p><img src="%s(g.zTop)/logo" alt="logo" /></p></blockquote>
1037	1071	@
1038	1072	@ <p>The logo is accessible to all users at this URL:
1039	1073	@ <a href="%s(g.zBaseURL)/logo">%s(g.zBaseURL)/logo</a>.
1040	1074	@ The logo may or may not appear on each
1041	1075	@ page depending on the <a href="setup_editcss">CSS</a> and
1042	1076	@ <a href="setup_header">header setup</a>.</p>
1043	1077	@
1044		- @ <form action="%s(g.zBaseURL)/setup_logo" method="POST"
1045		- @ enctype="multipart/form-data">
	1078	+ @ <form action="%s(g.zBaseURL)/setup_logo" method="post"
	1079	+ @ enctype="multipart/form-data"><div>
1046	1080	@ <p>To set a new logo image, select a file to use as the logo using
1047	1081	@ the entry box below and then press the "Change Logo" button.</p>
1048	1082	login_insert_csrf_secret();
1049	1083	@ Logo Image file:
1050		- @ <input type="file" name="im" size="60" accepts="image/*"><br>
1051		- @ <input type="submit" name="set" value="Change Logo">
1052		- @ <input type="submit" name="clr" value="Revert To Default">
1053		- @ </form>
1054		- @
1055		- @ <p><b>Note:</b> Your browser has probably cached the logo image, so
1056		- @ you will probably need to press the Reload button on your browser after
1057		- @ changing the logo to provoke your browser to reload the new logo image.
1058		- @ </p>
	1084	+ @ <input type="file" name="im" size="60" accept="image/*" /><br />
	1085	+ @ <input type="submit" name="set" value="Change Logo" />
	1086	+ @ <input type="submit" name="clr" value="Revert To Default" />
	1087	+ @ </div></form>
	1088	+ @
	1089	+ @ <p><span class="note">Note:</span> Your browser has probably cached the
	1090	+ @ logo image, so you will probably need to press the Reload button on your
	1091	+ @ browser after changing the logo to provoke your browser to reload the new
	1092	+ @ logo image. </p>
1059	1093	style_footer();
1060	1094	db_end_transaction(0);
1061	1095	}
1062	1096

	--- src/setup.c
	+++ src/setup.c
	@@ -99,42 +99,40 @@
99	return;
100	}
101
102	style_submenu_element("Add", "Add User", "setup_uedit");
103	style_header("User List");
104	@ <table border="0" cellpadding="0" cellspacing="25">
105	@ <tr><td valign="top">
106	@ <b>Users:</b>
107	@ <table border="1" cellpadding="10"><tr><td>
108	@ <table cellspacing=0 cellpadding=0 border=0>
109	@ <tr>
110	@ <th align="right">User ID</th><td width="20"> </td>
111	@ <th>Capabilities</th><td width="15"> </td>
112	@ <th>Contact Info</th>
113	@ </tr>
114	db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login");
115	while( db_step(&s)==SQLITE_ROW ){
116	const char *zCap = db_column_text(&s, 2);
117	if( strstr(zCap, "s") ) zCap = "s";
118	@ <tr>
119	@ <td align="right">
120	if( g.okAdmin && (zCap[0]!='s' \|\| g.okSetup) ){
121	@ <a href="setup_uedit?id=%d(db_column_int(&s,0))">
122	}
123	@ <nobr>%h(db_column_text(&s,1))</nobr>
124	if( g.okAdmin ){
125	@ </a>
126	}
127	@ </td><td>   </td>
128	@ <td align="center">%s(zCap)</td>
129	@ <td>   </td>
130	@ <td align="left">%s(db_column_text(&s,3))</td>
131	@ </tr>
132	}
133	@ </table></td></tr></table>
134	@ <td valign="top">
135	@ <b>Notes:</b>
136	@ <ol>
137	@ <li><p>The permission flags are as follows:</p>
138	@ <table>
139	@ <tr><td valign="top"><b>a</b></td>
140	@ <td><i>Admin:</i> Create and delete users</td></tr>
	@@ -181,31 +179,35 @@
181	@ user <tt>developer</tt></td></tr>
182	@ <tr><td valign="top"><b>w</b></td>
183	@ <td><i>Write-Tkt:</i> Edit tickets</td></tr>
184	@ <tr><td valign="top"><b>z</b></td>
185	@ <td><i>Zip download:</i> Download a baseline via the
186	@ <tt>/zip</tt> URL even without check<b>o</b>ut
187	@ and <b>h</b>istory permissions</td></tr>

188	@ </table>
189	@ </li>
190	@
191	@ <li><p>
192	@ Every user, logged in or not, inherits the privileges of <b>nobody</b>.

193	@ </p></li>
194	@
195	@ <li><p>
196	@ Any human can login as <b>anonymous</b> since the password is
197	@ clearly displayed on the login page for them to type. The purpose
198	@ of requiring anonymous to log in is to prevent access by spiders.
199	@ Every logged-in user inherits the combined privileges of
200	@ <b>anonymous</b> and
201	@ <b>nobody</b>.
202	@ </p></li>
203	@
204	@ <li><p>
205	@ Users with privilege <b>v</b> inherit the combined privileges of
206	@ <b>developer</b>, <b>anonymous</b>, and <b>nobody</b>.


207	@ </p></li>
208	@
209	@ </ol>
210	@ </td></tr></table>
211	style_footer();
	@@ -323,12 +325,12 @@
323	}
324	if( uid>0 &&
325	db_exists("SELECT 1 FROM user WHERE login=%Q AND uid!=%d", zLogin, uid)
326	){
327	style_header("User Creation Error");
328	@ <font color="red">Login "%h(zLogin)" is already used by a different
329	@ user.</font>
330	@
331	@ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
332	style_footer();
333	return;
334	}
	@@ -353,65 +355,69 @@
353	if( uid ){
354	zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid);
355	zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
356	zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
357	zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
358	if( strchr(zCap, 'a') ) oaa = " checked";
359	if( strchr(zCap, 'b') ) oab = " checked";
360	if( strchr(zCap, 'c') ) oac = " checked";
361	if( strchr(zCap, 'd') ) oad = " checked";
362	if( strchr(zCap, 'e') ) oae = " checked";
363	if( strchr(zCap, 'f') ) oaf = " checked";
364	if( strchr(zCap, 'g') ) oag = " checked";
365	if( strchr(zCap, 'h') ) oah = " checked";
366	if( strchr(zCap, 'i') ) oai = " checked";
367	if( strchr(zCap, 'j') ) oaj = " checked";
368	if( strchr(zCap, 'k') ) oak = " checked";
369	if( strchr(zCap, 'm') ) oam = " checked";
370	if( strchr(zCap, 'n') ) oan = " checked";
371	if( strchr(zCap, 'o') ) oao = " checked";
372	if( strchr(zCap, 'p') ) oap = " checked";
373	if( strchr(zCap, 'r') ) oar = " checked";
374	if( strchr(zCap, 's') ) oas = " checked";
375	if( strchr(zCap, 't') ) oat = " checked";
376	if( strchr(zCap, 'u') ) oau = " checked";
377	if( strchr(zCap, 'v') ) oav = " checked";
378	if( strchr(zCap, 'w') ) oaw = " checked";
379	if( strchr(zCap, 'z') ) oaz = " checked";
380	}
381
382	/* figure out inherited permissions */
383	memset(inherit, 0, sizeof(inherit));
384	if( strcmp(zLogin, "developer") ){
385	char z1, z2;
386	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='developer'");
387	while( z1 && *z1 ){
388	inherit[0x7f & *(z1++)] = "<font color=\"red\">•</font>";

389	}
390	free(z2);
391	}
392	if( strcmp(zLogin, "reader") ){
393	char z1, z2;
394	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='reader'");
395	while( z1 && *z1 ){
396	inherit[0x7f & *(z1++)] = "<font color=\"black\">•</font>";

397	}
398	free(z2);
399	}
400	if( strcmp(zLogin, "anonymous") ){
401	char z1, z2;
402	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='anonymous'");
403	while( z1 && *z1 ){
404	inherit[0x7f & *(z1++)] = "<font color=\"blue\">•</font>";

405	}
406	free(z2);
407	}
408	if( strcmp(zLogin, "nobody") ){
409	char z1, z2;
410	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='nobody'");
411	while( z1 && *z1 ){
412	inherit[0x7f & *(z1++)] = "<font color=\"green\">•</font>";

413	}
414	free(z2);
415	}
416
417	/* Begin generating the page
	@@ -420,77 +426,79 @@
420	if( uid ){
421	style_header(mprintf("Edit User %h", zLogin));
422	}else{
423	style_header("Add A New User");
424	}
425	@ <table align="left" hspace="20" vspace="10"><tr><td>
426	@ <form action="%s(g.zPath)" method="POST">
427	login_insert_csrf_secret();
428	@ <table>
429	@ <tr>
430	@ <td align="right"><nobr>User ID:</nobr></td>
431	if( uid ){
432	@ <td>%d(uid) <input type="hidden" name="id" value="%d(uid)"></td>
433	}else{
434	@ <td>(new user)<input type="hidden" name="id" value=0></td>
435	}
436	@ </tr>
437	@ <tr>
438	@ <td align="right"><nobr>Login:</nobr></td>
439	@ <td><input type="text" name="login" value="%h(zLogin)"></td>
440	@ </tr>
441	@ <tr>
442	@ <td align="right"><nobr>Contact Info:</nobr></td>
443	@ <td><input type="text" name="info" size=40 value="%h(zInfo)"></td>
444	@ </tr>
445	@ <tr>
446	@ <td align="right" valign="top">Capabilities:</td>
447	@ <td>
448	#define B(x) inherit[x]
449	if( g.okSetup ){
450	@ <input type="checkbox" name="as"%s(oas)/>%s(B('s'))Setup<br>
451	}
452	@ <input type="checkbox" name="aa"%s(oaa)/>%s(B('a'))Admin<br>
453	@ <input type="checkbox" name="ad"%s(oad)/>%s(B('d'))Delete<br>
454	@ <input type="checkbox" name="ae"%s(oae)/>%s(B('e'))Email<br>
455	@ <input type="checkbox" name="ap"%s(oap)/>%s(B('p'))Password<br>
456	@ <input type="checkbox" name="ai"%s(oai)/>%s(B('i'))Check-In<br>
457	@ <input type="checkbox" name="ao"%s(oao)/>%s(B('o'))Check-Out<br>
458	@ <input type="checkbox" name="ah"%s(oah)/>%s(B('h'))History<br>
459	@ <input type="checkbox" name="au"%s(oau)/>%s(B('u'))Reader<br>
460	@ <input type="checkbox" name="av"%s(oav)/>%s(B('v'))Developer<br>
461	@ <input type="checkbox" name="ag"%s(oag)/>%s(B('g'))Clone<br>
462	@ <input type="checkbox" name="aj"%s(oaj)/>%s(B('j'))Read Wiki<br>
463	@ <input type="checkbox" name="af"%s(oaf)/>%s(B('f'))New Wiki<br>
464	@ <input type="checkbox" name="am"%s(oam)/>%s(B('m'))Append Wiki<br>
465	@ <input type="checkbox" name="ak"%s(oak)/>%s(B('k'))Write Wiki<br>
466	@ <input type="checkbox" name="ab"%s(oab)/>%s(B('b'))Attachments<br>
467	@ <input type="checkbox" name="ar"%s(oar)/>%s(B('r'))Read Ticket<br>
468	@ <input type="checkbox" name="an"%s(oan)/>%s(B('n'))New Ticket<br>
469	@ <input type="checkbox" name="ac"%s(oac)/>%s(B('c'))Append Ticket<br>
470	@ <input type="checkbox" name="aw"%s(oaw)/>%s(B('w'))Write Ticket<br>
471	@ <input type="checkbox" name="at"%s(oat)/>%s(B('t'))Ticket Report<br>
472	@ <input type="checkbox" name="az"%s(oaz)/>%s(B('z'))Download Zip
473	@ </td>
474	@ </tr>
475	@ <tr>
476	@ <td align="right">Password:</td>
477	if( zPw[0] ){
478	/* Obscure the password for all users */
479	@ <td><input type="password" name="pw" value="**********"></td>
480	}else{
481	/* Show an empty password as an empty input field */
482	@ <td><input type="password" name="pw" value=""></td>
483	}
484	@ </tr>
485	if( !higherUser ){
486	@ <tr>
487	@ <td>&nbsp</td>
488	@ <td><input type="submit" name="submit" value="Apply Changes">
489	@ </tr>
490	}
491	@ </table></td></tr></table>


492	@ <h2>Privileges And Capabilities:</h2>
493	@ <ul>
494	if( higherUser ){
495	@ <li><p><font color="blue"><b>
496	@ User %h(zLogin) has Setup privileges and you only have Admin privileges
	@@ -497,95 +505,114 @@
497	@ so you are not permitted to make changes to %h(zLogin).
498	@ </b></font></p></li>
499	@
500	}
501	@ <li><p>
502	@ The <b>Setup</b> user can make arbitrary configuration changes.
503	@ An <b>Admin</b> user can add other users and change user privileges

504	@ and reset user passwords. Both automatically get all other privileges
505	@ listed below. Use these two settings with discretion.
506	@ </p></li>
507	@
508	@ <li><p>
509	@ The "<font color="green"><big>•</big></font>" mark indicates
510	@ the privileges of "nobody" that are available to all users
511	@ regardless of whether or not they are logged in.
512	@ </p></li>
513	@
514	@ <li><p>
515	@ The "<font color="blue"><big>•</big></font>" mark indicates
516	@ the privileges of "anonymous" that are inherited by all logged-in users.
517	@ </p></li>
518	@
519	@ <li><p>
520	@ The "<font color="red"><big>•</big></font>" mark indicates
521	@ the privileges of "developer" that are inherited by all users with
522	@ the <b>Developer</b> privilege.
523	@ </p></li>
524	@
525	@ <li><p>
526	@ The "<font color="black"><big>•</big></font>" mark indicates
527	@ the privileges of "reader" that are inherited by all users with
528	@ the <b>Reader</b> privilege.
529	@ </p></li>
530	@
531	@ <li><p>
532	@ The <b>Delete</b> privilege give the user the ability to erase
533	@ wiki, tickets, and attachments that have been added by anonymous
534	@ users. This capability is intended for deletion of spam. The
535	@ delete capability is only in effect for 24 hours after the item
536	@ is first posted. The Setup user can delete anything at any time.
537	@ </p></li>
538	@
539	@ <li><p>
540	@ The <b>History</b> privilege allows a user to see most hyperlinks.
541	@ This is recommended ON for most logged-in users but OFF for
542	@ user "nobody" to avoid problems with spiders trying to walk every
543	@ historical version of every baseline and file.
544	@ </p></li>
545	@
546	@ <li><p>
547	@ The <b>Zip</b> privilege allows a user to see the "download as ZIP"
548	@ hyperlink and permits access to the <tt>/zip</tt> page. This allows
549	@ users to download ZIP archives without granting other rights like
550	@ <b>Read</b> or <b>History</b>. This privilege is recommended for
551	@ user <b>nobody</b> so that automatic package downloaders can obtain
552	@ the sources without going through the login procedure.
553	@ </p></li>
554	@
555	@ <li><p>
556	@ The <b>Check-in</b> privilege allows remote users to "push".
557	@ The <b>Check-out</b> privilege allows remote users to "pull".
558	@ The <b>Clone</b> privilege allows remote users to "clone".
559	@ </li><p>
560	@
561	@ <li><p>
562	@ The <b>Read Wiki</b>, <b>New Wiki</b>, <b>Append Wiki</b>, and
563	@ <b>Write Wiki</b> privileges control access to wiki pages. The
564	@ <b>Read Ticket</b>, <b>New Ticket</b>, <b>Append Ticket</b>, and
565	@ <b>Write Ticket</b> privileges control access to trouble tickets.
566	@ The <b>Ticket Report</b> privilege allows the user to create or edit
567	@ ticket report formats.
568	@ </p></li>
569	@
570	@ <li><p>
571	@ Users with the <b>Password</b> privilege are allowed to change their
572	@ own password. Recommended ON for most users but OFF for special
573	@ users "developer", "anonymous", and "nobody".
574	@ </p></li>
575	@
576	@ <li><p>
577	@ The <b>EMail</b> privilege allows the display of sensitive information
578	@ such as the email address of users and contact information on tickets.
579	@ Recommended OFF for "anonymous" and for "nobody" but ON for
580	@ "developer".
581	@ </p></li>
582	@
583	@ <li><p>
584	@ The <b>Attachment</b> privilege is needed in order to add attachments
585	@ to tickets or wiki. Write privilege on the ticket or wiki is also
586	@ required.</p></li>


















587	@
588	@ <li><p>
589	@ Login is prohibited if the password is an empty string.
590	@ </p></li>
591	@ </ul>
	@@ -592,42 +619,46 @@
592	@
593	@ <h2>Special Logins</h2>
594	@
595	@ <ul>
596	@ <li><p>
597	@ No login is required for user "<b>nobody</b>". The capabilities
598	@ of the <b>nobody</b> user are inherited by all users, regardless of
599	@ whether or not they are logged in. To disable universal access
600	@ to the repository, make sure no user named "<b>nobody</b>" exists or
601	@ that the <b>nobody</b> user has no capabilities enabled.
602	@ The password for <b>nobody</b> is ignore. To avoid problems with
603	@ spiders overloading the server, it is recommended
604	@ that the 'h' (History) capability be turned off for the <b>nobody</b>
605	@ user.
606	@ </p></li>
607	@
608	@ <li><p>
609	@ Login is required for user "<b>anonymous</b>" but the password
610	@ is displayed on the login screen beside the password entry box
611	@ so anybody who can read should be able to login as anonymous.
612	@ On the other hand, spiders and web-crawlers will typically not
613	@ be able to login. Set the capabilities of the anonymous user
614	@ to things that you want any human to be able to do, but not any
615	@ spider. Every other logged-in user inherits the privileges of
616	@ <b>anonymous</b>.
617	@ </p></li>
618	@
619	@ <li><p>
620	@ The "<b>developer</b>" user is intended as a template for trusted users
621	@ with check-in privileges. When adding new trusted users, simply
622	@ select the <b>Developer</b> privilege to cause the new user to inherit
623	@ all privileges of the "developer" user. Similarly, the "<b>reader</b>"
624	@ user is a template for users who are allowed more access than anonymous,
625	@ but less than a developer.
626	@ </p></li>
627	@ </ul>
628	@ </form>




629	style_footer();
630	}
631
632
633	/*
	@@ -651,13 +682,14 @@
651	db_set(zVar, iQ ? "1" : "0", 0);
652	iVal = iQ;
653	}
654	}
655	if( iVal ){
656	@ <input type="checkbox" name="%s(zQParm)" checked><b>%s(zLabel)</b></input>

657	}else{
658	@ <input type="checkbox" name="%s(zQParm)"><b>%s(zLabel)</b></input>
659	}
660	}
661
662	/*
663	** Generate an entry box for an attribute.
	@@ -674,11 +706,11 @@
674	if( zQ && strcmp(zQ,zVal)!=0 ){
675	login_verify_csrf_secret();
676	db_set(zVar, zQ, 0);
677	zVal = zQ;
678	}
679	@ <input type="text" name="%s(zQParm)" value="%h(zVal)" size="%d(width)">
680	@ <b>%s(zLabel)</b>
681	}
682
683	/*
684	** Generate a text box for an attribute.
	@@ -698,11 +730,12 @@
698	db_set(zVar, zQ, 0);
699	z = zQ;
700	}
701	if( rows>0 && cols>0 ){
702	@ <textarea name="%s(zQP)" rows="%d(rows)" cols="%d(cols)">%h(z)</textarea>
703	@ <b>%s(zLabel)</b>

704	}
705	}
706
707
708	/*
	@@ -714,57 +747,57 @@
714	login_needed();
715	}
716
717	style_header("Access Control Settings");
718	db_begin_transaction();
719	@ <form action="%s(g.zBaseURL)/setup_access" method="POST">
720	login_insert_csrf_secret();
721	@ <hr>
722	onoff_attribute("Require password for local access",
723	"localauth", "localauth", 0);
724	@ <p>When enabled, the password sign-in is required for
725	@ web access coming from 127.0.0.1. When disabled, web access
726	@ from 127.0.0.1 is allows without any login - the user id is selected
727	@ from the ~/.fossil database. Password login is always required
728	@ for incoming web connections on internet addresses other than
729	@ 127.0.0.1.</p></li>
730
731	@ <hr>
732	onoff_attribute("Allow REMOTE_USER authentication",
733	"remote_user_ok", "remote_user_ok", 0);
734	@ <p>When enabled, if the REMOTE_USER environment variable is set to the
735	@ login name of a valid user and no other login credentials are available,
736	@ then the REMOTE_USER is accepted as an authenticated user.
737	@ </p></li>
738
739	@ <hr>
740	entry_attribute("Login expiration time", 6, "cookie-expire", "cex", "8766");
741	@ <p>The number of hours for which a login is valid. This must be a
742	@ positive number. The default is 8760 hours which is approximately equal
743	@ to a year.</p>
744
745	@ <hr>
746	entry_attribute("Download packet limit", 10, "max-download", "mxdwn",
747	"5000000");
748	@ <p>Fossil tries to limit out-bound sync, clone, and pull packets
749	@ to this many bytes, uncompressed. If the client requires more data
750	@ than this, then the client will issue multiple HTTP requests.
751	@ Values below 1 million are not recommended. 5 million is a
752	@ reasonable number.</p>
753
754	@ <hr>
755	onoff_attribute("Show javascript button to fill in CAPTCHA",
756	"auto-captcha", "autocaptcha", 0);
757	@ <p>When enabled, a button appears on the login screen for user
758	@ "anonymous" that will automatically fill in the CAPTCHA password.
759	@ This is less secure that forcing the user to do it manually, but is
760	@ probably secure enough and it is certainly more convenient for
761	@ anonymous users.</p>
762
763	@ <hr>
764	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
765	@ </form>
766	db_end_transaction(0);
767	style_footer();
768	}
769
770	/*
	@@ -776,42 +809,42 @@
776	login_needed();
777	}
778
779	style_header("Timeline Display Preferences");
780	db_begin_transaction();
781	@ <form action="%s(g.zBaseURL)/setup_timeline" method="POST">
782	login_insert_csrf_secret();
783
784	@ <hr>
785	onoff_attribute("Allow block-markup in timeline",
786	"timeline-block-markup", "tbm", 0);
787	@ <p>In timeline displays, check-in comments can be displayed with or
788	@ without block markup (paragraphs, tables, etc.)</p>
789
790	@ <hr>
791	onoff_attribute("Use Universal Coordinated Time (UTC)",
792	"timeline-utc", "utc", 1);
793	@ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
794	@ Zulu) instead of in local time.</p>
795
796	@ <hr>
797	onoff_attribute("Show version differences by default",
798	"show-version-diffs", "vdiff", 0);
799	@ <p>On the version-information pages linked from the timeline can either
800	@ show complete diffs of all file changes, or can just list the names of
801	@ the files that have changed. Users can get to either page by
802	@ clicking. This setting selects the default.</p>
803
804	@ <hr>
805	entry_attribute("Max timeline comment length", 6,
806	"timeline-max-comment", "tmc", "0");
807	@ <p>The maximum length of a comment to be displayed in a timeline.
808	@ "0" there is no length limit.</p>
809
810	@ <hr>
811	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
812	@ </form>
813	db_end_transaction(0);
814	style_footer();
815	}
816
817	/*
	@@ -823,11 +856,11 @@
823	login_needed();
824	}
825
826	style_header("WWW Configuration");
827	db_begin_transaction();
828	@ <form action="%s(g.zBaseURL)/setup_config" method="POST">
829	login_insert_csrf_secret();
830	@ <hr />
831	entry_attribute("Project Name", 60, "project-name", "pn", "");
832	@ <p>Give your project a name so visitors know what this site is about.
833	@ The project name will also be used as the RSS feed title.</p>
	@@ -840,36 +873,37 @@
840	entry_attribute("Index Page", 60, "index-page", "idxpg", "/home");
841	@ <p>Enter the pathname of the page to display when the "Home" menu
842	@ option is selected and when no pathname is
843	@ specified in the URL. For example, if you visit the url:</p>
844	@
845	@ <blockquote>%h(g.zBaseURL)</blockquote>
846	@
847	@ <p>And you have specified an index page of "/home" the above will
848	@ automatically redirect to:</p>
849	@
850	@ <blockquote>%h(g.zBaseURL)/home</blockquote>
851	@
852	@ <p>The default "/home" page displays a Wiki page with the same name
853	@ as the Project Name specified above. Some sites prefer to redirect
854	@ to a documentation page (ex: "/doc/tip/index.wiki") or to "/timeline".</p>
855	@ <hr />
856	onoff_attribute("Use HTML as wiki markup language",
857	"wiki-use-html", "wiki-use-html", 0);
858	@ <p>Use HTML as the wiki markup language. Wiki links will still be parsed but
859	@ all other wiki formatting will be ignored. This option is helpful if you have
860	@ chosen to use a rich HTML editor for wiki markup such as TinyMCE.</p>

861	@ <p><strong>CAUTION:</strong> when
862	@ enabling, <i>all</i> HTML tags and attributes are accepted in the wiki.
863	@ No sanitization is done. This means that it is very possible for malicious
864	@ users to inject dangerous HTML, CSS and JavaScript code into your wiki.</p>
865	@ <p>This should <strong>only</strong> be enabled when wiki editing is limited
866	@ to trusted users. It should <strong>not</strong> be used on a publically
867	@ editable wiki.</p>
868	@ <hr />
869	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
870	@ </form>
871	db_end_transaction(0);
872	style_footer();
873	}
874
875	/*
	@@ -892,27 +926,27 @@
892	if( P("submit")!=0 ){
893	db_end_transaction(0);
894	cgi_redirect("setup_editcss");
895	}
896	style_header("Edit CSS");
897	@ <form action="%s(g.zBaseURL)/setup_editcss" method="POST">
898	login_insert_csrf_secret();
899	@ Edit the CSS below:<br />
900	textarea_attribute("", 40, 80, "css", "css", zDefaultCSS);
901	@ <br />
902	@ <input type="submit" name="submit" value="Apply Changes">
903	@ <input type="submit" name="clear" value="Revert To Default">
904	@ </form>
905	@ <p><b>Note:</b> Press your browser Reload button after modifying the
906	@ CSS in order to pull in the modified CSS file.</p>
907	@ <hr>
908	@ The default CSS is shown below for reference. Other examples
909	@ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
910	@ See also the <a href="setup_header">header</a> and
911	@ <a href="setup_footer">footer</a> editing screens.
912	@ <blockquote><pre>
913	@ %h(zDefaultCSS)
914	@ </pre></blockquote>
915	style_footer();
916	db_end_transaction(0);
917	}
918
	@@ -930,21 +964,21 @@
930	cgi_replace_parameter("header", zDefaultHeader);
931	}else{
932	textarea_attribute(0, 0, 0, "header", "header", zDefaultHeader);
933	}
934	style_header("Edit Page Header");
935	@ <form action="%s(g.zBaseURL)/setup_header" method="POST">
936	login_insert_csrf_secret();
937	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
938	@ generate the beginning of every page through start of the main
939	@ menu.</p>
940	textarea_attribute("", 40, 80, "header", "header", zDefaultHeader);
941	@ <br />
942	@ <input type="submit" name="submit" value="Apply Changes">
943	@ <input type="submit" name="clear" value="Revert To Default">
944	@ </form>
945	@ <hr>
946	@ The default header is shown below for reference. Other examples
947	@ of headers can be seen on the <a href="setup_skin">skins page</a>.
948	@ See also the <a href="setup_editcss">CSS</a> and
949	@ <a href="setup_footer">footer</a> editing screeens.
950	@ <blockquote><pre>
	@@ -968,20 +1002,20 @@
968	cgi_replace_parameter("footer", zDefaultFooter);
969	}else{
970	textarea_attribute(0, 0, 0, "footer", "footer", zDefaultFooter);
971	}
972	style_header("Edit Page Footer");
973	@ <form action="%s(g.zBaseURL)/setup_footer" method="POST">
974	login_insert_csrf_secret();
975	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
976	@ generate the end of every page.</p>
977	textarea_attribute("", 20, 80, "footer", "footer", zDefaultFooter);
978	@ <br />
979	@ <input type="submit" name="submit" value="Apply Changes">
980	@ <input type="submit" name="clear" value="Revert To Default">
981	@ </form>
982	@ <hr>
983	@ The default footer is shown below for reference. Other examples
984	@ of footers can be seen on the <a href="setup_skin">skins page</a>.
985	@ See also the <a href="setup_editcss">CSS</a> and
986	@ <a href="setup_header">header</a> editing screens.
987	@ <blockquote><pre>
	@@ -1031,31 +1065,31 @@
1031	cgi_redirect("setup_logo");
1032	}
1033	style_header("Edit Project Logo");
1034	@ <p>The current project logo has a MIME-Type of <b>%h(zMime)</b> and looks
1035	@ like this:</p>
1036	@ <blockquote><img src="%s(g.zTop)/logo" alt="logo"></blockquote>
1037	@
1038	@ <p>The logo is accessible to all users at this URL:
1039	@ <a href="%s(g.zBaseURL)/logo">%s(g.zBaseURL)/logo</a>.
1040	@ The logo may or may not appear on each
1041	@ page depending on the <a href="setup_editcss">CSS</a> and
1042	@ <a href="setup_header">header setup</a>.</p>
1043	@
1044	@ <form action="%s(g.zBaseURL)/setup_logo" method="POST"
1045	@ enctype="multipart/form-data">
1046	@ <p>To set a new logo image, select a file to use as the logo using
1047	@ the entry box below and then press the "Change Logo" button.</p>
1048	login_insert_csrf_secret();
1049	@ Logo Image file:
1050	@ <input type="file" name="im" size="60" accepts="image/*"><br>
1051	@ <input type="submit" name="set" value="Change Logo">
1052	@ <input type="submit" name="clr" value="Revert To Default">
1053	@ </form>
1054	@
1055	@ <p><b>Note:</b> Your browser has probably cached the logo image, so
1056	@ you will probably need to press the Reload button on your browser after
1057	@ changing the logo to provoke your browser to reload the new logo image.
1058	@ </p>
1059	style_footer();
1060	db_end_transaction(0);
1061	}
1062

	--- src/setup.c
	+++ src/setup.c
	@@ -99,42 +99,40 @@
99	return;
100	}
101
102	style_submenu_element("Add", "Add User", "setup_uedit");
103	style_header("User List");
104	@ <table class="usetupLayoutTable">
105	@ <tr><td class="usetupColumnLayout">
106	@ <span class="note">Users:</span>
107	@ <table class="usetupUserList">

108	@ <tr>
109	@ <th class="usetupListUser" style="text-align: right;padding-right: 20px;">User ID</th>
110	@ <th class="usetupListCap" style="text-align: center;padding-right: 15px;">Capabilities</th>
111	@ <th class="usetupListCon" style="text-align: left;">Contact Info</th>
112	@ </tr>
113	db_prepare(&s, "SELECT uid, login, cap, info FROM user ORDER BY login");
114	while( db_step(&s)==SQLITE_ROW ){
115	const char *zCap = db_column_text(&s, 2);
116	if( strstr(zCap, "s") ) zCap = "s";
117	@ <tr>
118	@ <td class="usetupListUser" style="text-align: right;padding-right: 20px;white-space:nowrap;">
119	if( g.okAdmin && (zCap[0]!='s' \|\| g.okSetup) ){
120	@ <a href="setup_uedit?id=%d(db_column_int(&s,0))">
121	}
122	@ %h(db_column_text(&s,1))
123	if( g.okAdmin ){
124	@ </a>
125	}
126	@ </td>
127	@ <td class="usetupListCap" style="text-align: center;padding-right: 15px;">%s(zCap)</td>
128	@ <td class="usetupListCon" style="text-align: left;">%s(db_column_text(&s,3))</td>

129	@ </tr>
130	}
131	@ </table>
132	@ </td><td class="usetupColumnLayout">
133	@ <span class="note">Notes:</span>
134	@ <ol>
135	@ <li><p>The permission flags are as follows:</p>
136	@ <table>
137	@ <tr><td valign="top"><b>a</b></td>
138	@ <td><i>Admin:</i> Create and delete users</td></tr>
	@@ -181,31 +179,35 @@
179	@ user <tt>developer</tt></td></tr>
180	@ <tr><td valign="top"><b>w</b></td>
181	@ <td><i>Write-Tkt:</i> Edit tickets</td></tr>
182	@ <tr><td valign="top"><b>z</b></td>
183	@ <td><i>Zip download:</i> Download a baseline via the
184	@ <tt>/zip</tt> URL even without
185	@ check<span class="capability">o</span>ut
186	@ and <span class="capability">h</span>istory permissions</td></tr>
187	@ </table>
188	@ </li>
189	@
190	@ <li><p>
191	@ Every user, logged in or not, inherits the privileges of
192	@ <span class="usertype">nobody</span>.
193	@ </p></li>
194	@
195	@ <li><p>
196	@ Any human can login as <span class="usertype">anonymous</span> since the
197	@ password is clearly displayed on the login page for them to type. The
198	@ purpose of requiring anonymous to log in is to prevent access by spiders.
199	@ Every logged-in user inherits the combined privileges of
200	@ <span class="usertype">anonymous</span> and
201	@ <span class="usertype">nobody</span>.
202	@ </p></li>
203	@
204	@ <li><p>
205	@ Users with privilege <span class="capability">v</span> inherit the combined
206	@ privileges of <span class="usertype">developer</span>,
207	@ <span class="usertype">anonymous</span>, and
208	@ <span class="usertype">nobody</span>.
209	@ </p></li>
210	@
211	@ </ol>
212	@ </td></tr></table>
213	style_footer();
	@@ -323,12 +325,12 @@
325	}
326	if( uid>0 &&
327	db_exists("SELECT 1 FROM user WHERE login=%Q AND uid!=%d", zLogin, uid)
328	){
329	style_header("User Creation Error");
330	@ <span class="loginError">Login "%h(zLogin)" is already used by
331	@ a different user.</span>
332	@
333	@ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
334	style_footer();
335	return;
336	}
	@@ -353,65 +355,69 @@
355	if( uid ){
356	zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid);
357	zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid);
358	zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid);
359	zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid);
360	if( strchr(zCap, 'a') ) oaa = " checked=\"checked\"";
361	if( strchr(zCap, 'b') ) oab = " checked=\"checked\"";
362	if( strchr(zCap, 'c') ) oac = " checked=\"checked\"";
363	if( strchr(zCap, 'd') ) oad = " checked=\"checked\"";
364	if( strchr(zCap, 'e') ) oae = " checked=\"checked\"";
365	if( strchr(zCap, 'f') ) oaf = " checked=\"checked\"";
366	if( strchr(zCap, 'g') ) oag = " checked=\"checked\"";
367	if( strchr(zCap, 'h') ) oah = " checked=\"checked\"";
368	if( strchr(zCap, 'i') ) oai = " checked=\"checked\"";
369	if( strchr(zCap, 'j') ) oaj = " checked=\"checked\"";
370	if( strchr(zCap, 'k') ) oak = " checked=\"checked\"";
371	if( strchr(zCap, 'm') ) oam = " checked=\"checked\"";
372	if( strchr(zCap, 'n') ) oan = " checked=\"checked\"";
373	if( strchr(zCap, 'o') ) oao = " checked=\"checked\"";
374	if( strchr(zCap, 'p') ) oap = " checked=\"checked\"";
375	if( strchr(zCap, 'r') ) oar = " checked=\"checked\"";
376	if( strchr(zCap, 's') ) oas = " checked=\"checked\"";
377	if( strchr(zCap, 't') ) oat = " checked=\"checked\"";
378	if( strchr(zCap, 'u') ) oau = " checked=\"checked\"";
379	if( strchr(zCap, 'v') ) oav = " checked=\"checked\"";
380	if( strchr(zCap, 'w') ) oaw = " checked=\"checked\"";
381	if( strchr(zCap, 'z') ) oaz = " checked=\"checked\"";
382	}
383
384	/* figure out inherited permissions */
385	memset(inherit, 0, sizeof(inherit));
386	if( strcmp(zLogin, "developer") ){
387	char z1, z2;
388	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='developer'");
389	while( z1 && *z1 ){
390	inherit[0x7f & *(z1++)] =
391	"<span class=\"ueditInheritDeveloper\">•</span>";
392	}
393	free(z2);
394	}
395	if( strcmp(zLogin, "reader") ){
396	char z1, z2;
397	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='reader'");
398	while( z1 && *z1 ){
399	inherit[0x7f & *(z1++)] =
400	"<span class=\"ueditInheritReader\">•</span>";
401	}
402	free(z2);
403	}
404	if( strcmp(zLogin, "anonymous") ){
405	char z1, z2;
406	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='anonymous'");
407	while( z1 && *z1 ){
408	inherit[0x7f & *(z1++)] =
409	"<span class=\"ueditInheritAnonymous\">•</span>";
410	}
411	free(z2);
412	}
413	if( strcmp(zLogin, "nobody") ){
414	char z1, z2;
415	z1 = z2 = db_text(0,"SELECT cap FROM user WHERE login='nobody'");
416	while( z1 && *z1 ){
417	inherit[0x7f & *(z1++)] =
418	"<span class=\"ueditInheritNobody\">•</span>";
419	}
420	free(z2);
421	}
422
423	/* Begin generating the page
	@@ -420,77 +426,79 @@
426	if( uid ){
427	style_header(mprintf("Edit User %h", zLogin));
428	}else{
429	style_header("Add A New User");
430	}
431	@ <div class="ueditCapBox">
432	@ <form action="%s(g.zPath)" method="post"><div>
433	login_insert_csrf_secret();
434	@ <table>
435	@ <tr>
436	@ <td class="usetupEditLabel">User ID:</td>
437	if( uid ){
438	@ <td>%d(uid) <input type="hidden" name="id" value="%d(uid)" /></td>
439	}else{
440	@ <td>(new user)<input type="hidden" name="id" value="0" /></td>
441	}
442	@ </tr>
443	@ <tr>
444	@ <td class="usetupEditLabel">Login:</td>
445	@ <td><input type="text" name="login" value="%h(zLogin)" /></td>
446	@ </tr>
447	@ <tr>
448	@ <td class="usetupEditLabel">Contact Info:</td>
449	@ <td><input type="text" name="info" size="40" value="%h(zInfo)" /></td>
450	@ </tr>
451	@ <tr>
452	@ <td class="usetupEditLabel">Capabilities:</td>
453	@ <td>
454	#define B(x) inherit[x]
455	if( g.okSetup ){
456	@ <input type="checkbox" name="as"%s(oas) />%s(B('s'))Setup<br />
457	}
458	@ <input type="checkbox" name="aa"%s(oaa) />%s(B('a'))Admin<br />
459	@ <input type="checkbox" name="ad"%s(oad) />%s(B('d'))Delete<br />
460	@ <input type="checkbox" name="ae"%s(oae) />%s(B('e'))Email<br />
461	@ <input type="checkbox" name="ap"%s(oap) />%s(B('p'))Password<br />
462	@ <input type="checkbox" name="ai"%s(oai) />%s(B('i'))Check-In<br />
463	@ <input type="checkbox" name="ao"%s(oao) />%s(B('o'))Check-Out<br />
464	@ <input type="checkbox" name="ah"%s(oah) />%s(B('h'))History<br />
465	@ <input type="checkbox" name="au"%s(oau) />%s(B('u'))Reader<br />
466	@ <input type="checkbox" name="av"%s(oav) />%s(B('v'))Developer<br />
467	@ <input type="checkbox" name="ag"%s(oag) />%s(B('g'))Clone<br />
468	@ <input type="checkbox" name="aj"%s(oaj) />%s(B('j'))Read Wiki<br />
469	@ <input type="checkbox" name="af"%s(oaf) />%s(B('f'))New Wiki<br />
470	@ <input type="checkbox" name="am"%s(oam) />%s(B('m'))Append Wiki<br />
471	@ <input type="checkbox" name="ak"%s(oak) />%s(B('k'))Write Wiki<br />
472	@ <input type="checkbox" name="ab"%s(oab) />%s(B('b'))Attachments<br />
473	@ <input type="checkbox" name="ar"%s(oar) />%s(B('r'))Read Ticket<br />
474	@ <input type="checkbox" name="an"%s(oan) />%s(B('n'))New Ticket<br />
475	@ <input type="checkbox" name="ac"%s(oac) />%s(B('c'))Append Ticket<br />
476	@ <input type="checkbox" name="aw"%s(oaw) />%s(B('w'))Write Ticket<br />
477	@ <input type="checkbox" name="at"%s(oat) />%s(B('t'))Ticket Report<br />
478	@ <input type="checkbox" name="az"%s(oaz) />%s(B('z'))Download Zip
479	@ </td>
480	@ </tr>
481	@ <tr>
482	@ <td align="right">Password:</td>
483	if( zPw[0] ){
484	/* Obscure the password for all users */
485	@ <td><input type="password" name="pw" value="**********" /></td>
486	}else{
487	/* Show an empty password as an empty input field */
488	@ <td><input type="password" name="pw" value="" /></td>
489	}
490	@ </tr>
491	if( !higherUser ){
492	@ <tr>
493	@ <td> </td>
494	@ <td><input type="submit" name="submit" value="Apply Changes" /></td>
495	@ </tr>
496	}
497	@ </table>
498	@ </div></form>
499	@ </div>
500	@ <h2>Privileges And Capabilities:</h2>
501	@ <ul>
502	if( higherUser ){
503	@ <li><p><font color="blue"><b>
504	@ User %h(zLogin) has Setup privileges and you only have Admin privileges
	@@ -497,95 +505,114 @@
505	@ so you are not permitted to make changes to %h(zLogin).
506	@ </b></font></p></li>
507	@
508	}
509	@ <li><p>
510	@ The <span class="capability">Setup</span> user can make arbitrary
511	@ configuration changes. An <span class="usertype">Admin</span> user
512	@ can add other users and change user privileges
513	@ and reset user passwords. Both automatically get all other privileges
514	@ listed below. Use these two settings with discretion.
515	@ </p></li>
516	@
517	@ <li><p>
518	@ The "<span class="ueditInheritNobody"><big>•</big></span>" mark
519	@ indicates the privileges of <span class="usertype">nobody</span> that
520	@ are available to all users regardless of whether or not they are logged in.
521	@ </p></li>
522	@
523	@ <li><p>
524	@ The "<span class="ueditInheritAnonymous"><big>•</big></span>" mark
525	@ indicates the privileges of <span class="usertype">anonymous</span> that
526	@ are inherited by all logged-in users.
527	@ </p></li>
528	@
529	@ <li><p>
530	@ The "<span class="ueditInheritDeveloper"><big>•</big></span>" mark
531	@ indicates the privileges of <span class="usertype">developer</span> that
532	@ are inherited by all users with the
533	@ <span class="capability">Developer</span> privilege.
534	@ </p></li>
535	@
536	@ <li><p>
537	@ The "<span class="ueditInheritReader"><big>•</big></span>" mark
538	@ indicates the privileges of <span class="usertype">reader</span> that
539	@ are inherited by all users with the <span class="capability">Reader</span>
540	@ privilege.
541	@ </p></li>
542	@
543	@ <li><p>
544	@ The <span class="capability">Delete</span> privilege give the user the
545	@ ability to erase wiki, tickets, and attachments that have been added
546	@ by anonymous users. This capability is intended for deletion of spam.
547	@ The delete capability is only in effect for 24 hours after the item
548	@ is first posted. The <span class="usertype">Setup</span> user can
549	@ delete anything at any time.
550	@ </p></li>
551	@
552	@ <li><p>
553	@ The <span class="capability">History</span> privilege allows a user
554	@ to see most hyperlinks. This is recommended ON for most logged-in users
555	@ but OFF for user "nobody" to avoid problems with spiders trying to walk
556	@ every historical version of every baseline and file.
557	@ </p></li>
558	@
559	@ <li><p>
560	@ The <span class="capability">Zip</span> privilege allows a user to
561	@ see the "download as ZIP"
562	@ hyperlink and permits access to the <tt>/zip</tt> page. This allows
563	@ users to download ZIP archives without granting other rights like
564	@ <span class="capability">Read</span> or
565	@ <span class="capability">History</span>. This privilege is recommended for
566	@ user <span class="usertype">nobody</span> so that automatic package
567	@ downloaders can obtain the sources without going through the login
568	@ procedure.
569	@ </p></li>
570	@
571	@ <li><p>
572	@ The <span class="capability">Check-in</span> privilege allows remote
573	@ users to "push". The <span class="capability">Check-out</span> privilege
574	@ allows remote users to "pull". The <span class="capability">Clone</span>
575	@ privilege allows remote users to "clone".
576	@ </p></li>
577	@
578	@ <li><p>
579	@ The <span class="capability">Read Wiki</span>,
580	@ <span class="capability">New Wiki</span>,
581	@ <span class="capability">Append Wiki</span>, and
582	@ <b>Write Wiki</b> privileges control access to wiki pages. The
583	@ <span class="capability">Read Ticket</span>,
584	@ <span class="capability">New Ticket</span>,
585	@ <span class="capability">Append Ticket</span>, and
586	@ <span class="capability">Write Ticket</span> privileges control access
587	@ to trouble tickets.
588	@ The <span class="capability">Ticket Report</span> privilege allows
589	@ the user to create or edit ticket report formats.
590	@ </p></li>
591	@
592	@ <li><p>
593	@ Users with the <span class="capability">Password</span> privilege
594	@ are allowed to change their own password. Recommended ON for most
595	@ users but OFF for special users <span class="usertype">developer</span>,
596	@ <span class="usertype">anonymous</span>,
597	@ and <span class="usertype">nobody</span>.
598	@ </p></li>
599	@
600	@ <li><p>
601	@ The <span class="capability">EMail</span> privilege allows the display of
602	@ sensitive information such as the email address of users and contact
603	@ information on tickets. Recommended OFF for
604	@ <span class="usertype">anonymousy</span> and for
605	@ <span class="usertype">nobody</span> but ON for
606	@ <span class="usertype">developer</span>.
607	@ </p></li>
608	@
609	@ <li><p>
610	@ The <span class="capability">Attachment</span> privilege is needed in
611	@ order to add attachments to tickets or wiki. Write privilege on the
612	@ ticket or wiki is also required.
613	@ </p></li>
614	@
615	@ <li><p>
616	@ Login is prohibited if the password is an empty string.
617	@ </p></li>
618	@ </ul>
	@@ -592,42 +619,46 @@
619	@
620	@ <h2>Special Logins</h2>
621	@
622	@ <ul>
623	@ <li><p>
624	@ No login is required for user <span class="usertype">nobody</span>. The
625	@ capabilities of the <span class="usertype">nobody</span> user are
626	@ inherited by all users, regardless of whether or not they are logged in.
627	@ To disable universal access to the repository, make sure no user named
628	@ <span class="usertype">nobody</span> exists or that the
629	@ <span class="usertype">nobody</span> user has no capabilities
630	@ enabled. The password for <span class="usertype">nobody</span> is ignore.
631	@ To avoid problems with spiders overloading the server, it is recommended
632	@ that the <span class="capability">h</span> (History) capability be turned
633	@ off for the <span class="usertype">nobody</span> user.
634	@ </p></li>
635	@
636	@ <li><p>
637	@ Login is required for user <span class="usertype">anonymous</span> but the
638	@ password is displayed on the login screen beside the password entry box
639	@ so anybody who can read should be able to login as anonymous.
640	@ On the other hand, spiders and web-crawlers will typically not
641	@ be able to login. Set the capabilities of the
642	@ <span class="usertype">anonymous</span>
643	@ user to things that you want any human to be able to do, but not any
644	@ spider. Every other logged-in user inherits the privileges of
645	@ <span class="usertype">anonymous</span>.
646	@ </p></li>
647	@
648	@ <li><p>
649	@ The <span class="usertype">developer</span> user is intended as a template
650	@ for trusted users with check-in privileges. When adding new trusted users,
651	@ simply select the <span class="capability">developer</span> privilege to
652	@ cause the new user to inherit all privileges of the
653	@ <span class="usertype">developer</span>
654	@ user. Similarly, the <span class="usertype">reader</span> user is a
655	@ template for users who are allowed more access than
656	@ <span class="usertype">anonymous</span>,
657	@ but less than a <span class="usertype">developer</span>.
658	@ </p></li>
659	@ </ul>
660	style_footer();
661	}
662
663
664	/*
	@@ -651,13 +682,14 @@
682	db_set(zVar, iQ ? "1" : "0", 0);
683	iVal = iQ;
684	}
685	}
686	if( iVal ){
687	@ <input type="checkbox" name="%s(zQParm)" checked="checked" />
688	@ <b>%s(zLabel)</b>
689	}else{
690	@ <input type="checkbox" name="%s(zQParm)" /><b>%s(zLabel)</b>
691	}
692	}
693
694	/*
695	** Generate an entry box for an attribute.
	@@ -674,11 +706,11 @@
706	if( zQ && strcmp(zQ,zVal)!=0 ){
707	login_verify_csrf_secret();
708	db_set(zVar, zQ, 0);
709	zVal = zQ;
710	}
711	@ <input type="text" name="%s(zQParm)" value="%h(zVal)" size="%d(width)" />
712	@ <b>%s(zLabel)</b>
713	}
714
715	/*
716	** Generate a text box for an attribute.
	@@ -698,11 +730,12 @@
730	db_set(zVar, zQ, 0);
731	z = zQ;
732	}
733	if( rows>0 && cols>0 ){
734	@ <textarea name="%s(zQP)" rows="%d(rows)" cols="%d(cols)">%h(z)</textarea>
735	if (zLabel && *zLabel)
736	@ <span class="textareaLabel">%s(zLabel)</span>
737	}
738	}
739
740
741	/*
	@@ -714,57 +747,57 @@
747	login_needed();
748	}
749
750	style_header("Access Control Settings");
751	db_begin_transaction();
752	@ <form action="%s(g.zBaseURL)/setup_access" method="post"><div>
753	login_insert_csrf_secret();
754	@ <hr />
755	onoff_attribute("Require password for local access",
756	"localauth", "localauth", 0);
757	@ <p>When enabled, the password sign-in is required for
758	@ web access coming from 127.0.0.1. When disabled, web access
759	@ from 127.0.0.1 is allows without any login - the user id is selected
760	@ from the ~/.fossil database. Password login is always required
761	@ for incoming web connections on internet addresses other than
762	@ 127.0.0.1.</p>
763
764	@ <hr />
765	onoff_attribute("Allow REMOTE_USER authentication",
766	"remote_user_ok", "remote_user_ok", 0);
767	@ <p>When enabled, if the REMOTE_USER environment variable is set to the
768	@ login name of a valid user and no other login credentials are available,
769	@ then the REMOTE_USER is accepted as an authenticated user.
770	@ </p>
771
772	@ <hr />
773	entry_attribute("Login expiration time", 6, "cookie-expire", "cex", "8766");
774	@ <p>The number of hours for which a login is valid. This must be a
775	@ positive number. The default is 8760 hours which is approximately equal
776	@ to a year.</p>
777
778	@ <hr />
779	entry_attribute("Download packet limit", 10, "max-download", "mxdwn",
780	"5000000");
781	@ <p>Fossil tries to limit out-bound sync, clone, and pull packets
782	@ to this many bytes, uncompressed. If the client requires more data
783	@ than this, then the client will issue multiple HTTP requests.
784	@ Values below 1 million are not recommended. 5 million is a
785	@ reasonable number.</p>
786
787	@ <hr />
788	onoff_attribute("Show javascript button to fill in CAPTCHA",
789	"auto-captcha", "autocaptcha", 0);
790	@ <p>When enabled, a button appears on the login screen for user
791	@ "anonymous" that will automatically fill in the CAPTCHA password.
792	@ This is less secure that forcing the user to do it manually, but is
793	@ probably secure enough and it is certainly more convenient for
794	@ anonymous users.</p>
795
796	@ <hr />
797	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
798	@ </div></form>
799	db_end_transaction(0);
800	style_footer();
801	}
802
803	/*
	@@ -776,42 +809,42 @@
809	login_needed();
810	}
811
812	style_header("Timeline Display Preferences");
813	db_begin_transaction();
814	@ <form action="%s(g.zBaseURL)/setup_timeline" method="post"><div>
815	login_insert_csrf_secret();
816
817	@ <hr />
818	onoff_attribute("Allow block-markup in timeline",
819	"timeline-block-markup", "tbm", 0);
820	@ <p>In timeline displays, check-in comments can be displayed with or
821	@ without block markup (paragraphs, tables, etc.)</p>
822
823	@ <hr />
824	onoff_attribute("Use Universal Coordinated Time (UTC)",
825	"timeline-utc", "utc", 1);
826	@ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or
827	@ Zulu) instead of in local time.</p>
828
829	@ <hr />
830	onoff_attribute("Show version differences by default",
831	"show-version-diffs", "vdiff", 0);
832	@ <p>On the version-information pages linked from the timeline can either
833	@ show complete diffs of all file changes, or can just list the names of
834	@ the files that have changed. Users can get to either page by
835	@ clicking. This setting selects the default.</p>
836
837	@ <hr />
838	entry_attribute("Max timeline comment length", 6,
839	"timeline-max-comment", "tmc", "0");
840	@ <p>The maximum length of a comment to be displayed in a timeline.
841	@ "0" there is no length limit.</p>
842
843	@ <hr />
844	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
845	@ </div></form>
846	db_end_transaction(0);
847	style_footer();
848	}
849
850	/*
	@@ -823,11 +856,11 @@
856	login_needed();
857	}
858
859	style_header("WWW Configuration");
860	db_begin_transaction();
861	@ <form action="%s(g.zBaseURL)/setup_config" method="post"><div>
862	login_insert_csrf_secret();
863	@ <hr />
864	entry_attribute("Project Name", 60, "project-name", "pn", "");
865	@ <p>Give your project a name so visitors know what this site is about.
866	@ The project name will also be used as the RSS feed title.</p>
	@@ -840,36 +873,37 @@
873	entry_attribute("Index Page", 60, "index-page", "idxpg", "/home");
874	@ <p>Enter the pathname of the page to display when the "Home" menu
875	@ option is selected and when no pathname is
876	@ specified in the URL. For example, if you visit the url:</p>
877	@
878	@ <blockquote><p>%h(g.zBaseURL)</p></blockquote>
879	@
880	@ <p>And you have specified an index page of "/home" the above will
881	@ automatically redirect to:</p>
882	@
883	@ <blockquote><p>%h(g.zBaseURL)/home</p></blockquote>
884	@
885	@ <p>The default "/home" page displays a Wiki page with the same name
886	@ as the Project Name specified above. Some sites prefer to redirect
887	@ to a documentation page (ex: "/doc/tip/index.wiki") or to "/timeline".</p>
888	@ <hr />
889	onoff_attribute("Use HTML as wiki markup language",
890	"wiki-use-html", "wiki-use-html", 0);
891	@ <p>Use HTML as the wiki markup language. Wiki links will still be parsed
892	@ but all other wiki formatting will be ignored. This option is helpful
893	@ if you have chosen to use a rich HTML editor for wiki markup such as
894	@ TinyMCE.</p>
895	@ <p><strong>CAUTION:</strong> when
896	@ enabling, <i>all</i> HTML tags and attributes are accepted in the wiki.
897	@ No sanitization is done. This means that it is very possible for malicious
898	@ users to inject dangerous HTML, CSS and JavaScript code into your wiki.</p>
899	@ <p>This should <strong>only</strong> be enabled when wiki editing is limited
900	@ to trusted users. It should <strong>not</strong> be used on a publically
901	@ editable wiki.</p>
902	@ <hr />
903	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
904	@ </div></form>
905	db_end_transaction(0);
906	style_footer();
907	}
908
909	/*
	@@ -892,27 +926,27 @@
926	if( P("submit")!=0 ){
927	db_end_transaction(0);
928	cgi_redirect("setup_editcss");
929	}
930	style_header("Edit CSS");
931	@ <form action="%s(g.zBaseURL)/setup_editcss" method="post"><div>
932	login_insert_csrf_secret();
933	@ Edit the CSS below:<br />
934	textarea_attribute("", 40, 80, "css", "css", zDefaultCSS);
935	@ <br />
936	@ <input type="submit" name="submit" value="Apply Changes" />
937	@ <input type="submit" name="clear" value="Revert To Default" />
938	@ </div></form>
939	@ <p><span class="note">Note:</span> Press your browser Reload button after
940	@ modifying the CSS in order to pull in the modified CSS file.</p>
941	@ <hr />
942	@ The default CSS is shown below for reference. Other examples
943	@ of CSS files can be seen on the <a href="setup_skin">skins page</a>.
944	@ See also the <a href="setup_header">header</a> and
945	@ <a href="setup_footer">footer</a> editing screens.
946	@ <blockquote><pre>
947	cgi_append_default_css();
948	@ </pre></blockquote>
949	style_footer();
950	db_end_transaction(0);
951	}
952
	@@ -930,21 +964,21 @@
964	cgi_replace_parameter("header", zDefaultHeader);
965	}else{
966	textarea_attribute(0, 0, 0, "header", "header", zDefaultHeader);
967	}
968	style_header("Edit Page Header");
969	@ <form action="%s(g.zBaseURL)/setup_header" method="post"><div>
970	login_insert_csrf_secret();
971	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
972	@ generate the beginning of every page through start of the main
973	@ menu.</p>
974	textarea_attribute("", 40, 80, "header", "header", zDefaultHeader);
975	@ <br />
976	@ <input type="submit" name="submit" value="Apply Changes" />
977	@ <input type="submit" name="clear" value="Revert To Default" />
978	@ </div></form>
979	@ <hr />
980	@ The default header is shown below for reference. Other examples
981	@ of headers can be seen on the <a href="setup_skin">skins page</a>.
982	@ See also the <a href="setup_editcss">CSS</a> and
983	@ <a href="setup_footer">footer</a> editing screeens.
984	@ <blockquote><pre>
	@@ -968,20 +1002,20 @@
1002	cgi_replace_parameter("footer", zDefaultFooter);
1003	}else{
1004	textarea_attribute(0, 0, 0, "footer", "footer", zDefaultFooter);
1005	}
1006	style_header("Edit Page Footer");
1007	@ <form action="%s(g.zBaseURL)/setup_footer" method="post"><div>
1008	login_insert_csrf_secret();
1009	@ <p>Edit HTML text with embedded TH1 (a TCL dialect) that will be used to
1010	@ generate the end of every page.</p>
1011	textarea_attribute("", 20, 80, "footer", "footer", zDefaultFooter);
1012	@ <br />
1013	@ <input type="submit" name="submit" value="Apply Changes" />
1014	@ <input type="submit" name="clear" value="Revert To Default" />
1015	@ </div></form>
1016	@ <hr />
1017	@ The default footer is shown below for reference. Other examples
1018	@ of footers can be seen on the <a href="setup_skin">skins page</a>.
1019	@ See also the <a href="setup_editcss">CSS</a> and
1020	@ <a href="setup_header">header</a> editing screens.
1021	@ <blockquote><pre>
	@@ -1031,31 +1065,31 @@
1065	cgi_redirect("setup_logo");
1066	}
1067	style_header("Edit Project Logo");
1068	@ <p>The current project logo has a MIME-Type of <b>%h(zMime)</b> and looks
1069	@ like this:</p>
1070	@ <blockquote><p><img src="%s(g.zTop)/logo" alt="logo" /></p></blockquote>
1071	@
1072	@ <p>The logo is accessible to all users at this URL:
1073	@ <a href="%s(g.zBaseURL)/logo">%s(g.zBaseURL)/logo</a>.
1074	@ The logo may or may not appear on each
1075	@ page depending on the <a href="setup_editcss">CSS</a> and
1076	@ <a href="setup_header">header setup</a>.</p>
1077	@
1078	@ <form action="%s(g.zBaseURL)/setup_logo" method="post"
1079	@ enctype="multipart/form-data"><div>
1080	@ <p>To set a new logo image, select a file to use as the logo using
1081	@ the entry box below and then press the "Change Logo" button.</p>
1082	login_insert_csrf_secret();
1083	@ Logo Image file:
1084	@ <input type="file" name="im" size="60" accept="image/*" /><br />
1085	@ <input type="submit" name="set" value="Change Logo" />
1086	@ <input type="submit" name="clr" value="Revert To Default" />
1087	@ </div></form>
1088	@
1089	@ <p><span class="note">Note:</span> Your browser has probably cached the
1090	@ logo image, so you will probably need to press the Reload button on your
1091	@ browser after changing the logo to provoke your browser to reload the new
1092	@ logo image. </p>
1093	style_footer();
1094	db_end_transaction(0);
1095	}
1096

M src/sha1.c

+11 -9

		--- src/sha1.c
		+++ src/sha1.c
		@@ -1,22 +1,24 @@
1	1	/*
2	2	** This implementation of SHA1 is adapted from the example implementation
3	3	** contained in RFC-3174.
4	4	*/
5		-#include <stdint.h>
6		-#include <sys/types.h>
7		-#include "config.h"
8		-#include "sha1.h"
9		-
10	5	/*
11	6	* If you do not have the ISO standard stdint.h header file, then you
12	7	* must typdef the following:
13	8	* name meaning
14		- * uint32_t unsigned 32 bit integer
15		- * uint8_t unsigned 8 bit integer (i.e., unsigned char)
16		- *
17		- */
	9	+ * */
	10	+#if defined(__DMC__) \|\| defined(_MSC_VER)
	11	+ typedef unsigned long uint32_t; //unsigned 32 bit integer
	12	+ typedef unsigned char uint8_t; //unsigned 8 bit integer (i.e., unsigned char)
	13	+#else
	14	+# include <stdint.h>
	15	+#endif
	16	+#include <sys/types.h>
	17	+#include "config.h"
	18	+#include "sha1.h"
	19	+
18	20	#define SHA1HashSize 20
19	21	#define shaSuccess 0
20	22	#define shaInputTooLong 1
21	23	#define shaStateError 2
22	24
23	25

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,22 +1,24 @@
1	/*
2	** This implementation of SHA1 is adapted from the example implementation
3	** contained in RFC-3174.
4	*/
5	#include <stdint.h>
6	#include <sys/types.h>
7	#include "config.h"
8	#include "sha1.h"
9
10	/*
11	* If you do not have the ISO standard stdint.h header file, then you
12	* must typdef the following:
13	* name meaning
14	* uint32_t unsigned 32 bit integer
15	* uint8_t unsigned 8 bit integer (i.e., unsigned char)
16	*
17	*/







18	#define SHA1HashSize 20
19	#define shaSuccess 0
20	#define shaInputTooLong 1
21	#define shaStateError 2
22
23

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,22 +1,24 @@
1	/*
2	** This implementation of SHA1 is adapted from the example implementation
3	** contained in RFC-3174.
4	*/





5	/*
6	* If you do not have the ISO standard stdint.h header file, then you
7	* must typdef the following:
8	* name meaning
9	* */
10	#if defined(__DMC__) \|\| defined(_MSC_VER)
11	typedef unsigned long uint32_t; //unsigned 32 bit integer
12	typedef unsigned char uint8_t; //unsigned 8 bit integer (i.e., unsigned char)
13	#else
14	# include <stdint.h>
15	#endif
16	#include <sys/types.h>
17	#include "config.h"
18	#include "sha1.h"
19
20	#define SHA1HashSize 20
21	#define shaSuccess 0
22	#define shaInputTooLong 1
23	#define shaStateError 2
24
25

M src/shun.c

+29 -26

		--- src/shun.c
		+++ src/shun.c
		@@ -112,63 +112,63 @@
112	112	@ or artifacts that by design or accident interfere with the processing
113	113	@ of the repository. Do not shun artifacts merely to remove them from
114	114	@ sight - set the "hidden" tag on such artifacts instead.</p>
115	115	@
116	116	@ <blockquote>
117		- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
	117	+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
118	118	login_insert_csrf_secret();
119		- @ <input type="text" name="uuid" value="%h(PD("shun",""))" size="50">
120		- @ <input type="submit" name="add" value="Shun">
121		- @ </form>
	119	+ @ <input type="text" name="uuid" value="%h(PD("shun",""))" size="50" />
	120	+ @ <input type="submit" name="add" value="Shun" />
	121	+ @ </div></form>
122	122	@ </blockquote>
123	123	@
124	124	@ <p>Enter the UUID of a previous shunned artifact to cause it to be
125	125	@ accepted again in the repository. The artifact content is not
126	126	@ restored because the content is unknown. The only change is that
127	127	@ the formerly shunned artifact will be accepted on subsequent sync
128	128	@ operations.</p>
129	129	@
130	130	@ <blockquote>
131		- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
	131	+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
132	132	login_insert_csrf_secret();
133		- @ <input type="text" name="uuid" size="50">
134		- @ <input type="submit" name="sub" value="Accept">
135		- @ </form>
	133	+ @ <input type="text" name="uuid" size="50" />
	134	+ @ <input type="submit" name="sub" value="Accept" />
	135	+ @ </div></form>
136	136	@ </blockquote>
137	137	@
138	138	@ <p>Press the Rebuild button below to rebuild the respository. The
139	139	@ content of newly shunned artifacts is not purged until the repository
140	140	@ is rebuilt. On larger repositories, the rebuild may take minute or
141	141	@ two, so be patient after pressing the button.</p>
142	142	@
143	143	@ <blockquote>
144		- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
	144	+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
145	145	login_insert_csrf_secret();
146		- @ <input type="submit" name="rebuild" value="Rebuild">
147		- @ </form>
	146	+ @ <input type="submit" name="rebuild" value="Rebuild" />
	147	+ @ </div></form>
148	148	@ </blockquote>
149	149	@
150		- @ <hr><p>Shunned Artifacts:</p>
151		- @ <blockquote>
	150	+ @ <hr /><p>Shunned Artifacts:</p>
	151	+ @ <blockquote><p>
152	152	db_prepare(&q,
153	153	"SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)"
154	154	" FROM shun ORDER BY uuid");
155	155	while( db_step(&q)==SQLITE_ROW ){
156	156	const char *zUuid = db_column_text(&q, 0);
157	157	int stillExists = db_column_int(&q, 1);
158	158	cnt++;
159	159	if( stillExists ){
160		- @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br>
	160	+ @ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br />
161	161	}else{
162		- @ <b>%s(zUuid)</b><br>
	162	+ @ <b>%s(zUuid)</b><br />
163	163	}
164	164	}
165	165	if( cnt==0 ){
166	166	@ <i>no artifacts are shunned on this server</i>
167	167	}
168	168	db_finalize(&q);
169		- @ </blockquote>
	169	+ @ </p></blockquote>
170	170	style_footer();
171	171	}
172	172
173	173	/*
174	174	** Remove from the BLOB table all artifacts that are in the SHUN table.
		@@ -229,14 +229,15 @@
229	229	@
230	230	@ <p>Click on the "rcvid" to show a list of specific artifacts received
231	231	@ by a transaction. After identifying illicit artifacts, remove them
232	232	@ using the "Shun" feature.</p>
233	233	@
234		- @ <table cellpadding=0 cellspacing=0 border=0>
235		- @ <tr><th>rcvid</th><th width=15>
236		- @ <th>Date</th><th width=15><th>User</th>
237		- @ <th width=15><th>IP Address</th></tr>
	234	+ @ <table cellpadding="0" cellspacing="0" border="0">
	235	+ @ <tr><th style="padding-right: 15px;text-align: right;">rcvid</th>
	236	+ @ <th style="padding-right: 15px;text-align: left;">Date</th>
	237	+ @ <th style="padding-right: 15px;text-align: left;">User</th>
	238	+ @ <th style="text-align: left;">IP Address</th></tr>
238	239	cnt = 0;
239	240	while( db_step(&q)==SQLITE_ROW ){
240	241	int rcvid = db_column_int(&q, 0);
241	242	const char *zUser = db_column_text(&q, 1);
242	243	const char *zDate = db_column_text(&q, 2);
		@@ -245,14 +246,14 @@
245	246	style_submenu_element("Older", "Older",
246	247	"rcvfromlist?ofst=%d", ofst+30);
247	248	}else{
248	249	cnt++;
249	250	@ <tr>
250		- @ <td><a href="rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a></td><td>
251		- @ <td>%s(zDate)</td><td>
252		- @ <td>%h(zUser)</td><td>
253		- @ <td> %s(zIpAddr)&nbsp</td>
	251	+ @ <td style="padding-right: 15px;text-align: right;"><a href="rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a></td>
	252	+ @ <td style="padding-right: 15px;text-align: left;">%s(zDate)</td>
	253	+ @ <td style="padding-right: 15px;text-align: left;">%h(zUser)</td>
	254	+ @ <td style="text-align: left;">%s(zIpAddr)</td>
254	255	@ </tr>
255	256	}
256	257	}
257	258	db_finalize(&q);
258	259	@ </table>
		@@ -277,11 +278,11 @@
277	278	"SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
278	279	" FROM rcvfrom LEFT JOIN user USING(uid)"
279	280	" WHERE rcvid=%d",
280	281	rcvid
281	282	);
282		- @ <table cellspacing=15 cellpadding=0 border=0>
	283	+ @ <table cellspacing="15" cellpadding="0" border="0">
283	284	@ <tr><td valign="top" align="right"><b>rcvid:</b></td>
284	285	@ <td valign="top">%d(rcvid)</td></tr>
285	286	if( db_step(&q)==SQLITE_ROW ){
286	287	const char *zUser = db_column_text(&q, 0);
287	288	const char *zDate = db_column_text(&q, 1);
		@@ -302,10 +303,12 @@
302	303	while( db_step(&q)==SQLITE_ROW ){
303	304	int rid = db_column_int(&q, 0);
304	305	const char *zUuid = db_column_text(&q, 1);
305	306	int size = db_column_int(&q, 2);
306	307	@ <a href="%s(g.zBaseURL)/info/%s(zUuid)">%s(zUuid)</a>
307		- @ (rid: %d(rid), size: %d(size))<br>
	308	+ @ (rid: %d(rid), size: %d(size))<br />
308	309	}
309	310	@ </td></tr>
310	311	@ </table>
	312	+ db_finalize(&q);
	313	+ style_footer();
311	314	}
312	315

	--- src/shun.c
	+++ src/shun.c
	@@ -112,63 +112,63 @@
112	@ or artifacts that by design or accident interfere with the processing
113	@ of the repository. Do not shun artifacts merely to remove them from
114	@ sight - set the "hidden" tag on such artifacts instead.</p>
115	@
116	@ <blockquote>
117	@ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
118	login_insert_csrf_secret();
119	@ <input type="text" name="uuid" value="%h(PD("shun",""))" size="50">
120	@ <input type="submit" name="add" value="Shun">
121	@ </form>
122	@ </blockquote>
123	@
124	@ <p>Enter the UUID of a previous shunned artifact to cause it to be
125	@ accepted again in the repository. The artifact content is not
126	@ restored because the content is unknown. The only change is that
127	@ the formerly shunned artifact will be accepted on subsequent sync
128	@ operations.</p>
129	@
130	@ <blockquote>
131	@ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
132	login_insert_csrf_secret();
133	@ <input type="text" name="uuid" size="50">
134	@ <input type="submit" name="sub" value="Accept">
135	@ </form>
136	@ </blockquote>
137	@
138	@ <p>Press the Rebuild button below to rebuild the respository. The
139	@ content of newly shunned artifacts is not purged until the repository
140	@ is rebuilt. On larger repositories, the rebuild may take minute or
141	@ two, so be patient after pressing the button.</p>
142	@
143	@ <blockquote>
144	@ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
145	login_insert_csrf_secret();
146	@ <input type="submit" name="rebuild" value="Rebuild">
147	@ </form>
148	@ </blockquote>
149	@
150	@ <hr><p>Shunned Artifacts:</p>
151	@ <blockquote>
152	db_prepare(&q,
153	"SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)"
154	" FROM shun ORDER BY uuid");
155	while( db_step(&q)==SQLITE_ROW ){
156	const char *zUuid = db_column_text(&q, 0);
157	int stillExists = db_column_int(&q, 1);
158	cnt++;
159	if( stillExists ){
160	@ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br>
161	}else{
162	@ <b>%s(zUuid)</b><br>
163	}
164	}
165	if( cnt==0 ){
166	@ <i>no artifacts are shunned on this server</i>
167	}
168	db_finalize(&q);
169	@ </blockquote>
170	style_footer();
171	}
172
173	/*
174	** Remove from the BLOB table all artifacts that are in the SHUN table.
	@@ -229,14 +229,15 @@
229	@
230	@ <p>Click on the "rcvid" to show a list of specific artifacts received
231	@ by a transaction. After identifying illicit artifacts, remove them
232	@ using the "Shun" feature.</p>
233	@
234	@ <table cellpadding=0 cellspacing=0 border=0>
235	@ <tr><th>rcvid</th><th width=15>
236	@ <th>Date</th><th width=15><th>User</th>
237	@ <th width=15><th>IP Address</th></tr>

238	cnt = 0;
239	while( db_step(&q)==SQLITE_ROW ){
240	int rcvid = db_column_int(&q, 0);
241	const char *zUser = db_column_text(&q, 1);
242	const char *zDate = db_column_text(&q, 2);
	@@ -245,14 +246,14 @@
245	style_submenu_element("Older", "Older",
246	"rcvfromlist?ofst=%d", ofst+30);
247	}else{
248	cnt++;
249	@ <tr>
250	@ <td><a href="rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a></td><td>
251	@ <td>%s(zDate)</td><td>
252	@ <td>%h(zUser)</td><td>
253	@ <td> %s(zIpAddr)&nbsp</td>
254	@ </tr>
255	}
256	}
257	db_finalize(&q);
258	@ </table>
	@@ -277,11 +278,11 @@
277	"SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
278	" FROM rcvfrom LEFT JOIN user USING(uid)"
279	" WHERE rcvid=%d",
280	rcvid
281	);
282	@ <table cellspacing=15 cellpadding=0 border=0>
283	@ <tr><td valign="top" align="right"><b>rcvid:</b></td>
284	@ <td valign="top">%d(rcvid)</td></tr>
285	if( db_step(&q)==SQLITE_ROW ){
286	const char *zUser = db_column_text(&q, 0);
287	const char *zDate = db_column_text(&q, 1);
	@@ -302,10 +303,12 @@
302	while( db_step(&q)==SQLITE_ROW ){
303	int rid = db_column_int(&q, 0);
304	const char *zUuid = db_column_text(&q, 1);
305	int size = db_column_int(&q, 2);
306	@ <a href="%s(g.zBaseURL)/info/%s(zUuid)">%s(zUuid)</a>
307	@ (rid: %d(rid), size: %d(size))<br>
308	}
309	@ </td></tr>
310	@ </table>


311	}
312

	--- src/shun.c
	+++ src/shun.c
	@@ -112,63 +112,63 @@
112	@ or artifacts that by design or accident interfere with the processing
113	@ of the repository. Do not shun artifacts merely to remove them from
114	@ sight - set the "hidden" tag on such artifacts instead.</p>
115	@
116	@ <blockquote>
117	@ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
118	login_insert_csrf_secret();
119	@ <input type="text" name="uuid" value="%h(PD("shun",""))" size="50" />
120	@ <input type="submit" name="add" value="Shun" />
121	@ </div></form>
122	@ </blockquote>
123	@
124	@ <p>Enter the UUID of a previous shunned artifact to cause it to be
125	@ accepted again in the repository. The artifact content is not
126	@ restored because the content is unknown. The only change is that
127	@ the formerly shunned artifact will be accepted on subsequent sync
128	@ operations.</p>
129	@
130	@ <blockquote>
131	@ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
132	login_insert_csrf_secret();
133	@ <input type="text" name="uuid" size="50" />
134	@ <input type="submit" name="sub" value="Accept" />
135	@ </div></form>
136	@ </blockquote>
137	@
138	@ <p>Press the Rebuild button below to rebuild the respository. The
139	@ content of newly shunned artifacts is not purged until the repository
140	@ is rebuilt. On larger repositories, the rebuild may take minute or
141	@ two, so be patient after pressing the button.</p>
142	@
143	@ <blockquote>
144	@ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><div>
145	login_insert_csrf_secret();
146	@ <input type="submit" name="rebuild" value="Rebuild" />
147	@ </div></form>
148	@ </blockquote>
149	@
150	@ <hr /><p>Shunned Artifacts:</p>
151	@ <blockquote><p>
152	db_prepare(&q,
153	"SELECT uuid, EXISTS(SELECT 1 FROM blob WHERE blob.uuid=shun.uuid)"
154	" FROM shun ORDER BY uuid");
155	while( db_step(&q)==SQLITE_ROW ){
156	const char *zUuid = db_column_text(&q, 0);
157	int stillExists = db_column_int(&q, 1);
158	cnt++;
159	if( stillExists ){
160	@ <b><a href="%s(g.zBaseURL)/artifact/%s(zUuid)">%s(zUuid)</a></b><br />
161	}else{
162	@ <b>%s(zUuid)</b><br />
163	}
164	}
165	if( cnt==0 ){
166	@ <i>no artifacts are shunned on this server</i>
167	}
168	db_finalize(&q);
169	@ </p></blockquote>
170	style_footer();
171	}
172
173	/*
174	** Remove from the BLOB table all artifacts that are in the SHUN table.
	@@ -229,14 +229,15 @@
229	@
230	@ <p>Click on the "rcvid" to show a list of specific artifacts received
231	@ by a transaction. After identifying illicit artifacts, remove them
232	@ using the "Shun" feature.</p>
233	@
234	@ <table cellpadding="0" cellspacing="0" border="0">
235	@ <tr><th style="padding-right: 15px;text-align: right;">rcvid</th>
236	@ <th style="padding-right: 15px;text-align: left;">Date</th>
237	@ <th style="padding-right: 15px;text-align: left;">User</th>
238	@ <th style="text-align: left;">IP Address</th></tr>
239	cnt = 0;
240	while( db_step(&q)==SQLITE_ROW ){
241	int rcvid = db_column_int(&q, 0);
242	const char *zUser = db_column_text(&q, 1);
243	const char *zDate = db_column_text(&q, 2);
	@@ -245,14 +246,14 @@
246	style_submenu_element("Older", "Older",
247	"rcvfromlist?ofst=%d", ofst+30);
248	}else{
249	cnt++;
250	@ <tr>
251	@ <td style="padding-right: 15px;text-align: right;"><a href="rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a></td>
252	@ <td style="padding-right: 15px;text-align: left;">%s(zDate)</td>
253	@ <td style="padding-right: 15px;text-align: left;">%h(zUser)</td>
254	@ <td style="text-align: left;">%s(zIpAddr)</td>
255	@ </tr>
256	}
257	}
258	db_finalize(&q);
259	@ </table>
	@@ -277,11 +278,11 @@
278	"SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
279	" FROM rcvfrom LEFT JOIN user USING(uid)"
280	" WHERE rcvid=%d",
281	rcvid
282	);
283	@ <table cellspacing="15" cellpadding="0" border="0">
284	@ <tr><td valign="top" align="right"><b>rcvid:</b></td>
285	@ <td valign="top">%d(rcvid)</td></tr>
286	if( db_step(&q)==SQLITE_ROW ){
287	const char *zUser = db_column_text(&q, 0);
288	const char *zDate = db_column_text(&q, 1);
	@@ -302,10 +303,12 @@
303	while( db_step(&q)==SQLITE_ROW ){
304	int rid = db_column_int(&q, 0);
305	const char *zUuid = db_column_text(&q, 1);
306	int size = db_column_int(&q, 2);
307	@ <a href="%s(g.zBaseURL)/info/%s(zUuid)">%s(zUuid)</a>
308	@ (rid: %d(rid), size: %d(size))<br />
309	}
310	@ </td></tr>
311	@ </table>
312	db_finalize(&q);
313	style_footer();
314	}
315

M src/skins.c

+57 -57

		--- src/skins.c
		+++ src/skins.c
		@@ -24,19 +24,19 @@
24	24	/* @-comment: // */
25	25	/*
26	26	** A black-and-white theme with the project title in a bar across the top
27	27	** and no logo image.
28	28	*/
29		-static const char zBuiltinSkin1[] =
	29	+static const char zBuiltinSkin1[] =
30	30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	31	@ body {
32	32	@ margin: 0ex 1ex;
33	33	@ padding: 0px;
34	34	@ background-color: white;
35	35	@ font-family: sans-serif;
36	36	@ }
37		-@
	37	+@
38	38	@ /* The project logo in the upper left-hand corner of each page */
39	39	@ div.logo {
40	40	@ display: table-row;
41	41	@ text-align: center;
42	42	@ /* vertical-align: bottom;*/
		@@ -44,11 +44,11 @@
44	44	@ font-weight: bold;
45	45	@ background-color: #707070;
46	46	@ color: #ffffff;
47	47	@ min-width: 200px;
48	48	@ }
49		-@
	49	+@
50	50	@ /* The page title centered at the top of each page */
51	51	@ div.title {
52	52	@ display: table-cell;
53	53	@ font-size: 1.5em;
54	54	@ font-weight: bold;
		@@ -56,11 +56,11 @@
56	56	@ padding: 0 0 0 10px;
57	57	@ color: #404040;
58	58	@ vertical-align: bottom;
59	59	@ width: 100%;
60	60	@ }
61		-@
	61	+@
62	62	@ /* The login status message in the top right-hand corner */
63	63	@ div.status {
64	64	@ display: table-cell;
65	65	@ text-align: right;
66	66	@ vertical-align: bottom;
		@@ -67,17 +67,17 @@
67	67	@ color: #404040;
68	68	@ font-size: 0.8em;
69	69	@ font-weight: bold;
70	70	@ min-width: 200px;
71	71	@ }
72		-@
	72	+@
73	73	@ /* The header across the top of the page */
74	74	@ div.header {
75	75	@ display: table;
76	76	@ width: 100%;
77	77	@ }
78		-@
	78	+@
79	79	@ /* The main menu bar that appears at the top of the page beneath
80	80	@ ** the header */
81	81	@ div.mainmenu {
82	82	@ padding: 5px 10px 5px 10px;
83	83	@ font-size: 0.9em;
		@@ -85,11 +85,11 @@
85	85	@ text-align: center;
86	86	@ letter-spacing: 1px;
87	87	@ background-color: #404040;
88	88	@ color: white;
89	89	@ }
90		-@
	90	+@
91	91	@ /* The submenu bar that sometimes appears below the main menu */
92	92	@ div.submenu {
93	93	@ padding: 3px 10px 3px 0px;
94	94	@ font-size: 0.9em;
95	95	@ text-align: center;
		@@ -103,21 +103,21 @@
103	103	@ }
104	104	@ div.mainmenu a:hover, div.submenu a:hover {
105	105	@ color: #404040;
106	106	@ background-color: white;
107	107	@ }
108		-@
	108	+@
109	109	@ /* All page content from the bottom of the menu or submenu down to
110	110	@ ** the footer */
111	111	@ div.content {
112	112	@ padding: 0ex 0ex 0ex 0ex;
113	113	@ }
114	114	@ /* Hyperlink colors */
115	115	@ div.content a { color: #604000; }
116	116	@ div.content a:link { color: #604000;}
117	117	@ div.content a:visited { color: #600000; }
118		-@
	118	+@
119	119	@ /* Some pages have section dividers */
120	120	@ div.section {
121	121	@ margin-bottom: 0px;
122	122	@ margin-top: 1em;
123	123	@ padding: 1px 1px 1px 1px;
		@@ -124,11 +124,11 @@
124	124	@ font-size: 1.2em;
125	125	@ font-weight: bold;
126	126	@ background-color: #404040;
127	127	@ color: white;
128	128	@ }
129		-@
	129	+@
130	130	@ /* The "Date" that occurs on the left hand side of timelines */
131	131	@ div.divider {
132	132	@ background: #a0a0a0;
133	133	@ border: 2px #505050 solid;
134	134	@ font-size: 1em; font-weight: normal;
		@@ -135,21 +135,21 @@
135	135	@ padding: .25em;
136	136	@ margin: .2em 0 .2em 0;
137	137	@ float: left;
138	138	@ clear: left;
139	139	@ }
140		-@
	140	+@
141	141	@ /* The footer at the very bottom of the page */
142	142	@ div.footer {
143	143	@ font-size: 0.8em;
144	144	@ margin-top: 12px;
145	145	@ padding: 5px 10px 5px 10px;
146	146	@ text-align: right;
147	147	@ background-color: #404040;
148	148	@ color: white;
149	149	@ }
150		-@
	150	+@
151	151	@ /* The label/value pairs on (for example) the vinfo page */
152	152	@ table.label-value th {
153	153	@ vertical-align: top;
154	154	@ text-align: right;
155	155	@ padding: 0.2ex 2ex;
		@@ -165,11 +165,11 @@
165	165	@ <body>
166	166	@ <div class="header">
167	167	@ <div class="logo">
168	168	@ <img src="$baseurl/logo" alt="logo">
169	169	@ </div>
170		-@ <div class="title"><small>$<project_name></small><br>$<title></div>
	170	+@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	171	@ <div class="status"><nobr><th1>
172	172	@ if {[info exists login]} {
173	173	@ puts "Logged in as $login"
174	174	@ } else {
175	175	@ puts "Not logged in"
		@@ -206,39 +206,39 @@
206	206	@ html "<a href=''$baseurl/login''>Login</a> "
207	207	@ }
208	208	@ </th1></div>
209	209	@ ');
210	210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211		-@ Fossil version $manifest_version $manifest_date
	211	+@ Fossil version $manifest_version $manifest_date
212	212	@ </div>
213	213	@ </body></html>
214	214	@ ');
215	215	;
216	216
217	217	/*
218	218	** A tan theme with the project title above the user identification
219	219	** and no logo image.
220	220	*/
221		-static const char zBuiltinSkin2[] =
	221	+static const char zBuiltinSkin2[] =
222	222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	223	@ body {
224	224	@ margin: 0ex 0ex;
225	225	@ padding: 0px;
226	226	@ background-color: #fef3bc;
227	227	@ font-family: sans-serif;
228	228	@ }
229		-@
	229	+@
230	230	@ /* The project logo in the upper left-hand corner of each page */
231	231	@ div.logo {
232	232	@ display: inline;
233	233	@ text-align: center;
234	234	@ vertical-align: bottom;
235	235	@ font-weight: bold;
236	236	@ font-size: 2.5em;
237	237	@ color: #a09048;
238	238	@ }
239		-@
	239	+@
240	240	@ /* The page title centered at the top of each page */
241	241	@ div.title {
242	242	@ display: table-cell;
243	243	@ font-size: 2em;
244	244	@ font-weight: bold;
		@@ -246,11 +246,11 @@
246	246	@ padding: 0 0 0 5px;
247	247	@ color: #a09048;
248	248	@ vertical-align: bottom;
249	249	@ width: 100%;
250	250	@ }
251		-@
	251	+@
252	252	@ /* The login status message in the top right-hand corner */
253	253	@ div.status {
254	254	@ display: table-cell;
255	255	@ text-align: right;
256	256	@ vertical-align: bottom;
		@@ -257,17 +257,17 @@
257	257	@ color: #a09048;
258	258	@ padding: 5px 5px 0 0;
259	259	@ font-size: 0.8em;
260	260	@ font-weight: bold;
261	261	@ }
262		-@
	262	+@
263	263	@ /* The header across the top of the page */
264	264	@ div.header {
265	265	@ display: table;
266	266	@ width: 100%;
267	267	@ }
268		-@
	268	+@
269	269	@ /* The main menu bar that appears at the top of the page beneath
270	270	@ ** the header */
271	271	@ div.mainmenu {
272	272	@ padding: 5px 10px 5px 10px;
273	273	@ font-size: 0.9em;
		@@ -275,11 +275,11 @@
275	275	@ text-align: center;
276	276	@ letter-spacing: 1px;
277	277	@ background-color: #a09048;
278	278	@ color: black;
279	279	@ }
280		-@
	280	+@
281	281	@ /* The submenu bar that sometimes appears below the main menu */
282	282	@ div.submenu {
283	283	@ padding: 3px 10px 3px 0px;
284	284	@ font-size: 0.9em;
285	285	@ text-align: center;
		@@ -293,21 +293,21 @@
293	293	@ }
294	294	@ div.mainmenu a:hover, div.submenu a:hover {
295	295	@ color: #a09048;
296	296	@ background-color: white;
297	297	@ }
298		-@
	298	+@
299	299	@ /* All page content from the bottom of the menu or submenu down to
300	300	@ ** the footer */
301	301	@ div.content {
302	302	@ padding: 1ex 5px;
303	303	@ }
304	304	@ div.content a { color: #706532; }
305	305	@ div.content a:link { color: #706532; }
306	306	@ div.content a:visited { color: #704032; }
307	307	@ div.content a:hover { background-color: white; color: #706532; }
308		-@
	308	+@
309	309	@ /* Some pages have section dividers */
310	310	@ div.section {
311	311	@ margin-bottom: 0px;
312	312	@ margin-top: 1em;
313	313	@ padding: 3px 3px 0 3px;
		@@ -314,11 +314,11 @@
314	314	@ font-size: 1.2em;
315	315	@ font-weight: bold;
316	316	@ background-color: #a09048;
317	317	@ color: white;
318	318	@ }
319		-@
	319	+@
320	320	@ /* The "Date" that occurs on the left hand side of timelines */
321	321	@ div.divider {
322	322	@ background: #e1d498;
323	323	@ border: 2px #a09048 solid;
324	324	@ font-size: 1em; font-weight: normal;
		@@ -325,33 +325,33 @@
325	325	@ padding: .25em;
326	326	@ margin: .2em 0 .2em 0;
327	327	@ float: left;
328	328	@ clear: left;
329	329	@ }
330		-@
	330	+@
331	331	@ /* The footer at the very bottom of the page */
332	332	@ div.footer {
333	333	@ font-size: 0.8em;
334	334	@ margin-top: 12px;
335	335	@ padding: 5px 10px 5px 10px;
336	336	@ text-align: right;
337	337	@ background-color: #a09048;
338	338	@ color: white;
339	339	@ }
340		-@
	340	+@
341	341	@ /* Hyperlink colors */
342	342	@ div.footer a { color: white; }
343	343	@ div.footer a:link { color: white; }
344	344	@ div.footer a:visited { color: white; }
345	345	@ div.footer a:hover { background-color: white; color: #558195; }
346		-@
	346	+@
347	347	@ /* <verbatim> blocks */
348	348	@ pre.verbatim {
349	349	@ background-color: #f5f5f5;
350	350	@ padding: 0.5em;
351	351	@ }
352		-@
	352	+@
353	353	@ /* The label/value pairs on (for example) the ci page */
354	354	@ table.label-value th {
355	355	@ vertical-align: top;
356	356	@ text-align: right;
357	357	@ padding: 0.2ex 2ex;
		@@ -418,37 +418,37 @@
418	418
419	419	/*
420	420	** Black letters on a white or cream background with the main menu
421	421	** stuck on the left-hand side.
422	422	*/
423		-static const char zBuiltinSkin3[] =
	423	+static const char zBuiltinSkin3[] =
424	424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	425	@ body {
426	426	@ margin:0px 0px 0px 0px;
427	427	@ padding:0px;
428	428	@ font-family:verdana, arial, helvetica, "sans serif";
429	429	@ color:#333;
430	430	@ background-color:white;
431	431	@ }
432		-@
	432	+@
433	433	@ /* consistent colours */
434	434	@ h2 {
435	435	@ color: #333;
436	436	@ }
437	437	@ h3 {
438	438	@ color: #333;
439	439	@ }
440		-@
	440	+@
441	441	@ /* The project logo in the upper left-hand corner of each page */
442	442	@ div.logo {
443	443	@ display: table-cell;
444	444	@ text-align: left;
445	445	@ vertical-align: bottom;
446	446	@ font-weight: bold;
447	447	@ color: #333;
448	448	@ }
449		-@
	449	+@
450	450	@ /* The page title centered at the top of each page */
451	451	@ div.title {
452	452	@ display: table-cell;
453	453	@ font-size: 2em;
454	454	@ font-weight: bold;
		@@ -455,11 +455,11 @@
455	455	@ text-align: center;
456	456	@ color: #333;
457	457	@ vertical-align: bottom;
458	458	@ width: 100%;
459	459	@ }
460		-@
	460	+@
461	461	@ /* The login status message in the top right-hand corner */
462	462	@ div.status {
463	463	@ display: table-cell;
464	464	@ padding-right: 10px;
465	465	@ text-align: right;
		@@ -467,21 +467,21 @@
467	467	@ padding-bottom: 5px;
468	468	@ color: #333;
469	469	@ font-size: 0.8em;
470	470	@ font-weight: bold;
471	471	@ }
472		-@
	472	+@
473	473	@ /* The header across the top of the page */
474	474	@ div.header {
475	475	@ margin:10px 0px 10px 0px;
476	476	@ padding:1px 0px 0px 20px;
477	477	@ border-style:solid;
478	478	@ border-color:black;
479	479	@ border-width:1px 0px;
480	480	@ background-color:#eee;
481	481	@ }
482		-@
	482	+@
483	483	@ /* The main menu bar that appears at the top left of the page beneath
484	484	@ ** the header. Width must be co-ordinated with the container below */
485	485	@ div.mainmenu {
486	486	@ float: left;
487	487	@ margin-left: 10px;
		@@ -491,11 +491,11 @@
491	491	@ padding:5px;
492	492	@ background-color:#eee;
493	493	@ border:1px solid #999;
494	494	@ width:8em;
495	495	@ }
496		-@
	496	+@
497	497	@ /* Main menu is now a list */
498	498	@ div.mainmenu ul {
499	499	@ padding: 0;
500	500	@ list-style:none;
501	501	@ }
		@@ -506,17 +506,17 @@
506	506	@ }
507	507	@ div.mainmenu a:hover {
508	508	@ color: #eee;
509	509	@ background-color: #333;
510	510	@ }
511		-@
	511	+@
512	512	@ /* Container for the sub-menu and content so they don''t spread
513	513	@ ** out underneath the main menu */
514	514	@ #container {
515	515	@ padding-left: 9em;
516	516	@ }
517		-@
	517	+@
518	518	@ /* The submenu bar that sometimes appears below the main menu */
519	519	@ div.submenu {
520	520	@ padding: 3px 10px 3px 10px;
521	521	@ font-size: 0.9em;
522	522	@ text-align: center;
		@@ -532,18 +532,18 @@
532	532	@ }
533	533	@ div.submenu a:hover {
534	534	@ color: #eee;
535	535	@ background-color: #333;
536	536	@ }
537		-@
	537	+@
538	538	@ /* All page content from the bottom of the menu or submenu down to
539	539	@ ** the footer */
540	540	@ div.content {
541	541	@ float right;
542	542	@ padding: 2ex 1ex 0ex 2ex;
543	543	@ }
544		-@
	544	+@
545	545	@ /* Some pages have section dividers */
546	546	@ div.section {
547	547	@ margin-bottom: 0px;
548	548	@ margin-top: 1em;
549	549	@ padding: 1px 1px 1px 1px;
		@@ -553,11 +553,11 @@
553	553	@ border-color:#999;
554	554	@ border-width:1px 0px;
555	555	@ background-color: #eee;
556	556	@ color: #333;
557	557	@ }
558		-@
	558	+@
559	559	@ /* The "Date" that occurs on the left hand side of timelines */
560	560	@ div.divider {
561	561	@ background: #eee;
562	562	@ border: 2px #999 solid;
563	563	@ font-size: 1em; font-weight: normal;
		@@ -565,27 +565,27 @@
565	565	@ margin: .2em 0 .2em 0;
566	566	@ float: left;
567	567	@ clear: left;
568	568	@ color: #333
569	569	@ }
570		-@
	570	+@
571	571	@ /* The footer at the very bottom of the page */
572	572	@ div.footer {
573	573	@ font-size: 0.8em;
574	574	@ margin-top: 12px;
575	575	@ padding: 5px 10px 5px 10px;
576	576	@ text-align: right;
577	577	@ background-color: #eee;
578	578	@ color: #555;
579	579	@ }
580		-@
	580	+@
581	581	@ /* <verbatim> blocks */
582	582	@ pre.verbatim {
583	583	@ background-color: #f5f5f5;
584	584	@ padding: 0.5em;
585	585	@ }
586		-@
	586	+@
587	587	@ /* The label/value pairs on (for example) the ci page */
588	588	@ table.label-value th {
589	589	@ vertical-align: top;
590	590	@ text-align: right;
591	591	@ padding: 0.2ex 2ex;
		@@ -600,11 +600,11 @@
600	600	@ </head>
601	601	@ <body>
602	602	@ <div class="header">
603	603	@ <div class="logo">
604	604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605		-@ <br><nobr>$<project_name></nobr>
	605	+@ <br /><nobr>$<project_name></nobr>
606	606	@ </div>
607	607	@ <div class="title">$<title></div>
608	608	@ <div class="status"><nobr><th1>
609	609	@ if {[info exists login]} {
610	610	@ puts "Logged in as $login"
		@@ -732,18 +732,18 @@
732	732	db_begin_transaction();
733	733
734	734	/* Process requests to delete a user-defined skin */
735	735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	736	style_header("Confirm Custom Skin Delete");
737		- @ <form action="%s(g.zBaseURL)/setup_skin" method="POST">
	737	+ @ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
738	738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	739	@ be undone. Please confirm that this is what you want to do:</p>
740		- @ <input type="hidden" name="sn" value="%h(P("sn"))">
741		- @ <input type="submit" name="del2" value="Confirm - Delete The Skin">
742		- @ <input type="submit" name="cancel" value="Cancel - Do Not Delete">
	740	+ @ <input type="hidden" name="sn" value="%h(P("sn"))" />
	741	+ @ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
	742	+ @ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
743	743	login_insert_csrf_secret();
744		- @ </form>
	744	+ @ </div></form>
745	745	style_footer();
746	746	return;
747	747	}
748	748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
		@@ -800,11 +800,11 @@
800	800	}
801	801	}
802	802
803	803	style_header("Skins");
804	804	@ <p>A "skin" is a combination of
805		- @ <a href="setup_editcss">CSS</a>,
	805	+ @ <a href="setup_editcss">CSS</a>,
806	806	@ <a href="setup_header">Header</a>,
807	807	@ <a href="setup_footer">Footer</a>, and
808	808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	809	@ of the web interface.</p>
810	810	@
		@@ -813,15 +813,15 @@
813	813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	814	z = aBuiltinSkin[i].zName;
815	815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	817	}else{
818		- @ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
819		- @ %h(z).
820		- @ <input type="hidden" name="sn" value="%h(z)">
821		- @ <input type="submit" name="load" value="Use This Skin">
822		- @ </form></li>
	818	+ @ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
	819	+ @ %h(z).
	820	+ @ <input type="hidden" name="sn" value="%h(z)" />
	821	+ @ <input type="submit" name="load" value="Use This Skin" />
	822	+ @ </div></form></li>
823	823	}
824	824	}
825	825	db_prepare(&q,
826	826	"SELECT substr(name, 6), value FROM config"
827	827	" WHERE name GLOB 'skin:*'"
		@@ -832,11 +832,11 @@
832	832	const char *zV = db_column_text(&q, 1);
833	833	if( strcmp(zV, zCurrent)==0 ){
834	834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	835	}else{
836	836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837		- @ %h(zN).
	837	+ @ %h(zN).
838	838	@ <input type="hidden" name="sn" value="%h(zN)">
839	839	@ <input type="submit" name="load" value="Use This Skin">
840	840	@ <input type="submit" name="del1" value="Delete This Skin">
841	841	@ </form></li>
842	842	}
843	843

	--- src/skins.c
	+++ src/skins.c
	@@ -24,19 +24,19 @@
24	/* @-comment: // */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	@ body {
32	@ margin: 0ex 1ex;
33	@ padding: 0px;
34	@ background-color: white;
35	@ font-family: sans-serif;
36	@ }
37	@
38	@ /* The project logo in the upper left-hand corner of each page */
39	@ div.logo {
40	@ display: table-row;
41	@ text-align: center;
42	@ /* vertical-align: bottom;*/
	@@ -44,11 +44,11 @@
44	@ font-weight: bold;
45	@ background-color: #707070;
46	@ color: #ffffff;
47	@ min-width: 200px;
48	@ }
49	@
50	@ /* The page title centered at the top of each page */
51	@ div.title {
52	@ display: table-cell;
53	@ font-size: 1.5em;
54	@ font-weight: bold;
	@@ -56,11 +56,11 @@
56	@ padding: 0 0 0 10px;
57	@ color: #404040;
58	@ vertical-align: bottom;
59	@ width: 100%;
60	@ }
61	@
62	@ /* The login status message in the top right-hand corner */
63	@ div.status {
64	@ display: table-cell;
65	@ text-align: right;
66	@ vertical-align: bottom;
	@@ -67,17 +67,17 @@
67	@ color: #404040;
68	@ font-size: 0.8em;
69	@ font-weight: bold;
70	@ min-width: 200px;
71	@ }
72	@
73	@ /* The header across the top of the page */
74	@ div.header {
75	@ display: table;
76	@ width: 100%;
77	@ }
78	@
79	@ /* The main menu bar that appears at the top of the page beneath
80	@ ** the header */
81	@ div.mainmenu {
82	@ padding: 5px 10px 5px 10px;
83	@ font-size: 0.9em;
	@@ -85,11 +85,11 @@
85	@ text-align: center;
86	@ letter-spacing: 1px;
87	@ background-color: #404040;
88	@ color: white;
89	@ }
90	@
91	@ /* The submenu bar that sometimes appears below the main menu */
92	@ div.submenu {
93	@ padding: 3px 10px 3px 0px;
94	@ font-size: 0.9em;
95	@ text-align: center;
	@@ -103,21 +103,21 @@
103	@ }
104	@ div.mainmenu a:hover, div.submenu a:hover {
105	@ color: #404040;
106	@ background-color: white;
107	@ }
108	@
109	@ /* All page content from the bottom of the menu or submenu down to
110	@ ** the footer */
111	@ div.content {
112	@ padding: 0ex 0ex 0ex 0ex;
113	@ }
114	@ /* Hyperlink colors */
115	@ div.content a { color: #604000; }
116	@ div.content a:link { color: #604000;}
117	@ div.content a:visited { color: #600000; }
118	@
119	@ /* Some pages have section dividers */
120	@ div.section {
121	@ margin-bottom: 0px;
122	@ margin-top: 1em;
123	@ padding: 1px 1px 1px 1px;
	@@ -124,11 +124,11 @@
124	@ font-size: 1.2em;
125	@ font-weight: bold;
126	@ background-color: #404040;
127	@ color: white;
128	@ }
129	@
130	@ /* The "Date" that occurs on the left hand side of timelines */
131	@ div.divider {
132	@ background: #a0a0a0;
133	@ border: 2px #505050 solid;
134	@ font-size: 1em; font-weight: normal;
	@@ -135,21 +135,21 @@
135	@ padding: .25em;
136	@ margin: .2em 0 .2em 0;
137	@ float: left;
138	@ clear: left;
139	@ }
140	@
141	@ /* The footer at the very bottom of the page */
142	@ div.footer {
143	@ font-size: 0.8em;
144	@ margin-top: 12px;
145	@ padding: 5px 10px 5px 10px;
146	@ text-align: right;
147	@ background-color: #404040;
148	@ color: white;
149	@ }
150	@
151	@ /* The label/value pairs on (for example) the vinfo page */
152	@ table.label-value th {
153	@ vertical-align: top;
154	@ text-align: right;
155	@ padding: 0.2ex 2ex;
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br>$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -206,39 +206,39 @@
206	@ html "<a href=''$baseurl/login''>Login</a> "
207	@ }
208	@ </th1></div>
209	@ ');
210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211	@ Fossil version $manifest_version $manifest_date
212	@ </div>
213	@ </body></html>
214	@ ');
215	;
216
217	/*
218	** A tan theme with the project title above the user identification
219	** and no logo image.
220	*/
221	static const char zBuiltinSkin2[] =
222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	@ body {
224	@ margin: 0ex 0ex;
225	@ padding: 0px;
226	@ background-color: #fef3bc;
227	@ font-family: sans-serif;
228	@ }
229	@
230	@ /* The project logo in the upper left-hand corner of each page */
231	@ div.logo {
232	@ display: inline;
233	@ text-align: center;
234	@ vertical-align: bottom;
235	@ font-weight: bold;
236	@ font-size: 2.5em;
237	@ color: #a09048;
238	@ }
239	@
240	@ /* The page title centered at the top of each page */
241	@ div.title {
242	@ display: table-cell;
243	@ font-size: 2em;
244	@ font-weight: bold;
	@@ -246,11 +246,11 @@
246	@ padding: 0 0 0 5px;
247	@ color: #a09048;
248	@ vertical-align: bottom;
249	@ width: 100%;
250	@ }
251	@
252	@ /* The login status message in the top right-hand corner */
253	@ div.status {
254	@ display: table-cell;
255	@ text-align: right;
256	@ vertical-align: bottom;
	@@ -257,17 +257,17 @@
257	@ color: #a09048;
258	@ padding: 5px 5px 0 0;
259	@ font-size: 0.8em;
260	@ font-weight: bold;
261	@ }
262	@
263	@ /* The header across the top of the page */
264	@ div.header {
265	@ display: table;
266	@ width: 100%;
267	@ }
268	@
269	@ /* The main menu bar that appears at the top of the page beneath
270	@ ** the header */
271	@ div.mainmenu {
272	@ padding: 5px 10px 5px 10px;
273	@ font-size: 0.9em;
	@@ -275,11 +275,11 @@
275	@ text-align: center;
276	@ letter-spacing: 1px;
277	@ background-color: #a09048;
278	@ color: black;
279	@ }
280	@
281	@ /* The submenu bar that sometimes appears below the main menu */
282	@ div.submenu {
283	@ padding: 3px 10px 3px 0px;
284	@ font-size: 0.9em;
285	@ text-align: center;
	@@ -293,21 +293,21 @@
293	@ }
294	@ div.mainmenu a:hover, div.submenu a:hover {
295	@ color: #a09048;
296	@ background-color: white;
297	@ }
298	@
299	@ /* All page content from the bottom of the menu or submenu down to
300	@ ** the footer */
301	@ div.content {
302	@ padding: 1ex 5px;
303	@ }
304	@ div.content a { color: #706532; }
305	@ div.content a:link { color: #706532; }
306	@ div.content a:visited { color: #704032; }
307	@ div.content a:hover { background-color: white; color: #706532; }
308	@
309	@ /* Some pages have section dividers */
310	@ div.section {
311	@ margin-bottom: 0px;
312	@ margin-top: 1em;
313	@ padding: 3px 3px 0 3px;
	@@ -314,11 +314,11 @@
314	@ font-size: 1.2em;
315	@ font-weight: bold;
316	@ background-color: #a09048;
317	@ color: white;
318	@ }
319	@
320	@ /* The "Date" that occurs on the left hand side of timelines */
321	@ div.divider {
322	@ background: #e1d498;
323	@ border: 2px #a09048 solid;
324	@ font-size: 1em; font-weight: normal;
	@@ -325,33 +325,33 @@
325	@ padding: .25em;
326	@ margin: .2em 0 .2em 0;
327	@ float: left;
328	@ clear: left;
329	@ }
330	@
331	@ /* The footer at the very bottom of the page */
332	@ div.footer {
333	@ font-size: 0.8em;
334	@ margin-top: 12px;
335	@ padding: 5px 10px 5px 10px;
336	@ text-align: right;
337	@ background-color: #a09048;
338	@ color: white;
339	@ }
340	@
341	@ /* Hyperlink colors */
342	@ div.footer a { color: white; }
343	@ div.footer a:link { color: white; }
344	@ div.footer a:visited { color: white; }
345	@ div.footer a:hover { background-color: white; color: #558195; }
346	@
347	@ /* <verbatim> blocks */
348	@ pre.verbatim {
349	@ background-color: #f5f5f5;
350	@ padding: 0.5em;
351	@ }
352	@
353	@ /* The label/value pairs on (for example) the ci page */
354	@ table.label-value th {
355	@ vertical-align: top;
356	@ text-align: right;
357	@ padding: 0.2ex 2ex;
	@@ -418,37 +418,37 @@
418
419	/*
420	** Black letters on a white or cream background with the main menu
421	** stuck on the left-hand side.
422	*/
423	static const char zBuiltinSkin3[] =
424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	@ body {
426	@ margin:0px 0px 0px 0px;
427	@ padding:0px;
428	@ font-family:verdana, arial, helvetica, "sans serif";
429	@ color:#333;
430	@ background-color:white;
431	@ }
432	@
433	@ /* consistent colours */
434	@ h2 {
435	@ color: #333;
436	@ }
437	@ h3 {
438	@ color: #333;
439	@ }
440	@
441	@ /* The project logo in the upper left-hand corner of each page */
442	@ div.logo {
443	@ display: table-cell;
444	@ text-align: left;
445	@ vertical-align: bottom;
446	@ font-weight: bold;
447	@ color: #333;
448	@ }
449	@
450	@ /* The page title centered at the top of each page */
451	@ div.title {
452	@ display: table-cell;
453	@ font-size: 2em;
454	@ font-weight: bold;
	@@ -455,11 +455,11 @@
455	@ text-align: center;
456	@ color: #333;
457	@ vertical-align: bottom;
458	@ width: 100%;
459	@ }
460	@
461	@ /* The login status message in the top right-hand corner */
462	@ div.status {
463	@ display: table-cell;
464	@ padding-right: 10px;
465	@ text-align: right;
	@@ -467,21 +467,21 @@
467	@ padding-bottom: 5px;
468	@ color: #333;
469	@ font-size: 0.8em;
470	@ font-weight: bold;
471	@ }
472	@
473	@ /* The header across the top of the page */
474	@ div.header {
475	@ margin:10px 0px 10px 0px;
476	@ padding:1px 0px 0px 20px;
477	@ border-style:solid;
478	@ border-color:black;
479	@ border-width:1px 0px;
480	@ background-color:#eee;
481	@ }
482	@
483	@ /* The main menu bar that appears at the top left of the page beneath
484	@ ** the header. Width must be co-ordinated with the container below */
485	@ div.mainmenu {
486	@ float: left;
487	@ margin-left: 10px;
	@@ -491,11 +491,11 @@
491	@ padding:5px;
492	@ background-color:#eee;
493	@ border:1px solid #999;
494	@ width:8em;
495	@ }
496	@
497	@ /* Main menu is now a list */
498	@ div.mainmenu ul {
499	@ padding: 0;
500	@ list-style:none;
501	@ }
	@@ -506,17 +506,17 @@
506	@ }
507	@ div.mainmenu a:hover {
508	@ color: #eee;
509	@ background-color: #333;
510	@ }
511	@
512	@ /* Container for the sub-menu and content so they don''t spread
513	@ ** out underneath the main menu */
514	@ #container {
515	@ padding-left: 9em;
516	@ }
517	@
518	@ /* The submenu bar that sometimes appears below the main menu */
519	@ div.submenu {
520	@ padding: 3px 10px 3px 10px;
521	@ font-size: 0.9em;
522	@ text-align: center;
	@@ -532,18 +532,18 @@
532	@ }
533	@ div.submenu a:hover {
534	@ color: #eee;
535	@ background-color: #333;
536	@ }
537	@
538	@ /* All page content from the bottom of the menu or submenu down to
539	@ ** the footer */
540	@ div.content {
541	@ float right;
542	@ padding: 2ex 1ex 0ex 2ex;
543	@ }
544	@
545	@ /* Some pages have section dividers */
546	@ div.section {
547	@ margin-bottom: 0px;
548	@ margin-top: 1em;
549	@ padding: 1px 1px 1px 1px;
	@@ -553,11 +553,11 @@
553	@ border-color:#999;
554	@ border-width:1px 0px;
555	@ background-color: #eee;
556	@ color: #333;
557	@ }
558	@
559	@ /* The "Date" that occurs on the left hand side of timelines */
560	@ div.divider {
561	@ background: #eee;
562	@ border: 2px #999 solid;
563	@ font-size: 1em; font-weight: normal;
	@@ -565,27 +565,27 @@
565	@ margin: .2em 0 .2em 0;
566	@ float: left;
567	@ clear: left;
568	@ color: #333
569	@ }
570	@
571	@ /* The footer at the very bottom of the page */
572	@ div.footer {
573	@ font-size: 0.8em;
574	@ margin-top: 12px;
575	@ padding: 5px 10px 5px 10px;
576	@ text-align: right;
577	@ background-color: #eee;
578	@ color: #555;
579	@ }
580	@
581	@ /* <verbatim> blocks */
582	@ pre.verbatim {
583	@ background-color: #f5f5f5;
584	@ padding: 0.5em;
585	@ }
586	@
587	@ /* The label/value pairs on (for example) the ci page */
588	@ table.label-value th {
589	@ vertical-align: top;
590	@ text-align: right;
591	@ padding: 0.2ex 2ex;
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
	@@ -732,18 +732,18 @@
732	db_begin_transaction();
733
734	/* Process requests to delete a user-defined skin */
735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	style_header("Confirm Custom Skin Delete");
737	@ <form action="%s(g.zBaseURL)/setup_skin" method="POST">
738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	@ be undone. Please confirm that this is what you want to do:</p>
740	@ <input type="hidden" name="sn" value="%h(P("sn"))">
741	@ <input type="submit" name="del2" value="Confirm - Delete The Skin">
742	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete">
743	login_insert_csrf_secret();
744	@ </form>
745	style_footer();
746	return;
747	}
748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
	@@ -800,11 +800,11 @@
800	}
801	}
802
803	style_header("Skins");
804	@ <p>A "skin" is a combination of
805	@ <a href="setup_editcss">CSS</a>,
806	@ <a href="setup_header">Header</a>,
807	@ <a href="setup_footer">Footer</a>, and
808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	@ of the web interface.</p>
810	@
	@@ -813,15 +813,15 @@
813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	z = aBuiltinSkin[i].zName;
815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	}else{
818	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
819	@ %h(z).
820	@ <input type="hidden" name="sn" value="%h(z)">
821	@ <input type="submit" name="load" value="Use This Skin">
822	@ </form></li>
823	}
824	}
825	db_prepare(&q,
826	"SELECT substr(name, 6), value FROM config"
827	" WHERE name GLOB 'skin:*'"
	@@ -832,11 +832,11 @@
832	const char *zV = db_column_text(&q, 1);
833	if( strcmp(zV, zCurrent)==0 ){
834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	}else{
836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837	@ %h(zN).
838	@ <input type="hidden" name="sn" value="%h(zN)">
839	@ <input type="submit" name="load" value="Use This Skin">
840	@ <input type="submit" name="del1" value="Delete This Skin">
841	@ </form></li>
842	}
843

	--- src/skins.c
	+++ src/skins.c
	@@ -24,19 +24,19 @@
24	/* @-comment: // */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	@ body {
32	@ margin: 0ex 1ex;
33	@ padding: 0px;
34	@ background-color: white;
35	@ font-family: sans-serif;
36	@ }
37	@
38	@ /* The project logo in the upper left-hand corner of each page */
39	@ div.logo {
40	@ display: table-row;
41	@ text-align: center;
42	@ /* vertical-align: bottom;*/
	@@ -44,11 +44,11 @@
44	@ font-weight: bold;
45	@ background-color: #707070;
46	@ color: #ffffff;
47	@ min-width: 200px;
48	@ }
49	@
50	@ /* The page title centered at the top of each page */
51	@ div.title {
52	@ display: table-cell;
53	@ font-size: 1.5em;
54	@ font-weight: bold;
	@@ -56,11 +56,11 @@
56	@ padding: 0 0 0 10px;
57	@ color: #404040;
58	@ vertical-align: bottom;
59	@ width: 100%;
60	@ }
61	@
62	@ /* The login status message in the top right-hand corner */
63	@ div.status {
64	@ display: table-cell;
65	@ text-align: right;
66	@ vertical-align: bottom;
	@@ -67,17 +67,17 @@
67	@ color: #404040;
68	@ font-size: 0.8em;
69	@ font-weight: bold;
70	@ min-width: 200px;
71	@ }
72	@
73	@ /* The header across the top of the page */
74	@ div.header {
75	@ display: table;
76	@ width: 100%;
77	@ }
78	@
79	@ /* The main menu bar that appears at the top of the page beneath
80	@ ** the header */
81	@ div.mainmenu {
82	@ padding: 5px 10px 5px 10px;
83	@ font-size: 0.9em;
	@@ -85,11 +85,11 @@
85	@ text-align: center;
86	@ letter-spacing: 1px;
87	@ background-color: #404040;
88	@ color: white;
89	@ }
90	@
91	@ /* The submenu bar that sometimes appears below the main menu */
92	@ div.submenu {
93	@ padding: 3px 10px 3px 0px;
94	@ font-size: 0.9em;
95	@ text-align: center;
	@@ -103,21 +103,21 @@
103	@ }
104	@ div.mainmenu a:hover, div.submenu a:hover {
105	@ color: #404040;
106	@ background-color: white;
107	@ }
108	@
109	@ /* All page content from the bottom of the menu or submenu down to
110	@ ** the footer */
111	@ div.content {
112	@ padding: 0ex 0ex 0ex 0ex;
113	@ }
114	@ /* Hyperlink colors */
115	@ div.content a { color: #604000; }
116	@ div.content a:link { color: #604000;}
117	@ div.content a:visited { color: #600000; }
118	@
119	@ /* Some pages have section dividers */
120	@ div.section {
121	@ margin-bottom: 0px;
122	@ margin-top: 1em;
123	@ padding: 1px 1px 1px 1px;
	@@ -124,11 +124,11 @@
124	@ font-size: 1.2em;
125	@ font-weight: bold;
126	@ background-color: #404040;
127	@ color: white;
128	@ }
129	@
130	@ /* The "Date" that occurs on the left hand side of timelines */
131	@ div.divider {
132	@ background: #a0a0a0;
133	@ border: 2px #505050 solid;
134	@ font-size: 1em; font-weight: normal;
	@@ -135,21 +135,21 @@
135	@ padding: .25em;
136	@ margin: .2em 0 .2em 0;
137	@ float: left;
138	@ clear: left;
139	@ }
140	@
141	@ /* The footer at the very bottom of the page */
142	@ div.footer {
143	@ font-size: 0.8em;
144	@ margin-top: 12px;
145	@ padding: 5px 10px 5px 10px;
146	@ text-align: right;
147	@ background-color: #404040;
148	@ color: white;
149	@ }
150	@
151	@ /* The label/value pairs on (for example) the vinfo page */
152	@ table.label-value th {
153	@ vertical-align: top;
154	@ text-align: right;
155	@ padding: 0.2ex 2ex;
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -206,39 +206,39 @@
206	@ html "<a href=''$baseurl/login''>Login</a> "
207	@ }
208	@ </th1></div>
209	@ ');
210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211	@ Fossil version $manifest_version $manifest_date
212	@ </div>
213	@ </body></html>
214	@ ');
215	;
216
217	/*
218	** A tan theme with the project title above the user identification
219	** and no logo image.
220	*/
221	static const char zBuiltinSkin2[] =
222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	@ body {
224	@ margin: 0ex 0ex;
225	@ padding: 0px;
226	@ background-color: #fef3bc;
227	@ font-family: sans-serif;
228	@ }
229	@
230	@ /* The project logo in the upper left-hand corner of each page */
231	@ div.logo {
232	@ display: inline;
233	@ text-align: center;
234	@ vertical-align: bottom;
235	@ font-weight: bold;
236	@ font-size: 2.5em;
237	@ color: #a09048;
238	@ }
239	@
240	@ /* The page title centered at the top of each page */
241	@ div.title {
242	@ display: table-cell;
243	@ font-size: 2em;
244	@ font-weight: bold;
	@@ -246,11 +246,11 @@
246	@ padding: 0 0 0 5px;
247	@ color: #a09048;
248	@ vertical-align: bottom;
249	@ width: 100%;
250	@ }
251	@
252	@ /* The login status message in the top right-hand corner */
253	@ div.status {
254	@ display: table-cell;
255	@ text-align: right;
256	@ vertical-align: bottom;
	@@ -257,17 +257,17 @@
257	@ color: #a09048;
258	@ padding: 5px 5px 0 0;
259	@ font-size: 0.8em;
260	@ font-weight: bold;
261	@ }
262	@
263	@ /* The header across the top of the page */
264	@ div.header {
265	@ display: table;
266	@ width: 100%;
267	@ }
268	@
269	@ /* The main menu bar that appears at the top of the page beneath
270	@ ** the header */
271	@ div.mainmenu {
272	@ padding: 5px 10px 5px 10px;
273	@ font-size: 0.9em;
	@@ -275,11 +275,11 @@
275	@ text-align: center;
276	@ letter-spacing: 1px;
277	@ background-color: #a09048;
278	@ color: black;
279	@ }
280	@
281	@ /* The submenu bar that sometimes appears below the main menu */
282	@ div.submenu {
283	@ padding: 3px 10px 3px 0px;
284	@ font-size: 0.9em;
285	@ text-align: center;
	@@ -293,21 +293,21 @@
293	@ }
294	@ div.mainmenu a:hover, div.submenu a:hover {
295	@ color: #a09048;
296	@ background-color: white;
297	@ }
298	@
299	@ /* All page content from the bottom of the menu or submenu down to
300	@ ** the footer */
301	@ div.content {
302	@ padding: 1ex 5px;
303	@ }
304	@ div.content a { color: #706532; }
305	@ div.content a:link { color: #706532; }
306	@ div.content a:visited { color: #704032; }
307	@ div.content a:hover { background-color: white; color: #706532; }
308	@
309	@ /* Some pages have section dividers */
310	@ div.section {
311	@ margin-bottom: 0px;
312	@ margin-top: 1em;
313	@ padding: 3px 3px 0 3px;
	@@ -314,11 +314,11 @@
314	@ font-size: 1.2em;
315	@ font-weight: bold;
316	@ background-color: #a09048;
317	@ color: white;
318	@ }
319	@
320	@ /* The "Date" that occurs on the left hand side of timelines */
321	@ div.divider {
322	@ background: #e1d498;
323	@ border: 2px #a09048 solid;
324	@ font-size: 1em; font-weight: normal;
	@@ -325,33 +325,33 @@
325	@ padding: .25em;
326	@ margin: .2em 0 .2em 0;
327	@ float: left;
328	@ clear: left;
329	@ }
330	@
331	@ /* The footer at the very bottom of the page */
332	@ div.footer {
333	@ font-size: 0.8em;
334	@ margin-top: 12px;
335	@ padding: 5px 10px 5px 10px;
336	@ text-align: right;
337	@ background-color: #a09048;
338	@ color: white;
339	@ }
340	@
341	@ /* Hyperlink colors */
342	@ div.footer a { color: white; }
343	@ div.footer a:link { color: white; }
344	@ div.footer a:visited { color: white; }
345	@ div.footer a:hover { background-color: white; color: #558195; }
346	@
347	@ /* <verbatim> blocks */
348	@ pre.verbatim {
349	@ background-color: #f5f5f5;
350	@ padding: 0.5em;
351	@ }
352	@
353	@ /* The label/value pairs on (for example) the ci page */
354	@ table.label-value th {
355	@ vertical-align: top;
356	@ text-align: right;
357	@ padding: 0.2ex 2ex;
	@@ -418,37 +418,37 @@
418
419	/*
420	** Black letters on a white or cream background with the main menu
421	** stuck on the left-hand side.
422	*/
423	static const char zBuiltinSkin3[] =
424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	@ body {
426	@ margin:0px 0px 0px 0px;
427	@ padding:0px;
428	@ font-family:verdana, arial, helvetica, "sans serif";
429	@ color:#333;
430	@ background-color:white;
431	@ }
432	@
433	@ /* consistent colours */
434	@ h2 {
435	@ color: #333;
436	@ }
437	@ h3 {
438	@ color: #333;
439	@ }
440	@
441	@ /* The project logo in the upper left-hand corner of each page */
442	@ div.logo {
443	@ display: table-cell;
444	@ text-align: left;
445	@ vertical-align: bottom;
446	@ font-weight: bold;
447	@ color: #333;
448	@ }
449	@
450	@ /* The page title centered at the top of each page */
451	@ div.title {
452	@ display: table-cell;
453	@ font-size: 2em;
454	@ font-weight: bold;
	@@ -455,11 +455,11 @@
455	@ text-align: center;
456	@ color: #333;
457	@ vertical-align: bottom;
458	@ width: 100%;
459	@ }
460	@
461	@ /* The login status message in the top right-hand corner */
462	@ div.status {
463	@ display: table-cell;
464	@ padding-right: 10px;
465	@ text-align: right;
	@@ -467,21 +467,21 @@
467	@ padding-bottom: 5px;
468	@ color: #333;
469	@ font-size: 0.8em;
470	@ font-weight: bold;
471	@ }
472	@
473	@ /* The header across the top of the page */
474	@ div.header {
475	@ margin:10px 0px 10px 0px;
476	@ padding:1px 0px 0px 20px;
477	@ border-style:solid;
478	@ border-color:black;
479	@ border-width:1px 0px;
480	@ background-color:#eee;
481	@ }
482	@
483	@ /* The main menu bar that appears at the top left of the page beneath
484	@ ** the header. Width must be co-ordinated with the container below */
485	@ div.mainmenu {
486	@ float: left;
487	@ margin-left: 10px;
	@@ -491,11 +491,11 @@
491	@ padding:5px;
492	@ background-color:#eee;
493	@ border:1px solid #999;
494	@ width:8em;
495	@ }
496	@
497	@ /* Main menu is now a list */
498	@ div.mainmenu ul {
499	@ padding: 0;
500	@ list-style:none;
501	@ }
	@@ -506,17 +506,17 @@
506	@ }
507	@ div.mainmenu a:hover {
508	@ color: #eee;
509	@ background-color: #333;
510	@ }
511	@
512	@ /* Container for the sub-menu and content so they don''t spread
513	@ ** out underneath the main menu */
514	@ #container {
515	@ padding-left: 9em;
516	@ }
517	@
518	@ /* The submenu bar that sometimes appears below the main menu */
519	@ div.submenu {
520	@ padding: 3px 10px 3px 10px;
521	@ font-size: 0.9em;
522	@ text-align: center;
	@@ -532,18 +532,18 @@
532	@ }
533	@ div.submenu a:hover {
534	@ color: #eee;
535	@ background-color: #333;
536	@ }
537	@
538	@ /* All page content from the bottom of the menu or submenu down to
539	@ ** the footer */
540	@ div.content {
541	@ float right;
542	@ padding: 2ex 1ex 0ex 2ex;
543	@ }
544	@
545	@ /* Some pages have section dividers */
546	@ div.section {
547	@ margin-bottom: 0px;
548	@ margin-top: 1em;
549	@ padding: 1px 1px 1px 1px;
	@@ -553,11 +553,11 @@
553	@ border-color:#999;
554	@ border-width:1px 0px;
555	@ background-color: #eee;
556	@ color: #333;
557	@ }
558	@
559	@ /* The "Date" that occurs on the left hand side of timelines */
560	@ div.divider {
561	@ background: #eee;
562	@ border: 2px #999 solid;
563	@ font-size: 1em; font-weight: normal;
	@@ -565,27 +565,27 @@
565	@ margin: .2em 0 .2em 0;
566	@ float: left;
567	@ clear: left;
568	@ color: #333
569	@ }
570	@
571	@ /* The footer at the very bottom of the page */
572	@ div.footer {
573	@ font-size: 0.8em;
574	@ margin-top: 12px;
575	@ padding: 5px 10px 5px 10px;
576	@ text-align: right;
577	@ background-color: #eee;
578	@ color: #555;
579	@ }
580	@
581	@ /* <verbatim> blocks */
582	@ pre.verbatim {
583	@ background-color: #f5f5f5;
584	@ padding: 0.5em;
585	@ }
586	@
587	@ /* The label/value pairs on (for example) the ci page */
588	@ table.label-value th {
589	@ vertical-align: top;
590	@ text-align: right;
591	@ padding: 0.2ex 2ex;
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br /><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
	@@ -732,18 +732,18 @@
732	db_begin_transaction();
733
734	/* Process requests to delete a user-defined skin */
735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	style_header("Confirm Custom Skin Delete");
737	@ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	@ be undone. Please confirm that this is what you want to do:</p>
740	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
741	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
742	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
743	login_insert_csrf_secret();
744	@ </div></form>
745	style_footer();
746	return;
747	}
748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
	@@ -800,11 +800,11 @@
800	}
801	}
802
803	style_header("Skins");
804	@ <p>A "skin" is a combination of
805	@ <a href="setup_editcss">CSS</a>,
806	@ <a href="setup_header">Header</a>,
807	@ <a href="setup_footer">Footer</a>, and
808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	@ of the web interface.</p>
810	@
	@@ -813,15 +813,15 @@
813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	z = aBuiltinSkin[i].zName;
815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	}else{
818	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
819	@ %h(z).
820	@ <input type="hidden" name="sn" value="%h(z)" />
821	@ <input type="submit" name="load" value="Use This Skin" />
822	@ </div></form></li>
823	}
824	}
825	db_prepare(&q,
826	"SELECT substr(name, 6), value FROM config"
827	" WHERE name GLOB 'skin:*'"
	@@ -832,11 +832,11 @@
832	const char *zV = db_column_text(&q, 1);
833	if( strcmp(zV, zCurrent)==0 ){
834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	}else{
836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837	@ %h(zN).
838	@ <input type="hidden" name="sn" value="%h(zN)">
839	@ <input type="submit" name="load" value="Use This Skin">
840	@ <input type="submit" name="del1" value="Delete This Skin">
841	@ </form></li>
842	}
843

M src/skins.c

+57 -57

		--- src/skins.c
		+++ src/skins.c
		@@ -24,19 +24,19 @@
24	24	/* @-comment: // */
25	25	/*
26	26	** A black-and-white theme with the project title in a bar across the top
27	27	** and no logo image.
28	28	*/
29		-static const char zBuiltinSkin1[] =
	29	+static const char zBuiltinSkin1[] =
30	30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	31	@ body {
32	32	@ margin: 0ex 1ex;
33	33	@ padding: 0px;
34	34	@ background-color: white;
35	35	@ font-family: sans-serif;
36	36	@ }
37		-@
	37	+@
38	38	@ /* The project logo in the upper left-hand corner of each page */
39	39	@ div.logo {
40	40	@ display: table-row;
41	41	@ text-align: center;
42	42	@ /* vertical-align: bottom;*/
		@@ -44,11 +44,11 @@
44	44	@ font-weight: bold;
45	45	@ background-color: #707070;
46	46	@ color: #ffffff;
47	47	@ min-width: 200px;
48	48	@ }
49		-@
	49	+@
50	50	@ /* The page title centered at the top of each page */
51	51	@ div.title {
52	52	@ display: table-cell;
53	53	@ font-size: 1.5em;
54	54	@ font-weight: bold;
		@@ -56,11 +56,11 @@
56	56	@ padding: 0 0 0 10px;
57	57	@ color: #404040;
58	58	@ vertical-align: bottom;
59	59	@ width: 100%;
60	60	@ }
61		-@
	61	+@
62	62	@ /* The login status message in the top right-hand corner */
63	63	@ div.status {
64	64	@ display: table-cell;
65	65	@ text-align: right;
66	66	@ vertical-align: bottom;
		@@ -67,17 +67,17 @@
67	67	@ color: #404040;
68	68	@ font-size: 0.8em;
69	69	@ font-weight: bold;
70	70	@ min-width: 200px;
71	71	@ }
72		-@
	72	+@
73	73	@ /* The header across the top of the page */
74	74	@ div.header {
75	75	@ display: table;
76	76	@ width: 100%;
77	77	@ }
78		-@
	78	+@
79	79	@ /* The main menu bar that appears at the top of the page beneath
80	80	@ ** the header */
81	81	@ div.mainmenu {
82	82	@ padding: 5px 10px 5px 10px;
83	83	@ font-size: 0.9em;
		@@ -85,11 +85,11 @@
85	85	@ text-align: center;
86	86	@ letter-spacing: 1px;
87	87	@ background-color: #404040;
88	88	@ color: white;
89	89	@ }
90		-@
	90	+@
91	91	@ /* The submenu bar that sometimes appears below the main menu */
92	92	@ div.submenu {
93	93	@ padding: 3px 10px 3px 0px;
94	94	@ font-size: 0.9em;
95	95	@ text-align: center;
		@@ -103,21 +103,21 @@
103	103	@ }
104	104	@ div.mainmenu a:hover, div.submenu a:hover {
105	105	@ color: #404040;
106	106	@ background-color: white;
107	107	@ }
108		-@
	108	+@
109	109	@ /* All page content from the bottom of the menu or submenu down to
110	110	@ ** the footer */
111	111	@ div.content {
112	112	@ padding: 0ex 0ex 0ex 0ex;
113	113	@ }
114	114	@ /* Hyperlink colors */
115	115	@ div.content a { color: #604000; }
116	116	@ div.content a:link { color: #604000;}
117	117	@ div.content a:visited { color: #600000; }
118		-@
	118	+@
119	119	@ /* Some pages have section dividers */
120	120	@ div.section {
121	121	@ margin-bottom: 0px;
122	122	@ margin-top: 1em;
123	123	@ padding: 1px 1px 1px 1px;
		@@ -124,11 +124,11 @@
124	124	@ font-size: 1.2em;
125	125	@ font-weight: bold;
126	126	@ background-color: #404040;
127	127	@ color: white;
128	128	@ }
129		-@
	129	+@
130	130	@ /* The "Date" that occurs on the left hand side of timelines */
131	131	@ div.divider {
132	132	@ background: #a0a0a0;
133	133	@ border: 2px #505050 solid;
134	134	@ font-size: 1em; font-weight: normal;
		@@ -135,21 +135,21 @@
135	135	@ padding: .25em;
136	136	@ margin: .2em 0 .2em 0;
137	137	@ float: left;
138	138	@ clear: left;
139	139	@ }
140		-@
	140	+@
141	141	@ /* The footer at the very bottom of the page */
142	142	@ div.footer {
143	143	@ font-size: 0.8em;
144	144	@ margin-top: 12px;
145	145	@ padding: 5px 10px 5px 10px;
146	146	@ text-align: right;
147	147	@ background-color: #404040;
148	148	@ color: white;
149	149	@ }
150		-@
	150	+@
151	151	@ /* The label/value pairs on (for example) the vinfo page */
152	152	@ table.label-value th {
153	153	@ vertical-align: top;
154	154	@ text-align: right;
155	155	@ padding: 0.2ex 2ex;
		@@ -165,11 +165,11 @@
165	165	@ <body>
166	166	@ <div class="header">
167	167	@ <div class="logo">
168	168	@ <img src="$baseurl/logo" alt="logo">
169	169	@ </div>
170		-@ <div class="title"><small>$<project_name></small><br>$<title></div>
	170	+@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	171	@ <div class="status"><nobr><th1>
172	172	@ if {[info exists login]} {
173	173	@ puts "Logged in as $login"
174	174	@ } else {
175	175	@ puts "Not logged in"
		@@ -206,39 +206,39 @@
206	206	@ html "<a href=''$baseurl/login''>Login</a> "
207	207	@ }
208	208	@ </th1></div>
209	209	@ ');
210	210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211		-@ Fossil version $manifest_version $manifest_date
	211	+@ Fossil version $manifest_version $manifest_date
212	212	@ </div>
213	213	@ </body></html>
214	214	@ ');
215	215	;
216	216
217	217	/*
218	218	** A tan theme with the project title above the user identification
219	219	** and no logo image.
220	220	*/
221		-static const char zBuiltinSkin2[] =
	221	+static const char zBuiltinSkin2[] =
222	222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	223	@ body {
224	224	@ margin: 0ex 0ex;
225	225	@ padding: 0px;
226	226	@ background-color: #fef3bc;
227	227	@ font-family: sans-serif;
228	228	@ }
229		-@
	229	+@
230	230	@ /* The project logo in the upper left-hand corner of each page */
231	231	@ div.logo {
232	232	@ display: inline;
233	233	@ text-align: center;
234	234	@ vertical-align: bottom;
235	235	@ font-weight: bold;
236	236	@ font-size: 2.5em;
237	237	@ color: #a09048;
238	238	@ }
239		-@
	239	+@
240	240	@ /* The page title centered at the top of each page */
241	241	@ div.title {
242	242	@ display: table-cell;
243	243	@ font-size: 2em;
244	244	@ font-weight: bold;
		@@ -246,11 +246,11 @@
246	246	@ padding: 0 0 0 5px;
247	247	@ color: #a09048;
248	248	@ vertical-align: bottom;
249	249	@ width: 100%;
250	250	@ }
251		-@
	251	+@
252	252	@ /* The login status message in the top right-hand corner */
253	253	@ div.status {
254	254	@ display: table-cell;
255	255	@ text-align: right;
256	256	@ vertical-align: bottom;
		@@ -257,17 +257,17 @@
257	257	@ color: #a09048;
258	258	@ padding: 5px 5px 0 0;
259	259	@ font-size: 0.8em;
260	260	@ font-weight: bold;
261	261	@ }
262		-@
	262	+@
263	263	@ /* The header across the top of the page */
264	264	@ div.header {
265	265	@ display: table;
266	266	@ width: 100%;
267	267	@ }
268		-@
	268	+@
269	269	@ /* The main menu bar that appears at the top of the page beneath
270	270	@ ** the header */
271	271	@ div.mainmenu {
272	272	@ padding: 5px 10px 5px 10px;
273	273	@ font-size: 0.9em;
		@@ -275,11 +275,11 @@
275	275	@ text-align: center;
276	276	@ letter-spacing: 1px;
277	277	@ background-color: #a09048;
278	278	@ color: black;
279	279	@ }
280		-@
	280	+@
281	281	@ /* The submenu bar that sometimes appears below the main menu */
282	282	@ div.submenu {
283	283	@ padding: 3px 10px 3px 0px;
284	284	@ font-size: 0.9em;
285	285	@ text-align: center;
		@@ -293,21 +293,21 @@
293	293	@ }
294	294	@ div.mainmenu a:hover, div.submenu a:hover {
295	295	@ color: #a09048;
296	296	@ background-color: white;
297	297	@ }
298		-@
	298	+@
299	299	@ /* All page content from the bottom of the menu or submenu down to
300	300	@ ** the footer */
301	301	@ div.content {
302	302	@ padding: 1ex 5px;
303	303	@ }
304	304	@ div.content a { color: #706532; }
305	305	@ div.content a:link { color: #706532; }
306	306	@ div.content a:visited { color: #704032; }
307	307	@ div.content a:hover { background-color: white; color: #706532; }
308		-@
	308	+@
309	309	@ /* Some pages have section dividers */
310	310	@ div.section {
311	311	@ margin-bottom: 0px;
312	312	@ margin-top: 1em;
313	313	@ padding: 3px 3px 0 3px;
		@@ -314,11 +314,11 @@
314	314	@ font-size: 1.2em;
315	315	@ font-weight: bold;
316	316	@ background-color: #a09048;
317	317	@ color: white;
318	318	@ }
319		-@
	319	+@
320	320	@ /* The "Date" that occurs on the left hand side of timelines */
321	321	@ div.divider {
322	322	@ background: #e1d498;
323	323	@ border: 2px #a09048 solid;
324	324	@ font-size: 1em; font-weight: normal;
		@@ -325,33 +325,33 @@
325	325	@ padding: .25em;
326	326	@ margin: .2em 0 .2em 0;
327	327	@ float: left;
328	328	@ clear: left;
329	329	@ }
330		-@
	330	+@
331	331	@ /* The footer at the very bottom of the page */
332	332	@ div.footer {
333	333	@ font-size: 0.8em;
334	334	@ margin-top: 12px;
335	335	@ padding: 5px 10px 5px 10px;
336	336	@ text-align: right;
337	337	@ background-color: #a09048;
338	338	@ color: white;
339	339	@ }
340		-@
	340	+@
341	341	@ /* Hyperlink colors */
342	342	@ div.footer a { color: white; }
343	343	@ div.footer a:link { color: white; }
344	344	@ div.footer a:visited { color: white; }
345	345	@ div.footer a:hover { background-color: white; color: #558195; }
346		-@
	346	+@
347	347	@ /* <verbatim> blocks */
348	348	@ pre.verbatim {
349	349	@ background-color: #f5f5f5;
350	350	@ padding: 0.5em;
351	351	@ }
352		-@
	352	+@
353	353	@ /* The label/value pairs on (for example) the ci page */
354	354	@ table.label-value th {
355	355	@ vertical-align: top;
356	356	@ text-align: right;
357	357	@ padding: 0.2ex 2ex;
		@@ -418,37 +418,37 @@
418	418
419	419	/*
420	420	** Black letters on a white or cream background with the main menu
421	421	** stuck on the left-hand side.
422	422	*/
423		-static const char zBuiltinSkin3[] =
	423	+static const char zBuiltinSkin3[] =
424	424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	425	@ body {
426	426	@ margin:0px 0px 0px 0px;
427	427	@ padding:0px;
428	428	@ font-family:verdana, arial, helvetica, "sans serif";
429	429	@ color:#333;
430	430	@ background-color:white;
431	431	@ }
432		-@
	432	+@
433	433	@ /* consistent colours */
434	434	@ h2 {
435	435	@ color: #333;
436	436	@ }
437	437	@ h3 {
438	438	@ color: #333;
439	439	@ }
440		-@
	440	+@
441	441	@ /* The project logo in the upper left-hand corner of each page */
442	442	@ div.logo {
443	443	@ display: table-cell;
444	444	@ text-align: left;
445	445	@ vertical-align: bottom;
446	446	@ font-weight: bold;
447	447	@ color: #333;
448	448	@ }
449		-@
	449	+@
450	450	@ /* The page title centered at the top of each page */
451	451	@ div.title {
452	452	@ display: table-cell;
453	453	@ font-size: 2em;
454	454	@ font-weight: bold;
		@@ -455,11 +455,11 @@
455	455	@ text-align: center;
456	456	@ color: #333;
457	457	@ vertical-align: bottom;
458	458	@ width: 100%;
459	459	@ }
460		-@
	460	+@
461	461	@ /* The login status message in the top right-hand corner */
462	462	@ div.status {
463	463	@ display: table-cell;
464	464	@ padding-right: 10px;
465	465	@ text-align: right;
		@@ -467,21 +467,21 @@
467	467	@ padding-bottom: 5px;
468	468	@ color: #333;
469	469	@ font-size: 0.8em;
470	470	@ font-weight: bold;
471	471	@ }
472		-@
	472	+@
473	473	@ /* The header across the top of the page */
474	474	@ div.header {
475	475	@ margin:10px 0px 10px 0px;
476	476	@ padding:1px 0px 0px 20px;
477	477	@ border-style:solid;
478	478	@ border-color:black;
479	479	@ border-width:1px 0px;
480	480	@ background-color:#eee;
481	481	@ }
482		-@
	482	+@
483	483	@ /* The main menu bar that appears at the top left of the page beneath
484	484	@ ** the header. Width must be co-ordinated with the container below */
485	485	@ div.mainmenu {
486	486	@ float: left;
487	487	@ margin-left: 10px;
		@@ -491,11 +491,11 @@
491	491	@ padding:5px;
492	492	@ background-color:#eee;
493	493	@ border:1px solid #999;
494	494	@ width:8em;
495	495	@ }
496		-@
	496	+@
497	497	@ /* Main menu is now a list */
498	498	@ div.mainmenu ul {
499	499	@ padding: 0;
500	500	@ list-style:none;
501	501	@ }
		@@ -506,17 +506,17 @@
506	506	@ }
507	507	@ div.mainmenu a:hover {
508	508	@ color: #eee;
509	509	@ background-color: #333;
510	510	@ }
511		-@
	511	+@
512	512	@ /* Container for the sub-menu and content so they don''t spread
513	513	@ ** out underneath the main menu */
514	514	@ #container {
515	515	@ padding-left: 9em;
516	516	@ }
517		-@
	517	+@
518	518	@ /* The submenu bar that sometimes appears below the main menu */
519	519	@ div.submenu {
520	520	@ padding: 3px 10px 3px 10px;
521	521	@ font-size: 0.9em;
522	522	@ text-align: center;
		@@ -532,18 +532,18 @@
532	532	@ }
533	533	@ div.submenu a:hover {
534	534	@ color: #eee;
535	535	@ background-color: #333;
536	536	@ }
537		-@
	537	+@
538	538	@ /* All page content from the bottom of the menu or submenu down to
539	539	@ ** the footer */
540	540	@ div.content {
541	541	@ float right;
542	542	@ padding: 2ex 1ex 0ex 2ex;
543	543	@ }
544		-@
	544	+@
545	545	@ /* Some pages have section dividers */
546	546	@ div.section {
547	547	@ margin-bottom: 0px;
548	548	@ margin-top: 1em;
549	549	@ padding: 1px 1px 1px 1px;
		@@ -553,11 +553,11 @@
553	553	@ border-color:#999;
554	554	@ border-width:1px 0px;
555	555	@ background-color: #eee;
556	556	@ color: #333;
557	557	@ }
558		-@
	558	+@
559	559	@ /* The "Date" that occurs on the left hand side of timelines */
560	560	@ div.divider {
561	561	@ background: #eee;
562	562	@ border: 2px #999 solid;
563	563	@ font-size: 1em; font-weight: normal;
		@@ -565,27 +565,27 @@
565	565	@ margin: .2em 0 .2em 0;
566	566	@ float: left;
567	567	@ clear: left;
568	568	@ color: #333
569	569	@ }
570		-@
	570	+@
571	571	@ /* The footer at the very bottom of the page */
572	572	@ div.footer {
573	573	@ font-size: 0.8em;
574	574	@ margin-top: 12px;
575	575	@ padding: 5px 10px 5px 10px;
576	576	@ text-align: right;
577	577	@ background-color: #eee;
578	578	@ color: #555;
579	579	@ }
580		-@
	580	+@
581	581	@ /* <verbatim> blocks */
582	582	@ pre.verbatim {
583	583	@ background-color: #f5f5f5;
584	584	@ padding: 0.5em;
585	585	@ }
586		-@
	586	+@
587	587	@ /* The label/value pairs on (for example) the ci page */
588	588	@ table.label-value th {
589	589	@ vertical-align: top;
590	590	@ text-align: right;
591	591	@ padding: 0.2ex 2ex;
		@@ -600,11 +600,11 @@
600	600	@ </head>
601	601	@ <body>
602	602	@ <div class="header">
603	603	@ <div class="logo">
604	604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605		-@ <br><nobr>$<project_name></nobr>
	605	+@ <br /><nobr>$<project_name></nobr>
606	606	@ </div>
607	607	@ <div class="title">$<title></div>
608	608	@ <div class="status"><nobr><th1>
609	609	@ if {[info exists login]} {
610	610	@ puts "Logged in as $login"
		@@ -732,18 +732,18 @@
732	732	db_begin_transaction();
733	733
734	734	/* Process requests to delete a user-defined skin */
735	735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	736	style_header("Confirm Custom Skin Delete");
737		- @ <form action="%s(g.zBaseURL)/setup_skin" method="POST">
	737	+ @ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
738	738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	739	@ be undone. Please confirm that this is what you want to do:</p>
740		- @ <input type="hidden" name="sn" value="%h(P("sn"))">
741		- @ <input type="submit" name="del2" value="Confirm - Delete The Skin">
742		- @ <input type="submit" name="cancel" value="Cancel - Do Not Delete">
	740	+ @ <input type="hidden" name="sn" value="%h(P("sn"))" />
	741	+ @ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
	742	+ @ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
743	743	login_insert_csrf_secret();
744		- @ </form>
	744	+ @ </div></form>
745	745	style_footer();
746	746	return;
747	747	}
748	748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
		@@ -800,11 +800,11 @@
800	800	}
801	801	}
802	802
803	803	style_header("Skins");
804	804	@ <p>A "skin" is a combination of
805		- @ <a href="setup_editcss">CSS</a>,
	805	+ @ <a href="setup_editcss">CSS</a>,
806	806	@ <a href="setup_header">Header</a>,
807	807	@ <a href="setup_footer">Footer</a>, and
808	808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	809	@ of the web interface.</p>
810	810	@
		@@ -813,15 +813,15 @@
813	813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	814	z = aBuiltinSkin[i].zName;
815	815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	817	}else{
818		- @ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
819		- @ %h(z).
820		- @ <input type="hidden" name="sn" value="%h(z)">
821		- @ <input type="submit" name="load" value="Use This Skin">
822		- @ </form></li>
	818	+ @ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
	819	+ @ %h(z).
	820	+ @ <input type="hidden" name="sn" value="%h(z)" />
	821	+ @ <input type="submit" name="load" value="Use This Skin" />
	822	+ @ </div></form></li>
823	823	}
824	824	}
825	825	db_prepare(&q,
826	826	"SELECT substr(name, 6), value FROM config"
827	827	" WHERE name GLOB 'skin:*'"
		@@ -832,11 +832,11 @@
832	832	const char *zV = db_column_text(&q, 1);
833	833	if( strcmp(zV, zCurrent)==0 ){
834	834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	835	}else{
836	836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837		- @ %h(zN).
	837	+ @ %h(zN).
838	838	@ <input type="hidden" name="sn" value="%h(zN)">
839	839	@ <input type="submit" name="load" value="Use This Skin">
840	840	@ <input type="submit" name="del1" value="Delete This Skin">
841	841	@ </form></li>
842	842	}
843	843

	--- src/skins.c
	+++ src/skins.c
	@@ -24,19 +24,19 @@
24	/* @-comment: // */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	@ body {
32	@ margin: 0ex 1ex;
33	@ padding: 0px;
34	@ background-color: white;
35	@ font-family: sans-serif;
36	@ }
37	@
38	@ /* The project logo in the upper left-hand corner of each page */
39	@ div.logo {
40	@ display: table-row;
41	@ text-align: center;
42	@ /* vertical-align: bottom;*/
	@@ -44,11 +44,11 @@
44	@ font-weight: bold;
45	@ background-color: #707070;
46	@ color: #ffffff;
47	@ min-width: 200px;
48	@ }
49	@
50	@ /* The page title centered at the top of each page */
51	@ div.title {
52	@ display: table-cell;
53	@ font-size: 1.5em;
54	@ font-weight: bold;
	@@ -56,11 +56,11 @@
56	@ padding: 0 0 0 10px;
57	@ color: #404040;
58	@ vertical-align: bottom;
59	@ width: 100%;
60	@ }
61	@
62	@ /* The login status message in the top right-hand corner */
63	@ div.status {
64	@ display: table-cell;
65	@ text-align: right;
66	@ vertical-align: bottom;
	@@ -67,17 +67,17 @@
67	@ color: #404040;
68	@ font-size: 0.8em;
69	@ font-weight: bold;
70	@ min-width: 200px;
71	@ }
72	@
73	@ /* The header across the top of the page */
74	@ div.header {
75	@ display: table;
76	@ width: 100%;
77	@ }
78	@
79	@ /* The main menu bar that appears at the top of the page beneath
80	@ ** the header */
81	@ div.mainmenu {
82	@ padding: 5px 10px 5px 10px;
83	@ font-size: 0.9em;
	@@ -85,11 +85,11 @@
85	@ text-align: center;
86	@ letter-spacing: 1px;
87	@ background-color: #404040;
88	@ color: white;
89	@ }
90	@
91	@ /* The submenu bar that sometimes appears below the main menu */
92	@ div.submenu {
93	@ padding: 3px 10px 3px 0px;
94	@ font-size: 0.9em;
95	@ text-align: center;
	@@ -103,21 +103,21 @@
103	@ }
104	@ div.mainmenu a:hover, div.submenu a:hover {
105	@ color: #404040;
106	@ background-color: white;
107	@ }
108	@
109	@ /* All page content from the bottom of the menu or submenu down to
110	@ ** the footer */
111	@ div.content {
112	@ padding: 0ex 0ex 0ex 0ex;
113	@ }
114	@ /* Hyperlink colors */
115	@ div.content a { color: #604000; }
116	@ div.content a:link { color: #604000;}
117	@ div.content a:visited { color: #600000; }
118	@
119	@ /* Some pages have section dividers */
120	@ div.section {
121	@ margin-bottom: 0px;
122	@ margin-top: 1em;
123	@ padding: 1px 1px 1px 1px;
	@@ -124,11 +124,11 @@
124	@ font-size: 1.2em;
125	@ font-weight: bold;
126	@ background-color: #404040;
127	@ color: white;
128	@ }
129	@
130	@ /* The "Date" that occurs on the left hand side of timelines */
131	@ div.divider {
132	@ background: #a0a0a0;
133	@ border: 2px #505050 solid;
134	@ font-size: 1em; font-weight: normal;
	@@ -135,21 +135,21 @@
135	@ padding: .25em;
136	@ margin: .2em 0 .2em 0;
137	@ float: left;
138	@ clear: left;
139	@ }
140	@
141	@ /* The footer at the very bottom of the page */
142	@ div.footer {
143	@ font-size: 0.8em;
144	@ margin-top: 12px;
145	@ padding: 5px 10px 5px 10px;
146	@ text-align: right;
147	@ background-color: #404040;
148	@ color: white;
149	@ }
150	@
151	@ /* The label/value pairs on (for example) the vinfo page */
152	@ table.label-value th {
153	@ vertical-align: top;
154	@ text-align: right;
155	@ padding: 0.2ex 2ex;
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br>$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -206,39 +206,39 @@
206	@ html "<a href=''$baseurl/login''>Login</a> "
207	@ }
208	@ </th1></div>
209	@ ');
210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211	@ Fossil version $manifest_version $manifest_date
212	@ </div>
213	@ </body></html>
214	@ ');
215	;
216
217	/*
218	** A tan theme with the project title above the user identification
219	** and no logo image.
220	*/
221	static const char zBuiltinSkin2[] =
222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	@ body {
224	@ margin: 0ex 0ex;
225	@ padding: 0px;
226	@ background-color: #fef3bc;
227	@ font-family: sans-serif;
228	@ }
229	@
230	@ /* The project logo in the upper left-hand corner of each page */
231	@ div.logo {
232	@ display: inline;
233	@ text-align: center;
234	@ vertical-align: bottom;
235	@ font-weight: bold;
236	@ font-size: 2.5em;
237	@ color: #a09048;
238	@ }
239	@
240	@ /* The page title centered at the top of each page */
241	@ div.title {
242	@ display: table-cell;
243	@ font-size: 2em;
244	@ font-weight: bold;
	@@ -246,11 +246,11 @@
246	@ padding: 0 0 0 5px;
247	@ color: #a09048;
248	@ vertical-align: bottom;
249	@ width: 100%;
250	@ }
251	@
252	@ /* The login status message in the top right-hand corner */
253	@ div.status {
254	@ display: table-cell;
255	@ text-align: right;
256	@ vertical-align: bottom;
	@@ -257,17 +257,17 @@
257	@ color: #a09048;
258	@ padding: 5px 5px 0 0;
259	@ font-size: 0.8em;
260	@ font-weight: bold;
261	@ }
262	@
263	@ /* The header across the top of the page */
264	@ div.header {
265	@ display: table;
266	@ width: 100%;
267	@ }
268	@
269	@ /* The main menu bar that appears at the top of the page beneath
270	@ ** the header */
271	@ div.mainmenu {
272	@ padding: 5px 10px 5px 10px;
273	@ font-size: 0.9em;
	@@ -275,11 +275,11 @@
275	@ text-align: center;
276	@ letter-spacing: 1px;
277	@ background-color: #a09048;
278	@ color: black;
279	@ }
280	@
281	@ /* The submenu bar that sometimes appears below the main menu */
282	@ div.submenu {
283	@ padding: 3px 10px 3px 0px;
284	@ font-size: 0.9em;
285	@ text-align: center;
	@@ -293,21 +293,21 @@
293	@ }
294	@ div.mainmenu a:hover, div.submenu a:hover {
295	@ color: #a09048;
296	@ background-color: white;
297	@ }
298	@
299	@ /* All page content from the bottom of the menu or submenu down to
300	@ ** the footer */
301	@ div.content {
302	@ padding: 1ex 5px;
303	@ }
304	@ div.content a { color: #706532; }
305	@ div.content a:link { color: #706532; }
306	@ div.content a:visited { color: #704032; }
307	@ div.content a:hover { background-color: white; color: #706532; }
308	@
309	@ /* Some pages have section dividers */
310	@ div.section {
311	@ margin-bottom: 0px;
312	@ margin-top: 1em;
313	@ padding: 3px 3px 0 3px;
	@@ -314,11 +314,11 @@
314	@ font-size: 1.2em;
315	@ font-weight: bold;
316	@ background-color: #a09048;
317	@ color: white;
318	@ }
319	@
320	@ /* The "Date" that occurs on the left hand side of timelines */
321	@ div.divider {
322	@ background: #e1d498;
323	@ border: 2px #a09048 solid;
324	@ font-size: 1em; font-weight: normal;
	@@ -325,33 +325,33 @@
325	@ padding: .25em;
326	@ margin: .2em 0 .2em 0;
327	@ float: left;
328	@ clear: left;
329	@ }
330	@
331	@ /* The footer at the very bottom of the page */
332	@ div.footer {
333	@ font-size: 0.8em;
334	@ margin-top: 12px;
335	@ padding: 5px 10px 5px 10px;
336	@ text-align: right;
337	@ background-color: #a09048;
338	@ color: white;
339	@ }
340	@
341	@ /* Hyperlink colors */
342	@ div.footer a { color: white; }
343	@ div.footer a:link { color: white; }
344	@ div.footer a:visited { color: white; }
345	@ div.footer a:hover { background-color: white; color: #558195; }
346	@
347	@ /* <verbatim> blocks */
348	@ pre.verbatim {
349	@ background-color: #f5f5f5;
350	@ padding: 0.5em;
351	@ }
352	@
353	@ /* The label/value pairs on (for example) the ci page */
354	@ table.label-value th {
355	@ vertical-align: top;
356	@ text-align: right;
357	@ padding: 0.2ex 2ex;
	@@ -418,37 +418,37 @@
418
419	/*
420	** Black letters on a white or cream background with the main menu
421	** stuck on the left-hand side.
422	*/
423	static const char zBuiltinSkin3[] =
424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	@ body {
426	@ margin:0px 0px 0px 0px;
427	@ padding:0px;
428	@ font-family:verdana, arial, helvetica, "sans serif";
429	@ color:#333;
430	@ background-color:white;
431	@ }
432	@
433	@ /* consistent colours */
434	@ h2 {
435	@ color: #333;
436	@ }
437	@ h3 {
438	@ color: #333;
439	@ }
440	@
441	@ /* The project logo in the upper left-hand corner of each page */
442	@ div.logo {
443	@ display: table-cell;
444	@ text-align: left;
445	@ vertical-align: bottom;
446	@ font-weight: bold;
447	@ color: #333;
448	@ }
449	@
450	@ /* The page title centered at the top of each page */
451	@ div.title {
452	@ display: table-cell;
453	@ font-size: 2em;
454	@ font-weight: bold;
	@@ -455,11 +455,11 @@
455	@ text-align: center;
456	@ color: #333;
457	@ vertical-align: bottom;
458	@ width: 100%;
459	@ }
460	@
461	@ /* The login status message in the top right-hand corner */
462	@ div.status {
463	@ display: table-cell;
464	@ padding-right: 10px;
465	@ text-align: right;
	@@ -467,21 +467,21 @@
467	@ padding-bottom: 5px;
468	@ color: #333;
469	@ font-size: 0.8em;
470	@ font-weight: bold;
471	@ }
472	@
473	@ /* The header across the top of the page */
474	@ div.header {
475	@ margin:10px 0px 10px 0px;
476	@ padding:1px 0px 0px 20px;
477	@ border-style:solid;
478	@ border-color:black;
479	@ border-width:1px 0px;
480	@ background-color:#eee;
481	@ }
482	@
483	@ /* The main menu bar that appears at the top left of the page beneath
484	@ ** the header. Width must be co-ordinated with the container below */
485	@ div.mainmenu {
486	@ float: left;
487	@ margin-left: 10px;
	@@ -491,11 +491,11 @@
491	@ padding:5px;
492	@ background-color:#eee;
493	@ border:1px solid #999;
494	@ width:8em;
495	@ }
496	@
497	@ /* Main menu is now a list */
498	@ div.mainmenu ul {
499	@ padding: 0;
500	@ list-style:none;
501	@ }
	@@ -506,17 +506,17 @@
506	@ }
507	@ div.mainmenu a:hover {
508	@ color: #eee;
509	@ background-color: #333;
510	@ }
511	@
512	@ /* Container for the sub-menu and content so they don''t spread
513	@ ** out underneath the main menu */
514	@ #container {
515	@ padding-left: 9em;
516	@ }
517	@
518	@ /* The submenu bar that sometimes appears below the main menu */
519	@ div.submenu {
520	@ padding: 3px 10px 3px 10px;
521	@ font-size: 0.9em;
522	@ text-align: center;
	@@ -532,18 +532,18 @@
532	@ }
533	@ div.submenu a:hover {
534	@ color: #eee;
535	@ background-color: #333;
536	@ }
537	@
538	@ /* All page content from the bottom of the menu or submenu down to
539	@ ** the footer */
540	@ div.content {
541	@ float right;
542	@ padding: 2ex 1ex 0ex 2ex;
543	@ }
544	@
545	@ /* Some pages have section dividers */
546	@ div.section {
547	@ margin-bottom: 0px;
548	@ margin-top: 1em;
549	@ padding: 1px 1px 1px 1px;
	@@ -553,11 +553,11 @@
553	@ border-color:#999;
554	@ border-width:1px 0px;
555	@ background-color: #eee;
556	@ color: #333;
557	@ }
558	@
559	@ /* The "Date" that occurs on the left hand side of timelines */
560	@ div.divider {
561	@ background: #eee;
562	@ border: 2px #999 solid;
563	@ font-size: 1em; font-weight: normal;
	@@ -565,27 +565,27 @@
565	@ margin: .2em 0 .2em 0;
566	@ float: left;
567	@ clear: left;
568	@ color: #333
569	@ }
570	@
571	@ /* The footer at the very bottom of the page */
572	@ div.footer {
573	@ font-size: 0.8em;
574	@ margin-top: 12px;
575	@ padding: 5px 10px 5px 10px;
576	@ text-align: right;
577	@ background-color: #eee;
578	@ color: #555;
579	@ }
580	@
581	@ /* <verbatim> blocks */
582	@ pre.verbatim {
583	@ background-color: #f5f5f5;
584	@ padding: 0.5em;
585	@ }
586	@
587	@ /* The label/value pairs on (for example) the ci page */
588	@ table.label-value th {
589	@ vertical-align: top;
590	@ text-align: right;
591	@ padding: 0.2ex 2ex;
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
	@@ -732,18 +732,18 @@
732	db_begin_transaction();
733
734	/* Process requests to delete a user-defined skin */
735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	style_header("Confirm Custom Skin Delete");
737	@ <form action="%s(g.zBaseURL)/setup_skin" method="POST">
738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	@ be undone. Please confirm that this is what you want to do:</p>
740	@ <input type="hidden" name="sn" value="%h(P("sn"))">
741	@ <input type="submit" name="del2" value="Confirm - Delete The Skin">
742	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete">
743	login_insert_csrf_secret();
744	@ </form>
745	style_footer();
746	return;
747	}
748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
	@@ -800,11 +800,11 @@
800	}
801	}
802
803	style_header("Skins");
804	@ <p>A "skin" is a combination of
805	@ <a href="setup_editcss">CSS</a>,
806	@ <a href="setup_header">Header</a>,
807	@ <a href="setup_footer">Footer</a>, and
808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	@ of the web interface.</p>
810	@
	@@ -813,15 +813,15 @@
813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	z = aBuiltinSkin[i].zName;
815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	}else{
818	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
819	@ %h(z).
820	@ <input type="hidden" name="sn" value="%h(z)">
821	@ <input type="submit" name="load" value="Use This Skin">
822	@ </form></li>
823	}
824	}
825	db_prepare(&q,
826	"SELECT substr(name, 6), value FROM config"
827	" WHERE name GLOB 'skin:*'"
	@@ -832,11 +832,11 @@
832	const char *zV = db_column_text(&q, 1);
833	if( strcmp(zV, zCurrent)==0 ){
834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	}else{
836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837	@ %h(zN).
838	@ <input type="hidden" name="sn" value="%h(zN)">
839	@ <input type="submit" name="load" value="Use This Skin">
840	@ <input type="submit" name="del1" value="Delete This Skin">
841	@ </form></li>
842	}
843

	--- src/skins.c
	+++ src/skins.c
	@@ -24,19 +24,19 @@
24	/* @-comment: // */
25	/*
26	** A black-and-white theme with the project title in a bar across the top
27	** and no logo image.
28	*/
29	static const char zBuiltinSkin1[] =
30	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
31	@ body {
32	@ margin: 0ex 1ex;
33	@ padding: 0px;
34	@ background-color: white;
35	@ font-family: sans-serif;
36	@ }
37	@
38	@ /* The project logo in the upper left-hand corner of each page */
39	@ div.logo {
40	@ display: table-row;
41	@ text-align: center;
42	@ /* vertical-align: bottom;*/
	@@ -44,11 +44,11 @@
44	@ font-weight: bold;
45	@ background-color: #707070;
46	@ color: #ffffff;
47	@ min-width: 200px;
48	@ }
49	@
50	@ /* The page title centered at the top of each page */
51	@ div.title {
52	@ display: table-cell;
53	@ font-size: 1.5em;
54	@ font-weight: bold;
	@@ -56,11 +56,11 @@
56	@ padding: 0 0 0 10px;
57	@ color: #404040;
58	@ vertical-align: bottom;
59	@ width: 100%;
60	@ }
61	@
62	@ /* The login status message in the top right-hand corner */
63	@ div.status {
64	@ display: table-cell;
65	@ text-align: right;
66	@ vertical-align: bottom;
	@@ -67,17 +67,17 @@
67	@ color: #404040;
68	@ font-size: 0.8em;
69	@ font-weight: bold;
70	@ min-width: 200px;
71	@ }
72	@
73	@ /* The header across the top of the page */
74	@ div.header {
75	@ display: table;
76	@ width: 100%;
77	@ }
78	@
79	@ /* The main menu bar that appears at the top of the page beneath
80	@ ** the header */
81	@ div.mainmenu {
82	@ padding: 5px 10px 5px 10px;
83	@ font-size: 0.9em;
	@@ -85,11 +85,11 @@
85	@ text-align: center;
86	@ letter-spacing: 1px;
87	@ background-color: #404040;
88	@ color: white;
89	@ }
90	@
91	@ /* The submenu bar that sometimes appears below the main menu */
92	@ div.submenu {
93	@ padding: 3px 10px 3px 0px;
94	@ font-size: 0.9em;
95	@ text-align: center;
	@@ -103,21 +103,21 @@
103	@ }
104	@ div.mainmenu a:hover, div.submenu a:hover {
105	@ color: #404040;
106	@ background-color: white;
107	@ }
108	@
109	@ /* All page content from the bottom of the menu or submenu down to
110	@ ** the footer */
111	@ div.content {
112	@ padding: 0ex 0ex 0ex 0ex;
113	@ }
114	@ /* Hyperlink colors */
115	@ div.content a { color: #604000; }
116	@ div.content a:link { color: #604000;}
117	@ div.content a:visited { color: #600000; }
118	@
119	@ /* Some pages have section dividers */
120	@ div.section {
121	@ margin-bottom: 0px;
122	@ margin-top: 1em;
123	@ padding: 1px 1px 1px 1px;
	@@ -124,11 +124,11 @@
124	@ font-size: 1.2em;
125	@ font-weight: bold;
126	@ background-color: #404040;
127	@ color: white;
128	@ }
129	@
130	@ /* The "Date" that occurs on the left hand side of timelines */
131	@ div.divider {
132	@ background: #a0a0a0;
133	@ border: 2px #505050 solid;
134	@ font-size: 1em; font-weight: normal;
	@@ -135,21 +135,21 @@
135	@ padding: .25em;
136	@ margin: .2em 0 .2em 0;
137	@ float: left;
138	@ clear: left;
139	@ }
140	@
141	@ /* The footer at the very bottom of the page */
142	@ div.footer {
143	@ font-size: 0.8em;
144	@ margin-top: 12px;
145	@ padding: 5px 10px 5px 10px;
146	@ text-align: right;
147	@ background-color: #404040;
148	@ color: white;
149	@ }
150	@
151	@ /* The label/value pairs on (for example) the vinfo page */
152	@ table.label-value th {
153	@ vertical-align: top;
154	@ text-align: right;
155	@ padding: 0.2ex 2ex;
	@@ -165,11 +165,11 @@
165	@ <body>
166	@ <div class="header">
167	@ <div class="logo">
168	@ <img src="$baseurl/logo" alt="logo">
169	@ </div>
170	@ <div class="title"><small>$<project_name></small><br />$<title></div>
171	@ <div class="status"><nobr><th1>
172	@ if {[info exists login]} {
173	@ puts "Logged in as $login"
174	@ } else {
175	@ puts "Not logged in"
	@@ -206,39 +206,39 @@
206	@ html "<a href=''$baseurl/login''>Login</a> "
207	@ }
208	@ </th1></div>
209	@ ');
210	@ REPLACE INTO config VALUES('footer','<div class="footer">
211	@ Fossil version $manifest_version $manifest_date
212	@ </div>
213	@ </body></html>
214	@ ');
215	;
216
217	/*
218	** A tan theme with the project title above the user identification
219	** and no logo image.
220	*/
221	static const char zBuiltinSkin2[] =
222	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
223	@ body {
224	@ margin: 0ex 0ex;
225	@ padding: 0px;
226	@ background-color: #fef3bc;
227	@ font-family: sans-serif;
228	@ }
229	@
230	@ /* The project logo in the upper left-hand corner of each page */
231	@ div.logo {
232	@ display: inline;
233	@ text-align: center;
234	@ vertical-align: bottom;
235	@ font-weight: bold;
236	@ font-size: 2.5em;
237	@ color: #a09048;
238	@ }
239	@
240	@ /* The page title centered at the top of each page */
241	@ div.title {
242	@ display: table-cell;
243	@ font-size: 2em;
244	@ font-weight: bold;
	@@ -246,11 +246,11 @@
246	@ padding: 0 0 0 5px;
247	@ color: #a09048;
248	@ vertical-align: bottom;
249	@ width: 100%;
250	@ }
251	@
252	@ /* The login status message in the top right-hand corner */
253	@ div.status {
254	@ display: table-cell;
255	@ text-align: right;
256	@ vertical-align: bottom;
	@@ -257,17 +257,17 @@
257	@ color: #a09048;
258	@ padding: 5px 5px 0 0;
259	@ font-size: 0.8em;
260	@ font-weight: bold;
261	@ }
262	@
263	@ /* The header across the top of the page */
264	@ div.header {
265	@ display: table;
266	@ width: 100%;
267	@ }
268	@
269	@ /* The main menu bar that appears at the top of the page beneath
270	@ ** the header */
271	@ div.mainmenu {
272	@ padding: 5px 10px 5px 10px;
273	@ font-size: 0.9em;
	@@ -275,11 +275,11 @@
275	@ text-align: center;
276	@ letter-spacing: 1px;
277	@ background-color: #a09048;
278	@ color: black;
279	@ }
280	@
281	@ /* The submenu bar that sometimes appears below the main menu */
282	@ div.submenu {
283	@ padding: 3px 10px 3px 0px;
284	@ font-size: 0.9em;
285	@ text-align: center;
	@@ -293,21 +293,21 @@
293	@ }
294	@ div.mainmenu a:hover, div.submenu a:hover {
295	@ color: #a09048;
296	@ background-color: white;
297	@ }
298	@
299	@ /* All page content from the bottom of the menu or submenu down to
300	@ ** the footer */
301	@ div.content {
302	@ padding: 1ex 5px;
303	@ }
304	@ div.content a { color: #706532; }
305	@ div.content a:link { color: #706532; }
306	@ div.content a:visited { color: #704032; }
307	@ div.content a:hover { background-color: white; color: #706532; }
308	@
309	@ /* Some pages have section dividers */
310	@ div.section {
311	@ margin-bottom: 0px;
312	@ margin-top: 1em;
313	@ padding: 3px 3px 0 3px;
	@@ -314,11 +314,11 @@
314	@ font-size: 1.2em;
315	@ font-weight: bold;
316	@ background-color: #a09048;
317	@ color: white;
318	@ }
319	@
320	@ /* The "Date" that occurs on the left hand side of timelines */
321	@ div.divider {
322	@ background: #e1d498;
323	@ border: 2px #a09048 solid;
324	@ font-size: 1em; font-weight: normal;
	@@ -325,33 +325,33 @@
325	@ padding: .25em;
326	@ margin: .2em 0 .2em 0;
327	@ float: left;
328	@ clear: left;
329	@ }
330	@
331	@ /* The footer at the very bottom of the page */
332	@ div.footer {
333	@ font-size: 0.8em;
334	@ margin-top: 12px;
335	@ padding: 5px 10px 5px 10px;
336	@ text-align: right;
337	@ background-color: #a09048;
338	@ color: white;
339	@ }
340	@
341	@ /* Hyperlink colors */
342	@ div.footer a { color: white; }
343	@ div.footer a:link { color: white; }
344	@ div.footer a:visited { color: white; }
345	@ div.footer a:hover { background-color: white; color: #558195; }
346	@
347	@ /* <verbatim> blocks */
348	@ pre.verbatim {
349	@ background-color: #f5f5f5;
350	@ padding: 0.5em;
351	@ }
352	@
353	@ /* The label/value pairs on (for example) the ci page */
354	@ table.label-value th {
355	@ vertical-align: top;
356	@ text-align: right;
357	@ padding: 0.2ex 2ex;
	@@ -418,37 +418,37 @@
418
419	/*
420	** Black letters on a white or cream background with the main menu
421	** stuck on the left-hand side.
422	*/
423	static const char zBuiltinSkin3[] =
424	@ REPLACE INTO config VALUES('css','/* General settings for the entire page */
425	@ body {
426	@ margin:0px 0px 0px 0px;
427	@ padding:0px;
428	@ font-family:verdana, arial, helvetica, "sans serif";
429	@ color:#333;
430	@ background-color:white;
431	@ }
432	@
433	@ /* consistent colours */
434	@ h2 {
435	@ color: #333;
436	@ }
437	@ h3 {
438	@ color: #333;
439	@ }
440	@
441	@ /* The project logo in the upper left-hand corner of each page */
442	@ div.logo {
443	@ display: table-cell;
444	@ text-align: left;
445	@ vertical-align: bottom;
446	@ font-weight: bold;
447	@ color: #333;
448	@ }
449	@
450	@ /* The page title centered at the top of each page */
451	@ div.title {
452	@ display: table-cell;
453	@ font-size: 2em;
454	@ font-weight: bold;
	@@ -455,11 +455,11 @@
455	@ text-align: center;
456	@ color: #333;
457	@ vertical-align: bottom;
458	@ width: 100%;
459	@ }
460	@
461	@ /* The login status message in the top right-hand corner */
462	@ div.status {
463	@ display: table-cell;
464	@ padding-right: 10px;
465	@ text-align: right;
	@@ -467,21 +467,21 @@
467	@ padding-bottom: 5px;
468	@ color: #333;
469	@ font-size: 0.8em;
470	@ font-weight: bold;
471	@ }
472	@
473	@ /* The header across the top of the page */
474	@ div.header {
475	@ margin:10px 0px 10px 0px;
476	@ padding:1px 0px 0px 20px;
477	@ border-style:solid;
478	@ border-color:black;
479	@ border-width:1px 0px;
480	@ background-color:#eee;
481	@ }
482	@
483	@ /* The main menu bar that appears at the top left of the page beneath
484	@ ** the header. Width must be co-ordinated with the container below */
485	@ div.mainmenu {
486	@ float: left;
487	@ margin-left: 10px;
	@@ -491,11 +491,11 @@
491	@ padding:5px;
492	@ background-color:#eee;
493	@ border:1px solid #999;
494	@ width:8em;
495	@ }
496	@
497	@ /* Main menu is now a list */
498	@ div.mainmenu ul {
499	@ padding: 0;
500	@ list-style:none;
501	@ }
	@@ -506,17 +506,17 @@
506	@ }
507	@ div.mainmenu a:hover {
508	@ color: #eee;
509	@ background-color: #333;
510	@ }
511	@
512	@ /* Container for the sub-menu and content so they don''t spread
513	@ ** out underneath the main menu */
514	@ #container {
515	@ padding-left: 9em;
516	@ }
517	@
518	@ /* The submenu bar that sometimes appears below the main menu */
519	@ div.submenu {
520	@ padding: 3px 10px 3px 10px;
521	@ font-size: 0.9em;
522	@ text-align: center;
	@@ -532,18 +532,18 @@
532	@ }
533	@ div.submenu a:hover {
534	@ color: #eee;
535	@ background-color: #333;
536	@ }
537	@
538	@ /* All page content from the bottom of the menu or submenu down to
539	@ ** the footer */
540	@ div.content {
541	@ float right;
542	@ padding: 2ex 1ex 0ex 2ex;
543	@ }
544	@
545	@ /* Some pages have section dividers */
546	@ div.section {
547	@ margin-bottom: 0px;
548	@ margin-top: 1em;
549	@ padding: 1px 1px 1px 1px;
	@@ -553,11 +553,11 @@
553	@ border-color:#999;
554	@ border-width:1px 0px;
555	@ background-color: #eee;
556	@ color: #333;
557	@ }
558	@
559	@ /* The "Date" that occurs on the left hand side of timelines */
560	@ div.divider {
561	@ background: #eee;
562	@ border: 2px #999 solid;
563	@ font-size: 1em; font-weight: normal;
	@@ -565,27 +565,27 @@
565	@ margin: .2em 0 .2em 0;
566	@ float: left;
567	@ clear: left;
568	@ color: #333
569	@ }
570	@
571	@ /* The footer at the very bottom of the page */
572	@ div.footer {
573	@ font-size: 0.8em;
574	@ margin-top: 12px;
575	@ padding: 5px 10px 5px 10px;
576	@ text-align: right;
577	@ background-color: #eee;
578	@ color: #555;
579	@ }
580	@
581	@ /* <verbatim> blocks */
582	@ pre.verbatim {
583	@ background-color: #f5f5f5;
584	@ padding: 0.5em;
585	@ }
586	@
587	@ /* The label/value pairs on (for example) the ci page */
588	@ table.label-value th {
589	@ vertical-align: top;
590	@ text-align: right;
591	@ padding: 0.2ex 2ex;
	@@ -600,11 +600,11 @@
600	@ </head>
601	@ <body>
602	@ <div class="header">
603	@ <div class="logo">
604	@ <!-- <img src="$baseurl/logo" alt="logo"> -->
605	@ <br /><nobr>$<project_name></nobr>
606	@ </div>
607	@ <div class="title">$<title></div>
608	@ <div class="status"><nobr><th1>
609	@ if {[info exists login]} {
610	@ puts "Logged in as $login"
	@@ -732,18 +732,18 @@
732	db_begin_transaction();
733
734	/* Process requests to delete a user-defined skin */
735	if( P("del1") && (zName = skinVarName(P("sn"), 1))!=0 ){
736	style_header("Confirm Custom Skin Delete");
737	@ <form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
738	@ <p>Deletion of a custom skin is a permanent action that cannot
739	@ be undone. Please confirm that this is what you want to do:</p>
740	@ <input type="hidden" name="sn" value="%h(P("sn"))" />
741	@ <input type="submit" name="del2" value="Confirm - Delete The Skin" />
742	@ <input type="submit" name="cancel" value="Cancel - Do Not Delete" />
743	login_insert_csrf_secret();
744	@ </div></form>
745	style_footer();
746	return;
747	}
748	if( P("del2")!=0 && (zName = skinVarName(P("sn"), 1))!=0 ){
749	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
	@@ -800,11 +800,11 @@
800	}
801	}
802
803	style_header("Skins");
804	@ <p>A "skin" is a combination of
805	@ <a href="setup_editcss">CSS</a>,
806	@ <a href="setup_header">Header</a>,
807	@ <a href="setup_footer">Footer</a>, and
808	@ <a href="setup_logo">Logo</a> that determines the look and feel
809	@ of the web interface.</p>
810	@
	@@ -813,15 +813,15 @@
813	for(i=0; i<sizeof(aBuiltinSkin)/sizeof(aBuiltinSkin[0]); i++){
814	z = aBuiltinSkin[i].zName;
815	if( strcmp(aBuiltinSkin[i].zValue, zCurrent)==0 ){
816	@ <li><p>%h(z).   <b>Currently In Use</b></p>
817	}else{
818	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="post"><div>
819	@ %h(z).
820	@ <input type="hidden" name="sn" value="%h(z)" />
821	@ <input type="submit" name="load" value="Use This Skin" />
822	@ </div></form></li>
823	}
824	}
825	db_prepare(&q,
826	"SELECT substr(name, 6), value FROM config"
827	" WHERE name GLOB 'skin:*'"
	@@ -832,11 +832,11 @@
832	const char *zV = db_column_text(&q, 1);
833	if( strcmp(zV, zCurrent)==0 ){
834	@ <li><p>%h(zN).   <b>Currently In Use</b></p>
835	}else{
836	@ <li><form action="%s(g.zBaseURL)/setup_skin" method="POST">
837	@ %h(zN).
838	@ <input type="hidden" name="sn" value="%h(zN)">
839	@ <input type="submit" name="load" value="Use This Skin">
840	@ <input type="submit" name="del1" value="Delete This Skin">
841	@ </form></li>
842	}
843

M src/sqlite3.c

+1948 -1245

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -1,8 +1,8 @@
1	1	/******************************************************************************
2	2	** This file is an amalgamation of many separate C source files from SQLite
3		-** version 3.7.1. By combining all the individual C code files into this
	3	+** version 3.7.2. By combining all the individual C code files into this
4	4	** single large file, the entire code can be compiled as a one translation
5	5	** unit. This allows many compilers to do optimizations that would not be
6	6	** possible if the files were compiled separately. Performance improvements
7	7	** of 5% are more are commonly seen when SQLite is compiled as a single
8	8	** translation unit.
		@@ -213,24 +213,25 @@
213	213	*/
214	214	#ifndef SQLITE_MAX_VARIABLE_NUMBER
215	215	# define SQLITE_MAX_VARIABLE_NUMBER 999
216	216	#endif
217	217
218		-/* Maximum page size. The upper bound on this value is 32768. This a limit
219		-** imposed by the necessity of storing the value in a 2-byte unsigned integer
220		-** and the fact that the page size must be a power of 2.
	218	+/* Maximum page size. The upper bound on this value is 65536. This a limit
	219	+** imposed by the use of 16-bit offsets within each page.
221	220	**
222		-** If this limit is changed, then the compiled library is technically
223		-** incompatible with an SQLite library compiled with a different limit. If
224		-** a process operating on a database with a page-size of 65536 bytes
225		-** crashes, then an instance of SQLite compiled with the default page-size
226		-** limit will not be able to rollback the aborted transaction. This could
227		-** lead to database corruption.
	221	+** Earlier versions of SQLite allowed the user to change this value at
	222	+** compile time. This is no longer permitted, on the grounds that it creates
	223	+** a library that is technically incompatible with an SQLite library
	224	+** compiled with a different limit. If a process operating on a database
	225	+** with a page-size of 65536 bytes crashes, then an instance of SQLite
	226	+** compiled with the default page-size limit will not be able to rollback
	227	+** the aborted transaction. This could lead to database corruption.
228	228	*/
229		-#ifndef SQLITE_MAX_PAGE_SIZE
230		-# define SQLITE_MAX_PAGE_SIZE 32768
	229	+#ifdef SQLITE_MAX_PAGE_SIZE
	230	+# undef SQLITE_MAX_PAGE_SIZE
231	231	#endif
	232	+#define SQLITE_MAX_PAGE_SIZE 65536
232	233
233	234
234	235	/*
235	236	** The default size of a database page.
236	237	*/
		@@ -631,23 +632,23 @@
631	632	** be held constant and Z will be incremented or else Y will be incremented
632	633	** and Z will be reset to zero.
633	634	**
634	635	** Since version 3.6.18, SQLite source code has been stored in the
635	636	** <a href="http://www.fossil-scm.org/">Fossil configuration management
636		-** system</a>. ^The SQLITE_SOURCE_ID macro evalutes to
	637	+** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to
637	638	** a string which identifies a particular check-in of SQLite
638	639	** within its configuration management system. ^The SQLITE_SOURCE_ID
639	640	** string contains the date and time of the check-in (UTC) and an SHA1
640	641	** hash of the entire source tree.
641	642	**
642	643	** See also: [sqlite3_libversion()],
643	644	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
644	645	** [sqlite_version()] and [sqlite_source_id()].
645	646	*/
646		-#define SQLITE_VERSION "3.7.1"
647		-#define SQLITE_VERSION_NUMBER 3007001
648		-#define SQLITE_SOURCE_ID "2010-08-05 03:21:40 fbe70e1106bcc5086ceb9d8f39cc39baf3643092"
	647	+#define SQLITE_VERSION "3.7.2"
	648	+#define SQLITE_VERSION_NUMBER 3007002
	649	+#define SQLITE_SOURCE_ID "2010-08-23 18:52:01 42537b60566f288167f1b5864a5435986838e3a3"
649	650
650	651	/*
651	652	** CAPI3REF: Run-Time Library Version Numbers
652	653	** KEYWORDS: sqlite3_version, sqlite3_sourceid
653	654	**
		@@ -688,19 +689,19 @@
688	689	** ^The sqlite3_compileoption_used() function returns 0 or 1
689	690	** indicating whether the specified option was defined at
690	691	** compile time. ^The SQLITE_ prefix may be omitted from the
691	692	** option name passed to sqlite3_compileoption_used().
692	693	**
693		-** ^The sqlite3_compileoption_get() function allows interating
	694	+** ^The sqlite3_compileoption_get() function allows iterating
694	695	** over the list of options that were defined at compile time by
695	696	** returning the N-th compile time option string. ^If N is out of range,
696	697	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
697	698	** prefix is omitted from any strings returned by
698	699	** sqlite3_compileoption_get().
699	700	**
700	701	** ^Support for the diagnostic functions sqlite3_compileoption_used()
701		-** and sqlite3_compileoption_get() may be omitted by specifing the
	702	+** and sqlite3_compileoption_get() may be omitted by specifying the
702	703	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
703	704	**
704	705	** See also: SQL functions [sqlite_compileoption_used()] and
705	706	** [sqlite_compileoption_get()] and the [compile_options pragma].
706	707	*/
		@@ -802,11 +803,11 @@
802	803	/*
803	804	** CAPI3REF: Closing A Database Connection
804	805	**
805	806	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
806	807	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
807		-** successfullly destroyed and all associated resources are deallocated.
	808	+** successfully destroyed and all associated resources are deallocated.
808	809	**
809	810	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
810	811	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
811	812	** the [sqlite3] object prior to attempting to close the object. ^If
812	813	** sqlite3_close() is called on a [database connection] that still has
		@@ -1229,16 +1230,25 @@
1229	1230	** layer a hint of how large the database file will grow to be during the
1230	1231	** current transaction. This hint is not guaranteed to be accurate but it
1231	1232	** is often close. The underlying VFS might choose to preallocate database
1232	1233	** file space based on this hint in order to help writes to the database
1233	1234	** file run faster.
	1235	+**
	1236	+** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
	1237	+** extends and truncates the database file in chunks of a size specified
	1238	+** by the user. The fourth argument to [sqlite3_file_control()] should
	1239	+** point to an integer (type int) containing the new chunk-size to use
	1240	+** for the nominated database. Allocating database file space in large
	1241	+** chunks (say 1MB at a time), may reduce file-system fragmentation and
	1242	+** improve performance on some systems.
1234	1243	*/
1235	1244	#define SQLITE_FCNTL_LOCKSTATE 1
1236	1245	#define SQLITE_GET_LOCKPROXYFILE 2
1237	1246	#define SQLITE_SET_LOCKPROXYFILE 3
1238	1247	#define SQLITE_LAST_ERRNO 4
1239	1248	#define SQLITE_FCNTL_SIZE_HINT 5
	1249	+#define SQLITE_FCNTL_CHUNK_SIZE 6
1240	1250
1241	1251	/*
1242	1252	** CAPI3REF: Mutex Handle
1243	1253	**
1244	1254	** The mutex module within SQLite defines [sqlite3_mutex] to be an
		@@ -3197,11 +3207,11 @@
3197	3207	** <li> @VVV
3198	3208	** <li> $VVV
3199	3209	** </ul>
3200	3210	**
3201	3211	** In the templates above, NNN represents an integer literal,
3202		-** and VVV represents an alphanumeric identifer.)^ ^The values of these
	3212	+** and VVV represents an alphanumeric identifier.)^ ^The values of these
3203	3213	** parameters (also called "host parameter names" or "SQL parameters")
3204	3214	** can be set using the sqlite3_bind_*() routines defined here.
3205	3215	**
3206	3216	** ^The first argument to the sqlite3_bind_*() routines is always
3207	3217	** a pointer to the [sqlite3_stmt] object returned from
		@@ -3976,11 +3986,11 @@
3976	3986	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3977	3987
3978	3988	/*
3979	3989	** CAPI3REF: Obtain Aggregate Function Context
3980	3990	**
3981		-** Implementions of aggregate SQL functions use this
	3991	+** Implementations of aggregate SQL functions use this
3982	3992	** routine to allocate memory for storing their state.
3983	3993	**
3984	3994	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3985	3995	** for a particular aggregate function, SQLite
3986	3996	** allocates N of memory, zeroes out that memory, and returns a pointer
		@@ -4248,11 +4258,11 @@
4248	4258	** the routine expects pointers to 16-bit word aligned strings
4249	4259	** of UTF-16 in the native byte order.
4250	4260	**
4251	4261	** A pointer to the user supplied routine must be passed as the fifth
4252	4262	** argument. ^If it is NULL, this is the same as deleting the collation
4253		-** sequence (so that SQLite cannot call it anymore).
	4263	+** sequence (so that SQLite cannot call it any more).
4254	4264	** ^Each time the application supplied function is invoked, it is passed
4255	4265	** as its first parameter a copy of the void* passed as the fourth argument
4256	4266	** to sqlite3_create_collation() or sqlite3_create_collation16().
4257	4267	**
4258	4268	** ^The remaining arguments to the application-supplied routine are two strings,
		@@ -5466,11 +5476,11 @@
5466	5476	** of passing a NULL pointer instead of a valid mutex handle are undefined
5467	5477	** (i.e. it is acceptable to provide an implementation that segfaults if
5468	5478	** it is passed a NULL pointer).
5469	5479	**
5470	5480	** The xMutexInit() method must be threadsafe. ^It must be harmless to
5471		-** invoke xMutexInit() mutiple times within the same process and without
	5481	+** invoke xMutexInit() multiple times within the same process and without
5472	5482	** intervening calls to xMutexEnd(). Second and subsequent calls to
5473	5483	** xMutexInit() must be no-ops.
5474	5484	**
5475	5485	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
5476	5486	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
		@@ -5636,11 +5646,11 @@
5636	5646
5637	5647	/*
5638	5648	** CAPI3REF: SQLite Runtime Status
5639	5649	**
5640	5650	** ^This interface is used to retrieve runtime status information
5641		-** about the preformance of SQLite, and optionally to reset various
	5651	+** about the performance of SQLite, and optionally to reset various
5642	5652	** highwater marks. ^The first argument is an integer code for
5643	5653	** the specific parameter to measure. ^(Recognized integer codes
5644	5654	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5645	5655	** ^The current value of the parameter is returned into *pCurrent.
5646	5656	** ^The highest recorded value is returned in *pHighwater. ^If the
		@@ -5762,11 +5772,11 @@
5762	5772	** ^This interface is used to retrieve runtime status information
5763	5773	** about a single [database connection]. ^The first argument is the
5764	5774	** database connection object to be interrogated. ^The second argument
5765	5775	** is an integer constant, taken from the set of
5766	5776	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5767		-** determiness the parameter to interrogate. The set of
	5777	+** determines the parameter to interrogate. The set of
5768	5778	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5769	5779	** to grow in future releases of SQLite.
5770	5780	**
5771	5781	** ^The current value of the requested parameter is written into *pCur
5772	5782	** and the highest instantaneous value is written into *pHiwtr. ^If
		@@ -6184,11 +6194,11 @@
6184	6194	**
6185	6195	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
6186	6196	**
6187	6197	** ^Each call to sqlite3_backup_step() sets two values inside
6188	6198	** the [sqlite3_backup] object: the number of pages still to be backed
6189		-** up and the total number of pages in the source databae file.
	6199	+** up and the total number of pages in the source database file.
6190	6200	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
6191	6201	** retrieve these two values, respectively.
6192	6202	**
6193	6203	** ^The values returned by these functions are only updated by
6194	6204	** sqlite3_backup_step(). ^If the source database is modified during a backup
		@@ -6280,11 +6290,11 @@
6280	6290	** ^(There may be at most one unlock-notify callback registered by a
6281	6291	** blocked connection. If sqlite3_unlock_notify() is called when the
6282	6292	** blocked connection already has a registered unlock-notify callback,
6283	6293	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
6284	6294	** called with a NULL pointer as its second argument, then any existing
6285		-** unlock-notify callback is cancelled. ^The blocked connections
	6295	+** unlock-notify callback is canceled. ^The blocked connections
6286	6296	** unlock-notify callback may also be canceled by closing the blocked
6287	6297	** connection using [sqlite3_close()].
6288	6298	**
6289	6299	** The unlock-notify callback is not reentrant. If an application invokes
6290	6300	** any sqlite3_xxx API functions from within an unlock-notify callback, a
		@@ -6362,11 +6372,11 @@
6362	6372	/*
6363	6373	** CAPI3REF: String Comparison
6364	6374	**
6365	6375	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
6366	6376	** compare the contents of two buffers containing UTF-8 strings in a
6367		-** case-indendent fashion, using the same definition of case independence
	6377	+** case-independent fashion, using the same definition of case independence
6368	6378	** that SQLite uses internally when comparing identifiers.
6369	6379	*/
6370	6380	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
6371	6381
6372	6382	/*
		@@ -7868,11 +7878,11 @@
7868	7878	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager);
7869	7879	SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager, int, unsigned char);
7870	7880
7871	7881	/* Functions used to configure a Pager object. */
7872	7882	SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager, int()(void ), void );
7873		-SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager, u16, int);
	7883	+SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager, u32, int);
7874	7884	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int);
7875	7885	SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);
7876	7886	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int);
7877	7887	SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);
7878	7888	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);
		@@ -7895,11 +7905,11 @@
7895	7905	SQLITE_PRIVATE int sqlite3PagerPageRefcount(DbPage*);
7896	7906	SQLITE_PRIVATE void sqlite3PagerGetData(DbPage );
7897	7907	SQLITE_PRIVATE void sqlite3PagerGetExtra(DbPage );
7898	7908
7899	7909	/* Functions used to manage pager transactions and savepoints. */
7900		-SQLITE_PRIVATE int sqlite3PagerPagecount(Pager, int);
	7910	+SQLITE_PRIVATE void sqlite3PagerPagecount(Pager, int);
7901	7911	SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);
7902	7912	SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager,const char zMaster, int);
7903	7913	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);
7904	7914	SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager);
7905	7915	SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);
		@@ -9183,13 +9193,13 @@
9183	9193	** argument to sqlite3VdbeKeyCompare and is used to control the
9184	9194	** comparison of the two index keys.
9185	9195	*/
9186	9196	struct KeyInfo {
9187	9197	sqlite3 db; / The database connection */
9188		- u8 enc; /* Text encoding - one of the TEXT_Utf* values */
	9198	+ u8 enc; /* Text encoding - one of the SQLITE_UTF* values */
9189	9199	u16 nField; /* Number of entries in aColl[] */
9190		- u8 aSortOrder; / If defined an aSortOrder[i] is true, sort DESC */
	9200	+ u8 aSortOrder; / Sort order for each column. May be NULL */
9191	9201	CollSeq aColl[1]; / Collating sequence for each term of the key */
9192	9202	};
9193	9203
9194	9204	/*
9195	9205	** An instance of the following structure holds information about a
		@@ -14331,11 +14341,11 @@
14331	14341
14332	14342	/*
14333	14343	** Set the "type" of an allocation.
14334	14344	*/
14335	14345	SQLITE_PRIVATE void sqlite3MemdebugSetType(void *p, u8 eType){
14336		- if( p ){
	14346	+ if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14337	14347	struct MemBlockHdr *pHdr;
14338	14348	pHdr = sqlite3MemsysGetHeader(p);
14339	14349	assert( pHdr->iForeGuard==FOREGUARD );
14340	14350	pHdr->eType = eType;
14341	14351	}
		@@ -14350,11 +14360,11 @@
14350	14360	**
14351	14361	** assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) );
14352	14362	*/
14353	14363	SQLITE_PRIVATE int sqlite3MemdebugHasType(void *p, u8 eType){
14354	14364	int rc = 1;
14355		- if( p ){
	14365	+ if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14356	14366	struct MemBlockHdr *pHdr;
14357	14367	pHdr = sqlite3MemsysGetHeader(p);
14358	14368	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14359	14369	if( (pHdr->eType&eType)==0 ){
14360	14370	rc = 0;
		@@ -14372,11 +14382,11 @@
14372	14382	**
14373	14383	** assert( sqlite3MemdebugNoType(p, MEMTYPE_DB) );
14374	14384	*/
14375	14385	SQLITE_PRIVATE int sqlite3MemdebugNoType(void *p, u8 eType){
14376	14386	int rc = 1;
14377		- if( p ){
	14387	+ if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14378	14388	struct MemBlockHdr *pHdr;
14379	14389	pHdr = sqlite3MemsysGetHeader(p);
14380	14390	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14381	14391	if( (pHdr->eType&eType)!=0 ){
14382	14392	rc = 0;
		@@ -16624,10 +16634,11 @@
16624	16634	#else
16625	16635	/* Use the built-in recursive mutexes if they are available.
16626	16636	*/
16627	16637	pthread_mutex_lock(&p->mutex);
16628	16638	#if SQLITE_MUTEX_NREF
	16639	+ assert( p->nRef>0 \|\| p->owner==0 );
16629	16640	p->owner = pthread_self();
16630	16641	p->nRef++;
16631	16642	#endif
16632	16643	#endif
16633	16644
		@@ -16696,10 +16707,11 @@
16696	16707	*/
16697	16708	static void pthreadMutexLeave(sqlite3_mutex *p){
16698	16709	assert( pthreadMutexHeld(p) );
16699	16710	#if SQLITE_MUTEX_NREF
16700	16711	p->nRef--;
	16712	+ if( p->nRef==0 ) p->owner = 0;
16701	16713	#endif
16702	16714	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16703	16715
16704	16716	#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
16705	16717	if( p->nRef==0 ){
		@@ -16960,11 +16972,11 @@
16960	16972	** allocated mutex. SQLite is careful to deallocate every
16961	16973	** mutex that it allocates.
16962	16974	*/
16963	16975	static void winMutexFree(sqlite3_mutex *p){
16964	16976	assert( p );
16965		- assert( p->nRef==0 );
	16977	+ assert( p->nRef==0 && p->owner==0 );
16966	16978	assert( p->id==SQLITE_MUTEX_FAST \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16967	16979	DeleteCriticalSection(&p->mutex);
16968	16980	sqlite3_free(p);
16969	16981	}
16970	16982
		@@ -16984,10 +16996,11 @@
16984	16996	DWORD tid = GetCurrentThreadId();
16985	16997	assert( p->id==SQLITE_MUTEX_RECURSIVE \|\| winMutexNotheld2(p, tid) );
16986	16998	#endif
16987	16999	EnterCriticalSection(&p->mutex);
16988	17000	#ifdef SQLITE_DEBUG
	17001	+ assert( p->nRef>0 \|\| p->owner==0 );
16989	17002	p->owner = tid;
16990	17003	p->nRef++;
16991	17004	if( p->trace ){
16992	17005	printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
16993	17006	}
		@@ -17037,10 +17050,11 @@
17037	17050	#ifndef NDEBUG
17038	17051	DWORD tid = GetCurrentThreadId();
17039	17052	assert( p->nRef>0 );
17040	17053	assert( p->owner==tid );
17041	17054	p->nRef--;
	17055	+ if( p->nRef==0 ) p->owner = 0;
17042	17056	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
17043	17057	#endif
17044	17058	LeaveCriticalSection(&p->mutex);
17045	17059	#ifdef SQLITE_DEBUG
17046	17060	if( p->trace ){
		@@ -22609,10 +22623,11 @@
22609	22623	void lockingContext; / Locking style specific state */
22610	22624	UnixUnusedFd pUnused; / Pre-allocated UnixUnusedFd */
22611	22625	int fileFlags; /* Miscellanous flags */
22612	22626	const char zPath; / Name of the file */
22613	22627	unixShm pShm; / Shared memory segment information */
	22628	+ int szChunk; /* Configured by FCNTL_CHUNK_SIZE */
22614	22629	#if SQLITE_ENABLE_LOCKING_STYLE
22615	22630	int openFlags; /* The flags specified at open() */
22616	22631	#endif
22617	22632	#if SQLITE_ENABLE_LOCKING_STYLE \|\| defined(__APPLE__)
22618	22633	unsigned fsFlags; /* cached details from statfs() */
		@@ -25367,19 +25382,21 @@
25367	25382	offset += wrote;
25368	25383	pBuf = &((char*)pBuf)[wrote];
25369	25384	}
25370	25385	SimulateIOError(( wrote=(-1), amt=1 ));
25371	25386	SimulateDiskfullError(( wrote=0, amt=1 ));
	25387	+
25372	25388	if( amt>0 ){
25373	25389	if( wrote<0 ){
25374	25390	/* lastErrno set by seekAndWrite */
25375	25391	return SQLITE_IOERR_WRITE;
25376	25392	}else{
25377	25393	pFile->lastErrno = 0; /* not a system error */
25378	25394	return SQLITE_FULL;
25379	25395	}
25380	25396	}
	25397	+
25381	25398	return SQLITE_OK;
25382	25399	}
25383	25400
25384	25401	#ifdef SQLITE_TEST
25385	25402	/*
		@@ -25577,16 +25594,27 @@
25577	25594
25578	25595	/*
25579	25596	** Truncate an open file to a specified size
25580	25597	*/
25581	25598	static int unixTruncate(sqlite3_file *id, i64 nByte){
	25599	+ unixFile pFile = (unixFile )id;
25582	25600	int rc;
25583		- assert( id );
	25601	+ assert( pFile );
25584	25602	SimulateIOError( return SQLITE_IOERR_TRUNCATE );
25585		- rc = ftruncate(((unixFile*)id)->h, (off_t)nByte);
	25603	+
	25604	+ /* If the user has configured a chunk-size for this file, truncate the
	25605	+ ** file so that it consists of an integer number of chunks (i.e. the
	25606	+ ** actual file size after the operation may be larger than the requested
	25607	+ ** size).
	25608	+ */
	25609	+ if( pFile->szChunk ){
	25610	+ nByte = ((nByte + pFile->szChunk - 1)/pFile->szChunk) * pFile->szChunk;
	25611	+ }
	25612	+
	25613	+ rc = ftruncate(pFile->h, (off_t)nByte);
25586	25614	if( rc ){
25587		- ((unixFile*)id)->lastErrno = errno;
	25615	+ pFile->lastErrno = errno;
25588	25616	return SQLITE_IOERR_TRUNCATE;
25589	25617	}else{
25590	25618	#ifndef NDEBUG
25591	25619	/* If we are doing a normal write to a database file (as opposed to
25592	25620	** doing a hot-journal rollback or a write to some file other than a
		@@ -25593,12 +25621,12 @@
25593	25621	** normal database file) and we truncate the file to zero length,
25594	25622	** that effectively updates the change counter. This might happen
25595	25623	** when restoring a database using the backup API from a zero-length
25596	25624	** source.
25597	25625	*/
25598		- if( ((unixFile*)id)->inNormalWrite && nByte==0 ){
25599		- ((unixFile*)id)->transCntrChng = 1;
	25626	+ if( pFile->inNormalWrite && nByte==0 ){
	25627	+ pFile->transCntrChng = 1;
25600	25628	}
25601	25629	#endif
25602	25630
25603	25631	return SQLITE_OK;
25604	25632	}
		@@ -25637,10 +25665,58 @@
25637	25665	** proxying locking division.
25638	25666	*/
25639	25667	static int proxyFileControl(sqlite3_file,int,void);
25640	25668	#endif
25641	25669
	25670	+/*
	25671	+** This function is called to handle the SQLITE_FCNTL_SIZE_HINT
	25672	+** file-control operation.
	25673	+**
	25674	+** If the user has configured a chunk-size for this file, it could be
	25675	+** that the file needs to be extended at this point. Otherwise, the
	25676	+** SQLITE_FCNTL_SIZE_HINT operation is a no-op for Unix.
	25677	+*/
	25678	+static int fcntlSizeHint(unixFile *pFile, i64 nByte){
	25679	+ if( pFile->szChunk ){
	25680	+ i64 nSize; /* Required file size */
	25681	+ struct stat buf; /* Used to hold return values of fstat() */
	25682	+
	25683	+ if( fstat(pFile->h, &buf) ) return SQLITE_IOERR_FSTAT;
	25684	+
	25685	+ nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
	25686	+ if( nSize>(i64)buf.st_size ){
	25687	+#if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
	25688	+ if( posix_fallocate(pFile->h, buf.st_size, nSize-buf.st_size) ){
	25689	+ return SQLITE_IOERR_WRITE;
	25690	+ }
	25691	+#else
	25692	+ /* If the OS does not have posix_fallocate(), fake it. First use
	25693	+ ** ftruncate() to set the file size, then write a single byte to
	25694	+ ** the last byte in each block within the extended region. This
	25695	+ ** is the same technique used by glibc to implement posix_fallocate()
	25696	+ ** on systems that do not have a real fallocate() system call.
	25697	+ */
	25698	+ int nBlk = buf.st_blksize; /* File-system block size */
	25699	+ i64 iWrite; /* Next offset to write to */
	25700	+ int nWrite; /* Return value from seekAndWrite() */
	25701	+
	25702	+ if( ftruncate(pFile->h, nSize) ){
	25703	+ pFile->lastErrno = errno;
	25704	+ return SQLITE_IOERR_TRUNCATE;
	25705	+ }
	25706	+ iWrite = ((buf.st_size + 2nBlk - 1)/nBlk)nBlk-1;
	25707	+ do {
	25708	+ nWrite = seekAndWrite(pFile, iWrite, "", 1);
	25709	+ iWrite += nBlk;
	25710	+ } while( nWrite==1 && iWrite<nSize );
	25711	+ if( nWrite!=1 ) return SQLITE_IOERR_WRITE;
	25712	+#endif
	25713	+ }
	25714	+ }
	25715	+
	25716	+ return SQLITE_OK;
	25717	+}
25642	25718
25643	25719	/*
25644	25720	** Information and control of an open file handle.
25645	25721	*/
25646	25722	static int unixFileControl(sqlite3_file id, int op, void pArg){
		@@ -25650,18 +25726,17 @@
25650	25726	return SQLITE_OK;
25651	25727	}
25652	25728	case SQLITE_LAST_ERRNO: {
25653	25729	(int)pArg = ((unixFile*)id)->lastErrno;
25654	25730	return SQLITE_OK;
	25731	+ }
	25732	+ case SQLITE_FCNTL_CHUNK_SIZE: {
	25733	+ ((unixFile)id)->szChunk = (int *)pArg;
	25734	+ return SQLITE_OK;
25655	25735	}
25656	25736	case SQLITE_FCNTL_SIZE_HINT: {
25657		-#if 0 /* No performance advantage seen on Linux */
25658		- sqlite3_int64 szFile = (sqlite3_int64)pArg;
25659		- unixFile pFile = (unixFile)id;
25660		- ftruncate(pFile->h, szFile);
25661		-#endif
25662		- return SQLITE_OK;
	25737	+ return fcntlSizeHint((unixFile )id, (i64 *)pArg);
25663	25738	}
25664	25739	#ifndef NDEBUG
25665	25740	/* The pager calls this method to signal that it has done
25666	25741	** a rollback and that the database is therefore unchanged and
25667	25742	** it hence it is OK for the transaction change counter to be
		@@ -28522,11 +28597,11 @@
28522	28597	}else{
28523	28598	if( pCtx->conchFile ){
28524	28599	pCtx->conchFile->pMethod->xClose((sqlite3_file *)pCtx->conchFile);
28525	28600	sqlite3_free(pCtx->conchFile);
28526	28601	}
28527		- sqlite3_free(pCtx->lockProxyPath);
	28602	+ sqlite3DbFree(0, pCtx->lockProxyPath);
28528	28603	sqlite3_free(pCtx->conchFilePath);
28529	28604	sqlite3_free(pCtx);
28530	28605	}
28531	28606	OSTRACE(("TRANSPROXY %d %s\n", pFile->h,
28532	28607	(rc==SQLITE_OK ? "ok" : "failed")));
		@@ -28713,13 +28788,13 @@
28713	28788	}
28714	28789	rc = conchFile->pMethod->xClose((sqlite3_file*)conchFile);
28715	28790	if( rc ) return rc;
28716	28791	sqlite3_free(conchFile);
28717	28792	}
28718		- sqlite3_free(pCtx->lockProxyPath);
	28793	+ sqlite3DbFree(0, pCtx->lockProxyPath);
28719	28794	sqlite3_free(pCtx->conchFilePath);
28720		- sqlite3_free(pCtx->dbPath);
	28795	+ sqlite3DbFree(0, pCtx->dbPath);
28721	28796	/* restore the original locking context and pMethod then close it */
28722	28797	pFile->lockingContext = pCtx->oldLockingContext;
28723	28798	pFile->pMethod = pCtx->pOldMethod;
28724	28799	sqlite3_free(pCtx);
28725	28800	return pFile->pMethod->xClose(id);
		@@ -29161,10 +29236,11 @@
29161	29236	short sharedLockByte; /* Randomly chosen byte used as a shared lock */
29162	29237	DWORD lastErrno; /* The Windows errno from the last I/O error */
29163	29238	DWORD sectorSize; /* Sector size of the device file is on */
29164	29239	winShm pShm; / Instance of shared memory on this file */
29165	29240	const char zPath; / Full pathname of this file */
	29241	+ int szChunk; /* Chunk size configured by FCNTL_CHUNK_SIZE */
29166	29242	#if SQLITE_OS_WINCE
29167	29243	WCHAR zDeleteOnClose; / Name of file to delete when closing */
29168	29244	HANDLE hMutex; /* Mutex used to control access to shared lock */
29169	29245	HANDLE hShared; /* Shared memory segment used for locking */
29170	29246	winceLock local; /* Locks obtained by this instance of winFile */
		@@ -29671,10 +29747,46 @@
29671	29747
29672	29748	/*****************************************************************************
29673	29749	** The next group of routines implement the I/O methods specified
29674	29750	** by the sqlite3_io_methods object.
29675	29751	******************************************************************************/
	29752	+
	29753	+/*
	29754	+** Some microsoft compilers lack this definition.
	29755	+*/
	29756	+#ifndef INVALID_SET_FILE_POINTER
	29757	+# define INVALID_SET_FILE_POINTER ((DWORD)-1)
	29758	+#endif
	29759	+
	29760	+/*
	29761	+** Move the current position of the file handle passed as the first
	29762	+** argument to offset iOffset within the file. If successful, return 0.
	29763	+** Otherwise, set pFile->lastErrno and return non-zero.
	29764	+*/
	29765	+static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
	29766	+ LONG upperBits; /* Most sig. 32 bits of new offset */
	29767	+ LONG lowerBits; /* Least sig. 32 bits of new offset */
	29768	+ DWORD dwRet; /* Value returned by SetFilePointer() */
	29769	+
	29770	+ upperBits = (LONG)((iOffset>>32) & 0x7fffffff);
	29771	+ lowerBits = (LONG)(iOffset & 0xffffffff);
	29772	+
	29773	+ /* API oddity: If successful, SetFilePointer() returns a dword
	29774	+ ** containing the lower 32-bits of the new file-offset. Or, if it fails,
	29775	+ ** it returns INVALID_SET_FILE_POINTER. However according to MSDN,
	29776	+ ** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine
	29777	+ ** whether an error has actually occured, it is also necessary to call
	29778	+ ** GetLastError().
	29779	+ */
	29780	+ dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
	29781	+ if( (dwRet==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR) ){
	29782	+ pFile->lastErrno = GetLastError();
	29783	+ return 1;
	29784	+ }
	29785	+
	29786	+ return 0;
	29787	+}
29676	29788
29677	29789	/*
29678	29790	** Close a file.
29679	29791	**
29680	29792	** It is reported that an attempt to close a handle might sometimes
		@@ -29714,17 +29826,10 @@
29714	29826	OSTRACE(("CLOSE %d %s\n", pFile->h, rc ? "ok" : "failed"));
29715	29827	OpenCounter(-1);
29716	29828	return rc ? SQLITE_OK : SQLITE_IOERR;
29717	29829	}
29718	29830
29719		-/*
29720		-** Some microsoft compilers lack this definition.
29721		-*/
29722		-#ifndef INVALID_SET_FILE_POINTER
29723		-# define INVALID_SET_FILE_POINTER ((DWORD)-1)
29724		-#endif
29725		-
29726	29831	/*
29727	29832	** Read data from a file into a buffer. Return SQLITE_OK if all
29728	29833	** bytes were read successfully and SQLITE_IOERR if anything goes
29729	29834	** wrong.
29730	29835	*/
		@@ -29732,112 +29837,108 @@
29732	29837	sqlite3_file id, / File to read from */
29733	29838	void pBuf, / Write content into this buffer */
29734	29839	int amt, /* Number of bytes to read */
29735	29840	sqlite3_int64 offset /* Begin reading at this offset */
29736	29841	){
29737		- LONG upperBits = (LONG)((offset>>32) & 0x7fffffff);
29738		- LONG lowerBits = (LONG)(offset & 0xffffffff);
29739		- DWORD rc;
29740		- winFile pFile = (winFile)id;
29741		- DWORD error;
29742		- DWORD got;
	29842	+ winFile pFile = (winFile)id; /* file handle */
	29843	+ DWORD nRead; /* Number of bytes actually read from file */
29743	29844
29744	29845	assert( id!=0 );
29745	29846	SimulateIOError(return SQLITE_IOERR_READ);
29746	29847	OSTRACE(("READ %d lock=%d\n", pFile->h, pFile->locktype));
29747		- rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29748		- if( rc==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29749		- pFile->lastErrno = error;
	29848	+
	29849	+ if( seekWinFile(pFile, offset) ){
29750	29850	return SQLITE_FULL;
29751	29851	}
29752		- if( !ReadFile(pFile->h, pBuf, amt, &got, 0) ){
	29852	+ if( !ReadFile(pFile->h, pBuf, amt, &nRead, 0) ){
29753	29853	pFile->lastErrno = GetLastError();
29754	29854	return SQLITE_IOERR_READ;
29755	29855	}
29756		- if( got==(DWORD)amt ){
29757		- return SQLITE_OK;
29758		- }else{
	29856	+ if( nRead<(DWORD)amt ){
29759	29857	/* Unread parts of the buffer must be zero-filled */
29760		- memset(&((char*)pBuf)[got], 0, amt-got);
	29858	+ memset(&((char*)pBuf)[nRead], 0, amt-nRead);
29761	29859	return SQLITE_IOERR_SHORT_READ;
29762	29860	}
	29861	+
	29862	+ return SQLITE_OK;
29763	29863	}
29764	29864
29765	29865	/*
29766	29866	** Write data from a buffer into a file. Return SQLITE_OK on success
29767	29867	** or some other error code on failure.
29768	29868	*/
29769	29869	static int winWrite(
29770		- sqlite3_file id, / File to write into */
29771		- const void pBuf, / The bytes to be written */
29772		- int amt, /* Number of bytes to write */
29773		- sqlite3_int64 offset /* Offset into the file to begin writing at */
	29870	+ sqlite3_file id, / File to write into */
	29871	+ const void pBuf, / The bytes to be written */
	29872	+ int amt, /* Number of bytes to write */
	29873	+ sqlite3_int64 offset /* Offset into the file to begin writing at */
29774	29874	){
29775		- LONG upperBits = (LONG)((offset>>32) & 0x7fffffff);
29776		- LONG lowerBits = (LONG)(offset & 0xffffffff);
29777		- DWORD rc;
29778		- winFile pFile = (winFile)id;
29779		- DWORD error;
29780		- DWORD wrote = 0;
29781		-
29782		- assert( id!=0 );
	29875	+ int rc; /* True if error has occured, else false */
	29876	+ winFile pFile = (winFile)id; /* File handle */
	29877	+
	29878	+ assert( amt>0 );
	29879	+ assert( pFile );
29783	29880	SimulateIOError(return SQLITE_IOERR_WRITE);
29784	29881	SimulateDiskfullError(return SQLITE_FULL);
29785		- OSTRACE(("WRITE %d lock=%d\n", pFile->h, pFile->locktype));
29786		- rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29787		- if( rc==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29788		- pFile->lastErrno = error;
29789		- if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
29790		- return SQLITE_FULL;
29791		- }else{
29792		- return SQLITE_IOERR_WRITE;
29793		- }
29794		- }
29795		- assert( amt>0 );
29796		- while(
29797		- amt>0
29798		- && (rc = WriteFile(pFile->h, pBuf, amt, &wrote, 0))!=0
29799		- && wrote>0
29800		- ){
29801		- amt -= wrote;
29802		- pBuf = &((char*)pBuf)[wrote];
29803		- }
29804		- if( !rc \|\| amt>(int)wrote ){
29805		- pFile->lastErrno = GetLastError();
29806		- if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
29807		- return SQLITE_FULL;
29808		- }else{
29809		- return SQLITE_IOERR_WRITE;
29810		- }
	29882	+
	29883	+ OSTRACE(("WRITE %d lock=%d\n", pFile->h, pFile->locktype));
	29884	+
	29885	+ rc = seekWinFile(pFile, offset);
	29886	+ if( rc==0 ){
	29887	+ u8 aRem = (u8 )pBuf; /* Data yet to be written */
	29888	+ int nRem = amt; /* Number of bytes yet to be written */
	29889	+ DWORD nWrite; /* Bytes written by each WriteFile() call */
	29890	+
	29891	+ while( nRem>0 && WriteFile(pFile->h, aRem, nRem, &nWrite, 0) && nWrite>0 ){
	29892	+ aRem += nWrite;
	29893	+ nRem -= nWrite;
	29894	+ }
	29895	+ if( nRem>0 ){
	29896	+ pFile->lastErrno = GetLastError();
	29897	+ rc = 1;
	29898	+ }
	29899	+ }
	29900	+
	29901	+ if( rc ){
	29902	+ if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
	29903	+ return SQLITE_FULL;
	29904	+ }
	29905	+ return SQLITE_IOERR_WRITE;
29811	29906	}
29812	29907	return SQLITE_OK;
29813	29908	}
29814	29909
29815	29910	/*
29816	29911	** Truncate an open file to a specified size
29817	29912	*/
29818	29913	static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
29819		- LONG upperBits = (LONG)((nByte>>32) & 0x7fffffff);
29820		- LONG lowerBits = (LONG)(nByte & 0xffffffff);
29821		- DWORD dwRet;
29822		- winFile pFile = (winFile)id;
29823		- DWORD error;
29824		- int rc = SQLITE_OK;
29825		-
29826		- assert( id!=0 );
	29914	+ winFile pFile = (winFile)id; /* File handle object */
	29915	+ int rc = SQLITE_OK; /* Return code for this function */
	29916	+
	29917	+ assert( pFile );
	29918	+
29827	29919	OSTRACE(("TRUNCATE %d %lld\n", pFile->h, nByte));
29828	29920	SimulateIOError(return SQLITE_IOERR_TRUNCATE);
29829		- dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29830		- if( dwRet==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29831		- pFile->lastErrno = error;
	29921	+
	29922	+ /* If the user has configured a chunk-size for this file, truncate the
	29923	+ ** file so that it consists of an integer number of chunks (i.e. the
	29924	+ ** actual file size after the operation may be larger than the requested
	29925	+ ** size).
	29926	+ */
	29927	+ if( pFile->szChunk ){
	29928	+ nByte = ((nByte + pFile->szChunk - 1)/pFile->szChunk) * pFile->szChunk;
	29929	+ }
	29930	+
	29931	+ /* SetEndOfFile() returns non-zero when successful, or zero when it fails. */
	29932	+ if( seekWinFile(pFile, nByte) ){
29832	29933	rc = SQLITE_IOERR_TRUNCATE;
29833		- /* SetEndOfFile will fail if nByte is negative */
29834		- }else if( !SetEndOfFile(pFile->h) ){
	29934	+ }else if( 0==SetEndOfFile(pFile->h) ){
29835	29935	pFile->lastErrno = GetLastError();
29836	29936	rc = SQLITE_IOERR_TRUNCATE;
29837	29937	}
29838		- OSTRACE(("TRUNCATE %d %lld %s\n", pFile->h, nByte, rc==SQLITE_OK ? "ok" : "failed"));
	29938	+
	29939	+ OSTRACE(("TRUNCATE %d %lld %s\n", pFile->h, nByte, rc ? "failed" : "ok"));
29839	29940	return rc;
29840	29941	}
29841	29942
29842	29943	#ifdef SQLITE_TEST
29843	29944	/*
		@@ -30197,10 +30298,14 @@
30197	30298	return SQLITE_OK;
30198	30299	}
30199	30300	case SQLITE_LAST_ERRNO: {
30200	30301	(int)pArg = (int)((winFile*)id)->lastErrno;
30201	30302	return SQLITE_OK;
	30303	+ }
	30304	+ case SQLITE_FCNTL_CHUNK_SIZE: {
	30305	+ ((winFile)id)->szChunk = (int *)pArg;
	30306	+ return SQLITE_OK;
30202	30307	}
30203	30308	case SQLITE_FCNTL_SIZE_HINT: {
30204	30309	sqlite3_int64 sz = (sqlite3_int64)pArg;
30205	30310	SimulateIOErrorBenign(1);
30206	30311	winTruncate(id, sz);
		@@ -31749,11 +31854,11 @@
31749	31854	** start of a transaction, and is thus usually less than a few thousand,
31750	31855	** but can be as large as 2 billion for a really big database.
31751	31856	*/
31752	31857
31753	31858	/* Size of the Bitvec structure in bytes. */
31754		-#define BITVEC_SZ (sizeof(void)128) /* 512 on 32bit. 1024 on 64bit */
	31859	+#define BITVEC_SZ 512
31755	31860
31756	31861	/* Round the union size down to the nearest pointer boundary, since that's how
31757	31862	** it will be aligned within the Bitvec struct. */
31758	31863	#define BITVEC_USIZE (((BITVEC_SZ-(3sizeof(u32)))/sizeof(Bitvec))sizeof(Bitvec))
31759	31864
		@@ -32907,10 +33012,29 @@
32907	33012	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize);
32908	33013	sqlite3_free(p);
32909	33014	}
32910	33015	}
32911	33016
	33017	+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
	33018	+/*
	33019	+** Return the size of a pache allocation
	33020	+*/
	33021	+static int pcache1MemSize(void *p){
	33022	+ assert( sqlite3_mutex_held(pcache1.mutex) );
	33023	+ if( p>=pcache1.pStart && p<pcache1.pEnd ){
	33024	+ return pcache1.szSlot;
	33025	+ }else{
	33026	+ int iSize;
	33027	+ assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
	33028	+ sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
	33029	+ iSize = sqlite3MallocSize(p);
	33030	+ sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
	33031	+ return iSize;
	33032	+ }
	33033	+}
	33034	+#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT */
	33035	+
32912	33036	/*
32913	33037	** Allocate a new page object initially associated with cache pCache.
32914	33038	*/
32915	33039	static PgHdr1 pcache1AllocPage(PCache1 pCache){
32916	33040	int nByte = sizeof(PgHdr1) + pCache->szPage;
		@@ -33455,11 +33579,11 @@
33455	33579	int nFree = 0;
33456	33580	if( pcache1.pStart==0 ){
33457	33581	PgHdr1 *p;
33458	33582	pcache1EnterMutex();
33459	33583	while( (nReq<0 \|\| nFree<nReq) && (p=pcache1.pLruTail) ){
33460		- nFree += sqlite3MallocSize(PGHDR1_TO_PAGE(p));
	33584	+ nFree += pcache1MemSize(PGHDR1_TO_PAGE(p));
33461	33585	pcache1PinPage(p);
33462	33586	pcache1RemoveFromHash(p);
33463	33587	pcache1FreePage(p);
33464	33588	}
33465	33589	pcache1LeaveMutex();
		@@ -33964,11 +34088,11 @@
33964	34088	# define sqlite3WalOpen(x,y,z) 0
33965	34089	# define sqlite3WalClose(w,x,y,z) 0
33966	34090	# define sqlite3WalBeginReadTransaction(y,z) 0
33967	34091	# define sqlite3WalEndReadTransaction(z)
33968	34092	# define sqlite3WalRead(v,w,x,y,z) 0
33969		-# define sqlite3WalDbsize(y,z)
	34093	+# define sqlite3WalDbsize(y) 0
33970	34094	# define sqlite3WalBeginWriteTransaction(y) 0
33971	34095	# define sqlite3WalEndWriteTransaction(x) 0
33972	34096	# define sqlite3WalUndo(x,y,z) 0
33973	34097	# define sqlite3WalSavepoint(y,z)
33974	34098	# define sqlite3WalSavepointUndo(y,z) 0
		@@ -34000,13 +34124,12 @@
34000	34124	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal);
34001	34125
34002	34126	/* Read a page from the write-ahead log, if it is present. */
34003	34127	SQLITE_PRIVATE int sqlite3WalRead(Wal pWal, Pgno pgno, int pInWal, int nOut, u8 *pOut);
34004	34128
34005		-/* Return the size of the database as it existed at the beginning
34006		-** of the snapshot */
34007		-SQLITE_PRIVATE void sqlite3WalDbsize(Wal pWal, Pgno pPgno);
	34129	+/* If the WAL is not empty, return the size of the database. */
	34130	+SQLITE_PRIVATE Pgno sqlite3WalDbsize(Wal *pWal);
34008	34131
34009	34132	/* Obtain or release the WRITER lock. */
34010	34133	SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal);
34011	34134	SQLITE_PRIVATE int sqlite3WalEndWriteTransaction(Wal *pWal);
34012	34135
		@@ -34048,12 +34171,16 @@
34048	34171	#endif /* _WAL_H_ */
34049	34172
34050	34173	/************ End of wal.h ***********************************************/
34051	34174	/************ Continuing where we left off in pager.c ********************/
34052	34175
34053		-/*
34054		-****************** NOTES ON THE DESIGN OF THE PAGER **********************
	34176	+
	34177	+/***************** NOTES ON THE DESIGN OF THE PAGER **********************
	34178	+**
	34179	+** This comment block describes invariants that hold when using a rollback
	34180	+** journal. These invariants do not apply for journal_mode=WAL,
	34181	+** journal_mode=MEMORY, or journal_mode=OFF.
34055	34182	**
34056	34183	** Within this comment block, a page is deemed to have been synced
34057	34184	** automatically as soon as it is written when PRAGMA synchronous=OFF.
34058	34185	** Otherwise, the page is not synced until the xSync method of the VFS
34059	34186	** is called successfully on the file containing the page.
		@@ -34083,11 +34210,11 @@
34083	34210	** both the content in the database when the rollback journal was written
34084	34211	** and the content in the database at the beginning of the current
34085	34212	** transaction.
34086	34213	**
34087	34214	** (3) Writes to the database file are an integer multiple of the page size
34088		-** in length and are aligned to a page boundary.
	34215	+** in length and are aligned on a page boundary.
34089	34216	**
34090	34217	** (4) Reads from the database file are either aligned on a page boundary and
34091	34218	** an integer multiple of the page size in length or are taken from the
34092	34219	** first 100 bytes of the database file.
34093	34220	**
		@@ -34114,11 +34241,12 @@
34114	34241	** method is a no-op, but that does not change the fact the SQLite will
34115	34242	** invoke it.)
34116	34243	**
34117	34244	** (9) Whenever the database file is modified, at least one bit in the range
34118	34245	** of bytes from 24 through 39 inclusive will be changed prior to releasing
34119		-** the EXCLUSIVE lock.
	34246	+** the EXCLUSIVE lock, thus signaling other connections on the same
	34247	+** database to flush their caches.
34120	34248	**
34121	34249	** (10) The pattern of bits in bytes 24 through 39 shall not repeat in less
34122	34250	** than one billion transactions.
34123	34251	**
34124	34252	** (11) A database file is well-formed at the beginning and at the conclusion
		@@ -34127,11 +34255,12 @@
34127	34255	** (12) An EXCLUSIVE lock is held on the database file when writing to
34128	34256	** the database file.
34129	34257	**
34130	34258	** (13) A SHARED lock is held on the database file while reading any
34131	34259	** content out of the database file.
34132		-*/
	34260	+**
	34261	+******************************************************************************/
34133	34262
34134	34263	/*
34135	34264	** Macros for troubleshooting. Normally turned off
34136	34265	*/
34137	34266	#if 0
		@@ -34152,62 +34281,283 @@
34152	34281	*/
34153	34282	#define PAGERID(p) ((int)(p->fd))
34154	34283	#define FILEHANDLEID(fd) ((int)fd)
34155	34284
34156	34285	/*
34157		-** The page cache as a whole is always in one of the following
34158		-** states:
34159		-**
34160		-** PAGER_UNLOCK The page cache is not currently reading or
34161		-** writing the database file. There is no
34162		-** data held in memory. This is the initial
34163		-** state.
34164		-**
34165		-** PAGER_SHARED The page cache is reading the database.
34166		-** Writing is not permitted. There can be
34167		-** multiple readers accessing the same database
34168		-** file at the same time.
34169		-**
34170		-** PAGER_RESERVED This process has reserved the database for writing
34171		-** but has not yet made any changes. Only one process
34172		-** at a time can reserve the database. The original
34173		-** database file has not been modified so other
34174		-** processes may still be reading the on-disk
34175		-** database file.
34176		-**
34177		-** PAGER_EXCLUSIVE The page cache is writing the database.
34178		-** Access is exclusive. No other processes or
34179		-** threads can be reading or writing while one
34180		-** process is writing.
34181		-**
34182		-** PAGER_SYNCED The pager moves to this state from PAGER_EXCLUSIVE
34183		-** after all dirty pages have been written to the
34184		-** database file and the file has been synced to
34185		-** disk. All that remains to do is to remove or
34186		-** truncate the journal file and the transaction
34187		-** will be committed.
34188		-**
34189		-** The page cache comes up in PAGER_UNLOCK. The first time a
34190		-** sqlite3PagerGet() occurs, the state transitions to PAGER_SHARED.
34191		-** After all pages have been released using sqlite_page_unref(),
34192		-** the state transitions back to PAGER_UNLOCK. The first time
34193		-** that sqlite3PagerWrite() is called, the state transitions to
34194		-** PAGER_RESERVED. (Note that sqlite3PagerWrite() can only be
34195		-** called on an outstanding page which means that the pager must
34196		-** be in PAGER_SHARED before it transitions to PAGER_RESERVED.)
34197		-** PAGER_RESERVED means that there is an open rollback journal.
34198		-** The transition to PAGER_EXCLUSIVE occurs before any changes
34199		-** are made to the database file, though writes to the rollback
34200		-** journal occurs with just PAGER_RESERVED. After an sqlite3PagerRollback()
34201		-** or sqlite3PagerCommitPhaseTwo(), the state can go back to PAGER_SHARED,
34202		-** or it can stay at PAGER_EXCLUSIVE if we are in exclusive access mode.
34203		-*/
34204		-#define PAGER_UNLOCK 0
34205		-#define PAGER_SHARED 1 /* same as SHARED_LOCK */
34206		-#define PAGER_RESERVED 2 /* same as RESERVED_LOCK */
34207		-#define PAGER_EXCLUSIVE 4 /* same as EXCLUSIVE_LOCK */
34208		-#define PAGER_SYNCED 5
	34286	+** The Pager.eState variable stores the current 'state' of a pager. A
	34287	+** pager may be in any one of the seven states shown in the following
	34288	+** state diagram.
	34289	+**
	34290	+** OPEN <------+------+
	34291	+** \| \| \|
	34292	+** V \| \|
	34293	+** +---------> READER-------+ \|
	34294	+** \| \| \|
	34295	+** \| V \|
	34296	+** \|<-------WRITER_LOCKED------> ERROR
	34297	+** \| \| ^
	34298	+** \| V \|
	34299	+** \|<------WRITER_CACHEMOD-------->\|
	34300	+** \| \| \|
	34301	+** \| V \|
	34302	+** \|<-------WRITER_DBMOD---------->\|
	34303	+** \| \| \|
	34304	+** \| V \|
	34305	+** +<------WRITER_FINISHED-------->+
	34306	+**
	34307	+**
	34308	+** List of state transitions and the C [function] that performs each:
	34309	+**
	34310	+** OPEN -> READER [sqlite3PagerSharedLock]
	34311	+** READER -> OPEN [pager_unlock]
	34312	+**
	34313	+** READER -> WRITER_LOCKED [sqlite3PagerBegin]
	34314	+** WRITER_LOCKED -> WRITER_CACHEMOD [pager_open_journal]
	34315	+** WRITER_CACHEMOD -> WRITER_DBMOD [syncJournal]
	34316	+** WRITER_DBMOD -> WRITER_FINISHED [sqlite3PagerCommitPhaseOne]
	34317	+ WRITER_* -> READER [pager_end_transaction]
	34318	+**
	34319	+ WRITER_* -> ERROR [pager_error]
	34320	+** ERROR -> OPEN [pager_unlock]
	34321	+**
	34322	+**
	34323	+** OPEN:
	34324	+**
	34325	+** The pager starts up in this state. Nothing is guaranteed in this
	34326	+** state - the file may or may not be locked and the database size is
	34327	+** unknown. The database may not be read or written.
	34328	+**
	34329	+** * No read or write transaction is active.
	34330	+** * Any lock, or no lock at all, may be held on the database file.
	34331	+** * The dbSize, dbOrigSize and dbFileSize variables may not be trusted.
	34332	+**
	34333	+** READER:
	34334	+**
	34335	+** In this state all the requirements for reading the database in
	34336	+** rollback (non-WAL) mode are met. Unless the pager is (or recently
	34337	+** was) in exclusive-locking mode, a user-level read transaction is
	34338	+** open. The database size is known in this state.
	34339	+**
	34340	+** A connection running with locking_mode=normal enters this state when
	34341	+** it opens a read-transaction on the database and returns to state
	34342	+** OPEN after the read-transaction is completed. However a connection
	34343	+** running in locking_mode=exclusive (including temp databases) remains in
	34344	+** this state even after the read-transaction is closed. The only way
	34345	+** a locking_mode=exclusive connection can transition from READER to OPEN
	34346	+** is via the ERROR state (see below).
	34347	+**
	34348	+** * A read transaction may be active (but a write-transaction cannot).
	34349	+** * A SHARED or greater lock is held on the database file.
	34350	+** * The dbSize variable may be trusted (even if a user-level read
	34351	+** transaction is not active). The dbOrigSize and dbFileSize variables
	34352	+** may not be trusted at this point.
	34353	+** * If the database is a WAL database, then the WAL connection is open.
	34354	+** * Even if a read-transaction is not open, it is guaranteed that
	34355	+** there is no hot-journal in the file-system.
	34356	+**
	34357	+** WRITER_LOCKED:
	34358	+**
	34359	+** The pager moves to this state from READER when a write-transaction
	34360	+** is first opened on the database. In WRITER_LOCKED state, all locks
	34361	+** required to start a write-transaction are held, but no actual
	34362	+** modifications to the cache or database have taken place.
	34363	+**
	34364	+** In rollback mode, a RESERVED or (if the transaction was opened with
	34365	+** BEGIN EXCLUSIVE) EXCLUSIVE lock is obtained on the database file when
	34366	+** moving to this state, but the journal file is not written to or opened
	34367	+** to in this state. If the transaction is committed or rolled back while
	34368	+** in WRITER_LOCKED state, all that is required is to unlock the database
	34369	+** file.
	34370	+**
	34371	+** IN WAL mode, WalBeginWriteTransaction() is called to lock the log file.
	34372	+** If the connection is running with locking_mode=exclusive, an attempt
	34373	+** is made to obtain an EXCLUSIVE lock on the database file.
	34374	+**
	34375	+** * A write transaction is active.
	34376	+** * If the connection is open in rollback-mode, a RESERVED or greater
	34377	+** lock is held on the database file.
	34378	+** * If the connection is open in WAL-mode, a WAL write transaction
	34379	+** is open (i.e. sqlite3WalBeginWriteTransaction() has been successfully
	34380	+** called).
	34381	+** * The dbSize, dbOrigSize and dbFileSize variables are all valid.
	34382	+** * The contents of the pager cache have not been modified.
	34383	+** * The journal file may or may not be open.
	34384	+** * Nothing (not even the first header) has been written to the journal.
	34385	+**
	34386	+** WRITER_CACHEMOD:
	34387	+**
	34388	+** A pager moves from WRITER_LOCKED state to this state when a page is
	34389	+** first modified by the upper layer. In rollback mode the journal file
	34390	+** is opened (if it is not already open) and a header written to the
	34391	+** start of it. The database file on disk has not been modified.
	34392	+**
	34393	+** * A write transaction is active.
	34394	+** * A RESERVED or greater lock is held on the database file.
	34395	+** * The journal file is open and the first header has been written
	34396	+** to it, but the header has not been synced to disk.
	34397	+** * The contents of the page cache have been modified.
	34398	+**
	34399	+** WRITER_DBMOD:
	34400	+**
	34401	+** The pager transitions from WRITER_CACHEMOD into WRITER_DBMOD state
	34402	+** when it modifies the contents of the database file. WAL connections
	34403	+** never enter this state (since they do not modify the database file,
	34404	+** just the log file).
	34405	+**
	34406	+** * A write transaction is active.
	34407	+** * An EXCLUSIVE or greater lock is held on the database file.
	34408	+** * The journal file is open and the first header has been written
	34409	+** and synced to disk.
	34410	+** * The contents of the page cache have been modified (and possibly
	34411	+** written to disk).
	34412	+**
	34413	+** WRITER_FINISHED:
	34414	+**
	34415	+** It is not possible for a WAL connection to enter this state.
	34416	+**
	34417	+** A rollback-mode pager changes to WRITER_FINISHED state from WRITER_DBMOD
	34418	+** state after the entire transaction has been successfully written into the
	34419	+** database file. In this state the transaction may be committed simply
	34420	+** by finalizing the journal file. Once in WRITER_FINISHED state, it is
	34421	+** not possible to modify the database further. At this point, the upper
	34422	+** layer must either commit or rollback the transaction.
	34423	+**
	34424	+** * A write transaction is active.
	34425	+** * An EXCLUSIVE or greater lock is held on the database file.
	34426	+** * All writing and syncing of journal and database data has finished.
	34427	+** If no error occured, all that remains is to finalize the journal to
	34428	+** commit the transaction. If an error did occur, the caller will need
	34429	+** to rollback the transaction.
	34430	+**
	34431	+** ERROR:
	34432	+**
	34433	+** The ERROR state is entered when an IO or disk-full error (including
	34434	+** SQLITE_IOERR_NOMEM) occurs at a point in the code that makes it
	34435	+** difficult to be sure that the in-memory pager state (cache contents,
	34436	+** db size etc.) are consistent with the contents of the file-system.
	34437	+**
	34438	+** Temporary pager files may enter the ERROR state, but in-memory pagers
	34439	+** cannot.
	34440	+**
	34441	+** For example, if an IO error occurs while performing a rollback,
	34442	+** the contents of the page-cache may be left in an inconsistent state.
	34443	+** At this point it would be dangerous to change back to READER state
	34444	+** (as usually happens after a rollback). Any subsequent readers might
	34445	+** report database corruption (due to the inconsistent cache), and if
	34446	+** they upgrade to writers, they may inadvertently corrupt the database
	34447	+** file. To avoid this hazard, the pager switches into the ERROR state
	34448	+** instead of READER following such an error.
	34449	+**
	34450	+** Once it has entered the ERROR state, any attempt to use the pager
	34451	+** to read or write data returns an error. Eventually, once all
	34452	+** outstanding transactions have been abandoned, the pager is able to
	34453	+** transition back to OPEN state, discarding the contents of the
	34454	+** page-cache and any other in-memory state at the same time. Everything
	34455	+** is reloaded from disk (and, if necessary, hot-journal rollback peformed)
	34456	+** when a read-transaction is next opened on the pager (transitioning
	34457	+** the pager into READER state). At that point the system has recovered
	34458	+** from the error.
	34459	+**
	34460	+** Specifically, the pager jumps into the ERROR state if:
	34461	+**
	34462	+** 1. An error occurs while attempting a rollback. This happens in
	34463	+** function sqlite3PagerRollback().
	34464	+**
	34465	+** 2. An error occurs while attempting to finalize a journal file
	34466	+** following a commit in function sqlite3PagerCommitPhaseTwo().
	34467	+**
	34468	+** 3. An error occurs while attempting to write to the journal or
	34469	+** database file in function pagerStress() in order to free up
	34470	+** memory.
	34471	+**
	34472	+** In other cases, the error is returned to the b-tree layer. The b-tree
	34473	+** layer then attempts a rollback operation. If the error condition
	34474	+** persists, the pager enters the ERROR state via condition (1) above.
	34475	+**
	34476	+** Condition (3) is necessary because it can be triggered by a read-only
	34477	+** statement executed within a transaction. In this case, if the error
	34478	+** code were simply returned to the user, the b-tree layer would not
	34479	+** automatically attempt a rollback, as it assumes that an error in a
	34480	+** read-only statement cannot leave the pager in an internally inconsistent
	34481	+** state.
	34482	+**
	34483	+** * The Pager.errCode variable is set to something other than SQLITE_OK.
	34484	+** * There are one or more outstanding references to pages (after the
	34485	+** last reference is dropped the pager should move back to OPEN state).
	34486	+** * The pager is not an in-memory pager.
	34487	+**
	34488	+**
	34489	+** Notes:
	34490	+**
	34491	+** * A pager is never in WRITER_DBMOD or WRITER_FINISHED state if the
	34492	+** connection is open in WAL mode. A WAL connection is always in one
	34493	+** of the first four states.
	34494	+**
	34495	+** * Normally, a connection open in exclusive mode is never in PAGER_OPEN
	34496	+** state. There are two exceptions: immediately after exclusive-mode has
	34497	+** been turned on (and before any read or write transactions are
	34498	+** executed), and when the pager is leaving the "error state".
	34499	+**
	34500	+** * See also: assert_pager_state().
	34501	+*/
	34502	+#define PAGER_OPEN 0
	34503	+#define PAGER_READER 1
	34504	+#define PAGER_WRITER_LOCKED 2
	34505	+#define PAGER_WRITER_CACHEMOD 3
	34506	+#define PAGER_WRITER_DBMOD 4
	34507	+#define PAGER_WRITER_FINISHED 5
	34508	+#define PAGER_ERROR 6
	34509	+
	34510	+/*
	34511	+** The Pager.eLock variable is almost always set to one of the
	34512	+** following locking-states, according to the lock currently held on
	34513	+** the database file: NO_LOCK, SHARED_LOCK, RESERVED_LOCK or EXCLUSIVE_LOCK.
	34514	+** This variable is kept up to date as locks are taken and released by
	34515	+** the pagerLockDb() and pagerUnlockDb() wrappers.
	34516	+**
	34517	+** If the VFS xLock() or xUnlock() returns an error other than SQLITE_BUSY
	34518	+** (i.e. one of the SQLITE_IOERR subtypes), it is not clear whether or not
	34519	+** the operation was successful. In these circumstances pagerLockDb() and
	34520	+** pagerUnlockDb() take a conservative approach - eLock is always updated
	34521	+** when unlocking the file, and only updated when locking the file if the
	34522	+** VFS call is successful. This way, the Pager.eLock variable may be set
	34523	+** to a less exclusive (lower) value than the lock that is actually held
	34524	+** at the system level, but it is never set to a more exclusive value.
	34525	+**
	34526	+** This is usually safe. If an xUnlock fails or appears to fail, there may
	34527	+** be a few redundant xLock() calls or a lock may be held for longer than
	34528	+** required, but nothing really goes wrong.
	34529	+**
	34530	+** The exception is when the database file is unlocked as the pager moves
	34531	+** from ERROR to OPEN state. At this point there may be a hot-journal file
	34532	+** in the file-system that needs to be rolled back (as part of a OPEN->SHARED
	34533	+** transition, by the same pager or any other). If the call to xUnlock()
	34534	+** fails at this point and the pager is left holding an EXCLUSIVE lock, this
	34535	+** can confuse the call to xCheckReservedLock() call made later as part
	34536	+** of hot-journal detection.
	34537	+**
	34538	+** xCheckReservedLock() is defined as returning true "if there is a RESERVED
	34539	+** lock held by this process or any others". So xCheckReservedLock may
	34540	+** return true because the caller itself is holding an EXCLUSIVE lock (but
	34541	+** doesn't know it because of a previous error in xUnlock). If this happens
	34542	+** a hot-journal may be mistaken for a journal being created by an active
	34543	+** transaction in another process, causing SQLite to read from the database
	34544	+** without rolling it back.
	34545	+**
	34546	+** To work around this, if a call to xUnlock() fails when unlocking the
	34547	+** database in the ERROR state, Pager.eLock is set to UNKNOWN_LOCK. It
	34548	+** is only changed back to a real locking state after a successful call
	34549	+** to xLock(EXCLUSIVE). Also, the code to do the OPEN->SHARED state transition
	34550	+** omits the check for a hot-journal if Pager.eLock is set to UNKNOWN_LOCK
	34551	+** lock. Instead, it assumes a hot-journal exists and obtains an EXCLUSIVE
	34552	+** lock on the database file before attempting to roll it back. See function
	34553	+** PagerSharedLock() for more detail.
	34554	+**
	34555	+** Pager.eLock may only be set to UNKNOWN_LOCK when the pager is in
	34556	+** PAGER_OPEN state.
	34557	+*/
	34558	+#define UNKNOWN_LOCK (EXCLUSIVE_LOCK+1)
34209	34559
34210	34560	/*
34211	34561	** A macro used for invoking the codec if there is one
34212	34562	*/
34213	34563	#ifdef SQLITE_HAS_CODEC
		@@ -34253,37 +34603,32 @@
34253	34603	u32 aWalData[WAL_SAVEPOINT_NDATA]; /* WAL savepoint context */
34254	34604	#endif
34255	34605	};
34256	34606
34257	34607	/*
34258		-** A open page cache is an instance of the following structure.
34259		-**
34260		-** errCode
34261		-**
34262		-** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, or
34263		-** or SQLITE_FULL. Once one of the first three errors occurs, it persists
34264		-** and is returned as the result of every major pager API call. The
34265		-** SQLITE_FULL return code is slightly different. It persists only until the
34266		-** next successful rollback is performed on the pager cache. Also,
34267		-** SQLITE_FULL does not affect the sqlite3PagerGet() and sqlite3PagerLookup()
34268		-** APIs, they may still be used successfully.
34269		-**
34270		-** dbSizeValid, dbSize, dbOrigSize, dbFileSize
34271		-**
34272		-** Managing the size of the database file in pages is a little complicated.
34273		-** The variable Pager.dbSize contains the number of pages that the database
34274		-** image currently contains. As the database image grows or shrinks this
34275		-** variable is updated. The variable Pager.dbFileSize contains the number
34276		-** of pages in the database file. This may be different from Pager.dbSize
34277		-** if some pages have been appended to the database image but not yet written
34278		-** out from the cache to the actual file on disk. Or if the image has been
34279		-** truncated by an incremental-vacuum operation. The Pager.dbOrigSize variable
34280		-** contains the number of pages in the database image when the current
34281		-** transaction was opened. The contents of all three of these variables is
34282		-** only guaranteed to be correct if the boolean Pager.dbSizeValid is true.
34283		-**
34284		-** TODO: Under what conditions is dbSizeValid set? Cleared?
	34608	+** A open page cache is an instance of struct Pager. A description of
	34609	+** some of the more important member variables follows:
	34610	+**
	34611	+** eState
	34612	+**
	34613	+** The current 'state' of the pager object. See the comment and state
	34614	+** diagram above for a description of the pager state.
	34615	+**
	34616	+** eLock
	34617	+**
	34618	+** For a real on-disk database, the current lock held on the database file -
	34619	+** NO_LOCK, SHARED_LOCK, RESERVED_LOCK or EXCLUSIVE_LOCK.
	34620	+**
	34621	+** For a temporary or in-memory database (neither of which require any
	34622	+** locks), this variable is always set to EXCLUSIVE_LOCK. Since such
	34623	+** databases always have Pager.exclusiveMode==1, this tricks the pager
	34624	+** logic into thinking that it already has all the locks it will ever
	34625	+** need (and no reason to release them).
	34626	+**
	34627	+** In some (obscure) circumstances, this variable may also be set to
	34628	+** UNKNOWN_LOCK. See the comment above the #define of UNKNOWN_LOCK for
	34629	+** details.
34285	34630	**
34286	34631	** changeCountDone
34287	34632	**
34288	34633	** This boolean variable is used to make sure that the change-counter
34289	34634	** (the 4-byte header field at byte offset 24 of the database file) is
		@@ -34298,28 +34643,10 @@
34298	34643	**
34299	34644	** This mechanism means that when running in exclusive mode, a connection
34300	34645	** need only update the change-counter once, for the first transaction
34301	34646	** committed.
34302	34647	**
34303		-** dbModified
34304		-**
34305		-** The dbModified flag is set whenever a database page is dirtied.
34306		-** It is cleared at the end of each transaction.
34307		-**
34308		-** It is used when committing or otherwise ending a transaction. If
34309		-** the dbModified flag is clear then less work has to be done.
34310		-**
34311		-** journalStarted
34312		-**
34313		-** This flag is set during a write-transaction after the first
34314		-** journal-header is written and synced to disk.
34315		-**
34316		-** After this has happened, new pages appended to the database
34317		-** do not need the PGHDR_NEED_SYNC flag set, as they do not need
34318		-** to wait for a journal sync before they can be written out to
34319		-** the database file (see function pager_write()).
34320		-**
34321	34648	** setMaster
34322	34649	**
34323	34650	** When PagerCommitPhaseOne() is called to commit a transaction, it may
34324	34651	** (or may not) specify a master-journal name to be written into the
34325	34652	** journal file before it is synced to disk.
		@@ -34326,84 +34653,146 @@
34326	34653	**
34327	34654	** Whether or not a journal file contains a master-journal pointer affects
34328	34655	** the way in which the journal file is finalized after the transaction is
34329	34656	** committed or rolled back when running in "journal_mode=PERSIST" mode.
34330	34657	** If a journal file does not contain a master-journal pointer, it is
34331		-** finalized by overwriting the first journal header with zeroes. If,
34332		-** on the other hand, it does contain a master-journal pointer, the
34333		-** journal file is finalized by truncating it to zero bytes, just as if
34334		-** the connection were running in "journal_mode=truncate" mode.
	34658	+** finalized by overwriting the first journal header with zeroes. If
	34659	+** it does contain a master-journal pointer the journal file is finalized
	34660	+** by truncating it to zero bytes, just as if the connection were
	34661	+** running in "journal_mode=truncate" mode.
34335	34662	**
34336	34663	** Journal files that contain master journal pointers cannot be finalized
34337	34664	** simply by overwriting the first journal-header with zeroes, as the
34338	34665	** master journal pointer could interfere with hot-journal rollback of any
34339	34666	** subsequently interrupted transaction that reuses the journal file.
34340	34667	**
34341	34668	** The flag is cleared as soon as the journal file is finalized (either
34342	34669	** by PagerCommitPhaseTwo or PagerRollback). If an IO error prevents the
34343	34670	** journal file from being successfully finalized, the setMaster flag
34344		-** is cleared anyway.
	34671	+** is cleared anyway (and the pager will move to ERROR state).
34345	34672	**
34346	34673	** doNotSpill, doNotSyncSpill
34347	34674	**
34348		-** When enabled, cache spills are prohibited. The doNotSpill variable
34349		-** inhibits all cache spill and doNotSyncSpill inhibits those spills that
34350		-** would require a journal sync. The doNotSyncSpill is set and cleared
34351		-** by sqlite3PagerWrite() in order to prevent a journal sync from happening
34352		-** in between the journalling of two pages on the same sector. The
34353		-** doNotSpill value set to prevent pagerStress() from trying to use
34354		-** the journal during a rollback.
34355		-**
34356		-** needSync
34357		-**
34358		-** TODO: It might be easier to set this variable in writeJournalHdr()
34359		-** and writeMasterJournal() only. Change its meaning to "unsynced data
34360		-** has been written to the journal".
	34675	+** These two boolean variables control the behaviour of cache-spills
	34676	+** (calls made by the pcache module to the pagerStress() routine to
	34677	+** write cached data to the file-system in order to free up memory).
	34678	+**
	34679	+** When doNotSpill is non-zero, writing to the database from pagerStress()
	34680	+** is disabled altogether. This is done in a very obscure case that
	34681	+** comes up during savepoint rollback that requires the pcache module
	34682	+** to allocate a new page to prevent the journal file from being written
	34683	+** while it is being traversed by code in pager_playback().
	34684	+**
	34685	+** If doNotSyncSpill is non-zero, writing to the database from pagerStress()
	34686	+** is permitted, but syncing the journal file is not. This flag is set
	34687	+** by sqlite3PagerWrite() when the file-system sector-size is larger than
	34688	+** the database page-size in order to prevent a journal sync from happening
	34689	+** in between the journalling of two pages on the same sector.
34361	34690	**
34362	34691	** subjInMemory
34363	34692	**
34364	34693	** This is a boolean variable. If true, then any required sub-journal
34365	34694	** is opened as an in-memory journal file. If false, then in-memory
34366	34695	** sub-journals are only used for in-memory pager files.
	34696	+**
	34697	+** This variable is updated by the upper layer each time a new
	34698	+** write-transaction is opened.
	34699	+**
	34700	+** dbSize, dbOrigSize, dbFileSize
	34701	+**
	34702	+** Variable dbSize is set to the number of pages in the database file.
	34703	+** It is valid in PAGER_READER and higher states (all states except for
	34704	+** OPEN and ERROR).
	34705	+**
	34706	+** dbSize is set based on the size of the database file, which may be
	34707	+** larger than the size of the database (the value stored at offset
	34708	+** 28 of the database header by the btree). If the size of the file
	34709	+** is not an integer multiple of the page-size, the value stored in
	34710	+** dbSize is rounded down (i.e. a 5KB file with 2K page-size has dbSize==2).
	34711	+** Except, any file that is greater than 0 bytes in size is considered
	34712	+** to have at least one page. (i.e. a 1KB file with 2K page-size leads
	34713	+** to dbSize==1).
	34714	+**
	34715	+** During a write-transaction, if pages with page-numbers greater than
	34716	+** dbSize are modified in the cache, dbSize is updated accordingly.
	34717	+** Similarly, if the database is truncated using PagerTruncateImage(),
	34718	+** dbSize is updated.
	34719	+**
	34720	+** Variables dbOrigSize and dbFileSize are valid in states
	34721	+** PAGER_WRITER_LOCKED and higher. dbOrigSize is a copy of the dbSize
	34722	+** variable at the start of the transaction. It is used during rollback,
	34723	+** and to determine whether or not pages need to be journalled before
	34724	+** being modified.
	34725	+**
	34726	+** Throughout a write-transaction, dbFileSize contains the size of
	34727	+** the file on disk in pages. It is set to a copy of dbSize when the
	34728	+** write-transaction is first opened, and updated when VFS calls are made
	34729	+** to write or truncate the database file on disk.
	34730	+**
	34731	+** The only reason the dbFileSize variable is required is to suppress
	34732	+** unnecessary calls to xTruncate() after committing a transaction. If,
	34733	+** when a transaction is committed, the dbFileSize variable indicates
	34734	+** that the database file is larger than the database image (Pager.dbSize),
	34735	+** pager_truncate() is called. The pager_truncate() call uses xFilesize()
	34736	+** to measure the database file on disk, and then truncates it if required.
	34737	+** dbFileSize is not used when rolling back a transaction. In this case
	34738	+** pager_truncate() is called unconditionally (which means there may be
	34739	+** a call to xFilesize() that is not strictly required). In either case,
	34740	+** pager_truncate() may cause the file to become smaller or larger.
	34741	+**
	34742	+** dbHintSize
	34743	+**
	34744	+** The dbHintSize variable is used to limit the number of calls made to
	34745	+** the VFS xFileControl(FCNTL_SIZE_HINT) method.
	34746	+**
	34747	+** dbHintSize is set to a copy of the dbSize variable when a
	34748	+** write-transaction is opened (at the same time as dbFileSize and
	34749	+** dbOrigSize). If the xFileControl(FCNTL_SIZE_HINT) method is called,
	34750	+** dbHintSize is increased to the number of pages that correspond to the
	34751	+** size-hint passed to the method call. See pager_write_pagelist() for
	34752	+** details.
	34753	+**
	34754	+** errCode
	34755	+**
	34756	+** The Pager.errCode variable is only ever used in PAGER_ERROR state. It
	34757	+** is set to zero in all other states. In PAGER_ERROR state, Pager.errCode
	34758	+** is always set to SQLITE_FULL, SQLITE_IOERR or one of the SQLITE_IOERR_XXX
	34759	+** sub-codes.
34367	34760	*/
34368	34761	struct Pager {
34369	34762	sqlite3_vfs pVfs; / OS functions to use for IO */
34370	34763	u8 exclusiveMode; /* Boolean. True if locking_mode==EXCLUSIVE */
34371		- u8 journalMode; /* On of the PAGER_JOURNALMODE_* values */
	34764	+ u8 journalMode; /* One of the PAGER_JOURNALMODE_* values */
34372	34765	u8 useJournal; /* Use a rollback journal on this file */
34373	34766	u8 noReadlock; /* Do not bother to obtain readlocks */
34374	34767	u8 noSync; /* Do not sync the journal if true */
34375	34768	u8 fullSync; /* Do extra syncs of the journal for robustness */
34376	34769	u8 sync_flags; /* One of SYNC_NORMAL or SYNC_FULL */
34377	34770	u8 tempFile; /* zFilename is a temporary file */
34378	34771	u8 readOnly; /* True for a read-only database */
34379	34772	u8 memDb; /* True to inhibit all file I/O */
34380	34773
34381		- /* The following block contains those class members that are dynamically
34382		- ** modified during normal operations. The other variables in this structure
34383		- ** are either constant throughout the lifetime of the pager, or else
34384		- ** used to store configuration parameters that affect the way the pager
34385		- ** operates.
34386		- **
34387		- ** The 'state' variable is described in more detail along with the
34388		- ** descriptions of the values it may take - PAGER_UNLOCK etc. Many of the
34389		- ** other variables in this block are described in the comment directly
34390		- ** above this class definition.
	34774	+ /**************************************************************************
	34775	+ ** The following block contains those class members that change during
	34776	+ ** routine opertion. Class members not in this block are either fixed
	34777	+ ** when the pager is first created or else only change when there is a
	34778	+ ** significant mode change (such as changing the page_size, locking_mode,
	34779	+ ** or the journal_mode). From another view, these class members describe
	34780	+ ** the "state" of the pager, while other class members describe the
	34781	+ ** "configuration" of the pager.
34391	34782	*/
34392		- u8 state; /* PAGER_UNLOCK, _SHARED, _RESERVED, etc. */
34393		- u8 dbModified; /* True if there are any changes to the Db */
34394		- u8 needSync; /* True if an fsync() is needed on the journal */
34395		- u8 journalStarted; /* True if header of journal is synced */
	34783	+ u8 eState; /* Pager state (OPEN, READER, WRITER_LOCKED..) */
	34784	+ u8 eLock; /* Current lock held on database file */
34396	34785	u8 changeCountDone; /* Set after incrementing the change-counter */
34397	34786	u8 setMaster; /* True if a m-j name has been written to jrnl */
34398	34787	u8 doNotSpill; /* Do not spill the cache when non-zero */
34399	34788	u8 doNotSyncSpill; /* Do not do a spill that requires jrnl sync */
34400		- u8 dbSizeValid; /* Set when dbSize is correct */
34401	34789	u8 subjInMemory; /* True to use in-memory sub-journals */
34402	34790	Pgno dbSize; /* Number of pages in the database */
34403	34791	Pgno dbOrigSize; /* dbSize before the current transaction */
34404	34792	Pgno dbFileSize; /* Number of pages in the database file */
	34793	+ Pgno dbHintSize; /* Value passed to FCNTL_SIZE_HINT call */
34405	34794	int errCode; /* One of several kinds of errors */
34406	34795	int nRec; /* Pages journalled since last j-header written */
34407	34796	u32 cksumInit; /* Quasi-random value added to every checksum */
34408	34797	u32 nSubRec; /* Number of records written to sub-journal */
34409	34798	Bitvec pInJournal; / One bit for each page in the database file */
		@@ -34410,21 +34799,25 @@
34410	34799	sqlite3_file fd; / File descriptor for database */
34411	34800	sqlite3_file jfd; / File descriptor for main journal */
34412	34801	sqlite3_file sjfd; / File descriptor for sub-journal */
34413	34802	i64 journalOff; /* Current write offset in the journal file */
34414	34803	i64 journalHdr; /* Byte offset to previous journal header */
34415		- i64 journalSizeLimit; /* Size limit for persistent journal files */
	34804	+ sqlite3_backup pBackup; / Pointer to list of ongoing backup processes */
34416	34805	PagerSavepoint aSavepoint; / Array of active savepoints */
34417	34806	int nSavepoint; /* Number of elements in aSavepoint[] */
34418	34807	char dbFileVers[16]; /* Changes whenever database file changes */
34419		- u32 sectorSize; /* Assumed sector size during rollback */
	34808	+ /*
	34809	+ ** End of the routinely-changing class members
	34810	+ ***************************************************************************/
34420	34811
34421	34812	u16 nExtra; /* Add this many bytes to each in-memory page */
34422	34813	i16 nReserve; /* Number of unused bytes at end of each page */
34423	34814	u32 vfsFlags; /* Flags for sqlite3_vfs.xOpen() */
	34815	+ u32 sectorSize; /* Assumed sector size during rollback */
34424	34816	int pageSize; /* Number of bytes in a page */
34425	34817	Pgno mxPgno; /* Maximum allowed size of the database */
	34818	+ i64 journalSizeLimit; /* Size limit for persistent journal files */
34426	34819	char zFilename; / Name of the database file */
34427	34820	char zJournal; / Name of the journal file */
34428	34821	int (xBusyHandler)(void); /* Function to call when busy */
34429	34822	void pBusyHandlerArg; / Context argument for xBusyHandler */
34430	34823	#ifdef SQLITE_TEST
		@@ -34438,11 +34831,10 @@
34438	34831	void (xCodecFree)(void); /* Destructor for the codec */
34439	34832	void pCodec; / First argument to xCodec... methods */
34440	34833	#endif
34441	34834	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
34442	34835	PCache pPCache; / Pointer to page cache object */
34443		- sqlite3_backup pBackup; / Pointer to list of ongoing backup processes */
34444	34836	#ifndef SQLITE_OMIT_WAL
34445	34837	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
34446	34838	char zWal; / File name for write-ahead log */
34447	34839	#endif
34448	34840	};
		@@ -34517,26 +34909,225 @@
34517	34909	/*
34518	34910	** The maximum legal page number is (2^31 - 1).
34519	34911	*/
34520	34912	#define PAGER_MAX_PGNO 2147483647
34521	34913
	34914	+/*
	34915	+** The argument to this macro is a file descriptor (type sqlite3_file*).
	34916	+** Return 0 if it is not open, or non-zero (but not 1) if it is.
	34917	+**
	34918	+** This is so that expressions can be written as:
	34919	+**
	34920	+** if( isOpen(pPager->jfd) ){ ...
	34921	+**
	34922	+** instead of
	34923	+**
	34924	+** if( pPager->jfd->pMethods ){ ...
	34925	+*/
	34926	+#define isOpen(pFd) ((pFd)->pMethods)
	34927	+
	34928	+/*
	34929	+** Return true if this pager uses a write-ahead log instead of the usual
	34930	+** rollback journal. Otherwise false.
	34931	+*/
	34932	+#ifndef SQLITE_OMIT_WAL
	34933	+static int pagerUseWal(Pager *pPager){
	34934	+ return (pPager->pWal!=0);
	34935	+}
	34936	+#else
	34937	+# define pagerUseWal(x) 0
	34938	+# define pagerRollbackWal(x) 0
	34939	+# define pagerWalFrames(v,w,x,y,z) 0
	34940	+# define pagerOpenWalIfPresent(z) SQLITE_OK
	34941	+# define pagerBeginReadTransaction(z) SQLITE_OK
	34942	+#endif
	34943	+
34522	34944	#ifndef NDEBUG
34523	34945	/*
34524	34946	** Usage:
34525	34947	**
34526	34948	** assert( assert_pager_state(pPager) );
	34949	+**
	34950	+** This function runs many asserts to try to find inconsistencies in
	34951	+** the internal state of the Pager object.
34527	34952	*/
34528		-static int assert_pager_state(Pager *pPager){
	34953	+static int assert_pager_state(Pager *p){
	34954	+ Pager *pPager = p;
34529	34955
34530		- /* A temp-file is always in PAGER_EXCLUSIVE or PAGER_SYNCED state. */
34531		- assert( pPager->tempFile==0 \|\| pPager->state>=PAGER_EXCLUSIVE );
	34956	+ /* State must be valid. */
	34957	+ assert( p->eState==PAGER_OPEN
	34958	+ \|\| p->eState==PAGER_READER
	34959	+ \|\| p->eState==PAGER_WRITER_LOCKED
	34960	+ \|\| p->eState==PAGER_WRITER_CACHEMOD
	34961	+ \|\| p->eState==PAGER_WRITER_DBMOD
	34962	+ \|\| p->eState==PAGER_WRITER_FINISHED
	34963	+ \|\| p->eState==PAGER_ERROR
	34964	+ );
34532	34965
34533		- /* The changeCountDone flag is always set for temp-files */
34534		- assert( pPager->tempFile==0 \|\| pPager->changeCountDone );
	34966	+ /* Regardless of the current state, a temp-file connection always behaves
	34967	+ ** as if it has an exclusive lock on the database file. It never updates
	34968	+ ** the change-counter field, so the changeCountDone flag is always set.
	34969	+ */
	34970	+ assert( p->tempFile==0 \|\| p->eLock==EXCLUSIVE_LOCK );
	34971	+ assert( p->tempFile==0 \|\| pPager->changeCountDone );
	34972	+
	34973	+ /* If the useJournal flag is clear, the journal-mode must be "OFF".
	34974	+ ** And if the journal-mode is "OFF", the journal file must not be open.
	34975	+ */
	34976	+ assert( p->journalMode==PAGER_JOURNALMODE_OFF \|\| p->useJournal );
	34977	+ assert( p->journalMode!=PAGER_JOURNALMODE_OFF \|\| !isOpen(p->jfd) );
	34978	+
	34979	+ /* Check that MEMDB implies noSync. And an in-memory journal. Since
	34980	+ ** this means an in-memory pager performs no IO at all, it cannot encounter
	34981	+ ** either SQLITE_IOERR or SQLITE_FULL during rollback or while finalizing
	34982	+ ** a journal file. (although the in-memory journal implementation may
	34983	+ ** return SQLITE_IOERR_NOMEM while the journal file is being written). It
	34984	+ ** is therefore not possible for an in-memory pager to enter the ERROR
	34985	+ ** state.
	34986	+ */
	34987	+ if( MEMDB ){
	34988	+ assert( p->noSync );
	34989	+ assert( p->journalMode==PAGER_JOURNALMODE_OFF
	34990	+ \|\| p->journalMode==PAGER_JOURNALMODE_MEMORY
	34991	+ );
	34992	+ assert( p->eState!=PAGER_ERROR && p->eState!=PAGER_OPEN );
	34993	+ assert( pagerUseWal(p)==0 );
	34994	+ }
	34995	+
	34996	+ /* If changeCountDone is set, a RESERVED lock or greater must be held
	34997	+ ** on the file.
	34998	+ */
	34999	+ assert( pPager->changeCountDone==0 \|\| pPager->eLock>=RESERVED_LOCK );
	35000	+ assert( p->eLock!=PENDING_LOCK );
	35001	+
	35002	+ switch( p->eState ){
	35003	+ case PAGER_OPEN:
	35004	+ assert( !MEMDB );
	35005	+ assert( pPager->errCode==SQLITE_OK );
	35006	+ assert( sqlite3PcacheRefCount(pPager->pPCache)==0 \|\| pPager->tempFile );
	35007	+ break;
	35008	+
	35009	+ case PAGER_READER:
	35010	+ assert( pPager->errCode==SQLITE_OK );
	35011	+ assert( p->eLock!=UNKNOWN_LOCK );
	35012	+ assert( p->eLock>=SHARED_LOCK \|\| p->noReadlock );
	35013	+ break;
	35014	+
	35015	+ case PAGER_WRITER_LOCKED:
	35016	+ assert( p->eLock!=UNKNOWN_LOCK );
	35017	+ assert( pPager->errCode==SQLITE_OK );
	35018	+ if( !pagerUseWal(pPager) ){
	35019	+ assert( p->eLock>=RESERVED_LOCK );
	35020	+ }
	35021	+ assert( pPager->dbSize==pPager->dbOrigSize );
	35022	+ assert( pPager->dbOrigSize==pPager->dbFileSize );
	35023	+ assert( pPager->dbOrigSize==pPager->dbHintSize );
	35024	+ assert( pPager->setMaster==0 );
	35025	+ break;
	35026	+
	35027	+ case PAGER_WRITER_CACHEMOD:
	35028	+ assert( p->eLock!=UNKNOWN_LOCK );
	35029	+ assert( pPager->errCode==SQLITE_OK );
	35030	+ if( !pagerUseWal(pPager) ){
	35031	+ /* It is possible that if journal_mode=wal here that neither the
	35032	+ ** journal file nor the WAL file are open. This happens during
	35033	+ ** a rollback transaction that switches from journal_mode=off
	35034	+ ** to journal_mode=wal.
	35035	+ */
	35036	+ assert( p->eLock>=RESERVED_LOCK );
	35037	+ assert( isOpen(p->jfd)
	35038	+ \|\| p->journalMode==PAGER_JOURNALMODE_OFF
	35039	+ \|\| p->journalMode==PAGER_JOURNALMODE_WAL
	35040	+ );
	35041	+ }
	35042	+ assert( pPager->dbOrigSize==pPager->dbFileSize );
	35043	+ assert( pPager->dbOrigSize==pPager->dbHintSize );
	35044	+ break;
	35045	+
	35046	+ case PAGER_WRITER_DBMOD:
	35047	+ assert( p->eLock==EXCLUSIVE_LOCK );
	35048	+ assert( pPager->errCode==SQLITE_OK );
	35049	+ assert( !pagerUseWal(pPager) );
	35050	+ assert( p->eLock>=EXCLUSIVE_LOCK );
	35051	+ assert( isOpen(p->jfd)
	35052	+ \|\| p->journalMode==PAGER_JOURNALMODE_OFF
	35053	+ \|\| p->journalMode==PAGER_JOURNALMODE_WAL
	35054	+ );
	35055	+ assert( pPager->dbOrigSize<=pPager->dbHintSize );
	35056	+ break;
	35057	+
	35058	+ case PAGER_WRITER_FINISHED:
	35059	+ assert( p->eLock==EXCLUSIVE_LOCK );
	35060	+ assert( pPager->errCode==SQLITE_OK );
	35061	+ assert( !pagerUseWal(pPager) );
	35062	+ assert( isOpen(p->jfd)
	35063	+ \|\| p->journalMode==PAGER_JOURNALMODE_OFF
	35064	+ \|\| p->journalMode==PAGER_JOURNALMODE_WAL
	35065	+ );
	35066	+ break;
	35067	+
	35068	+ case PAGER_ERROR:
	35069	+ /* There must be at least one outstanding reference to the pager if
	35070	+ ** in ERROR state. Otherwise the pager should have already dropped
	35071	+ ** back to OPEN state.
	35072	+ */
	35073	+ assert( pPager->errCode!=SQLITE_OK );
	35074	+ assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
	35075	+ break;
	35076	+ }
34535	35077
34536	35078	return 1;
34537	35079	}
	35080	+
	35081	+/*
	35082	+** Return a pointer to a human readable string in a static buffer
	35083	+** containing the state of the Pager object passed as an argument. This
	35084	+** is intended to be used within debuggers. For example, as an alternative
	35085	+** to "print *pPager" in gdb:
	35086	+**
	35087	+** (gdb) printf "%s", print_pager_state(pPager)
	35088	+*/
	35089	+static char print_pager_state(Pager p){
	35090	+ static char zRet[1024];
	35091	+
	35092	+ sqlite3_snprintf(1024, zRet,
	35093	+ "Filename: %s\n"
	35094	+ "State: %s errCode=%d\n"
	35095	+ "Lock: %s\n"
	35096	+ "Locking mode: locking_mode=%s\n"
	35097	+ "Journal mode: journal_mode=%s\n"
	35098	+ "Backing store: tempFile=%d memDb=%d useJournal=%d\n"
	35099	+ "Journal: journalOff=%lld journalHdr=%lld\n"
	35100	+ "Size: dbsize=%d dbOrigSize=%d dbFileSize=%d\n"
	35101	+ , p->zFilename
	35102	+ , p->eState==PAGER_OPEN ? "OPEN" :
	35103	+ p->eState==PAGER_READER ? "READER" :
	35104	+ p->eState==PAGER_WRITER_LOCKED ? "WRITER_LOCKED" :
	35105	+ p->eState==PAGER_WRITER_CACHEMOD ? "WRITER_CACHEMOD" :
	35106	+ p->eState==PAGER_WRITER_DBMOD ? "WRITER_DBMOD" :
	35107	+ p->eState==PAGER_WRITER_FINISHED ? "WRITER_FINISHED" :
	35108	+ p->eState==PAGER_ERROR ? "ERROR" : "?error?"
	35109	+ , (int)p->errCode
	35110	+ , p->eLock==NO_LOCK ? "NO_LOCK" :
	35111	+ p->eLock==RESERVED_LOCK ? "RESERVED" :
	35112	+ p->eLock==EXCLUSIVE_LOCK ? "EXCLUSIVE" :
	35113	+ p->eLock==SHARED_LOCK ? "SHARED" :
	35114	+ p->eLock==UNKNOWN_LOCK ? "UNKNOWN" : "?error?"
	35115	+ , p->exclusiveMode ? "exclusive" : "normal"
	35116	+ , p->journalMode==PAGER_JOURNALMODE_MEMORY ? "memory" :
	35117	+ p->journalMode==PAGER_JOURNALMODE_OFF ? "off" :
	35118	+ p->journalMode==PAGER_JOURNALMODE_DELETE ? "delete" :
	35119	+ p->journalMode==PAGER_JOURNALMODE_PERSIST ? "persist" :
	35120	+ p->journalMode==PAGER_JOURNALMODE_TRUNCATE ? "truncate" :
	35121	+ p->journalMode==PAGER_JOURNALMODE_WAL ? "wal" : "?error?"
	35122	+ , (int)p->tempFile, (int)p->memDb, (int)p->useJournal
	35123	+ , p->journalOff, p->journalHdr
	35124	+ , (int)p->dbSize, (int)p->dbOrigSize, (int)p->dbFileSize
	35125	+ );
	35126	+
	35127	+ return zRet;
	35128	+}
34538	35129	#endif
34539	35130
34540	35131	/*
34541	35132	** Return true if it is necessary to write page *pPg into the sub-journal.
34542	35133	** A page needs to be written into the sub-journal if there exists one
		@@ -34584,10 +35175,11 @@
34584	35175
34585	35176	/*
34586	35177	** Write a 32-bit integer into a string buffer in big-endian byte order.
34587	35178	*/
34588	35179	#define put32bits(A,B) sqlite3Put4byte((u8*)A,B)
	35180	+
34589	35181
34590	35182	/*
34591	35183	** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK
34592	35184	** on success or an error code is something goes wrong.
34593	35185	*/
		@@ -34596,31 +35188,57 @@
34596	35188	put32bits(ac, val);
34597	35189	return sqlite3OsWrite(fd, ac, 4, offset);
34598	35190	}
34599	35191
34600	35192	/*
34601		-** The argument to this macro is a file descriptor (type sqlite3_file*).
34602		-** Return 0 if it is not open, or non-zero (but not 1) if it is.
34603		-**
34604		-** This is so that expressions can be written as:
34605		-**
34606		-** if( isOpen(pPager->jfd) ){ ...
34607		-**
34608		-** instead of
34609		-**
34610		-** if( pPager->jfd->pMethods ){ ...
34611		-*/
34612		-#define isOpen(pFd) ((pFd)->pMethods)
	35193	+** Unlock the database file to level eLock, which must be either NO_LOCK
	35194	+** or SHARED_LOCK. Regardless of whether or not the call to xUnlock()
	35195	+** succeeds, set the Pager.eLock variable to match the (attempted) new lock.
	35196	+**
	35197	+** Except, if Pager.eLock is set to UNKNOWN_LOCK when this function is
	35198	+** called, do not modify it. See the comment above the #define of
	35199	+** UNKNOWN_LOCK for an explanation of this.
	35200	+*/
	35201	+static int pagerUnlockDb(Pager *pPager, int eLock){
	35202	+ int rc = SQLITE_OK;
	35203	+
	35204	+ assert( !pPager->exclusiveMode );
	35205	+ assert( eLock==NO_LOCK \|\| eLock==SHARED_LOCK );
	35206	+ assert( eLock!=NO_LOCK \|\| pagerUseWal(pPager)==0 );
	35207	+ if( isOpen(pPager->fd) ){
	35208	+ assert( pPager->eLock>=eLock );
	35209	+ rc = sqlite3OsUnlock(pPager->fd, eLock);
	35210	+ if( pPager->eLock!=UNKNOWN_LOCK ){
	35211	+ pPager->eLock = (u8)eLock;
	35212	+ }
	35213	+ IOTRACE(("UNLOCK %p %d\n", pPager, eLock))
	35214	+ }
	35215	+ return rc;
	35216	+}
34613	35217
34614	35218	/*
34615		-** If file pFd is open, call sqlite3OsUnlock() on it.
	35219	+** Lock the database file to level eLock, which must be either SHARED_LOCK,
	35220	+** RESERVED_LOCK or EXCLUSIVE_LOCK. If the caller is successful, set the
	35221	+** Pager.eLock variable to the new locking state.
	35222	+**
	35223	+** Except, if Pager.eLock is set to UNKNOWN_LOCK when this function is
	35224	+** called, do not modify it unless the new locking state is EXCLUSIVE_LOCK.
	35225	+** See the comment above the #define of UNKNOWN_LOCK for an explanation
	35226	+** of this.
34616	35227	*/
34617		-static int osUnlock(sqlite3_file *pFd, int eLock){
34618		- if( !isOpen(pFd) ){
34619		- return SQLITE_OK;
	35228	+static int pagerLockDb(Pager *pPager, int eLock){
	35229	+ int rc = SQLITE_OK;
	35230	+
	35231	+ assert( eLock==SHARED_LOCK \|\| eLock==RESERVED_LOCK \|\| eLock==EXCLUSIVE_LOCK );
	35232	+ if( pPager->eLock<eLock \|\| pPager->eLock==UNKNOWN_LOCK ){
	35233	+ rc = sqlite3OsLock(pPager->fd, eLock);
	35234	+ if( rc==SQLITE_OK && (pPager->eLock!=UNKNOWN_LOCK\|\|eLock==EXCLUSIVE_LOCK) ){
	35235	+ pPager->eLock = (u8)eLock;
	35236	+ IOTRACE(("LOCK %p %d\n", pPager, eLock))
	35237	+ }
34620	35238	}
34621		- return sqlite3OsUnlock(pFd, eLock);
	35239	+ return rc;
34622	35240	}
34623	35241
34624	35242	/*
34625	35243	** This function determines whether or not the atomic-write optimization
34626	35244	** can be used with this pager. The optimization can be used if:
		@@ -34692,17 +35310,18 @@
34692	35310	** that the page is either dirty or still matches the calculated page-hash.
34693	35311	*/
34694	35312	#define CHECK_PAGE(x) checkPage(x)
34695	35313	static void checkPage(PgHdr *pPg){
34696	35314	Pager *pPager = pPg->pPager;
34697		- assert( !pPg->pageHash \|\| pPager->errCode
34698		- \|\| (pPg->flags&PGHDR_DIRTY) \|\| pPg->pageHash==pager_pagehash(pPg) );
	35315	+ assert( pPager->eState!=PAGER_ERROR );
	35316	+ assert( (pPg->flags&PGHDR_DIRTY) \|\| pPg->pageHash==pager_pagehash(pPg) );
34699	35317	}
34700	35318
34701	35319	#else
34702	35320	#define pager_datahash(X,Y) 0
34703	35321	#define pager_pagehash(X) 0
	35322	+#define pager_set_pagehash(X)
34704	35323	#define CHECK_PAGE(x)
34705	35324	#endif /* SQLITE_CHECK_PAGES */
34706	35325
34707	35326	/*
34708	35327	** When this is called the journal file for pager pPager must be open.
		@@ -34865,11 +35484,11 @@
34865	35484	** Followed by (JOURNAL_HDR_SZ - 28) bytes of unused space.
34866	35485	*/
34867	35486	static int writeJournalHdr(Pager *pPager){
34868	35487	int rc = SQLITE_OK; /* Return code */
34869	35488	char zHeader = pPager->pTmpSpace; / Temporary space used to build header */
34870		- u32 nHeader = pPager->pageSize; /* Size of buffer pointed to by zHeader */
	35489	+ u32 nHeader = (u32)pPager->pageSize;/* Size of buffer pointed to by zHeader */
34871	35490	u32 nWrite; /* Bytes of header sector written */
34872	35491	int ii; /* Loop counter */
34873	35492
34874	35493	assert( isOpen(pPager->jfd) ); /* Journal file must be open. */
34875	35494
		@@ -34908,11 +35527,11 @@
34908	35527	**
34909	35528	** * When the SQLITE_IOCAP_SAFE_APPEND flag is set. This guarantees
34910	35529	** that garbage data is never appended to the journal file.
34911	35530	*/
34912	35531	assert( isOpen(pPager->fd) \|\| pPager->noSync );
34913		- if( (pPager->noSync) \|\| (pPager->journalMode==PAGER_JOURNALMODE_MEMORY)
	35532	+ if( pPager->noSync \|\| (pPager->journalMode==PAGER_JOURNALMODE_MEMORY)
34914	35533	\|\| (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
34915	35534	){
34916	35535	memcpy(zHeader, aJournalMagic, sizeof(aJournalMagic));
34917	35536	put32bits(&zHeader[sizeof(aJournalMagic)], 0xffffffff);
34918	35537	}else{
		@@ -35032,18 +35651,25 @@
35032	35651	}
35033	35652
35034	35653	if( pPager->journalOff==0 ){
35035	35654	u32 iPageSize; /* Page-size field of journal header */
35036	35655	u32 iSectorSize; /* Sector-size field of journal header */
35037		- u16 iPageSize16; /* Copy of iPageSize in 16-bit variable */
35038	35656
35039	35657	/* Read the page-size and sector-size journal header fields. */
35040	35658	if( SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+20, &iSectorSize))
35041	35659	\|\| SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+24, &iPageSize))
35042	35660	){
35043	35661	return rc;
35044	35662	}
	35663	+
	35664	+ /* Versions of SQLite prior to 3.5.8 set the page-size field of the
	35665	+ ** journal header to zero. In this case, assume that the Pager.pageSize
	35666	+ ** variable is already set to the correct page size.
	35667	+ */
	35668	+ if( iPageSize==0 ){
	35669	+ iPageSize = pPager->pageSize;
	35670	+ }
35045	35671
35046	35672	/* Check that the values read from the page-size and sector-size fields
35047	35673	** are within range. To be 'in range', both values need to be a power
35048	35674	** of two greater than or equal to 512 or 32, and not greater than their
35049	35675	** respective compile time maximum limits.
		@@ -35062,14 +35688,12 @@
35062	35688
35063	35689	/* Update the page-size to match the value read from the journal.
35064	35690	** Use a testcase() macro to make sure that malloc failure within
35065	35691	** PagerSetPagesize() is tested.
35066	35692	*/
35067		- iPageSize16 = (u16)iPageSize;
35068		- rc = sqlite3PagerSetPagesize(pPager, &iPageSize16, -1);
	35693	+ rc = sqlite3PagerSetPagesize(pPager, &iPageSize, -1);
35069	35694	testcase( rc!=SQLITE_OK );
35070		- assert( rc!=SQLITE_OK \|\| iPageSize16==(u16)iPageSize );
35071	35695
35072	35696	/* Update the assumed sector-size to match the value used by
35073	35697	** the process that created this journal. If this journal was
35074	35698	** created by a process other than this one, then this routine
35075	35699	** is being called from within pager_playback(). The local value
		@@ -35108,10 +35732,12 @@
35108	35732	i64 iHdrOff; /* Offset of header in journal file */
35109	35733	i64 jrnlSize; /* Size of journal file on disk */
35110	35734	u32 cksum = 0; /* Checksum of string zMaster */
35111	35735
35112	35736	assert( pPager->setMaster==0 );
	35737	+ assert( !pagerUseWal(pPager) );
	35738	+
35113	35739	if( !zMaster
35114	35740	\|\| pPager->journalMode==PAGER_JOURNALMODE_MEMORY
35115	35741	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
35116	35742	){
35117	35743	return SQLITE_OK;
		@@ -35144,11 +35770,10 @@
35144	35770	\|\| (0 != (rc = sqlite3OsWrite(pPager->jfd, aJournalMagic, 8, iHdrOff+4+nMaster+8)))
35145	35771	){
35146	35772	return rc;
35147	35773	}
35148	35774	pPager->journalOff += (nMaster+20);
35149		- pPager->needSync = !pPager->noSync;
35150	35775
35151	35776	/* If the pager is in peristent-journal mode, then the physical
35152	35777	** journal-file may extend past the end of the master-journal name
35153	35778	** and 8 bytes of magic data just written to the file. This is
35154	35779	** dangerous because the code to rollback a hot-journal file
		@@ -35180,21 +35805,15 @@
35180	35805	(void)sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &p);
35181	35806	return p;
35182	35807	}
35183	35808
35184	35809	/*
35185		-** Unless the pager is in error-state, discard all in-memory pages. If
35186		-** the pager is in error-state, then this call is a no-op.
35187		-**
35188		-** TODO: Why can we not reset the pager while in error state?
	35810	+** Discard the entire contents of the in-memory page-cache.
35189	35811	*/
35190	35812	static void pager_reset(Pager *pPager){
35191		- if( SQLITE_OK==pPager->errCode ){
35192		- sqlite3BackupRestart(pPager->pBackup);
35193		- sqlite3PcacheClear(pPager->pPCache);
35194		- pPager->dbSizeValid = 0;
35195		- }
	35813	+ sqlite3BackupRestart(pPager->pBackup);
	35814	+ sqlite3PcacheClear(pPager->pPCache);
35196	35815	}
35197	35816
35198	35817	/*
35199	35818	** Free all structures in the Pager.aSavepoint[] array and set both
35200	35819	** Pager.aSavepoint and Pager.nSavepoint to zero. Close the sub-journal
		@@ -35233,38 +35852,43 @@
35233	35852	}
35234	35853	return rc;
35235	35854	}
35236	35855
35237	35856	/*
35238		-** Return true if this pager uses a write-ahead log instead of the usual
35239		-** rollback journal. Otherwise false.
35240		-*/
35241		-#ifndef SQLITE_OMIT_WAL
35242		-static int pagerUseWal(Pager *pPager){
35243		- return (pPager->pWal!=0);
35244		-}
35245		-#else
35246		-# define pagerUseWal(x) 0
35247		-# define pagerRollbackWal(x) 0
35248		-# define pagerWalFrames(v,w,x,y,z) 0
35249		-# define pagerOpenWalIfPresent(z) SQLITE_OK
35250		-# define pagerBeginReadTransaction(z) SQLITE_OK
35251		-#endif
35252		-
35253		-/*
35254		-** Unlock the database file. This function is a no-op if the pager
35255		-** is in exclusive mode.
	35857	+** This function is a no-op if the pager is in exclusive mode and not
	35858	+** in the ERROR state. Otherwise, it switches the pager to PAGER_OPEN
	35859	+** state.
35256	35860	**
35257		-** If the pager is currently in error state, discard the contents of
35258		-** the cache and reset the Pager structure internal state. If there is
35259		-** an open journal-file, then the next time a shared-lock is obtained
35260		-** on the pager file (by this or any other process), it will be
35261		-** treated as a hot-journal and rolled back.
	35861	+** If the pager is not in exclusive-access mode, the database file is
	35862	+** completely unlocked. If the file is unlocked and the file-system does
	35863	+** not exhibit the UNDELETABLE_WHEN_OPEN property, the journal file is
	35864	+** closed (if it is open).
	35865	+**
	35866	+** If the pager is in ERROR state when this function is called, the
	35867	+** contents of the pager cache are discarded before switching back to
	35868	+** the OPEN state. Regardless of whether the pager is in exclusive-mode
	35869	+** or not, any journal file left in the file-system will be treated
	35870	+** as a hot-journal and rolled back the next time a read-transaction
	35871	+** is opened (by this or by any other connection).
35262	35872	*/
35263	35873	static void pager_unlock(Pager *pPager){
35264		- if( !pPager->exclusiveMode ){
35265		- int rc = SQLITE_OK; /* Return code */
	35874	+
	35875	+ assert( pPager->eState==PAGER_READER
	35876	+ \|\| pPager->eState==PAGER_OPEN
	35877	+ \|\| pPager->eState==PAGER_ERROR
	35878	+ );
	35879	+
	35880	+ sqlite3BitvecDestroy(pPager->pInJournal);
	35881	+ pPager->pInJournal = 0;
	35882	+ releaseAllSavepoints(pPager);
	35883	+
	35884	+ if( pagerUseWal(pPager) ){
	35885	+ assert( !isOpen(pPager->jfd) );
	35886	+ sqlite3WalEndReadTransaction(pPager->pWal);
	35887	+ pPager->eState = PAGER_OPEN;
	35888	+ }else if( !pPager->exclusiveMode ){
	35889	+ int rc; /* Error code returned by pagerUnlockDb() */
35266	35890	int iDc = isOpen(pPager->fd)?sqlite3OsDeviceCharacteristics(pPager->fd):0;
35267	35891
35268	35892	/* If the operating system support deletion of open files, then
35269	35893	** close the journal file when dropping the database lock. Otherwise
35270	35894	** another connection with journal_mode=delete might delete the file
		@@ -35280,62 +35904,60 @@
35280	35904	\|\| 1!=(pPager->journalMode & 5)
35281	35905	){
35282	35906	sqlite3OsClose(pPager->jfd);
35283	35907	}
35284	35908
35285		- sqlite3BitvecDestroy(pPager->pInJournal);
35286		- pPager->pInJournal = 0;
35287		- releaseAllSavepoints(pPager);
35288		-
35289		- /* If the file is unlocked, somebody else might change it. The
35290		- ** values stored in Pager.dbSize etc. might become invalid if
35291		- ** this happens. One can argue that this doesn't need to be cleared
35292		- ** until the change-counter check fails in PagerSharedLock().
35293		- ** Clearing the page size cache here is being conservative.
35294		- */
35295		- pPager->dbSizeValid = 0;
35296		-
35297		- if( pagerUseWal(pPager) ){
35298		- sqlite3WalEndReadTransaction(pPager->pWal);
35299		- }else{
35300		- rc = osUnlock(pPager->fd, NO_LOCK);
35301		- }
35302		- if( rc ){
35303		- pPager->errCode = rc;
35304		- }
35305		- IOTRACE(("UNLOCK %p\n", pPager))
35306		-
35307		- /* If Pager.errCode is set, the contents of the pager cache cannot be
35308		- ** trusted. Now that the pager file is unlocked, the contents of the
35309		- ** cache can be discarded and the error code safely cleared.
35310		- */
35311		- if( pPager->errCode ){
35312		- if( rc==SQLITE_OK ){
35313		- pPager->errCode = SQLITE_OK;
35314		- }
35315		- pager_reset(pPager);
35316		- }
35317		-
	35909	+ /* If the pager is in the ERROR state and the call to unlock the database
	35910	+ ** file fails, set the current lock to UNKNOWN_LOCK. See the comment
	35911	+ ** above the #define for UNKNOWN_LOCK for an explanation of why this
	35912	+ ** is necessary.
	35913	+ */
	35914	+ rc = pagerUnlockDb(pPager, NO_LOCK);
	35915	+ if( rc!=SQLITE_OK && pPager->eState==PAGER_ERROR ){
	35916	+ pPager->eLock = UNKNOWN_LOCK;
	35917	+ }
	35918	+
	35919	+ /* The pager state may be changed from PAGER_ERROR to PAGER_OPEN here
	35920	+ ** without clearing the error code. This is intentional - the error
	35921	+ ** code is cleared and the cache reset in the block below.
	35922	+ */
	35923	+ assert( pPager->errCode \|\| pPager->eState!=PAGER_ERROR );
35318	35924	pPager->changeCountDone = 0;
35319		- pPager->state = PAGER_UNLOCK;
35320		- pPager->dbModified = 0;
	35925	+ pPager->eState = PAGER_OPEN;
35321	35926	}
	35927	+
	35928	+ /* If Pager.errCode is set, the contents of the pager cache cannot be
	35929	+ ** trusted. Now that there are no outstanding references to the pager,
	35930	+ ** it can safely move back to PAGER_OPEN state. This happens in both
	35931	+ ** normal and exclusive-locking mode.
	35932	+ */
	35933	+ if( pPager->errCode ){
	35934	+ assert( !MEMDB );
	35935	+ pager_reset(pPager);
	35936	+ pPager->changeCountDone = pPager->tempFile;
	35937	+ pPager->eState = PAGER_OPEN;
	35938	+ pPager->errCode = SQLITE_OK;
	35939	+ }
	35940	+
	35941	+ pPager->journalOff = 0;
	35942	+ pPager->journalHdr = 0;
	35943	+ pPager->setMaster = 0;
35322	35944	}
35323	35945
35324	35946	/*
35325		-** This function should be called when an IOERR, CORRUPT or FULL error
35326		-** may have occurred. The first argument is a pointer to the pager
35327		-** structure, the second the error-code about to be returned by a pager
35328		-** API function. The value returned is a copy of the second argument
35329		-** to this function.
35330		-**
35331		-** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT, or SQLITE_FULL
35332		-** the error becomes persistent. Until the persistent error is cleared,
35333		-** subsequent API calls on this Pager will immediately return the same
35334		-** error code.
35335		-**
35336		-** A persistent error indicates that the contents of the pager-cache
	35947	+** This function is called whenever an IOERR or FULL error that requires
	35948	+** the pager to transition into the ERROR state may ahve occurred.
	35949	+** The first argument is a pointer to the pager structure, the second
	35950	+** the error-code about to be returned by a pager API function. The
	35951	+** value returned is a copy of the second argument to this function.
	35952	+**
	35953	+** If the second argument is SQLITE_FULL, SQLITE_IOERR or one of the
	35954	+** IOERR sub-codes, the pager enters the ERROR state and the error code
	35955	+** is stored in Pager.errCode. While the pager remains in the ERROR state,
	35956	+** all major API calls on the Pager will immediately return Pager.errCode.
	35957	+**
	35958	+** The ERROR state indicates that the contents of the pager-cache
35337	35959	** cannot be trusted. This state can be cleared by completely discarding
35338	35960	** the contents of the pager-cache. If a transaction was active when
35339	35961	** the persistent error occurred, then the rollback journal may need
35340	35962	** to be replayed to restore the contents of the database file (as if
35341	35963	** it were a hot-journal).
		@@ -35348,49 +35970,25 @@
35348	35970	pPager->errCode==SQLITE_OK \|\|
35349	35971	(pPager->errCode & 0xff)==SQLITE_IOERR
35350	35972	);
35351	35973	if( rc2==SQLITE_FULL \|\| rc2==SQLITE_IOERR ){
35352	35974	pPager->errCode = rc;
	35975	+ pPager->eState = PAGER_ERROR;
35353	35976	}
35354	35977	return rc;
35355	35978	}
35356	35979
35357		-/*
35358		-** Execute a rollback if a transaction is active and unlock the
35359		-** database file.
35360		-**
35361		-** If the pager has already entered the error state, do not attempt
35362		-** the rollback at this time. Instead, pager_unlock() is called. The
35363		-** call to pager_unlock() will discard all in-memory pages, unlock
35364		-** the database file and clear the error state. If this means that
35365		-** there is a hot-journal left in the file-system, the next connection
35366		-** to obtain a shared lock on the pager (which may be this one) will
35367		-** roll it back.
35368		-**
35369		-** If the pager has not already entered the error state, but an IO or
35370		-** malloc error occurs during a rollback, then this will itself cause
35371		-** the pager to enter the error state. Which will be cleared by the
35372		-** call to pager_unlock(), as described above.
35373		-*/
35374		-static void pagerUnlockAndRollback(Pager *pPager){
35375		- if( pPager->errCode==SQLITE_OK && pPager->state>=PAGER_RESERVED ){
35376		- sqlite3BeginBenignMalloc();
35377		- sqlite3PagerRollback(pPager);
35378		- sqlite3EndBenignMalloc();
35379		- }
35380		- pager_unlock(pPager);
35381		-}
35382		-
35383	35980	/*
35384	35981	** This routine ends a transaction. A transaction is usually ended by
35385	35982	** either a COMMIT or a ROLLBACK operation. This routine may be called
35386	35983	** after rollback of a hot-journal, or if an error occurs while opening
35387	35984	** the journal file or writing the very first journal-header of a
35388	35985	** database transaction.
35389	35986	**
35390		-** If the pager is in PAGER_SHARED or PAGER_UNLOCK state when this
35391		-** routine is called, it is a no-op (returns SQLITE_OK).
	35987	+** This routine is never called in PAGER_ERROR state. If it is called
	35988	+** in PAGER_NONE or PAGER_SHARED state and the lock held is less
	35989	+** exclusive than a RESERVED lock, it is a no-op.
35392	35990	**
35393	35991	** Otherwise, any active savepoints are released.
35394	35992	**
35395	35993	** If the journal file is open, then it is "finalized". Once a journal
35396	35994	** file has been finalized it is not possible to use it to roll back a
		@@ -35417,17 +36015,13 @@
35417	36015	** If the pager is running in exclusive mode, this method of finalizing
35418	36016	** the journal file is never used. Instead, if the journalMode is
35419	36017	** DELETE and the pager is in exclusive mode, the method described under
35420	36018	** journalMode==PERSIST is used instead.
35421	36019	**
35422		-** After the journal is finalized, if running in non-exclusive mode, the
35423		-** pager moves to PAGER_SHARED state (and downgrades the lock on the
35424		-** database file accordingly).
35425		-**
35426		-** If the pager is running in exclusive mode and is in PAGER_SYNCED state,
35427		-** it moves to PAGER_EXCLUSIVE. No locks are downgraded when running in
35428		-** exclusive mode.
	36020	+** After the journal is finalized, the pager moves to PAGER_READER state.
	36021	+** If running in non-exclusive rollback mode, the lock on the file is
	36022	+** downgraded to a SHARED_LOCK.
35429	36023	**
35430	36024	** SQLITE_OK is returned if no error occurs. If an error occurs during
35431	36025	** any of the IO operations to finalize the journal file or unlock the
35432	36026	** database then the IO error code is returned to the user. If the
35433	36027	** operation to finalize the journal file fails, then the code still
		@@ -35438,15 +36032,30 @@
35438	36032	*/
35439	36033	static int pager_end_transaction(Pager *pPager, int hasMaster){
35440	36034	int rc = SQLITE_OK; /* Error code from journal finalization operation */
35441	36035	int rc2 = SQLITE_OK; /* Error code from db file unlock operation */
35442	36036
35443		- if( pPager->state<PAGER_RESERVED ){
	36037	+ /* Do nothing if the pager does not have an open write transaction
	36038	+ ** or at least a RESERVED lock. This function may be called when there
	36039	+ ** is no write-transaction active but a RESERVED or greater lock is
	36040	+ ** held under two circumstances:
	36041	+ **
	36042	+ ** 1. After a successful hot-journal rollback, it is called with
	36043	+ ** eState==PAGER_NONE and eLock==EXCLUSIVE_LOCK.
	36044	+ **
	36045	+ ** 2. If a connection with locking_mode=exclusive holding an EXCLUSIVE
	36046	+ ** lock switches back to locking_mode=normal and then executes a
	36047	+ ** read-transaction, this function is called with eState==PAGER_READER
	36048	+ ** and eLock==EXCLUSIVE_LOCK when the read-transaction is closed.
	36049	+ */
	36050	+ assert( assert_pager_state(pPager) );
	36051	+ assert( pPager->eState!=PAGER_ERROR );
	36052	+ if( pPager->eState<PAGER_WRITER_LOCKED && pPager->eLock<RESERVED_LOCK ){
35444	36053	return SQLITE_OK;
35445	36054	}
	36055	+
35446	36056	releaseAllSavepoints(pPager);
35447		-
35448	36057	assert( isOpen(pPager->jfd) \|\| pPager->pInJournal==0 );
35449	36058	if( isOpen(pPager->jfd) ){
35450	36059	assert( !pagerUseWal(pPager) );
35451	36060
35452	36061	/* Finalize the journal file. */
		@@ -35458,18 +36067,15 @@
35458	36067	rc = SQLITE_OK;
35459	36068	}else{
35460	36069	rc = sqlite3OsTruncate(pPager->jfd, 0);
35461	36070	}
35462	36071	pPager->journalOff = 0;
35463		- pPager->journalStarted = 0;
35464	36072	}else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST
35465	36073	\|\| (pPager->exclusiveMode && pPager->journalMode!=PAGER_JOURNALMODE_WAL)
35466	36074	){
35467	36075	rc = zeroJournalHdr(pPager, hasMaster);
35468		- pager_error(pPager, rc);
35469	36076	pPager->journalOff = 0;
35470		- pPager->journalStarted = 0;
35471	36077	}else{
35472	36078	/* This branch may be executed with Pager.journalMode==MEMORY if
35473	36079	** a hot-journal was just rolled back. In this case the journal
35474	36080	** file should be closed and deleted. If this connection writes to
35475	36081	** the database file, it will do so using an in-memory journal.
		@@ -35481,52 +36087,80 @@
35481	36087	sqlite3OsClose(pPager->jfd);
35482	36088	if( !pPager->tempFile ){
35483	36089	rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
35484	36090	}
35485	36091	}
	36092	+ }
35486	36093
35487	36094	#ifdef SQLITE_CHECK_PAGES
35488		- sqlite3PcacheIterateDirty(pPager->pPCache, pager_set_pagehash);
	36095	+ sqlite3PcacheIterateDirty(pPager->pPCache, pager_set_pagehash);
	36096	+ if( pPager->dbSize==0 && sqlite3PcacheRefCount(pPager->pPCache)>0 ){
	36097	+ PgHdr *p = pager_lookup(pPager, 1);
	36098	+ if( p ){
	36099	+ p->pageHash = 0;
	36100	+ sqlite3PagerUnref(p);
	36101	+ }
	36102	+ }
35489	36103	#endif
35490		- }
	36104	+
35491	36105	sqlite3BitvecDestroy(pPager->pInJournal);
35492	36106	pPager->pInJournal = 0;
35493	36107	pPager->nRec = 0;
35494	36108	sqlite3PcacheCleanAll(pPager->pPCache);
	36109	+ sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
35495	36110
35496	36111	if( pagerUseWal(pPager) ){
	36112	+ /* Drop the WAL write-lock, if any. Also, if the connection was in
	36113	+ ** locking_mode=exclusive mode but is no longer, drop the EXCLUSIVE
	36114	+ ** lock held on the database file.
	36115	+ */
35497	36116	rc2 = sqlite3WalEndWriteTransaction(pPager->pWal);
35498	36117	assert( rc2==SQLITE_OK );
35499		- pPager->state = PAGER_SHARED;
35500		-
35501		- /* If the connection was in locking_mode=exclusive mode but is no longer,
35502		- ** drop the EXCLUSIVE lock held on the database file.
35503		- */
35504		- if( !pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, 0) ){
35505		- rc2 = osUnlock(pPager->fd, SHARED_LOCK);
35506		- }
35507		- }else if( !pPager->exclusiveMode ){
35508		- rc2 = osUnlock(pPager->fd, SHARED_LOCK);
35509		- pPager->state = PAGER_SHARED;
	36118	+ }
	36119	+ if( !pPager->exclusiveMode
	36120	+ && (!pagerUseWal(pPager) \|\| sqlite3WalExclusiveMode(pPager->pWal, 0))
	36121	+ ){
	36122	+ rc2 = pagerUnlockDb(pPager, SHARED_LOCK);
35510	36123	pPager->changeCountDone = 0;
35511		- }else if( pPager->state==PAGER_SYNCED ){
35512		- pPager->state = PAGER_EXCLUSIVE;
35513		- }
35514		- pPager->setMaster = 0;
35515		- pPager->needSync = 0;
35516		- pPager->dbModified = 0;
35517		-
35518		- /* TODO: Is this optimal? Why is the db size invalidated here
35519		- ** when the database file is not unlocked? */
35520		- pPager->dbOrigSize = 0;
35521		- sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
35522		- if( !MEMDB ){
35523		- pPager->dbSizeValid = 0;
35524		- }
	36124	+ }
	36125	+ pPager->eState = PAGER_READER;
	36126	+ pPager->setMaster = 0;
35525	36127
35526	36128	return (rc==SQLITE_OK?rc2:rc);
35527	36129	}
	36130	+
	36131	+/*
	36132	+** Execute a rollback if a transaction is active and unlock the
	36133	+** database file.
	36134	+**
	36135	+** If the pager has already entered the ERROR state, do not attempt
	36136	+** the rollback at this time. Instead, pager_unlock() is called. The
	36137	+** call to pager_unlock() will discard all in-memory pages, unlock
	36138	+** the database file and move the pager back to OPEN state. If this
	36139	+** means that there is a hot-journal left in the file-system, the next
	36140	+** connection to obtain a shared lock on the pager (which may be this one)
	36141	+** will roll it back.
	36142	+**
	36143	+** If the pager has not already entered the ERROR state, but an IO or
	36144	+** malloc error occurs during a rollback, then this will itself cause
	36145	+** the pager to enter the ERROR state. Which will be cleared by the
	36146	+** call to pager_unlock(), as described above.
	36147	+*/
	36148	+static void pagerUnlockAndRollback(Pager *pPager){
	36149	+ if( pPager->eState!=PAGER_ERROR && pPager->eState!=PAGER_OPEN ){
	36150	+ assert( assert_pager_state(pPager) );
	36151	+ if( pPager->eState>=PAGER_WRITER_LOCKED ){
	36152	+ sqlite3BeginBenignMalloc();
	36153	+ sqlite3PagerRollback(pPager);
	36154	+ sqlite3EndBenignMalloc();
	36155	+ }else if( !pPager->exclusiveMode ){
	36156	+ assert( pPager->eState==PAGER_READER );
	36157	+ pager_end_transaction(pPager, 0);
	36158	+ }
	36159	+ }
	36160	+ pager_unlock(pPager);
	36161	+}
35528	36162
35529	36163	/*
35530	36164	** Parameter aData must point to a buffer of pPager->pageSize bytes
35531	36165	** of data. Compute and return a checksum based ont the contents of the
35532	36166	** page of data and the current value of pPager->cksumInit.
		@@ -35574,13 +36208,12 @@
35574	36208	** Read a single page from either the journal file (if isMainJrnl==1) or
35575	36209	** from the sub-journal (if isMainJrnl==0) and playback that page.
35576	36210	** The page begins at offset pOffset into the file. The pOffset
35577	36211	** value is increased to the start of the next page in the journal.
35578	36212	**
35579		-** The isMainJrnl flag is true if this is the main rollback journal and
35580		-** false for the statement journal. The main rollback journal uses
35581		-** checksums - the statement journal does not.
	36213	+** The main rollback journal uses checksums - the statement journal does
	36214	+** not.
35582	36215	**
35583	36216	** If the page number of the page record read from the (sub-)journal file
35584	36217	** is greater than the current value of Pager.dbSize, then playback is
35585	36218	** skipped and SQLITE_OK is returned.
35586	36219	**
		@@ -35629,10 +36262,21 @@
35629	36262	assert( isSavepnt \|\| pDone==0 ); /* pDone never used on non-savepoint */
35630	36263
35631	36264	aData = pPager->pTmpSpace;
35632	36265	assert( aData ); /* Temp storage must have already been allocated */
35633	36266	assert( pagerUseWal(pPager)==0 \|\| (!isMainJrnl && isSavepnt) );
	36267	+
	36268	+ /* Either the state is greater than PAGER_WRITER_CACHEMOD (a transaction
	36269	+ ** or savepoint rollback done at the request of the caller) or this is
	36270	+ ** a hot-journal rollback. If it is a hot-journal rollback, the pager
	36271	+ ** is in state OPEN and holds an EXCLUSIVE lock. Hot-journal rollback
	36272	+ ** only reads from the main journal, not the sub-journal.
	36273	+ */
	36274	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD
	36275	+ \|\| (pPager->eState==PAGER_OPEN && pPager->eLock==EXCLUSIVE_LOCK)
	36276	+ );
	36277	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD \|\| isMainJrnl );
35634	36278
35635	36279	/* Read the page number and page data from the journal or sub-journal
35636	36280	** file. Return an error code to the caller if an IO error occurs.
35637	36281	*/
35638	36282	jfd = isMainJrnl ? pPager->jfd : pPager->sjfd;
		@@ -35666,20 +36310,19 @@
35666	36310	** rollback, then don't bother to play it back again.
35667	36311	*/
35668	36312	if( pDone && (rc = sqlite3BitvecSet(pDone, pgno))!=SQLITE_OK ){
35669	36313	return rc;
35670	36314	}
35671		- assert( pPager->state==PAGER_RESERVED \|\| pPager->state>=PAGER_EXCLUSIVE );
35672	36315
35673	36316	/* When playing back page 1, restore the nReserve setting
35674	36317	*/
35675	36318	if( pgno==1 && pPager->nReserve!=((u8*)aData)[20] ){
35676	36319	pPager->nReserve = ((u8*)aData)[20];
35677	36320	pagerReportSize(pPager);
35678	36321	}
35679	36322
35680		- /* If the pager is in RESERVED state, then there must be a copy of this
	36323	+ /* If the pager is in CACHEMOD state, then there must be a copy of this
35681	36324	** page in the pager cache. In this case just update the pager cache,
35682	36325	** not the database file. The page is left marked dirty in this case.
35683	36326	**
35684	36327	** An exception to the above rule: If the database is in no-sync mode
35685	36328	** and a page is moved during an incremental vacuum then the page may
		@@ -35686,12 +36329,15 @@
35686	36329	** not be in the pager cache. Later: if a malloc() or IO error occurs
35687	36330	** during a Movepage() call, then the page may not be in the cache
35688	36331	** either. So the condition described in the above paragraph is not
35689	36332	** assert()able.
35690	36333	**
35691		- ** If in EXCLUSIVE state, then we update the pager cache if it exists
35692		- ** and the main file. The page is then marked not dirty.
	36334	+ ** If in WRITER_DBMOD, WRITER_FINISHED or OPEN state, then we update the
	36335	+ ** pager cache if it exists and the main file. The page is then marked
	36336	+ ** not dirty. Since this code is only executed in PAGER_OPEN state for
	36337	+ ** a hot-journal rollback, it is guaranteed that the page-cache is empty
	36338	+ ** if the pager is in OPEN state.
35693	36339	**
35694	36340	** Ticket #1171: The statement journal might contain page content that is
35695	36341	** different from the page content at the start of the transaction.
35696	36342	** This occurs when a page is changed prior to the start of a statement
35697	36343	** then changed again within the statement. When rolling back such a
		@@ -35713,21 +36359,22 @@
35713	36359	pPg = 0;
35714	36360	}else{
35715	36361	pPg = pager_lookup(pPager, pgno);
35716	36362	}
35717	36363	assert( pPg \|\| !MEMDB );
	36364	+ assert( pPager->eState!=PAGER_OPEN \|\| pPg==0 );
35718	36365	PAGERTRACE(("PLAYBACK %d page %d hash(%08x) %s\n",
35719	36366	PAGERID(pPager), pgno, pager_datahash(pPager->pageSize, (u8*)aData),
35720	36367	(isMainJrnl?"main-journal":"sub-journal")
35721	36368	));
35722	36369	if( isMainJrnl ){
35723	36370	isSynced = pPager->noSync \|\| (*pOffset <= pPager->journalHdr);
35724	36371	}else{
35725	36372	isSynced = (pPg==0 \|\| 0==(pPg->flags & PGHDR_NEED_SYNC));
35726	36373	}
35727		- if( (pPager->state>=PAGER_EXCLUSIVE)
35728		- && isOpen(pPager->fd)
	36374	+ if( isOpen(pPager->fd)
	36375	+ && (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
35729	36376	&& isSynced
35730	36377	){
35731	36378	i64 ofst = (pgno-1)*(i64)pPager->pageSize;
35732	36379	testcase( !isSavepnt && pPg!=0 && (pPg->flags&PGHDR_NEED_SYNC)!=0 );
35733	36380	assert( !pagerUseWal(pPager) );
		@@ -35799,13 +36446,12 @@
35799	36446	** database corruption may ensue.
35800	36447	*/
35801	36448	assert( !pagerUseWal(pPager) );
35802	36449	sqlite3PcacheMakeClean(pPg);
35803	36450	}
35804		-#ifdef SQLITE_CHECK_PAGES
35805		- pPg->pageHash = pager_pagehash(pPg);
35806		-#endif
	36451	+ pager_set_pagehash(pPg);
	36452	+
35807	36453	/* If this was page 1, then restore the value of Pager.dbFileVers.
35808	36454	** Do this before any decoding. */
35809	36455	if( pgno==1 ){
35810	36456	memcpy(&pPager->dbFileVers, &((u8*)pData)[24],sizeof(pPager->dbFileVers));
35811	36457	}
		@@ -35953,14 +36599,14 @@
35953	36599	/*
35954	36600	** This function is used to change the actual size of the database
35955	36601	** file in the file-system. This only happens when committing a transaction,
35956	36602	** or rolling back a transaction (including rolling back a hot-journal).
35957	36603	**
35958		-** If the main database file is not open, or an exclusive lock is not
35959		-** held, this function is a no-op. Otherwise, the size of the file is
35960		-** changed to nPage pages (nPage*pPager->pageSize bytes). If the file
35961		-** on disk is currently larger than nPage pages, then use the VFS
	36604	+** If the main database file is not open, or the pager is not in either
	36605	+** DBMOD or OPEN state, this function is a no-op. Otherwise, the size
	36606	+** of the file is changed to nPage pages (nPage*pPager->pageSize bytes).
	36607	+** If the file on disk is currently larger than nPage pages, then use the VFS
35962	36608	** xTruncate() method to truncate it.
35963	36609	**
35964	36610	** Or, it might might be the case that the file on disk is smaller than
35965	36611	** nPage pages. Some operating system implementations can get confused if
35966	36612	** you try to truncate a file to some size that is larger than it
		@@ -35970,12 +36616,18 @@
35970	36616	** If successful, return SQLITE_OK. If an IO error occurs while modifying
35971	36617	** the database file, return the error code to the caller.
35972	36618	*/
35973	36619	static int pager_truncate(Pager *pPager, Pgno nPage){
35974	36620	int rc = SQLITE_OK;
35975		- if( pPager->state>=PAGER_EXCLUSIVE && isOpen(pPager->fd) ){
	36621	+ assert( pPager->eState!=PAGER_ERROR );
	36622	+ assert( pPager->eState!=PAGER_READER );
	36623	+
	36624	+ if( isOpen(pPager->fd)
	36625	+ && (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
	36626	+ ){
35976	36627	i64 currentSize, newSize;
	36628	+ assert( pPager->eLock==EXCLUSIVE_LOCK );
35977	36629	/* TODO: Is it safe to use Pager.dbFileSize here? */
35978	36630	rc = sqlite3OsFileSize(pPager->fd, &currentSize);
35979	36631	newSize = pPager->pageSize*(i64)nPage;
35980	36632	if( rc==SQLITE_OK && currentSize!=newSize ){
35981	36633	if( currentSize>newSize ){
		@@ -36095,11 +36747,11 @@
36095	36747	/* Figure out how many records are in the journal. Abort early if
36096	36748	** the journal is empty.
36097	36749	*/
36098	36750	assert( isOpen(pPager->jfd) );
36099	36751	rc = sqlite3OsFileSize(pPager->jfd, &szJ);
36100		- if( rc!=SQLITE_OK \|\| szJ==0 ){
	36752	+ if( rc!=SQLITE_OK ){
36101	36753	goto end_playback;
36102	36754	}
36103	36755
36104	36756	/* Read the master journal name from the journal, if it is present.
36105	36757	** If a master journal file name is specified, but the file is not
		@@ -36129,11 +36781,11 @@
36129	36781	** occurs.
36130	36782	*/
36131	36783	while( 1 ){
36132	36784	/* Read the next journal header from the journal file. If there are
36133	36785	** not enough bytes left in the journal file for a complete header, or
36134		- ** it is corrupted, then a process must of failed while writing it.
	36786	+ ** it is corrupted, then a process must have failed while writing it.
36135	36787	** This indicates nothing more needs to be rolled back.
36136	36788	*/
36137	36789	rc = readJournalHdr(pPager, isHot, szJ, &nRec, &mxPg);
36138	36790	if( rc!=SQLITE_OK ){
36139	36791	if( rc==SQLITE_DONE ){
		@@ -36243,14 +36895,13 @@
36243	36895	if( rc==SQLITE_OK ){
36244	36896	zMaster = pPager->pTmpSpace;
36245	36897	rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);
36246	36898	testcase( rc!=SQLITE_OK );
36247	36899	}
36248		- if( rc==SQLITE_OK && pPager->noSync==0 && pPager->state>=PAGER_EXCLUSIVE ){
36249		- rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
36250		- }
36251		- if( rc==SQLITE_OK && pPager->noSync==0 && pPager->state>=PAGER_EXCLUSIVE ){
	36900	+ if( rc==SQLITE_OK && !pPager->noSync
	36901	+ && (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
	36902	+ ){
36252	36903	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
36253	36904	}
36254	36905	if( rc==SQLITE_OK ){
36255	36906	rc = pager_end_transaction(pPager, zMaster[0]!='\0');
36256	36907	testcase( rc!=SQLITE_OK );
		@@ -36288,11 +36939,11 @@
36288	36939	Pgno pgno = pPg->pgno; /* Page number to read */
36289	36940	int rc = SQLITE_OK; /* Return code */
36290	36941	int isInWal = 0; /* True if page is in log file */
36291	36942	int pgsz = pPager->pageSize; /* Number of bytes to read */
36292	36943
36293		- assert( pPager->state>=PAGER_SHARED && !MEMDB );
	36944	+ assert( pPager->eState>=PAGER_READER && !MEMDB );
36294	36945	assert( isOpen(pPager->fd) );
36295	36946
36296	36947	if( NEVER(!isOpen(pPager->fd)) ){
36297	36948	assert( pPager->tempFile );
36298	36949	memset(pPg->pData, 0, pPager->pageSize);
		@@ -36435,10 +37086,18 @@
36435	37086	PgHdr *p;
36436	37087	for(p=pList; p; p=p->pDirty){
36437	37088	sqlite3BackupUpdate(pPager->pBackup, p->pgno, (u8 *)p->pData);
36438	37089	}
36439	37090	}
	37091	+
	37092	+#ifdef SQLITE_CHECK_PAGES
	37093	+ {
	37094	+ PgHdr *p;
	37095	+ for(p=pList; p; p=p->pDirty) pager_set_pagehash(p);
	37096	+ }
	37097	+#endif
	37098	+
36440	37099	return rc;
36441	37100	}
36442	37101
36443	37102	/*
36444	37103	** Begin a read transaction on the WAL.
		@@ -36451,31 +37110,82 @@
36451	37110	static int pagerBeginReadTransaction(Pager *pPager){
36452	37111	int rc; /* Return code */
36453	37112	int changed = 0; /* True if cache must be reset */
36454	37113
36455	37114	assert( pagerUseWal(pPager) );
	37115	+ assert( pPager->eState==PAGER_OPEN \|\| pPager->eState==PAGER_READER );
36456	37116
36457	37117	/* sqlite3WalEndReadTransaction() was not called for the previous
36458	37118	** transaction in locking_mode=EXCLUSIVE. So call it now. If we
36459	37119	** are in locking_mode=NORMAL and EndRead() was previously called,
36460	37120	** the duplicate call is harmless.
36461	37121	*/
36462	37122	sqlite3WalEndReadTransaction(pPager->pWal);
36463	37123
36464	37124	rc = sqlite3WalBeginReadTransaction(pPager->pWal, &changed);
36465		- if( rc==SQLITE_OK ){
36466		- int dummy;
36467		- if( changed ){
36468		- pager_reset(pPager);
36469		- assert( pPager->errCode \|\| pPager->dbSizeValid==0 );
36470		- }
36471		- rc = sqlite3PagerPagecount(pPager, &dummy);
36472		- }
36473		- pPager->state = PAGER_SHARED;
	37125	+ if( rc==SQLITE_OK && changed ){
	37126	+ pager_reset(pPager);
	37127	+ }
36474	37128
36475	37129	return rc;
36476	37130	}
	37131	+
	37132	+/*
	37133	+** This function is called as part of the transition from PAGER_OPEN
	37134	+** to PAGER_READER state to determine the size of the database file
	37135	+** in pages (assuming the page size currently stored in Pager.pageSize).
	37136	+**
	37137	+** If no error occurs, SQLITE_OK is returned and the size of the database
	37138	+** in pages is stored in *pnPage. Otherwise, an error code (perhaps
	37139	+** SQLITE_IOERR_FSTAT) is returned and *pnPage is left unmodified.
	37140	+*/
	37141	+static int pagerPagecount(Pager pPager, Pgno pnPage){
	37142	+ Pgno nPage; /* Value to return via pnPage /
	37143	+
	37144	+ /* Query the WAL sub-system for the database size. The WalDbsize()
	37145	+ ** function returns zero if the WAL is not open (i.e. Pager.pWal==0), or
	37146	+ ** if the database size is not available. The database size is not
	37147	+ ** available from the WAL sub-system if the log file is empty or
	37148	+ ** contains no valid committed transactions.
	37149	+ */
	37150	+ assert( pPager->eState==PAGER_OPEN );
	37151	+ assert( pPager->eLock>=SHARED_LOCK \|\| pPager->noReadlock );
	37152	+ nPage = sqlite3WalDbsize(pPager->pWal);
	37153	+
	37154	+ /* If the database size was not available from the WAL sub-system,
	37155	+ ** determine it based on the size of the database file. If the size
	37156	+ ** of the database file is not an integer multiple of the page-size,
	37157	+ ** round down to the nearest page. Except, any file larger than 0
	37158	+ ** bytes in size is considered to contain at least one page.
	37159	+ */
	37160	+ if( nPage==0 ){
	37161	+ i64 n = 0; /* Size of db file in bytes */
	37162	+ assert( isOpen(pPager->fd) \|\| pPager->tempFile );
	37163	+ if( isOpen(pPager->fd) ){
	37164	+ int rc = sqlite3OsFileSize(pPager->fd, &n);
	37165	+ if( rc!=SQLITE_OK ){
	37166	+ return rc;
	37167	+ }
	37168	+ }
	37169	+ nPage = (Pgno)(n / pPager->pageSize);
	37170	+ if( nPage==0 && n>0 ){
	37171	+ nPage = 1;
	37172	+ }
	37173	+ }
	37174	+
	37175	+ /* If the current number of pages in the file is greater than the
	37176	+ ** configured maximum pager number, increase the allowed limit so
	37177	+ ** that the file can be read.
	37178	+ */
	37179	+ if( nPage>pPager->mxPgno ){
	37180	+ pPager->mxPgno = (Pgno)nPage;
	37181	+ }
	37182	+
	37183	+ *pnPage = nPage;
	37184	+ return SQLITE_OK;
	37185	+}
	37186	+
36477	37187
36478	37188	/*
36479	37189	** Check if the *-wal file that corresponds to the database opened by pPager
36480	37190	** exists if the database is not empy, or verify that the *-wal file does
36481	37191	** not exist (by deleting it) if the database file is empty.
		@@ -36485,25 +37195,26 @@
36485	37195	** if no error occurs, make sure Pager.journalMode is not set to
36486	37196	** PAGER_JOURNALMODE_WAL.
36487	37197	**
36488	37198	** Return SQLITE_OK or an error code.
36489	37199	**
36490		-** If the WAL file is opened, also open a snapshot (read transaction).
36491		-**
36492	37200	** The caller must hold a SHARED lock on the database file to call this
36493	37201	** function. Because an EXCLUSIVE lock on the db file is required to delete
36494	37202	** a WAL on a none-empty database, this ensures there is no race condition
36495	37203	** between the xAccess() below and an xDelete() being executed by some
36496	37204	** other connection.
36497	37205	*/
36498	37206	static int pagerOpenWalIfPresent(Pager *pPager){
36499	37207	int rc = SQLITE_OK;
	37208	+ assert( pPager->eState==PAGER_OPEN );
	37209	+ assert( pPager->eLock>=SHARED_LOCK \|\| pPager->noReadlock );
	37210	+
36500	37211	if( !pPager->tempFile ){
36501	37212	int isWal; /* True if WAL file exists */
36502		- int nPage; /* Size of the database file */
36503		- assert( pPager->state>=SHARED_LOCK );
36504		- rc = sqlite3PagerPagecount(pPager, &nPage);
	37213	+ Pgno nPage; /* Size of the database file */
	37214	+
	37215	+ rc = pagerPagecount(pPager, &nPage);
36505	37216	if( rc ) return rc;
36506	37217	if( nPage==0 ){
36507	37218	rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
36508	37219	isWal = 0;
36509	37220	}else{
		@@ -36511,15 +37222,12 @@
36511	37222	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &isWal
36512	37223	);
36513	37224	}
36514	37225	if( rc==SQLITE_OK ){
36515	37226	if( isWal ){
36516		- pager_reset(pPager);
	37227	+ testcase( sqlite3PcachePagecount(pPager->pPCache)==0 );
36517	37228	rc = sqlite3PagerOpenWal(pPager, 0);
36518		- if( rc==SQLITE_OK ){
36519		- rc = pagerBeginReadTransaction(pPager);
36520		- }
36521	37229	}else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
36522	37230	pPager->journalMode = PAGER_JOURNALMODE_DELETE;
36523	37231	}
36524	37232	}
36525	37233	}
		@@ -36567,11 +37275,12 @@
36567	37275	i64 szJ; /* Effective size of the main journal */
36568	37276	i64 iHdrOff; /* End of first segment of main-journal records */
36569	37277	int rc = SQLITE_OK; /* Return code */
36570	37278	Bitvec pDone = 0; / Bitvec to ensure pages played back only once */
36571	37279
36572		- assert( pPager->state>=PAGER_SHARED );
	37280	+ assert( pPager->eState!=PAGER_ERROR );
	37281	+ assert( pPager->eState>=PAGER_WRITER_LOCKED );
36573	37282
36574	37283	/* Allocate a bitvec to use to store the set of pages rolled back */
36575	37284	if( pSavepoint ){
36576	37285	pDone = sqlite3BitvecCreate(pSavepoint->nOrig);
36577	37286	if( !pDone ){
		@@ -36706,11 +37415,10 @@
36706	37415	#ifndef SQLITE_OMIT_PAGER_PRAGMAS
36707	37416	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int bFullFsync){
36708	37417	pPager->noSync = (level==1 \|\| pPager->tempFile) ?1:0;
36709	37418	pPager->fullSync = (level==3 && !pPager->tempFile) ?1:0;
36710	37419	pPager->sync_flags = (bFullFsync?SQLITE_SYNC_FULL:SQLITE_SYNC_NORMAL);
36711		- if( pPager->noSync ) pPager->needSync = 0;
36712	37420	}
36713	37421	#endif
36714	37422
36715	37423	/*
36716	37424	** The following global variable is incremented whenever the library
		@@ -36788,11 +37496,11 @@
36788	37496	** Change the page size used by the Pager object. The new page size
36789	37497	** is passed in *pPageSize.
36790	37498	**
36791	37499	** If the pager is in the error state when this function is called, it
36792	37500	** is a no-op. The value returned is the error state error code (i.e.
36793		-** one of SQLITE_IOERR, SQLITE_CORRUPT or SQLITE_FULL).
	37501	+** one of SQLITE_IOERR, an SQLITE_IOERR_xxx sub-code or SQLITE_FULL).
36794	37502	**
36795	37503	** Otherwise, if all of the following are true:
36796	37504	**
36797	37505	** * the new page size (value of *pPageSize) is valid (a power
36798	37506	** of two between 512 and SQLITE_MAX_PAGE_SIZE, inclusive), and
		@@ -36812,32 +37520,52 @@
36812	37520	** If the page size is not changed, either because one of the enumerated
36813	37521	** conditions above is not true, the pager was in error state when this
36814	37522	** function was called, or because the memory allocation attempt failed,
36815	37523	** then *pPageSize is set to the old, retained page size before returning.
36816	37524	*/
36817		-SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager pPager, u16 pPageSize, int nReserve){
36818		- int rc = pPager->errCode;
36819		-
36820		- if( rc==SQLITE_OK ){
36821		- u16 pageSize = *pPageSize;
36822		- assert( pageSize==0 \|\| (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
36823		- if( (pPager->memDb==0 \|\| pPager->dbSize==0)
36824		- && sqlite3PcacheRefCount(pPager->pPCache)==0
36825		- && pageSize && pageSize!=pPager->pageSize
36826		- ){
36827		- char pNew = (char )sqlite3PageMalloc(pageSize);
36828		- if( !pNew ){
36829		- rc = SQLITE_NOMEM;
36830		- }else{
36831		- pager_reset(pPager);
36832		- pPager->pageSize = pageSize;
36833		- sqlite3PageFree(pPager->pTmpSpace);
36834		- pPager->pTmpSpace = pNew;
36835		- sqlite3PcacheSetPageSize(pPager->pPCache, pageSize);
36836		- }
36837		- }
36838		- *pPageSize = (u16)pPager->pageSize;
	37525	+SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager pPager, u32 pPageSize, int nReserve){
	37526	+ int rc = SQLITE_OK;
	37527	+
	37528	+ /* It is not possible to do a full assert_pager_state() here, as this
	37529	+ ** function may be called from within PagerOpen(), before the state
	37530	+ ** of the Pager object is internally consistent.
	37531	+ **
	37532	+ ** At one point this function returned an error if the pager was in
	37533	+ ** PAGER_ERROR state. But since PAGER_ERROR state guarantees that
	37534	+ ** there is at least one outstanding page reference, this function
	37535	+ ** is a no-op for that case anyhow.
	37536	+ */
	37537	+
	37538	+ u32 pageSize = *pPageSize;
	37539	+ assert( pageSize==0 \|\| (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
	37540	+ if( (pPager->memDb==0 \|\| pPager->dbSize==0)
	37541	+ && sqlite3PcacheRefCount(pPager->pPCache)==0
	37542	+ && pageSize && pageSize!=(u32)pPager->pageSize
	37543	+ ){
	37544	+ char pNew = NULL; / New temp space */
	37545	+ i64 nByte = 0;
	37546	+
	37547	+ if( pPager->eState>PAGER_OPEN && isOpen(pPager->fd) ){
	37548	+ rc = sqlite3OsFileSize(pPager->fd, &nByte);
	37549	+ }
	37550	+ if( rc==SQLITE_OK ){
	37551	+ pNew = (char *)sqlite3PageMalloc(pageSize);
	37552	+ if( !pNew ) rc = SQLITE_NOMEM;
	37553	+ }
	37554	+
	37555	+ if( rc==SQLITE_OK ){
	37556	+ pager_reset(pPager);
	37557	+ pPager->dbSize = (Pgno)(nByte/pageSize);
	37558	+ pPager->pageSize = pageSize;
	37559	+ sqlite3PageFree(pPager->pTmpSpace);
	37560	+ pPager->pTmpSpace = pNew;
	37561	+ sqlite3PcacheSetPageSize(pPager->pPCache, pageSize);
	37562	+ }
	37563	+ }
	37564	+
	37565	+ *pPageSize = pPager->pageSize;
	37566	+ if( rc==SQLITE_OK ){
36839	37567	if( nReserve<0 ) nReserve = pPager->nReserve;
36840	37568	assert( nReserve>=0 && nReserve<1000 );
36841	37569	pPager->nReserve = (i16)nReserve;
36842	37570	pagerReportSize(pPager);
36843	37571	}
		@@ -36862,17 +37590,15 @@
36862	37590	** maximum page count below the current size of the database.
36863	37591	**
36864	37592	** Regardless of mxPage, return the current maximum page count.
36865	37593	*/
36866	37594	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){
36867		- int nPage;
36868	37595	if( mxPage>0 ){
36869	37596	pPager->mxPgno = mxPage;
36870	37597	}
36871		- if( pPager->state!=PAGER_UNLOCK ){
36872		- sqlite3PagerPagecount(pPager, &nPage);
36873		- assert( (int)pPager->mxPgno>=nPage );
	37598	+ if( pPager->eState!=PAGER_OPEN && pPager->mxPgno<pPager->dbSize ){
	37599	+ pPager->mxPgno = pPager->dbSize;
36874	37600	}
36875	37601	return pPager->mxPgno;
36876	37602	}
36877	37603
36878	37604	/*
		@@ -36933,70 +37659,20 @@
36933	37659	}
36934	37660	return rc;
36935	37661	}
36936	37662
36937	37663	/*
36938		-** Return the total number of pages in the database file associated
36939		-** with pPager. Normally, this is calculated as (<db file size>/<page-size>).
	37664	+** This function may only be called when a read-transaction is open on
	37665	+** the pager. It returns the total number of pages in the database.
	37666	+**
36940	37667	** However, if the file is between 1 and <page-size> bytes in size, then
36941	37668	** this is considered a 1 page file.
36942		-**
36943		-** If the pager is in error state when this function is called, then the
36944		-** error state error code is returned and *pnPage left unchanged. Or,
36945		-** if the file system has to be queried for the size of the file and
36946		-** the query attempt returns an IO error, the IO error code is returned
36947		-** and *pnPage is left unchanged.
36948		-**
36949		-** Otherwise, if everything is successful, then SQLITE_OK is returned
36950		-** and *pnPage is set to the number of pages in the database.
36951		-*/
36952		-SQLITE_PRIVATE int sqlite3PagerPagecount(Pager pPager, int pnPage){
36953		- Pgno nPage = 0; /* Value to return via pnPage /
36954		-
36955		- /* Determine the number of pages in the file. Store this in nPage. */
36956		- if( pPager->dbSizeValid ){
36957		- nPage = pPager->dbSize;
36958		- }else{
36959		- int rc; /* Error returned by OsFileSize() */
36960		- i64 n = 0; /* File size in bytes returned by OsFileSize() */
36961		-
36962		- if( pagerUseWal(pPager) && pPager->state!=PAGER_UNLOCK ){
36963		- sqlite3WalDbsize(pPager->pWal, &nPage);
36964		- }
36965		-
36966		- if( nPage==0 ){
36967		- assert( isOpen(pPager->fd) \|\| pPager->tempFile );
36968		- if( isOpen(pPager->fd) ){
36969		- if( SQLITE_OK!=(rc = sqlite3OsFileSize(pPager->fd, &n)) ){
36970		- pager_error(pPager, rc);
36971		- return rc;
36972		- }
36973		- }
36974		- if( n>0 && n<pPager->pageSize ){
36975		- nPage = 1;
36976		- }else{
36977		- nPage = (Pgno)(n / pPager->pageSize);
36978		- }
36979		- }
36980		- if( pPager->state!=PAGER_UNLOCK ){
36981		- pPager->dbSize = nPage;
36982		- pPager->dbFileSize = nPage;
36983		- pPager->dbSizeValid = 1;
36984		- }
36985		- }
36986		-
36987		- /* If the current number of pages in the file is greater than the
36988		- ** configured maximum pager number, increase the allowed limit so
36989		- ** that the file can be read.
36990		- */
36991		- if( nPage>pPager->mxPgno ){
36992		- pPager->mxPgno = (Pgno)nPage;
36993		- }
36994		-
36995		- /* Set the output variable and return SQLITE_OK */
36996		- *pnPage = nPage;
36997		- return SQLITE_OK;
	37669	+*/
	37670	+SQLITE_PRIVATE void sqlite3PagerPagecount(Pager pPager, int pnPage){
	37671	+ assert( pPager->eState>=PAGER_READER );
	37672	+ assert( pPager->eState!=PAGER_WRITER_FINISHED );
	37673	+ *pnPage = (int)pPager->dbSize;
36998	37674	}
36999	37675
37000	37676
37001	37677	/*
37002	37678	** Try to obtain a lock of type locktype on the database file. If
		@@ -37013,42 +37689,23 @@
37013	37689	** variable to locktype before returning.
37014	37690	*/
37015	37691	static int pager_wait_on_lock(Pager *pPager, int locktype){
37016	37692	int rc; /* Return code */
37017	37693
37018		- /* The OS lock values must be the same as the Pager lock values */
37019		- assert( PAGER_SHARED==SHARED_LOCK );
37020		- assert( PAGER_RESERVED==RESERVED_LOCK );
37021		- assert( PAGER_EXCLUSIVE==EXCLUSIVE_LOCK );
37022		-
37023		- /* If the file is currently unlocked then the size must be unknown. It
37024		- ** must not have been modified at this point.
37025		- */
37026		- assert( pPager->state>=PAGER_SHARED \|\| pPager->dbSizeValid==0 );
37027		- assert( pPager->state>=PAGER_SHARED \|\| pPager->dbModified==0 );
37028		-
37029	37694	/* Check that this is either a no-op (because the requested lock is
37030	37695	** already held, or one of the transistions that the busy-handler
37031	37696	** may be invoked during, according to the comment above
37032	37697	** sqlite3PagerSetBusyhandler().
37033	37698	*/
37034		- assert( (pPager->state>=locktype)
37035		- \|\| (pPager->state==PAGER_UNLOCK && locktype==PAGER_SHARED)
37036		- \|\| (pPager->state==PAGER_RESERVED && locktype==PAGER_EXCLUSIVE)
	37699	+ assert( (pPager->eLock>=locktype)
	37700	+ \|\| (pPager->eLock==NO_LOCK && locktype==SHARED_LOCK)
	37701	+ \|\| (pPager->eLock==RESERVED_LOCK && locktype==EXCLUSIVE_LOCK)
37037	37702	);
37038	37703
37039		- if( pPager->state>=locktype ){
37040		- rc = SQLITE_OK;
37041		- }else{
37042		- do {
37043		- rc = sqlite3OsLock(pPager->fd, locktype);
37044		- }while( rc==SQLITE_BUSY && pPager->xBusyHandler(pPager->pBusyHandlerArg) );
37045		- if( rc==SQLITE_OK ){
37046		- pPager->state = (u8)locktype;
37047		- IOTRACE(("LOCK %p %d\n", pPager, locktype))
37048		- }
37049		- }
	37704	+ do {
	37705	+ rc = pagerLockDb(pPager, locktype);
	37706	+ }while( rc==SQLITE_BUSY && pPager->xBusyHandler(pPager->pBusyHandlerArg) );
37050	37707	return rc;
37051	37708	}
37052	37709
37053	37710	/*
37054	37711	** Function assertTruncateConstraint(pPager) checks that one of the
		@@ -37089,13 +37746,12 @@
37089	37746	** function does not actually modify the database file on disk. It
37090	37747	** just sets the internal state of the pager object so that the
37091	37748	** truncation will be done when the current transaction is committed.
37092	37749	*/
37093	37750	SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager *pPager, Pgno nPage){
37094		- assert( pPager->dbSizeValid );
37095	37751	assert( pPager->dbSize>=nPage );
37096		- assert( pPager->state>=PAGER_RESERVED );
	37752	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
37097	37753	pPager->dbSize = nPage;
37098	37754	assertTruncateConstraint(pPager);
37099	37755	}
37100	37756
37101	37757
		@@ -37141,11 +37797,11 @@
37141	37797	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){
37142	37798	u8 pTmp = (u8 )pPager->pTmpSpace;
37143	37799
37144	37800	disable_simulated_io_errors();
37145	37801	sqlite3BeginBenignMalloc();
37146		- pPager->errCode = 0;
	37802	+ /* pPager->errCode = 0; */
37147	37803	pPager->exclusiveMode = 0;
37148	37804	#ifndef SQLITE_OMIT_WAL
37149	37805	sqlite3WalClose(pPager->pWal,
37150	37806	(pPager->noSync ? 0 : pPager->sync_flags),
37151	37807	pPager->pageSize, pTmp
		@@ -37154,18 +37810,23 @@
37154	37810	#endif
37155	37811	pager_reset(pPager);
37156	37812	if( MEMDB ){
37157	37813	pager_unlock(pPager);
37158	37814	}else{
37159		- /* Set Pager.journalHdr to -1 for the benefit of the pager_playback()
37160		- ** call which may be made from within pagerUnlockAndRollback(). If it
37161		- ** is not -1, then the unsynced portion of an open journal file may
37162		- ** be played back into the database. If a power failure occurs while
37163		- ** this is happening, the database may become corrupt.
	37815	+ /* If it is open, sync the journal file before calling UnlockAndRollback.
	37816	+ ** If this is not done, then an unsynced portion of the open journal
	37817	+ ** file may be played back into the database. If a power failure occurs
	37818	+ ** while this is happening, the database could become corrupt.
	37819	+ **
	37820	+ ** If an error occurs while trying to sync the journal, shift the pager
	37821	+ ** into the ERROR state. This causes UnlockAndRollback to unlock the
	37822	+ ** database and close the journal file without attempting to roll it
	37823	+ ** back or finalize it. The next database user will have to do hot-journal
	37824	+ ** rollback before accessing the database file.
37164	37825	*/
37165	37826	if( isOpen(pPager->jfd) ){
37166		- pPager->errCode = pagerSyncHotJournal(pPager);
	37827	+ pager_error(pPager, pagerSyncHotJournal(pPager));
37167	37828	}
37168	37829	pagerUnlockAndRollback(pPager);
37169	37830	}
37170	37831	sqlite3EndBenignMalloc();
37171	37832	enable_simulated_io_errors();
		@@ -37206,13 +37867,13 @@
37206	37867	/*
37207	37868	** Sync the journal. In other words, make sure all the pages that have
37208	37869	** been written to the journal have actually reached the surface of the
37209	37870	** disk and can be restored in the event of a hot-journal rollback.
37210	37871	**
37211		-** If the Pager.needSync flag is not set, then this function is a
37212		-** no-op. Otherwise, the actions required depend on the journal-mode
37213		-** and the device characteristics of the the file-system, as follows:
	37872	+** If the Pager.noSync flag is set, then this function is a no-op.
	37873	+** Otherwise, the actions required depend on the journal-mode and the
	37874	+** device characteristics of the the file-system, as follows:
37214	37875	**
37215	37876	** * If the journal file is an in-memory journal file, no action need
37216	37877	** be taken.
37217	37878	**
37218	37879	** * Otherwise, if the device does not support the SAFE_APPEND property,
		@@ -37232,22 +37893,29 @@
37232	37893	** <update nRec field>
37233	37894	** }
37234	37895	** if( NOT SEQUENTIAL ) xSync(<journal file>);
37235	37896	** }
37236	37897	**
37237		-** The Pager.needSync flag is never be set for temporary files, or any
37238		-** file operating in no-sync mode (Pager.noSync set to non-zero).
37239		-**
37240	37898	** If successful, this routine clears the PGHDR_NEED_SYNC flag of every
37241	37899	** page currently held in memory before returning SQLITE_OK. If an IO
37242	37900	** error is encountered, then the IO error code is returned to the caller.
37243	37901	*/
37244		-static int syncJournal(Pager *pPager){
37245		- if( pPager->needSync ){
	37902	+static int syncJournal(Pager *pPager, int newHdr){
	37903	+ int rc; /* Return code */
	37904	+
	37905	+ assert( pPager->eState==PAGER_WRITER_CACHEMOD
	37906	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	37907	+ );
	37908	+ assert( assert_pager_state(pPager) );
	37909	+ assert( !pagerUseWal(pPager) );
	37910	+
	37911	+ rc = sqlite3PagerExclusiveLock(pPager);
	37912	+ if( rc!=SQLITE_OK ) return rc;
	37913	+
	37914	+ if( !pPager->noSync ){
37246	37915	assert( !pPager->tempFile );
37247		- if( pPager->journalMode!=PAGER_JOURNALMODE_MEMORY ){
37248		- int rc; /* Return code */
	37916	+ if( isOpen(pPager->jfd) && pPager->journalMode!=PAGER_JOURNALMODE_MEMORY ){
37249	37917	const int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
37250	37918	assert( isOpen(pPager->jfd) );
37251	37919
37252	37920	if( 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
37253	37921	/* This block deals with an obscure problem. If the last connection
		@@ -37318,21 +37986,29 @@
37318	37986	rc = sqlite3OsSync(pPager->jfd, pPager->sync_flags\|
37319	37987	(pPager->sync_flags==SQLITE_SYNC_FULL?SQLITE_SYNC_DATAONLY:0)
37320	37988	);
37321	37989	if( rc!=SQLITE_OK ) return rc;
37322	37990	}
37323		- }
37324		-
37325		- /* The journal file was just successfully synced. Set Pager.needSync
37326		- ** to zero and clear the PGHDR_NEED_SYNC flag on all pagess.
37327		- */
37328		- pPager->needSync = 0;
37329		- pPager->journalStarted = 1;
37330		- pPager->journalHdr = pPager->journalOff;
37331		- sqlite3PcacheClearSyncFlags(pPager->pPCache);
	37991	+
	37992	+ pPager->journalHdr = pPager->journalOff;
	37993	+ if( newHdr && 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
	37994	+ pPager->nRec = 0;
	37995	+ rc = writeJournalHdr(pPager);
	37996	+ if( rc!=SQLITE_OK ) return rc;
	37997	+ }
	37998	+ }else{
	37999	+ pPager->journalHdr = pPager->journalOff;
	38000	+ }
37332	38001	}
37333	38002
	38003	+ /* Unless the pager is in noSync mode, the journal file was just
	38004	+ ** successfully synced. Either way, clear the PGHDR_NEED_SYNC flag on
	38005	+ ** all pages.
	38006	+ */
	38007	+ sqlite3PcacheClearSyncFlags(pPager->pPCache);
	38008	+ pPager->eState = PAGER_WRITER_DBMOD;
	38009	+ assert( assert_pager_state(pPager) );
37334	38010	return SQLITE_OK;
37335	38011	}
37336	38012
37337	38013	/*
37338	38014	** The argument is the first in a linked list of dirty pages connected
		@@ -37365,31 +38041,16 @@
37365	38041	** If everything is successful, SQLITE_OK is returned. If an IO error
37366	38042	** occurs, an IO error code is returned. Or, if the EXCLUSIVE lock cannot
37367	38043	** be obtained, SQLITE_BUSY is returned.
37368	38044	*/
37369	38045	static int pager_write_pagelist(Pager pPager, PgHdr pList){
37370		- int rc; /* Return code */
37371		-
37372		- /* At this point there may be either a RESERVED or EXCLUSIVE lock on the
37373		- ** database file. If there is already an EXCLUSIVE lock, the following
37374		- ** call is a no-op.
37375		- **
37376		- ** Moving the lock from RESERVED to EXCLUSIVE actually involves going
37377		- ** through an intermediate state PENDING. A PENDING lock prevents new
37378		- ** readers from attaching to the database but is unsufficient for us to
37379		- ** write. The idea of a PENDING lock is to prevent new readers from
37380		- ** coming in while we wait for existing readers to clear.
37381		- **
37382		- ** While the pager is in the RESERVED state, the original database file
37383		- ** is unchanged and we can rollback without having to playback the
37384		- ** journal into the original database file. Once we transition to
37385		- ** EXCLUSIVE, it means the database file has been changed and any rollback
37386		- ** will require a journal playback.
37387		- */
	38046	+ int rc = SQLITE_OK; /* Return code */
	38047	+
	38048	+ /* This function is only called for rollback pagers in WRITER_DBMOD state. */
37388	38049	assert( !pagerUseWal(pPager) );
37389		- assert( pPager->state>=PAGER_RESERVED );
37390		- rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
	38050	+ assert( pPager->eState==PAGER_WRITER_DBMOD );
	38051	+ assert( pPager->eLock==EXCLUSIVE_LOCK );
37391	38052
37392	38053	/* If the file is a temp-file has not yet been opened, open it now. It
37393	38054	** is not possible for rc to be other than SQLITE_OK if this branch
37394	38055	** is taken, as pager_wait_on_lock() is a no-op for temp-files.
37395	38056	*/
		@@ -37400,13 +38061,14 @@
37400	38061
37401	38062	/* Before the first write, give the VFS a hint of what the final
37402	38063	** file size will be.
37403	38064	*/
37404	38065	assert( rc!=SQLITE_OK \|\| isOpen(pPager->fd) );
37405		- if( rc==SQLITE_OK && pPager->dbSize>(pPager->dbOrigSize+1) ){
	38066	+ if( rc==SQLITE_OK && pPager->dbSize>pPager->dbHintSize ){
37406	38067	sqlite3_int64 szFile = pPager->pageSize * (sqlite3_int64)pPager->dbSize;
37407	38068	sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SIZE_HINT, &szFile);
	38069	+ pPager->dbHintSize = pPager->dbSize;
37408	38070	}
37409	38071
37410	38072	while( rc==SQLITE_OK && pList ){
37411	38073	Pgno pgno = pList->pgno;
37412	38074
		@@ -37419,10 +38081,12 @@
37419	38081	** set (set by sqlite3PagerDontWrite()).
37420	38082	*/
37421	38083	if( pgno<=pPager->dbSize && 0==(pList->flags&PGHDR_DONT_WRITE) ){
37422	38084	i64 offset = (pgno-1)(i64)pPager->pageSize; / Offset to write */
37423	38085	char pData; / Data to write */
	38086	+
	38087	+ assert( (pList->flags&PGHDR_NEED_SYNC)==0 );
37424	38088
37425	38089	/* Encode the database */
37426	38090	CODEC2(pPager, pList->pData, pgno, 6, return SQLITE_NOMEM, pData);
37427	38091
37428	38092	/* Write out the page data. */
		@@ -37448,13 +38112,11 @@
37448	38112	PAGER_INCR(sqlite3_pager_writedb_count);
37449	38113	PAGER_INCR(pPager->nWrite);
37450	38114	}else{
37451	38115	PAGERTRACE(("NOSTORE %d page %d\n", PAGERID(pPager), pgno));
37452	38116	}
37453		-#ifdef SQLITE_CHECK_PAGES
37454		- pList->pageHash = pager_pagehash(pList);
37455		-#endif
	38117	+ pager_set_pagehash(pList);
37456	38118	pList = pList->pDirty;
37457	38119	}
37458	38120
37459	38121	return rc;
37460	38122	}
		@@ -37562,13 +38224,18 @@
37562	38224	** pages belonging to the same sector.
37563	38225	**
37564	38226	** The doNotSpill flag inhibits all cache spilling regardless of whether
37565	38227	** or not a sync is required. This is set during a rollback.
37566	38228	**
37567		- ** Spilling is also inhibited when in an error state.
	38229	+ ** Spilling is also prohibited when in an error state since that could
	38230	+ ** lead to database corruption. In the current implementaton it
	38231	+ ** is impossible for sqlite3PCacheFetch() to be called with createFlag==1
	38232	+ ** while in the error state, hence it is impossible for this routine to
	38233	+ ** be called in the error state. Nevertheless, we include a NEVER()
	38234	+ ** test for the error state as a safeguard against future changes.
37568	38235	*/
37569		- if( pPager->errCode ) return SQLITE_OK;
	38236	+ if( NEVER(pPager->errCode) ) return SQLITE_OK;
37570	38237	if( pPager->doNotSpill ) return SQLITE_OK;
37571	38238	if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){
37572	38239	return SQLITE_OK;
37573	38240	}
37574	38241
		@@ -37582,20 +38249,14 @@
37582	38249	rc = pagerWalFrames(pPager, pPg, 0, 0, 0);
37583	38250	}
37584	38251	}else{
37585	38252
37586	38253	/* Sync the journal file if required. */
37587		- if( pPg->flags&PGHDR_NEED_SYNC ){
37588		- assert( !pPager->noSync );
37589		- rc = syncJournal(pPager);
37590		- if( rc==SQLITE_OK &&
37591		- !(pPager->journalMode==PAGER_JOURNALMODE_MEMORY) &&
37592		- !(sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
37593		- ){
37594		- pPager->nRec = 0;
37595		- rc = writeJournalHdr(pPager);
37596		- }
	38254	+ if( pPg->flags&PGHDR_NEED_SYNC
	38255	+ \|\| pPager->eState==PAGER_WRITER_CACHEMOD
	38256	+ ){
	38257	+ rc = syncJournal(pPager, 1);
37597	38258	}
37598	38259
37599	38260	/* If the page number of this page is larger than the current size of
37600	38261	** the database image, it may need to be written to the sub-journal.
37601	38262	** This is because the call to pager_write_pagelist() below will not
		@@ -37629,10 +38290,11 @@
37629	38290	rc = subjournalPage(pPg);
37630	38291	}
37631	38292
37632	38293	/* Write the contents of the page out to the database file. */
37633	38294	if( rc==SQLITE_OK ){
	38295	+ assert( (pPg->flags&PGHDR_NEED_SYNC)==0 );
37634	38296	rc = pager_write_pagelist(pPager, pPg);
37635	38297	}
37636	38298	}
37637	38299
37638	38300	/* Mark the page as clean. */
		@@ -37639,11 +38301,11 @@
37639	38301	if( rc==SQLITE_OK ){
37640	38302	PAGERTRACE(("STRESS %d page %d\n", PAGERID(pPager), pPg->pgno));
37641	38303	sqlite3PcacheMakeClean(pPg);
37642	38304	}
37643	38305
37644		- return pager_error(pPager, rc);
	38306	+ return pager_error(pPager, rc);
37645	38307	}
37646	38308
37647	38309
37648	38310	/*
37649	38311	** Allocate and initialize a new Pager object and put a pointer to it
		@@ -37694,11 +38356,11 @@
37694	38356	char zPathname = 0; / Full path to database file */
37695	38357	int nPathname = 0; /* Number of bytes in zPathname */
37696	38358	int useJournal = (flags & PAGER_OMIT_JOURNAL)==0; /* False to omit journal */
37697	38359	int noReadlock = (flags & PAGER_NO_READLOCK)!=0; /* True to omit read-lock */
37698	38360	int pcacheSize = sqlite3PcacheSize(); /* Bytes to allocate for PCache */
37699		- u16 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE; /* Default page size */
	38361	+ u32 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE; /* Default page size */
37700	38362
37701	38363	/* Figure out how much space is required for each journal file-handle
37702	38364	** (there are two of them, the main journal and the sub-journal). This
37703	38365	** is the maximum space required for an in-memory journal file handle
37704	38366	** and a regular journal file-handle. Note that a "regular journal-handle"
		@@ -37829,11 +38491,11 @@
37829	38491	assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
37830	38492	if( szPageDflt<pPager->sectorSize ){
37831	38493	if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
37832	38494	szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
37833	38495	}else{
37834		- szPageDflt = (u16)pPager->sectorSize;
	38496	+ szPageDflt = (u32)pPager->sectorSize;
37835	38497	}
37836	38498	}
37837	38499	#ifdef SQLITE_ENABLE_ATOMIC_WRITE
37838	38500	{
37839	38501	int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
		@@ -37857,11 +38519,12 @@
37857	38519	** This branch is also run for an in-memory database. An in-memory
37858	38520	** database is the same as a temp-file that is never written out to
37859	38521	** disk and uses an in-memory rollback journal.
37860	38522	*/
37861	38523	tempFile = 1;
37862		- pPager->state = PAGER_EXCLUSIVE;
	38524	+ pPager->eState = PAGER_READER;
	38525	+ pPager->eLock = EXCLUSIVE_LOCK;
37863	38526	readOnly = (vfsFlags&SQLITE_OPEN_READONLY);
37864	38527	}
37865	38528
37866	38529	/* The following call to PagerSetPagesize() serves to set the value of
37867	38530	** Pager.pageSize and to allocate the Pager.pTmpSpace buffer.
		@@ -37894,27 +38557,27 @@
37894	38557	pPager->useJournal = (u8)useJournal;
37895	38558	pPager->noReadlock = (noReadlock && readOnly) ?1:0;
37896	38559	/* pPager->stmtOpen = 0; */
37897	38560	/* pPager->stmtInUse = 0; */
37898	38561	/* pPager->nRef = 0; */
37899		- pPager->dbSizeValid = (u8)memDb;
37900	38562	/* pPager->stmtSize = 0; */
37901	38563	/* pPager->stmtJSize = 0; */
37902	38564	/* pPager->nPage = 0; */
37903	38565	pPager->mxPgno = SQLITE_MAX_PAGE_COUNT;
37904	38566	/* pPager->state = PAGER_UNLOCK; */
	38567	+#if 0
37905	38568	assert( pPager->state == (tempFile ? PAGER_EXCLUSIVE : PAGER_UNLOCK) );
	38569	+#endif
37906	38570	/* pPager->errMask = 0; */
37907	38571	pPager->tempFile = (u8)tempFile;
37908	38572	assert( tempFile==PAGER_LOCKINGMODE_NORMAL
37909	38573	\|\| tempFile==PAGER_LOCKINGMODE_EXCLUSIVE );
37910	38574	assert( PAGER_LOCKINGMODE_EXCLUSIVE==1 );
37911	38575	pPager->exclusiveMode = (u8)tempFile;
37912	38576	pPager->changeCountDone = pPager->tempFile;
37913	38577	pPager->memDb = (u8)memDb;
37914	38578	pPager->readOnly = (u8)readOnly;
37915		- /* pPager->needSync = 0; */
37916	38579	assert( useJournal \|\| pPager->tempFile );
37917	38580	pPager->noSync = pPager->tempFile;
37918	38581	pPager->fullSync = pPager->noSync ?0:1;
37919	38582	pPager->sync_flags = SQLITE_SYNC_NORMAL;
37920	38583	/* pPager->pFirst = 0; */
		@@ -37975,24 +38638,24 @@
37975	38638	sqlite3_vfs * const pVfs = pPager->pVfs;
37976	38639	int rc = SQLITE_OK; /* Return code */
37977	38640	int exists = 1; /* True if a journal file is present */
37978	38641	int jrnlOpen = !!isOpen(pPager->jfd);
37979	38642
37980		- assert( pPager!=0 );
37981	38643	assert( pPager->useJournal );
37982	38644	assert( isOpen(pPager->fd) );
37983		- assert( pPager->state <= PAGER_SHARED );
	38645	+ assert( pPager->eState==PAGER_OPEN );
	38646	+
37984	38647	assert( jrnlOpen==0 \|\| ( sqlite3OsDeviceCharacteristics(pPager->jfd) &
37985	38648	SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
37986	38649	));
37987	38650
37988	38651	*pExists = 0;
37989	38652	if( !jrnlOpen ){
37990	38653	rc = sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS, &exists);
37991	38654	}
37992	38655	if( rc==SQLITE_OK && exists ){
37993		- int locked; /* True if some process holds a RESERVED lock */
	38656	+ int locked = 0; /* True if some process holds a RESERVED lock */
37994	38657
37995	38658	/* Race condition here: Another process might have been holding the
37996	38659	** the RESERVED lock and have a journal open at the sqlite3OsAccess()
37997	38660	** call above, but then delete the journal and drop the lock before
37998	38661	** we get to the following sqlite3OsCheckReservedLock() call. If that
		@@ -38000,25 +38663,25 @@
38000	38663	** in fact there is none. This results in a false-positive which will
38001	38664	** be dealt with by the playback routine. Ticket #3883.
38002	38665	*/
38003	38666	rc = sqlite3OsCheckReservedLock(pPager->fd, &locked);
38004	38667	if( rc==SQLITE_OK && !locked ){
38005		- int nPage;
	38668	+ Pgno nPage; /* Number of pages in database file */
38006	38669
38007	38670	/* Check the size of the database file. If it consists of 0 pages,
38008	38671	** then delete the journal file. See the header comment above for
38009	38672	** the reasoning here. Delete the obsolete journal file under
38010	38673	** a RESERVED lock to avoid race conditions and to avoid violating
38011	38674	** [H33020].
38012	38675	*/
38013		- rc = sqlite3PagerPagecount(pPager, &nPage);
	38676	+ rc = pagerPagecount(pPager, &nPage);
38014	38677	if( rc==SQLITE_OK ){
38015	38678	if( nPage==0 ){
38016	38679	sqlite3BeginBenignMalloc();
38017		- if( sqlite3OsLock(pPager->fd, RESERVED_LOCK)==SQLITE_OK ){
	38680	+ if( pagerLockDb(pPager, RESERVED_LOCK)==SQLITE_OK ){
38018	38681	sqlite3OsDelete(pVfs, pPager->zJournal, 0);
38019		- sqlite3OsUnlock(pPager->fd, SHARED_LOCK);
	38682	+ pagerUnlockDb(pPager, SHARED_LOCK);
38020	38683	}
38021	38684	sqlite3EndBenignMalloc();
38022	38685	}else{
38023	38686	/* The journal file exists and no other connection has a reserved
38024	38687	** or greater lock on the database file. Now check that there is
		@@ -38067,11 +38730,11 @@
38067	38730	** has been successfully called. If a shared-lock is already held when
38068	38731	** this function is called, it is a no-op.
38069	38732	**
38070	38733	** The following operations are also performed by this function.
38071	38734	**
38072		-** 1) If the pager is currently in PAGER_UNLOCK state (no lock held
	38735	+** 1) If the pager is currently in PAGER_OPEN state (no lock held
38073	38736	** on the database file), then an attempt is made to obtain a
38074	38737	** SHARED lock on the database file. Immediately after obtaining
38075	38738	** the SHARED lock, the file-system is checked for a hot-journal,
38076	38739	** which is played back if present. Following any hot-journal
38077	38740	** rollback, the contents of the cache are validated by checking
		@@ -38082,70 +38745,51 @@
38082	38745	** no outstanding references to any pages, and is in the error state,
38083	38746	** then an attempt is made to clear the error state by discarding
38084	38747	** the contents of the page cache and rolling back any open journal
38085	38748	** file.
38086	38749	**
38087		-** If the operation described by (2) above is not attempted, and if the
38088		-** pager is in an error state other than SQLITE_FULL when this is called,
38089		-** the error state error code is returned. It is permitted to read the
38090		-** database when in SQLITE_FULL error state.
38091		-**
38092		-** Otherwise, if everything is successful, SQLITE_OK is returned. If an
38093		-** IO error occurs while locking the database, checking for a hot-journal
38094		-** file or rolling back a journal file, the IO error code is returned.
	38750	+** If everything is successful, SQLITE_OK is returned. If an IO error
	38751	+** occurs while locking the database, checking for a hot-journal file or
	38752	+** rolling back a journal file, the IO error code is returned.
38095	38753	*/
38096	38754	SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager){
38097	38755	int rc = SQLITE_OK; /* Return code */
38098		- int isErrorReset = 0; /* True if recovering from error state */
38099	38756
38100	38757	/* This routine is only called from b-tree and only when there are no
38101		- ** outstanding pages */
	38758	+ ** outstanding pages. This implies that the pager state should either
	38759	+ ** be OPEN or READER. READER is only possible if the pager is or was in
	38760	+ ** exclusive access mode.
	38761	+ */
38102	38762	assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
	38763	+ assert( assert_pager_state(pPager) );
	38764	+ assert( pPager->eState==PAGER_OPEN \|\| pPager->eState==PAGER_READER );
38103	38765	if( NEVER(MEMDB && pPager->errCode) ){ return pPager->errCode; }
38104	38766
38105		- /* If this database is in an error-state, now is a chance to clear
38106		- ** the error. Discard the contents of the pager-cache and rollback
38107		- ** any hot journal in the file-system.
38108		- */
38109		- if( pPager->errCode ){
38110		- if( isOpen(pPager->jfd) \|\| pPager->zJournal ){
38111		- isErrorReset = 1;
38112		- }
38113		- pPager->errCode = SQLITE_OK;
38114		- pager_reset(pPager);
38115		- }
38116		-
38117		- if( pagerUseWal(pPager) ){
38118		- rc = pagerBeginReadTransaction(pPager);
38119		- }else if( pPager->state==PAGER_UNLOCK \|\| isErrorReset ){
38120		- sqlite3_vfs * const pVfs = pPager->pVfs;
38121		- int isHotJournal = 0;
	38767	+ if( !pagerUseWal(pPager) && pPager->eState==PAGER_OPEN ){
	38768	+ int bHotJournal = 1; /* True if there exists a hot journal-file */
	38769	+
38122	38770	assert( !MEMDB );
38123		- assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
38124		- if( pPager->noReadlock ){
38125		- assert( pPager->readOnly );
38126		- pPager->state = PAGER_SHARED;
38127		- }else{
	38771	+ assert( pPager->noReadlock==0 \|\| pPager->readOnly );
	38772	+
	38773	+ if( pPager->noReadlock==0 ){
38128	38774	rc = pager_wait_on_lock(pPager, SHARED_LOCK);
38129	38775	if( rc!=SQLITE_OK ){
38130		- assert( pPager->state==PAGER_UNLOCK );
38131		- return pager_error(pPager, rc);
	38776	+ assert( pPager->eLock==NO_LOCK \|\| pPager->eLock==UNKNOWN_LOCK );
	38777	+ goto failed;
38132	38778	}
38133	38779	}
38134		- assert( pPager->state>=SHARED_LOCK );
38135	38780
38136	38781	/* If a journal file exists, and there is no RESERVED lock on the
38137	38782	** database file, then it either needs to be played back or deleted.
38138	38783	*/
38139		- if( !isErrorReset ){
38140		- assert( pPager->state <= PAGER_SHARED );
38141		- rc = hasHotJournal(pPager, &isHotJournal);
38142		- if( rc!=SQLITE_OK ){
38143		- goto failed;
38144		- }
38145		- }
38146		- if( isErrorReset \|\| isHotJournal ){
	38784	+ if( pPager->eLock<=SHARED_LOCK ){
	38785	+ rc = hasHotJournal(pPager, &bHotJournal);
	38786	+ }
	38787	+ if( rc!=SQLITE_OK ){
	38788	+ goto failed;
	38789	+ }
	38790	+ if( bHotJournal ){
38147	38791	/* Get an EXCLUSIVE lock on the database file. At this point it is
38148	38792	** important that a RESERVED lock is not obtained on the way to the
38149	38793	** EXCLUSIVE lock. If it were, another process might open the
38150	38794	** database file, detect the RESERVED lock, and conclude that the
38151	38795	** database is safe to read while this process is still rolling the
		@@ -38153,62 +38797,49 @@
38153	38797	**
38154	38798	** Because the intermediate RESERVED lock is not requested, any
38155	38799	** other process attempting to access the database file will get to
38156	38800	** this point in the code and fail to obtain its own EXCLUSIVE lock
38157	38801	** on the database file.
38158		- */
38159		- if( pPager->state<EXCLUSIVE_LOCK ){
38160		- rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK);
38161		- if( rc!=SQLITE_OK ){
38162		- rc = pager_error(pPager, rc);
38163		- goto failed;
38164		- }
38165		- pPager->state = PAGER_EXCLUSIVE;
38166		- }
38167		-
38168		- /* Open the journal for read/write access. This is because in
38169		- ** exclusive-access mode the file descriptor will be kept open and
38170		- ** possibly used for a transaction later on. On some systems, the
38171		- ** OsTruncate() call used in exclusive-access mode also requires
38172		- ** a read/write file handle.
38173		- */
38174		- if( !isOpen(pPager->jfd) ){
38175		- int res;
38176		- rc = sqlite3OsAccess(pVfs,pPager->zJournal,SQLITE_ACCESS_EXISTS,&res);
38177		- if( rc==SQLITE_OK ){
38178		- if( res ){
38179		- int fout = 0;
38180		- int f = SQLITE_OPEN_READWRITE\|SQLITE_OPEN_MAIN_JOURNAL;
38181		- assert( !pPager->tempFile );
38182		- rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, f, &fout);
38183		- assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
38184		- if( rc==SQLITE_OK && fout&SQLITE_OPEN_READONLY ){
38185		- rc = SQLITE_CANTOPEN_BKPT;
38186		- sqlite3OsClose(pPager->jfd);
38187		- }
38188		- }else{
38189		- /* If the journal does not exist, it usually means that some
38190		- ** other connection managed to get in and roll it back before
38191		- ** this connection obtained the exclusive lock above. Or, it
38192		- ** may mean that the pager was in the error-state when this
38193		- ** function was called and the journal file does not exist. */
38194		- rc = pager_end_transaction(pPager, 0);
38195		- }
38196		- }
38197		- }
38198		- if( rc!=SQLITE_OK ){
38199		- goto failed;
38200		- }
38201		-
38202		- /* Reset the journal status fields to indicates that we have no
38203		- ** rollback journal at this time. */
38204		- pPager->journalStarted = 0;
38205		- pPager->journalOff = 0;
38206		- pPager->setMaster = 0;
38207		- pPager->journalHdr = 0;
38208		-
38209		- /* Make sure the journal file has been synced to disk. */
	38802	+ **
	38803	+ ** Unless the pager is in locking_mode=exclusive mode, the lock is
	38804	+ ** downgraded to SHARED_LOCK before this function returns.
	38805	+ */
	38806	+ rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
	38807	+ if( rc!=SQLITE_OK ){
	38808	+ goto failed;
	38809	+ }
	38810	+
	38811	+ /* If it is not already open and the file exists on disk, open the
	38812	+ ** journal for read/write access. Write access is required because
	38813	+ ** in exclusive-access mode the file descriptor will be kept open
	38814	+ ** and possibly used for a transaction later on. Also, write-access
	38815	+ ** is usually required to finalize the journal in journal_mode=persist
	38816	+ ** mode (and also for journal_mode=truncate on some systems).
	38817	+ **
	38818	+ ** If the journal does not exist, it usually means that some
	38819	+ ** other connection managed to get in and roll it back before
	38820	+ ** this connection obtained the exclusive lock above. Or, it
	38821	+ ** may mean that the pager was in the error-state when this
	38822	+ ** function was called and the journal file does not exist.
	38823	+ */
	38824	+ if( !isOpen(pPager->jfd) ){
	38825	+ sqlite3_vfs * const pVfs = pPager->pVfs;
	38826	+ int bExists; /* True if journal file exists */
	38827	+ rc = sqlite3OsAccess(
	38828	+ pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS, &bExists);
	38829	+ if( rc==SQLITE_OK && bExists ){
	38830	+ int fout = 0;
	38831	+ int f = SQLITE_OPEN_READWRITE\|SQLITE_OPEN_MAIN_JOURNAL;
	38832	+ assert( !pPager->tempFile );
	38833	+ rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, f, &fout);
	38834	+ assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
	38835	+ if( rc==SQLITE_OK && fout&SQLITE_OPEN_READONLY ){
	38836	+ rc = SQLITE_CANTOPEN_BKPT;
	38837	+ sqlite3OsClose(pPager->jfd);
	38838	+ }
	38839	+ }
	38840	+ }
38210	38841
38211	38842	/* Playback and delete the journal. Drop the database write
38212	38843	** lock and reacquire the read lock. Purge the cache before
38213	38844	** playing back the hot-journal so that we don't end up with
38214	38845	** an inconsistent cache. Sync the hot journal before playing
		@@ -38215,25 +38846,50 @@
38215	38846	** it back since the process that crashed and left the hot journal
38216	38847	** probably did not sync it and we are required to always sync
38217	38848	** the journal before playing it back.
38218	38849	*/
38219	38850	if( isOpen(pPager->jfd) ){
	38851	+ assert( rc==SQLITE_OK );
38220	38852	rc = pagerSyncHotJournal(pPager);
38221	38853	if( rc==SQLITE_OK ){
38222	38854	rc = pager_playback(pPager, 1);
38223		- }
38224		- if( rc!=SQLITE_OK ){
38225		- rc = pager_error(pPager, rc);
38226		- goto failed;
38227		- }
38228		- }
38229		- assert( (pPager->state==PAGER_SHARED)
38230		- \|\| (pPager->exclusiveMode && pPager->state>PAGER_SHARED)
	38855	+ pPager->eState = PAGER_OPEN;
	38856	+ }
	38857	+ }else if( !pPager->exclusiveMode ){
	38858	+ pagerUnlockDb(pPager, SHARED_LOCK);
	38859	+ }
	38860	+
	38861	+ if( rc!=SQLITE_OK ){
	38862	+ /* This branch is taken if an error occurs while trying to open
	38863	+ ** or roll back a hot-journal while holding an EXCLUSIVE lock. The
	38864	+ ** pager_unlock() routine will be called before returning to unlock
	38865	+ ** the file. If the unlock attempt fails, then Pager.eLock must be
	38866	+ ** set to UNKNOWN_LOCK (see the comment above the #define for
	38867	+ ** UNKNOWN_LOCK above for an explanation).
	38868	+ **
	38869	+ ** In order to get pager_unlock() to do this, set Pager.eState to
	38870	+ ** PAGER_ERROR now. This is not actually counted as a transition
	38871	+ ** to ERROR state in the state diagram at the top of this file,
	38872	+ ** since we know that the same call to pager_unlock() will very
	38873	+ ** shortly transition the pager object to the OPEN state. Calling
	38874	+ ** assert_pager_state() would fail now, as it should not be possible
	38875	+ ** to be in ERROR state when there are zero outstanding page
	38876	+ ** references.
	38877	+ */
	38878	+ pager_error(pPager, rc);
	38879	+ goto failed;
	38880	+ }
	38881	+
	38882	+ assert( pPager->eState==PAGER_OPEN );
	38883	+ assert( (pPager->eLock==SHARED_LOCK)
	38884	+ \|\| (pPager->exclusiveMode && pPager->eLock>SHARED_LOCK)
38231	38885	);
38232	38886	}
38233	38887
38234		- if( pPager->pBackup \|\| sqlite3PcachePagecount(pPager->pPCache)>0 ){
	38888	+ if( !pPager->tempFile
	38889	+ && (pPager->pBackup \|\| sqlite3PcachePagecount(pPager->pPCache)>0)
	38890	+ ){
38235	38891	/* The shared-lock has just been acquired on the database file
38236	38892	** and there are already pages in the cache (from a previous
38237	38893	** read or write transaction). Check to see if the database
38238	38894	** has been modified. If the database has changed, flush the
38239	38895	** cache.
		@@ -38246,18 +38902,15 @@
38246	38902	**
38247	38903	** There is a vanishingly small chance that a change will not be
38248	38904	** detected. The chance of an undetected change is so small that
38249	38905	** it can be neglected.
38250	38906	*/
38251		- int nPage = 0;
	38907	+ Pgno nPage = 0;
38252	38908	char dbFileVers[sizeof(pPager->dbFileVers)];
38253		- sqlite3PagerPagecount(pPager, &nPage);
38254	38909
38255		- if( pPager->errCode ){
38256		- rc = pPager->errCode;
38257		- goto failed;
38258		- }
	38910	+ rc = pagerPagecount(pPager, &nPage);
	38911	+ if( rc ) goto failed;
38259	38912
38260	38913	if( nPage>0 ){
38261	38914	IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
38262	38915	rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
38263	38916	if( rc!=SQLITE_OK ){
		@@ -38269,22 +38922,34 @@
38269	38922
38270	38923	if( memcmp(pPager->dbFileVers, dbFileVers, sizeof(dbFileVers))!=0 ){
38271	38924	pager_reset(pPager);
38272	38925	}
38273	38926	}
38274		- assert( pPager->exclusiveMode \|\| pPager->state==PAGER_SHARED );
38275	38927
38276	38928	/* If there is a WAL file in the file-system, open this database in WAL
38277	38929	** mode. Otherwise, the following function call is a no-op.
38278	38930	*/
38279	38931	rc = pagerOpenWalIfPresent(pPager);
	38932	+ assert( pPager->pWal==0 \|\| rc==SQLITE_OK );
	38933	+ }
	38934	+
	38935	+ if( pagerUseWal(pPager) ){
	38936	+ assert( rc==SQLITE_OK );
	38937	+ rc = pagerBeginReadTransaction(pPager);
	38938	+ }
	38939	+
	38940	+ if( pPager->eState==PAGER_OPEN && rc==SQLITE_OK ){
	38941	+ rc = pagerPagecount(pPager, &pPager->dbSize);
38280	38942	}
38281	38943
38282	38944	failed:
38283	38945	if( rc!=SQLITE_OK ){
38284		- /* pager_unlock() is a no-op for exclusive mode and in-memory databases. */
	38946	+ assert( !MEMDB );
38285	38947	pager_unlock(pPager);
	38948	+ assert( pPager->eState==PAGER_OPEN );
	38949	+ }else{
	38950	+ pPager->eState = PAGER_READER;
38286	38951	}
38287	38952	return rc;
38288	38953	}
38289	38954
38290	38955	/*
		@@ -38294,13 +38959,11 @@
38294	38959	** Except, in locking_mode=EXCLUSIVE when there is nothing to in
38295	38960	** the rollback journal, the unlock is not performed and there is
38296	38961	** nothing to rollback, so this routine is a no-op.
38297	38962	*/
38298	38963	static void pagerUnlockIfUnused(Pager *pPager){
38299		- if( (sqlite3PcacheRefCount(pPager->pPCache)==0)
38300		- && (!pPager->exclusiveMode \|\| pPager->journalOff>0)
38301		- ){
	38964	+ if( (sqlite3PcacheRefCount(pPager->pPCache)==0) ){
38302	38965	pagerUnlockAndRollback(pPager);
38303	38966	}
38304	38967	}
38305	38968
38306	38969	/*
		@@ -38360,20 +39023,20 @@
38360	39023	int noContent /* Do not bother reading content from disk if true */
38361	39024	){
38362	39025	int rc;
38363	39026	PgHdr *pPg;
38364	39027
	39028	+ assert( pPager->eState>=PAGER_READER );
38365	39029	assert( assert_pager_state(pPager) );
38366		- assert( pPager->state>PAGER_UNLOCK );
38367	39030
38368	39031	if( pgno==0 ){
38369	39032	return SQLITE_CORRUPT_BKPT;
38370	39033	}
38371	39034
38372	39035	/* If the pager is in the error state, return an error immediately.
38373	39036	** Otherwise, request the page from the PCache layer. */
38374		- if( pPager->errCode!=SQLITE_OK && pPager->errCode!=SQLITE_FULL ){
	39037	+ if( pPager->errCode!=SQLITE_OK ){
38375	39038	rc = pPager->errCode;
38376	39039	}else{
38377	39040	rc = sqlite3PcacheFetch(pPager->pPCache, pgno, 1, ppPage);
38378	39041	}
38379	39042
		@@ -38395,11 +39058,10 @@
38395	39058	return SQLITE_OK;
38396	39059
38397	39060	}else{
38398	39061	/* The pager cache has created a new page. Its content needs to
38399	39062	** be initialized. */
38400		- int nMax;
38401	39063
38402	39064	PAGER_INCR(pPager->nMiss);
38403	39065	pPg = *ppPage;
38404	39066	pPg->pPager = pPager;
38405	39067
		@@ -38408,16 +39070,11 @@
38408	39070	if( pgno>PAGER_MAX_PGNO \|\| pgno==PAGER_MJ_PGNO(pPager) ){
38409	39071	rc = SQLITE_CORRUPT_BKPT;
38410	39072	goto pager_acquire_err;
38411	39073	}
38412	39074
38413		- rc = sqlite3PagerPagecount(pPager, &nMax);
38414		- if( rc!=SQLITE_OK ){
38415		- goto pager_acquire_err;
38416		- }
38417		-
38418		- if( MEMDB \|\| nMax<(int)pgno \|\| noContent \|\| !isOpen(pPager->fd) ){
	39075	+ if( MEMDB \|\| pPager->dbSize<pgno \|\| noContent \|\| !isOpen(pPager->fd) ){
38419	39076	if( pgno>pPager->mxPgno ){
38420	39077	rc = SQLITE_FULL;
38421	39078	goto pager_acquire_err;
38422	39079	}
38423	39080	if( noContent ){
		@@ -38443,13 +39100,11 @@
38443	39100	rc = readDbPage(pPg);
38444	39101	if( rc!=SQLITE_OK ){
38445	39102	goto pager_acquire_err;
38446	39103	}
38447	39104	}
38448		-#ifdef SQLITE_CHECK_PAGES
38449		- pPg->pageHash = pager_pagehash(pPg);
38450		-#endif
	39105	+ pager_set_pagehash(pPg);
38451	39106	}
38452	39107
38453	39108	return SQLITE_OK;
38454	39109
38455	39110	pager_acquire_err:
		@@ -38464,13 +39119,11 @@
38464	39119	}
38465	39120
38466	39121	/*
38467	39122	** Acquire a page if it is already in the in-memory cache. Do
38468	39123	** not read the page from disk. Return a pointer to the page,
38469		-** or 0 if the page is not in cache. Also, return 0 if the
38470		-** pager is in PAGER_UNLOCK state when this function is called,
38471		-** or if the pager is in an error state other than SQLITE_FULL.
	39124	+** or 0 if the page is not in cache.
38472	39125	**
38473	39126	** See also sqlite3PagerGet(). The difference between this routine
38474	39127	** and sqlite3PagerGet() is that _get() will go to the disk and read
38475	39128	** in the page if the page is not already in cache. This routine
38476	39129	** returns NULL if the page is not in cache or if a disk I/O error
		@@ -38479,11 +39132,11 @@
38479	39132	SQLITE_PRIVATE DbPage sqlite3PagerLookup(Pager pPager, Pgno pgno){
38480	39133	PgHdr *pPg = 0;
38481	39134	assert( pPager!=0 );
38482	39135	assert( pgno!=0 );
38483	39136	assert( pPager->pPCache!=0 );
38484		- assert( pPager->state > PAGER_UNLOCK );
	39137	+ assert( pPager->eState>=PAGER_READER && pPager->eState!=PAGER_ERROR );
38485	39138	sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &pPg);
38486	39139	return pPg;
38487	39140	}
38488	39141
38489	39142	/*
		@@ -38524,73 +39177,71 @@
38524	39177	** SQLITE_NOMEM if the attempt to allocate Pager.pInJournal fails, or
38525	39178	** an IO error code if opening or writing the journal file fails.
38526	39179	*/
38527	39180	static int pager_open_journal(Pager *pPager){
38528	39181	int rc = SQLITE_OK; /* Return code */
38529		- int nPage; /* Size of database file */
38530	39182	sqlite3_vfs * const pVfs = pPager->pVfs; /* Local cache of vfs pointer */
38531	39183
38532		- assert( pPager->state>=PAGER_RESERVED );
38533		- assert( pPager->useJournal );
38534		- assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF );
	39184	+ assert( pPager->eState==PAGER_WRITER_LOCKED );
	39185	+ assert( assert_pager_state(pPager) );
38535	39186	assert( pPager->pInJournal==0 );
38536	39187
38537	39188	/* If already in the error state, this function is a no-op. But on
38538	39189	** the other hand, this routine is never called if we are already in
38539	39190	** an error state. */
38540	39191	if( NEVER(pPager->errCode) ) return pPager->errCode;
38541	39192
38542		- testcase( pPager->dbSizeValid==0 );
38543		- rc = sqlite3PagerPagecount(pPager, &nPage);
38544		- if( rc ) return rc;
38545		- pPager->pInJournal = sqlite3BitvecCreate(nPage);
38546		- if( pPager->pInJournal==0 ){
38547		- return SQLITE_NOMEM;
38548		- }
38549		-
38550		- /* Open the journal file if it is not already open. */
38551		- if( !isOpen(pPager->jfd) ){
38552		- if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
38553		- sqlite3MemJournalOpen(pPager->jfd);
38554		- }else{
38555		- const int flags = /* VFS flags to open journal file */
38556		- SQLITE_OPEN_READWRITE\|SQLITE_OPEN_CREATE\|
38557		- (pPager->tempFile ?
38558		- (SQLITE_OPEN_DELETEONCLOSE\|SQLITE_OPEN_TEMP_JOURNAL):
38559		- (SQLITE_OPEN_MAIN_JOURNAL)
38560		- );
38561		-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
38562		- rc = sqlite3JournalOpen(
38563		- pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
38564		- );
38565		-#else
38566		- rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
38567		-#endif
38568		- }
38569		- assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
38570		- }
38571		-
38572		-
38573		- /* Write the first journal header to the journal file and open
38574		- ** the sub-journal if necessary.
38575		- */
38576		- if( rc==SQLITE_OK ){
38577		- /* TODO: Check if all of these are really required. */
38578		- pPager->dbOrigSize = pPager->dbSize;
38579		- pPager->journalStarted = 0;
38580		- pPager->needSync = 0;
38581		- pPager->nRec = 0;
38582		- pPager->journalOff = 0;
38583		- pPager->setMaster = 0;
38584		- pPager->journalHdr = 0;
38585		- rc = writeJournalHdr(pPager);
	39193	+ if( !pagerUseWal(pPager) && pPager->journalMode!=PAGER_JOURNALMODE_OFF ){
	39194	+ pPager->pInJournal = sqlite3BitvecCreate(pPager->dbSize);
	39195	+ if( pPager->pInJournal==0 ){
	39196	+ return SQLITE_NOMEM;
	39197	+ }
	39198	+
	39199	+ /* Open the journal file if it is not already open. */
	39200	+ if( !isOpen(pPager->jfd) ){
	39201	+ if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
	39202	+ sqlite3MemJournalOpen(pPager->jfd);
	39203	+ }else{
	39204	+ const int flags = /* VFS flags to open journal file */
	39205	+ SQLITE_OPEN_READWRITE\|SQLITE_OPEN_CREATE\|
	39206	+ (pPager->tempFile ?
	39207	+ (SQLITE_OPEN_DELETEONCLOSE\|SQLITE_OPEN_TEMP_JOURNAL):
	39208	+ (SQLITE_OPEN_MAIN_JOURNAL)
	39209	+ );
	39210	+ #ifdef SQLITE_ENABLE_ATOMIC_WRITE
	39211	+ rc = sqlite3JournalOpen(
	39212	+ pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
	39213	+ );
	39214	+ #else
	39215	+ rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
	39216	+ #endif
	39217	+ }
	39218	+ assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
	39219	+ }
	39220	+
	39221	+
	39222	+ /* Write the first journal header to the journal file and open
	39223	+ ** the sub-journal if necessary.
	39224	+ */
	39225	+ if( rc==SQLITE_OK ){
	39226	+ /* TODO: Check if all of these are really required. */
	39227	+ pPager->nRec = 0;
	39228	+ pPager->journalOff = 0;
	39229	+ pPager->setMaster = 0;
	39230	+ pPager->journalHdr = 0;
	39231	+ rc = writeJournalHdr(pPager);
	39232	+ }
38586	39233	}
38587	39234
38588	39235	if( rc!=SQLITE_OK ){
38589	39236	sqlite3BitvecDestroy(pPager->pInJournal);
38590	39237	pPager->pInJournal = 0;
	39238	+ }else{
	39239	+ assert( pPager->eState==PAGER_WRITER_LOCKED );
	39240	+ pPager->eState = PAGER_WRITER_CACHEMOD;
38591	39241	}
	39242	+
38592	39243	return rc;
38593	39244	}
38594	39245
38595	39246	/*
38596	39247	** Begin a write-transaction on the specified pager object. If a
		@@ -38599,18 +39250,10 @@
38599	39250	** If the exFlag argument is false, then acquire at least a RESERVED
38600	39251	** lock on the database file. If exFlag is true, then acquire at least
38601	39252	** an EXCLUSIVE lock. If such a lock is already held, no locking
38602	39253	** functions need be called.
38603	39254	**
38604		-** If this is not a temporary or in-memory file and, the journal file is
38605		-** opened if it has not been already. For a temporary file, the opening
38606		-** of the journal file is deferred until there is an actual need to
38607		-** write to the journal. TODO: Why handle temporary files differently?
38608		-**
38609		-** If the journal file is opened (or if it is already open), then a
38610		-** journal-header is written to the start of it.
38611		-**
38612	39255	** If the subjInMemory argument is non-zero, then any sub-journal opened
38613	39256	** within this transaction will be opened as an in-memory file. This
38614	39257	** has no effect if the sub-journal is already opened (as it may be when
38615	39258	** running in exclusive mode) or if the transaction does not require a
38616	39259	** sub-journal. If the subjInMemory argument is zero, then any required
		@@ -38617,24 +39260,24 @@
38617	39260	** sub-journal is implemented in-memory if pPager is an in-memory database,
38618	39261	** or using a temporary file otherwise.
38619	39262	*/
38620	39263	SQLITE_PRIVATE int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
38621	39264	int rc = SQLITE_OK;
38622		- assert( pPager->state!=PAGER_UNLOCK );
	39265	+
	39266	+ if( pPager->errCode ) return pPager->errCode;
	39267	+ assert( pPager->eState>=PAGER_READER && pPager->eState<PAGER_ERROR );
38623	39268	pPager->subjInMemory = (u8)subjInMemory;
38624	39269
38625		- if( pPager->state==PAGER_SHARED ){
	39270	+ if( ALWAYS(pPager->eState==PAGER_READER) ){
38626	39271	assert( pPager->pInJournal==0 );
38627		- assert( !MEMDB && !pPager->tempFile );
38628	39272
38629	39273	if( pagerUseWal(pPager) ){
38630	39274	/* If the pager is configured to use locking_mode=exclusive, and an
38631	39275	** exclusive lock on the database is not already held, obtain it now.
38632	39276	*/
38633	39277	if( pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, -1) ){
38634		- rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK);
38635		- pPager->state = PAGER_SHARED;
	39278	+ rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
38636	39279	if( rc!=SQLITE_OK ){
38637	39280	return rc;
38638	39281	}
38639	39282	sqlite3WalExclusiveMode(pPager->pWal, 1);
38640	39283	}
		@@ -38641,56 +39284,44 @@
38641	39284
38642	39285	/* Grab the write lock on the log file. If successful, upgrade to
38643	39286	** PAGER_RESERVED state. Otherwise, return an error code to the caller.
38644	39287	** The busy-handler is not invoked if another connection already
38645	39288	** holds the write-lock. If possible, the upper layer will call it.
38646		- **
38647		- ** WAL mode sets Pager.state to PAGER_RESERVED when it has an open
38648		- ** transaction, but never to PAGER_EXCLUSIVE. This is because in
38649		- ** PAGER_EXCLUSIVE state the code to roll back savepoint transactions
38650		- ** may copy data from the sub-journal into the database file as well
38651		- ** as into the page cache. Which would be incorrect in WAL mode.
38652	39289	*/
38653	39290	rc = sqlite3WalBeginWriteTransaction(pPager->pWal);
38654		- if( rc==SQLITE_OK ){
38655		- pPager->dbOrigSize = pPager->dbSize;
38656		- pPager->state = PAGER_RESERVED;
38657		- pPager->journalOff = 0;
38658		- }
38659		-
38660		- assert( rc!=SQLITE_OK \|\| pPager->state==PAGER_RESERVED );
38661		- assert( rc==SQLITE_OK \|\| pPager->state==PAGER_SHARED );
38662	39291	}else{
38663	39292	/* Obtain a RESERVED lock on the database file. If the exFlag parameter
38664	39293	** is true, then immediately upgrade this to an EXCLUSIVE lock. The
38665	39294	** busy-handler callback can be used when upgrading to the EXCLUSIVE
38666	39295	** lock, but not when obtaining the RESERVED lock.
38667	39296	*/
38668		- rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
38669		- if( rc==SQLITE_OK ){
38670		- pPager->state = PAGER_RESERVED;
38671		- if( exFlag ){
38672		- rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
38673		- }
38674		- }
38675		- }
38676		-
38677		- /* No need to open the journal file at this time. It will be
38678		- ** opened before it is written to. If we defer opening the journal,
38679		- ** we might save the work of creating a file if the transaction
38680		- ** ends up being a no-op.
38681		- */
38682		-
38683		- if( rc!=SQLITE_OK ){
38684		- assert( !pPager->dbModified );
38685		- /* Ignore any IO error that occurs within pager_end_transaction(). The
38686		- ** purpose of this call is to reset the internal state of the pager
38687		- ** sub-system. It doesn't matter if the journal-file is not properly
38688		- ** finalized at this point (since it is not a valid journal file anyway).
38689		- */
38690		- pager_end_transaction(pPager, 0);
38691		- }
	39297	+ rc = pagerLockDb(pPager, RESERVED_LOCK);
	39298	+ if( rc==SQLITE_OK && exFlag ){
	39299	+ rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
	39300	+ }
	39301	+ }
	39302	+
	39303	+ if( rc==SQLITE_OK ){
	39304	+ /* Change to WRITER_LOCKED state.
	39305	+ **
	39306	+ ** WAL mode sets Pager.eState to PAGER_WRITER_LOCKED or CACHEMOD
	39307	+ ** when it has an open transaction, but never to DBMOD or FINISHED.
	39308	+ ** This is because in those states the code to roll back savepoint
	39309	+ ** transactions may copy data from the sub-journal into the database
	39310	+ ** file as well as into the page cache. Which would be incorrect in
	39311	+ ** WAL mode.
	39312	+ */
	39313	+ pPager->eState = PAGER_WRITER_LOCKED;
	39314	+ pPager->dbHintSize = pPager->dbSize;
	39315	+ pPager->dbFileSize = pPager->dbSize;
	39316	+ pPager->dbOrigSize = pPager->dbSize;
	39317	+ pPager->journalOff = 0;
	39318	+ }
	39319	+
	39320	+ assert( rc==SQLITE_OK \|\| pPager->eState==PAGER_READER );
	39321	+ assert( rc!=SQLITE_OK \|\| pPager->eState==PAGER_WRITER_LOCKED );
	39322	+ assert( assert_pager_state(pPager) );
38692	39323	}
38693	39324
38694	39325	PAGERTRACE(("TRANSACTION %d\n", PAGERID(pPager)));
38695	39326	return rc;
38696	39327	}
		@@ -38705,110 +39336,98 @@
38705	39336	static int pager_write(PgHdr *pPg){
38706	39337	void *pData = pPg->pData;
38707	39338	Pager *pPager = pPg->pPager;
38708	39339	int rc = SQLITE_OK;
38709	39340
38710		- /* This routine is not called unless a transaction has already been
38711		- ** started.
	39341	+ /* This routine is not called unless a write-transaction has already
	39342	+ ** been started. The journal file may or may not be open at this point.
	39343	+ ** It is never called in the ERROR state.
38712	39344	*/
38713		- assert( pPager->state>=PAGER_RESERVED );
	39345	+ assert( pPager->eState==PAGER_WRITER_LOCKED
	39346	+ \|\| pPager->eState==PAGER_WRITER_CACHEMOD
	39347	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	39348	+ );
	39349	+ assert( assert_pager_state(pPager) );
38714	39350
38715	39351	/* If an error has been previously detected, report the same error
38716		- ** again.
38717		- */
	39352	+ ** again. This should not happen, but the check provides robustness. */
38718	39353	if( NEVER(pPager->errCode) ) return pPager->errCode;
38719	39354
38720	39355	/* Higher-level routines never call this function if database is not
38721	39356	** writable. But check anyway, just for robustness. */
38722	39357	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
38723	39358
38724		- assert( !pPager->setMaster );
38725		-
38726	39359	CHECK_PAGE(pPg);
38727	39360
38728	39361	/* Mark the page as dirty. If the page has already been written
38729	39362	** to the journal then we can return right away.
38730	39363	*/
38731	39364	sqlite3PcacheMakeDirty(pPg);
38732	39365	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
38733	39366	assert( !pagerUseWal(pPager) );
38734		- pPager->dbModified = 1;
	39367	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
38735	39368	}else{
38736	39369
38737	39370	/* If we get this far, it means that the page needs to be
38738		- ** written to the transaction journal or the ckeckpoint journal
	39371	+ ** written to the transaction journal or the checkpoint journal
38739	39372	** or both.
38740	39373	**
38741		- ** Higher level routines should have already started a transaction,
38742		- ** which means they have acquired the necessary locks but the rollback
38743		- ** journal might not yet be open.
	39374	+ ** Higher level routines have already obtained the necessary locks
	39375	+ ** to begin the write-transaction, but the rollback journal might not
	39376	+ ** yet be open. Open it now if this is the case.
38744	39377	*/
38745		- assert( pPager->state>=RESERVED_LOCK );
38746		- if( pPager->pInJournal==0
38747		- && pPager->journalMode!=PAGER_JOURNALMODE_OFF
38748		- && !pagerUseWal(pPager)
38749		- ){
38750		- assert( pPager->useJournal );
	39378	+ if( pPager->eState==PAGER_WRITER_LOCKED ){
38751	39379	rc = pager_open_journal(pPager);
38752	39380	if( rc!=SQLITE_OK ) return rc;
38753	39381	}
38754		- pPager->dbModified = 1;
	39382	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
	39383	+ assert( assert_pager_state(pPager) );
38755	39384
38756	39385	/* The transaction journal now exists and we have a RESERVED or an
38757	39386	** EXCLUSIVE lock on the main database file. Write the current page to
38758	39387	** the transaction journal if it is not there already.
38759	39388	*/
38760		- if( !pageInJournal(pPg) && isOpen(pPager->jfd) ){
38761		- assert( !pagerUseWal(pPager) );
38762		- if( pPg->pgno<=pPager->dbOrigSize ){
	39389	+ if( !pageInJournal(pPg) && !pagerUseWal(pPager) ){
	39390	+ assert( pagerUseWal(pPager)==0 );
	39391	+ if( pPg->pgno<=pPager->dbOrigSize && isOpen(pPager->jfd) ){
38763	39392	u32 cksum;
38764	39393	char *pData2;
	39394	+ i64 iOff = pPager->journalOff;
38765	39395
38766	39396	/* We should never write to the journal file the page that
38767	39397	** contains the database locks. The following assert verifies
38768	39398	** that we do not. */
38769	39399	assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
38770	39400
38771		- assert( pPager->journalHdr <= pPager->journalOff );
	39401	+ assert( pPager->journalHdr<=pPager->journalOff );
38772	39402	CODEC2(pPager, pData, pPg->pgno, 7, return SQLITE_NOMEM, pData2);
38773	39403	cksum = pager_cksum(pPager, (u8*)pData2);
38774		- rc = write32bits(pPager->jfd, pPager->journalOff, pPg->pgno);
38775		- if( rc==SQLITE_OK ){
38776		- rc = sqlite3OsWrite(pPager->jfd, pData2, pPager->pageSize,
38777		- pPager->journalOff + 4);
38778		- pPager->journalOff += pPager->pageSize+4;
38779		- }
38780		- if( rc==SQLITE_OK ){
38781		- rc = write32bits(pPager->jfd, pPager->journalOff, cksum);
38782		- pPager->journalOff += 4;
38783		- }
	39404	+
	39405	+ /* Even if an IO or diskfull error occurs while journalling the
	39406	+ ** page in the block above, set the need-sync flag for the page.
	39407	+ ** Otherwise, when the transaction is rolled back, the logic in
	39408	+ ** playback_one_page() will think that the page needs to be restored
	39409	+ ** in the database file. And if an IO error occurs while doing so,
	39410	+ ** then corruption may follow.
	39411	+ */
	39412	+ pPg->flags \|= PGHDR_NEED_SYNC;
	39413	+
	39414	+ rc = write32bits(pPager->jfd, iOff, pPg->pgno);
	39415	+ if( rc!=SQLITE_OK ) return rc;
	39416	+ rc = sqlite3OsWrite(pPager->jfd, pData2, pPager->pageSize, iOff+4);
	39417	+ if( rc!=SQLITE_OK ) return rc;
	39418	+ rc = write32bits(pPager->jfd, iOff+pPager->pageSize+4, cksum);
	39419	+ if( rc!=SQLITE_OK ) return rc;
	39420	+
38784	39421	IOTRACE(("JOUT %p %d %lld %d\n", pPager, pPg->pgno,
38785	39422	pPager->journalOff, pPager->pageSize));
38786	39423	PAGER_INCR(sqlite3_pager_writej_count);
38787	39424	PAGERTRACE(("JOURNAL %d page %d needSync=%d hash(%08x)\n",
38788	39425	PAGERID(pPager), pPg->pgno,
38789	39426	((pPg->flags&PGHDR_NEED_SYNC)?1:0), pager_pagehash(pPg)));
38790	39427
38791		- /* Even if an IO or diskfull error occurred while journalling the
38792		- ** page in the block above, set the need-sync flag for the page.
38793		- ** Otherwise, when the transaction is rolled back, the logic in
38794		- ** playback_one_page() will think that the page needs to be restored
38795		- ** in the database file. And if an IO error occurs while doing so,
38796		- ** then corruption may follow.
38797		- */
38798		- if( !pPager->noSync ){
38799		- pPg->flags \|= PGHDR_NEED_SYNC;
38800		- pPager->needSync = 1;
38801		- }
38802		-
38803		- /* An error has occurred writing to the journal file. The
38804		- ** transaction will be rolled back by the layer above.
38805		- */
38806		- if( rc!=SQLITE_OK ){
38807		- return rc;
38808		- }
38809		-
	39428	+ pPager->journalOff += 8 + pPager->pageSize;
38810	39429	pPager->nRec++;
38811	39430	assert( pPager->pInJournal!=0 );
38812	39431	rc = sqlite3BitvecSet(pPager->pInJournal, pPg->pgno);
38813	39432	testcase( rc==SQLITE_NOMEM );
38814	39433	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
		@@ -38816,13 +39435,12 @@
38816	39435	if( rc!=SQLITE_OK ){
38817	39436	assert( rc==SQLITE_NOMEM );
38818	39437	return rc;
38819	39438	}
38820	39439	}else{
38821		- if( !pPager->journalStarted && !pPager->noSync ){
	39440	+ if( pPager->eState!=PAGER_WRITER_DBMOD ){
38822	39441	pPg->flags \|= PGHDR_NEED_SYNC;
38823		- pPager->needSync = 1;
38824	39442	}
38825	39443	PAGERTRACE(("APPEND %d page %d needSync=%d\n",
38826	39444	PAGERID(pPager), pPg->pgno,
38827	39445	((pPg->flags&PGHDR_NEED_SYNC)?1:0)));
38828	39446	}
		@@ -38838,11 +39456,10 @@
38838	39456	}
38839	39457	}
38840	39458
38841	39459	/* Update the database size and return.
38842	39460	*/
38843		- assert( pPager->state>=PAGER_SHARED );
38844	39461	if( pPager->dbSize<pPg->pgno ){
38845	39462	pPager->dbSize = pPg->pgno;
38846	39463	}
38847	39464	return rc;
38848	39465	}
		@@ -38866,10 +39483,14 @@
38866	39483
38867	39484	PgHdr *pPg = pDbPage;
38868	39485	Pager *pPager = pPg->pPager;
38869	39486	Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
38870	39487
	39488	+ assert( pPager->eState>=PAGER_WRITER_LOCKED );
	39489	+ assert( pPager->eState!=PAGER_ERROR );
	39490	+ assert( assert_pager_state(pPager) );
	39491	+
38871	39492	if( nPagePerSector>1 ){
38872	39493	Pgno nPageCount; /* Total number of pages in database file */
38873	39494	Pgno pg1; /* First page of the sector pPg is located on. */
38874	39495	int nPage = 0; /* Number of pages starting at pg1 to journal */
38875	39496	int ii; /* Loop counter */
		@@ -38887,23 +39508,21 @@
38887	39508	** an integer power of 2. It sets variable pg1 to the identifier
38888	39509	** of the first page of the sector pPg is located on.
38889	39510	*/
38890	39511	pg1 = ((pPg->pgno-1) & ~(nPagePerSector-1)) + 1;
38891	39512
38892		- rc = sqlite3PagerPagecount(pPager, (int *)&nPageCount);
38893		- if( rc==SQLITE_OK ){
38894		- if( pPg->pgno>nPageCount ){
38895		- nPage = (pPg->pgno - pg1)+1;
38896		- }else if( (pg1+nPagePerSector-1)>nPageCount ){
38897		- nPage = nPageCount+1-pg1;
38898		- }else{
38899		- nPage = nPagePerSector;
38900		- }
38901		- assert(nPage>0);
38902		- assert(pg1<=pPg->pgno);
38903		- assert((pg1+nPage)>pPg->pgno);
38904		- }
	39513	+ nPageCount = pPager->dbSize;
	39514	+ if( pPg->pgno>nPageCount ){
	39515	+ nPage = (pPg->pgno - pg1)+1;
	39516	+ }else if( (pg1+nPagePerSector-1)>nPageCount ){
	39517	+ nPage = nPageCount+1-pg1;
	39518	+ }else{
	39519	+ nPage = nPagePerSector;
	39520	+ }
	39521	+ assert(nPage>0);
	39522	+ assert(pg1<=pPg->pgno);
	39523	+ assert((pg1+nPage)>pPg->pgno);
38905	39524
38906	39525	for(ii=0; ii<nPage && rc==SQLITE_OK; ii++){
38907	39526	Pgno pg = pg1+ii;
38908	39527	PgHdr *pPage;
38909	39528	if( pg==pPg->pgno \|\| !sqlite3BitvecTest(pPager->pInJournal, pg) ){
		@@ -38911,11 +39530,10 @@
38911	39530	rc = sqlite3PagerGet(pPager, pg, &pPage);
38912	39531	if( rc==SQLITE_OK ){
38913	39532	rc = pager_write(pPage);
38914	39533	if( pPage->flags&PGHDR_NEED_SYNC ){
38915	39534	needSync = 1;
38916		- assert(pPager->needSync);
38917	39535	}
38918	39536	sqlite3PagerUnref(pPage);
38919	39537	}
38920	39538	}
38921	39539	}else if( (pPage = pager_lookup(pPager, pg))!=0 ){
		@@ -38931,19 +39549,18 @@
38931	39549	** writing to any of these nPage pages may damage the others, the
38932	39550	** journal file must contain sync()ed copies of all of them
38933	39551	** before any of them can be written out to the database file.
38934	39552	*/
38935	39553	if( rc==SQLITE_OK && needSync ){
38936		- assert( !MEMDB && pPager->noSync==0 );
	39554	+ assert( !MEMDB );
38937	39555	for(ii=0; ii<nPage; ii++){
38938	39556	PgHdr *pPage = pager_lookup(pPager, pg1+ii);
38939	39557	if( pPage ){
38940	39558	pPage->flags \|= PGHDR_NEED_SYNC;
38941	39559	sqlite3PagerUnref(pPage);
38942	39560	}
38943	39561	}
38944		- assert(pPager->needSync);
38945	39562	}
38946	39563
38947	39564	assert( pPager->doNotSyncSpill==1 );
38948	39565	pPager->doNotSyncSpill--;
38949	39566	}else{
		@@ -38981,13 +39598,11 @@
38981	39598	Pager *pPager = pPg->pPager;
38982	39599	if( (pPg->flags&PGHDR_DIRTY) && pPager->nSavepoint==0 ){
38983	39600	PAGERTRACE(("DONT_WRITE page %d of %d\n", pPg->pgno, PAGERID(pPager)));
38984	39601	IOTRACE(("CLEAN %p %d\n", pPager, pPg->pgno))
38985	39602	pPg->flags \|= PGHDR_DONT_WRITE;
38986		-#ifdef SQLITE_CHECK_PAGES
38987		- pPg->pageHash = pager_pagehash(pPg);
38988		-#endif
	39603	+ pager_set_pagehash(pPg);
38989	39604	}
38990	39605	}
38991	39606
38992	39607	/*
38993	39608	** This routine is called to increment the value of the database file
		@@ -39005,10 +39620,15 @@
39005	39620	** by writing an updated version of page 1 using a call to the
39006	39621	** sqlite3OsWrite() function.
39007	39622	*/
39008	39623	static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
39009	39624	int rc = SQLITE_OK;
	39625	+
	39626	+ assert( pPager->eState==PAGER_WRITER_CACHEMOD
	39627	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	39628	+ );
	39629	+ assert( assert_pager_state(pPager) );
39010	39630
39011	39631	/* Declare and initialize constant integer 'isDirect'. If the
39012	39632	** atomic-write optimization is enabled in this build, then isDirect
39013	39633	** is initialized to the value passed as the isDirectMode parameter
39014	39634	** to this function. Otherwise, it is always set to zero.
		@@ -39024,11 +39644,10 @@
39024	39644	UNUSED_PARAMETER(isDirectMode);
39025	39645	#else
39026	39646	# define DIRECT_MODE isDirectMode
39027	39647	#endif
39028	39648
39029		- assert( pPager->state>=PAGER_RESERVED );
39030	39649	if( !pPager->changeCountDone && pPager->dbSize>0 ){
39031	39650	PgHdr pPgHdr; / Reference to page 1 */
39032	39651	u32 change_counter; /* Initial value of change-counter field */
39033	39652
39034	39653	assert( !pPager->tempFile && isOpen(pPager->fd) );
		@@ -39109,13 +39728,17 @@
39109	39728	** Otherwise, either SQLITE_BUSY or an SQLITE_IOERR_XXX error code is
39110	39729	** returned.
39111	39730	*/
39112	39731	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager *pPager){
39113	39732	int rc = SQLITE_OK;
39114		- assert( pPager->state>=PAGER_RESERVED );
	39733	+ assert( pPager->eState==PAGER_WRITER_CACHEMOD
	39734	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	39735	+ \|\| pPager->eState==PAGER_WRITER_LOCKED
	39736	+ );
	39737	+ assert( assert_pager_state(pPager) );
39115	39738	if( 0==pagerUseWal(pPager) ){
39116		- rc = pager_wait_on_lock(pPager, PAGER_EXCLUSIVE);
	39739	+ rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
39117	39740	}
39118	39741	return rc;
39119	39742	}
39120	39743
39121	39744	/*
		@@ -39149,26 +39772,33 @@
39149	39772	const char zMaster, / If not NULL, the master journal name */
39150	39773	int noSync /* True to omit the xSync on the db file */
39151	39774	){
39152	39775	int rc = SQLITE_OK; /* Return code */
39153	39776
39154		- /* The dbOrigSize is never set if journal_mode=OFF */
39155		- assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF \|\| pPager->dbOrigSize==0 );
	39777	+ assert( pPager->eState==PAGER_WRITER_LOCKED
	39778	+ \|\| pPager->eState==PAGER_WRITER_CACHEMOD
	39779	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	39780	+ \|\| pPager->eState==PAGER_ERROR
	39781	+ );
	39782	+ assert( assert_pager_state(pPager) );
39156	39783
39157	39784	/* If a prior error occurred, report that error again. */
39158		- if( pPager->errCode ) return pPager->errCode;
	39785	+ if( NEVER(pPager->errCode) ) return pPager->errCode;
39159	39786
39160	39787	PAGERTRACE(("DATABASE SYNC: File=%s zMaster=%s nSize=%d\n",
39161	39788	pPager->zFilename, zMaster, pPager->dbSize));
39162	39789
39163		- if( MEMDB && pPager->dbModified ){
	39790	+ /* If no database changes have been made, return early. */
	39791	+ if( pPager->eState<PAGER_WRITER_CACHEMOD ) return SQLITE_OK;
	39792	+
	39793	+ if( MEMDB ){
39164	39794	/* If this is an in-memory db, or no pages have been written to, or this
39165	39795	** function has already been called, it is mostly a no-op. However, any
39166	39796	** backup in progress needs to be restarted.
39167	39797	*/
39168	39798	sqlite3BackupRestart(pPager->pBackup);
39169		- }else if( pPager->dbModified ){
	39799	+ }else{
39170	39800	if( pagerUseWal(pPager) ){
39171	39801	PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache);
39172	39802	if( pList ){
39173	39803	rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1,
39174	39804	(pPager->fullSync ? pPager->sync_flags : 0)
		@@ -39207,11 +39837,11 @@
39207	39837	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
39208	39838	\|\| pPager->journalMode==PAGER_JOURNALMODE_WAL
39209	39839	);
39210	39840	if( !zMaster && isOpen(pPager->jfd)
39211	39841	&& pPager->journalOff==jrnlBufferSize(pPager)
39212		- && pPager->dbSize>=pPager->dbFileSize
	39842	+ && pPager->dbSize>=pPager->dbOrigSize
39213	39843	&& (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) \|\| 0==pPg->pDirty)
39214	39844	){
39215	39845	/* Update the db file change counter via the direct-write method. The
39216	39846	** following call will modify the in-memory representation of page 1
39217	39847	** to include the updated change counter and then write page 1
		@@ -39237,17 +39867,14 @@
39237	39867	** Before reading the pages with page numbers larger than the
39238	39868	** current value of Pager.dbSize, set dbSize back to the value
39239	39869	** that it took at the start of the transaction. Otherwise, the
39240	39870	** calls to sqlite3PagerGet() return zeroed pages instead of
39241	39871	** reading data from the database file.
39242		- **
39243		- ** When journal_mode==OFF the dbOrigSize is always zero, so this
39244		- ** block never runs if journal_mode=OFF.
39245	39872	*/
39246	39873	#ifndef SQLITE_OMIT_AUTOVACUUM
39247	39874	if( pPager->dbSize<pPager->dbOrigSize
39248		- && ALWAYS(pPager->journalMode!=PAGER_JOURNALMODE_OFF)
	39875	+ && pPager->journalMode!=PAGER_JOURNALMODE_OFF
39249	39876	){
39250	39877	Pgno i; /* Iterator variable */
39251	39878	const Pgno iSkip = PAGER_MJ_PGNO(pPager); /* Pending lock page */
39252	39879	const Pgno dbSize = pPager->dbSize; /* Database image size */
39253	39880	pPager->dbSize = pPager->dbOrigSize;
		@@ -39270,18 +39897,24 @@
39270	39897	** or if zMaster is NULL (no master journal), then this call is a no-op.
39271	39898	*/
39272	39899	rc = writeMasterJournal(pPager, zMaster);
39273	39900	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39274	39901
39275		- /* Sync the journal file. If the atomic-update optimization is being
39276		- ** used, this call will not create the journal file or perform any
39277		- ** real IO.
	39902	+ /* Sync the journal file and write all dirty pages to the database.
	39903	+ ** If the atomic-update optimization is being used, this sync will not
	39904	+ ** create the journal file or perform any real IO.
	39905	+ **
	39906	+ ** Because the change-counter page was just modified, unless the
	39907	+ ** atomic-update optimization is used it is almost certain that the
	39908	+ ** journal requires a sync here. However, in locking_mode=exclusive
	39909	+ ** on a system under memory pressure it is just possible that this is
	39910	+ ** not the case. In this case it is likely enough that the redundant
	39911	+ ** xSync() call will be changed to a no-op by the OS anyhow.
39278	39912	*/
39279		- rc = syncJournal(pPager);
	39913	+ rc = syncJournal(pPager, 0);
39280	39914	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39281	39915
39282		- /* Write all dirty pages to the database file. */
39283	39916	rc = pager_write_pagelist(pPager,sqlite3PcacheDirtyList(pPager->pPCache));
39284	39917	if( rc!=SQLITE_OK ){
39285	39918	assert( rc!=SQLITE_IOERR_BLOCKED );
39286	39919	goto commit_phase_one_exit;
39287	39920	}
		@@ -39290,11 +39923,11 @@
39290	39923	/* If the file on disk is not the same size as the database image,
39291	39924	** then use pager_truncate to grow or shrink the file here.
39292	39925	*/
39293	39926	if( pPager->dbSize!=pPager->dbFileSize ){
39294	39927	Pgno nNew = pPager->dbSize - (pPager->dbSize==PAGER_MJ_PGNO(pPager));
39295		- assert( pPager->state>=PAGER_EXCLUSIVE );
	39928	+ assert( pPager->eState==PAGER_WRITER_DBMOD );
39296	39929	rc = pager_truncate(pPager, nNew);
39297	39930	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39298	39931	}
39299	39932
39300	39933	/* Finally, sync the database file. */
		@@ -39301,16 +39934,16 @@
39301	39934	if( !pPager->noSync && !noSync ){
39302	39935	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
39303	39936	}
39304	39937	IOTRACE(("DBSYNC %p\n", pPager))
39305	39938	}
39306		-
39307		- assert( pPager->state!=PAGER_SYNCED );
39308		- pPager->state = PAGER_SYNCED;
39309	39939	}
39310	39940
39311	39941	commit_phase_one_exit:
	39942	+ if( rc==SQLITE_OK && !pagerUseWal(pPager) ){
	39943	+ pPager->eState = PAGER_WRITER_FINISHED;
	39944	+ }
39312	39945	return rc;
39313	39946	}
39314	39947
39315	39948
39316	39949	/*
		@@ -39334,16 +39967,15 @@
39334	39967	/* This routine should not be called if a prior error has occurred.
39335	39968	** But if (due to a coding error elsewhere in the system) it does get
39336	39969	** called, just return the same error code without doing anything. */
39337	39970	if( NEVER(pPager->errCode) ) return pPager->errCode;
39338	39971
39339		- /* This function should not be called if the pager is not in at least
39340		- PAGER_RESERVED state. FIXME**: Make it so that this test always
39341		- ** fails - make it so that we never reach this point if we do not hold
39342		- ** all necessary locks.
39343		- */
39344		- if( NEVER(pPager->state<PAGER_RESERVED) ) return SQLITE_ERROR;
	39972	+ assert( pPager->eState==PAGER_WRITER_LOCKED
	39973	+ \|\| pPager->eState==PAGER_WRITER_FINISHED
	39974	+ \|\| (pagerUseWal(pPager) && pPager->eState==PAGER_WRITER_CACHEMOD)
	39975	+ );
	39976	+ assert( assert_pager_state(pPager) );
39345	39977
39346	39978	/* An optimization. If the database was not actually modified during
39347	39979	** this transaction, the pager is running in exclusive-mode and is
39348	39980	** using persistent journals, then this function is a no-op.
39349	39981	**
		@@ -39352,106 +39984,80 @@
39352	39984	** a hot-journal during hot-journal rollback, 0 changes will be made
39353	39985	** to the database file. So there is no need to zero the journal
39354	39986	** header. Since the pager is in exclusive mode, there is no need
39355	39987	** to drop any locks either.
39356	39988	*/
39357		- if( pPager->dbModified==0 && pPager->exclusiveMode
	39989	+ if( pPager->eState==PAGER_WRITER_LOCKED
	39990	+ && pPager->exclusiveMode
39358	39991	&& pPager->journalMode==PAGER_JOURNALMODE_PERSIST
39359	39992	){
39360	39993	assert( pPager->journalOff==JOURNAL_HDR_SZ(pPager) \|\| !pPager->journalOff );
	39994	+ pPager->eState = PAGER_READER;
39361	39995	return SQLITE_OK;
39362	39996	}
39363	39997
39364	39998	PAGERTRACE(("COMMIT %d\n", PAGERID(pPager)));
39365		- assert( pPager->state==PAGER_SYNCED \|\| MEMDB \|\| !pPager->dbModified );
39366	39999	rc = pager_end_transaction(pPager, pPager->setMaster);
39367	40000	return pager_error(pPager, rc);
39368	40001	}
39369	40002
39370	40003	/*
39371		-** Rollback all changes. The database falls back to PAGER_SHARED mode.
	40004	+** If a write transaction is open, then all changes made within the
	40005	+** transaction are reverted and the current write-transaction is closed.
	40006	+** The pager falls back to PAGER_READER state if successful, or PAGER_ERROR
	40007	+** state if an error occurs.
39372	40008	**
39373		-** This function performs two tasks:
	40009	+** If the pager is already in PAGER_ERROR state when this function is called,
	40010	+** it returns Pager.errCode immediately. No work is performed in this case.
	40011	+**
	40012	+** Otherwise, in rollback mode, this function performs two functions:
39374	40013	**
39375	40014	** 1) It rolls back the journal file, restoring all database file and
39376	40015	** in-memory cache pages to the state they were in when the transaction
39377	40016	** was opened, and
	40017	+**
39378	40018	** 2) It finalizes the journal file, so that it is not used for hot
39379	40019	** rollback at any point in the future.
39380	40020	**
39381		-** subject to the following qualifications:
39382		-**
39383		-** * If the journal file is not yet open when this function is called,
39384		-** then only (2) is performed. In this case there is no journal file
39385		-** to roll back.
39386		-**
39387		-** * If in an error state other than SQLITE_FULL, then task (1) is
39388		-** performed. If successful, task (2). Regardless of the outcome
39389		-** of either, the error state error code is returned to the caller
39390		-** (i.e. either SQLITE_IOERR or SQLITE_CORRUPT).
39391		-**
39392		-** * If the pager is in PAGER_RESERVED state, then attempt (1). Whether
39393		-** or not (1) is successful, also attempt (2). If successful, return
39394		-** SQLITE_OK. Otherwise, enter the error state and return the first
39395		-** error code encountered.
39396		-**
39397		-** In this case there is no chance that the database was written to.
39398		-** So is safe to finalize the journal file even if the playback
39399		-** (operation 1) failed. However the pager must enter the error state
39400		-** as the contents of the in-memory cache are now suspect.
39401		-**
39402		-** * Finally, if in PAGER_EXCLUSIVE state, then attempt (1). Only
39403		-** attempt (2) if (1) is successful. Return SQLITE_OK if successful,
39404		-** otherwise enter the error state and return the error code from the
39405		-** failing operation.
39406		-**
39407		-** In this case the database file may have been written to. So if the
39408		-** playback operation did not succeed it would not be safe to finalize
39409		-** the journal file. It needs to be left in the file-system so that
39410		-** some other process can use it to restore the database state (by
39411		-** hot-journal rollback).
	40021	+** Finalization of the journal file (task 2) is only performed if the
	40022	+** rollback is successful.
	40023	+**
	40024	+** In WAL mode, all cache-entries containing data modified within the
	40025	+** current transaction are either expelled from the cache or reverted to
	40026	+** their pre-transaction state by re-reading data from the database or
	40027	+** WAL files. The WAL transaction is then closed.
39412	40028	*/
39413	40029	SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){
39414	40030	int rc = SQLITE_OK; /* Return code */
39415	40031	PAGERTRACE(("ROLLBACK %d\n", PAGERID(pPager)));
	40032	+
	40033	+ /* PagerRollback() is a no-op if called in READER or OPEN state. If
	40034	+ ** the pager is already in the ERROR state, the rollback is not
	40035	+ ** attempted here. Instead, the error code is returned to the caller.
	40036	+ */
	40037	+ assert( assert_pager_state(pPager) );
	40038	+ if( pPager->eState==PAGER_ERROR ) return pPager->errCode;
	40039	+ if( pPager->eState<=PAGER_READER ) return SQLITE_OK;
	40040	+
39416	40041	if( pagerUseWal(pPager) ){
39417	40042	int rc2;
39418		-
39419	40043	rc = sqlite3PagerSavepoint(pPager, SAVEPOINT_ROLLBACK, -1);
39420	40044	rc2 = pager_end_transaction(pPager, pPager->setMaster);
39421	40045	if( rc==SQLITE_OK ) rc = rc2;
39422		- rc = pager_error(pPager, rc);
39423		- }else if( !pPager->dbModified \|\| !isOpen(pPager->jfd) ){
39424		- rc = pager_end_transaction(pPager, pPager->setMaster);
39425		- }else if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){
39426		- if( pPager->state>=PAGER_EXCLUSIVE ){
39427		- pager_playback(pPager, 0);
39428		- }
39429		- rc = pPager->errCode;
39430		- }else{
39431		- if( pPager->state==PAGER_RESERVED ){
39432		- int rc2;
39433		- rc = pager_playback(pPager, 0);
39434		- rc2 = pager_end_transaction(pPager, pPager->setMaster);
39435		- if( rc==SQLITE_OK ){
39436		- rc = rc2;
39437		- }
39438		- }else{
39439		- rc = pager_playback(pPager, 0);
39440		- }
39441		-
39442		- if( !MEMDB ){
39443		- pPager->dbSizeValid = 0;
39444		- }
39445		-
39446		- /* If an error occurs during a ROLLBACK, we can no longer trust the pager
39447		- ** cache. So call pager_error() on the way out to make any error
39448		- ** persistent.
39449		- */
39450		- rc = pager_error(pPager, rc);
39451		- }
39452		- return rc;
	40046	+ }else if( !isOpen(pPager->jfd) \|\| pPager->eState==PAGER_WRITER_LOCKED ){
	40047	+ rc = pager_end_transaction(pPager, 0);
	40048	+ }else{
	40049	+ rc = pager_playback(pPager, 0);
	40050	+ }
	40051	+
	40052	+ assert( pPager->eState==PAGER_READER \|\| rc!=SQLITE_OK );
	40053	+ assert( rc==SQLITE_OK \|\| rc==SQLITE_FULL \|\| (rc&0xFF)==SQLITE_IOERR );
	40054	+
	40055	+ /* If an error occurs during a ROLLBACK, we can no longer trust the pager
	40056	+ ** cache. So call pager_error() on the way out to make any error persistent.
	40057	+ */
	40058	+ return pager_error(pPager, rc);
39453	40059	}
39454	40060
39455	40061	/*
39456	40062	** Return TRUE if the database file is opened read-only. Return FALSE
39457	40063	** if the database is (in theory) writable.
		@@ -39493,12 +40099,12 @@
39493	40099	SQLITE_PRIVATE int sqlite3PagerStats(Pager pPager){
39494	40100	static int a[11];
39495	40101	a[0] = sqlite3PcacheRefCount(pPager->pPCache);
39496	40102	a[1] = sqlite3PcachePagecount(pPager->pPCache);
39497	40103	a[2] = sqlite3PcacheGetCachesize(pPager->pPCache);
39498		- a[3] = pPager->dbSizeValid ? (int) pPager->dbSize : -1;
39499		- a[4] = pPager->state;
	40104	+ a[3] = pPager->eState==PAGER_OPEN ? -1 : (int) pPager->dbSize;
	40105	+ a[4] = pPager->eState;
39500	40106	a[5] = pPager->errCode;
39501	40107	a[6] = pPager->nHit;
39502	40108	a[7] = pPager->nMiss;
39503	40109	a[8] = 0; /* Used to be pPager->nOvfl */
39504	40110	a[9] = pPager->nRead;
		@@ -39525,18 +40131,17 @@
39525	40131	** returned. Otherwise, SQLITE_OK.
39526	40132	*/
39527	40133	SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int nSavepoint){
39528	40134	int rc = SQLITE_OK; /* Return code */
39529	40135	int nCurrent = pPager->nSavepoint; /* Current number of savepoints */
	40136	+
	40137	+ assert( pPager->eState>=PAGER_WRITER_LOCKED );
	40138	+ assert( assert_pager_state(pPager) );
39530	40139
39531	40140	if( nSavepoint>nCurrent && pPager->useJournal ){
39532	40141	int ii; /* Iterator variable */
39533	40142	PagerSavepoint aNew; / New Pager.aSavepoint array */
39534		- int nPage; /* Size of database file */
39535		-
39536		- rc = sqlite3PagerPagecount(pPager, &nPage);
39537		- if( rc ) return rc;
39538	40143
39539	40144	/* Grow the Pager.aSavepoint array using realloc(). Return SQLITE_NOMEM
39540	40145	** if the allocation fails. Otherwise, zero the new portion in case a
39541	40146	** malloc failure occurs while populating it in the for(...) loop below.
39542	40147	*/
		@@ -39549,18 +40154,18 @@
39549	40154	memset(&aNew[nCurrent], 0, (nSavepoint-nCurrent) * sizeof(PagerSavepoint));
39550	40155	pPager->aSavepoint = aNew;
39551	40156
39552	40157	/* Populate the PagerSavepoint structures just allocated. */
39553	40158	for(ii=nCurrent; ii<nSavepoint; ii++){
39554		- aNew[ii].nOrig = nPage;
	40159	+ aNew[ii].nOrig = pPager->dbSize;
39555	40160	if( isOpen(pPager->jfd) && pPager->journalOff>0 ){
39556	40161	aNew[ii].iOffset = pPager->journalOff;
39557	40162	}else{
39558	40163	aNew[ii].iOffset = JOURNAL_HDR_SZ(pPager);
39559	40164	}
39560	40165	aNew[ii].iSubRec = pPager->nSubRec;
39561		- aNew[ii].pInSavepoint = sqlite3BitvecCreate(nPage);
	40166	+ aNew[ii].pInSavepoint = sqlite3BitvecCreate(pPager->dbSize);
39562	40167	if( !aNew[ii].pInSavepoint ){
39563	40168	return SQLITE_NOMEM;
39564	40169	}
39565	40170	if( pagerUseWal(pPager) ){
39566	40171	sqlite3WalSavepoint(pPager->pWal, aNew[ii].aWalData);
		@@ -39603,16 +40208,16 @@
39603	40208	** This function may return SQLITE_NOMEM if a memory allocation fails,
39604	40209	** or an IO error code if an IO error occurs while rolling back a
39605	40210	** savepoint. If no errors occur, SQLITE_OK is returned.
39606	40211	*/
39607	40212	SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){
39608		- int rc = SQLITE_OK;
	40213	+ int rc = pPager->errCode; /* Return code */
39609	40214
39610	40215	assert( op==SAVEPOINT_RELEASE \|\| op==SAVEPOINT_ROLLBACK );
39611	40216	assert( iSavepoint>=0 \|\| op==SAVEPOINT_ROLLBACK );
39612	40217
39613		- if( iSavepoint<pPager->nSavepoint ){
	40218	+ if( rc==SQLITE_OK && iSavepoint<pPager->nSavepoint ){
39614	40219	int ii; /* Iterator variable */
39615	40220	int nNew; /* Number of remaining savepoints after this op. */
39616	40221
39617	40222	/* Figure out how many savepoints will still be active after this
39618	40223	** operation. Store this value in nNew. Then free resources associated
		@@ -39644,12 +40249,12 @@
39644	40249	else if( pagerUseWal(pPager) \|\| isOpen(pPager->jfd) ){
39645	40250	PagerSavepoint *pSavepoint = (nNew==0)?0:&pPager->aSavepoint[nNew-1];
39646	40251	rc = pagerPlaybackSavepoint(pPager, pSavepoint);
39647	40252	assert(rc!=SQLITE_DONE);
39648	40253	}
39649		-
39650	40254	}
	40255	+
39651	40256	return rc;
39652	40257	}
39653	40258
39654	40259	/*
39655	40260	** Return the full pathname of the database file.
		@@ -39743,10 +40348,14 @@
39743	40348	Pgno needSyncPgno = 0; /* Old value of pPg->pgno, if sync is required */
39744	40349	int rc; /* Return code */
39745	40350	Pgno origPgno; /* The original page number */
39746	40351
39747	40352	assert( pPg->nRef>0 );
	40353	+ assert( pPager->eState==PAGER_WRITER_CACHEMOD
	40354	+ \|\| pPager->eState==PAGER_WRITER_DBMOD
	40355	+ );
	40356	+ assert( assert_pager_state(pPager) );
39748	40357
39749	40358	/* In order to be able to rollback, an in-memory database must journal
39750	40359	** the page we are moving from.
39751	40360	*/
39752	40361	if( MEMDB ){
		@@ -39792,15 +40401,14 @@
39792	40401	*/
39793	40402	if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
39794	40403	needSyncPgno = pPg->pgno;
39795	40404	assert( pageInJournal(pPg) \|\| pPg->pgno>pPager->dbOrigSize );
39796	40405	assert( pPg->flags&PGHDR_DIRTY );
39797		- assert( pPager->needSync );
39798	40406	}
39799	40407
39800	40408	/* If the cache contains a page with page-number pgno, remove it
39801		- ** from its hash chain. Also, if the PgHdr.needSync was set for
	40409	+ ** from its hash chain. Also, if the PGHDR_NEED_SYNC flag was set for
39802	40410	** page pgno before the 'move' operation, it needs to be retained
39803	40411	** for the page moved there.
39804	40412	*/
39805	40413	pPg->flags &= ~PGHDR_NEED_SYNC;
39806	40414	pPgOld = pager_lookup(pPager, pgno);
		@@ -39808,67 +40416,59 @@
39808	40416	if( pPgOld ){
39809	40417	pPg->flags \|= (pPgOld->flags&PGHDR_NEED_SYNC);
39810	40418	if( MEMDB ){
39811	40419	/* Do not discard pages from an in-memory database since we might
39812	40420	** need to rollback later. Just move the page out of the way. */
39813		- assert( pPager->dbSizeValid );
39814	40421	sqlite3PcacheMove(pPgOld, pPager->dbSize+1);
39815	40422	}else{
39816	40423	sqlite3PcacheDrop(pPgOld);
39817	40424	}
39818	40425	}
39819	40426
39820	40427	origPgno = pPg->pgno;
39821	40428	sqlite3PcacheMove(pPg, pgno);
39822	40429	sqlite3PcacheMakeDirty(pPg);
39823		- pPager->dbModified = 1;
	40430	+
	40431	+ /* For an in-memory database, make sure the original page continues
	40432	+ ** to exist, in case the transaction needs to roll back. Use pPgOld
	40433	+ ** as the original page since it has already been allocated.
	40434	+ */
	40435	+ if( MEMDB ){
	40436	+ assert( pPgOld );
	40437	+ sqlite3PcacheMove(pPgOld, origPgno);
	40438	+ sqlite3PagerUnref(pPgOld);
	40439	+ }
39824	40440
39825	40441	if( needSyncPgno ){
39826	40442	/* If needSyncPgno is non-zero, then the journal file needs to be
39827	40443	** sync()ed before any data is written to database file page needSyncPgno.
39828	40444	** Currently, no such page exists in the page-cache and the
39829	40445	** "is journaled" bitvec flag has been set. This needs to be remedied by
39830		- ** loading the page into the pager-cache and setting the PgHdr.needSync
	40446	+ ** loading the page into the pager-cache and setting the PGHDR_NEED_SYNC
39831	40447	** flag.
39832	40448	**
39833	40449	** If the attempt to load the page into the page-cache fails, (due
39834	40450	** to a malloc() or IO failure), clear the bit in the pInJournal[]
39835	40451	** array. Otherwise, if the page is loaded and written again in
39836	40452	** this transaction, it may be written to the database file before
39837	40453	** it is synced into the journal file. This way, it may end up in
39838	40454	** the journal file twice, but that is not a problem.
39839		- **
39840		- ** The sqlite3PagerGet() call may cause the journal to sync. So make
39841		- ** sure the Pager.needSync flag is set too.
39842	40455	*/
39843	40456	PgHdr *pPgHdr;
39844		- assert( pPager->needSync );
39845	40457	rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr);
39846	40458	if( rc!=SQLITE_OK ){
39847	40459	if( needSyncPgno<=pPager->dbOrigSize ){
39848	40460	assert( pPager->pTmpSpace!=0 );
39849	40461	sqlite3BitvecClear(pPager->pInJournal, needSyncPgno, pPager->pTmpSpace);
39850	40462	}
39851	40463	return rc;
39852	40464	}
39853		- pPager->needSync = 1;
39854		- assert( pPager->noSync==0 && !MEMDB );
39855	40465	pPgHdr->flags \|= PGHDR_NEED_SYNC;
39856	40466	sqlite3PcacheMakeDirty(pPgHdr);
39857	40467	sqlite3PagerUnref(pPgHdr);
39858	40468	}
39859	40469
39860		- /*
39861		- ** For an in-memory database, make sure the original page continues
39862		- ** to exist, in case the transaction needs to roll back. Use pPgOld
39863		- ** as the original page since it has already been allocated.
39864		- */
39865		- if( MEMDB ){
39866		- sqlite3PcacheMove(pPgOld, origPgno);
39867		- sqlite3PagerUnref(pPgOld);
39868		- }
39869		-
39870	40470	return SQLITE_OK;
39871	40471	}
39872	40472	#endif
39873	40473
39874	40474	/*
		@@ -39929,10 +40529,17 @@
39929	40529	**
39930	40530	** The returned indicate the current (possibly updated) journal-mode.
39931	40531	*/
39932	40532	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
39933	40533	u8 eOld = pPager->journalMode; /* Prior journalmode */
	40534	+
	40535	+#ifdef SQLITE_DEBUG
	40536	+ /* The print_pager_state() routine is intended to be used by the debugger
	40537	+ ** only. We invoke it once here to suppress a compiler warning. */
	40538	+ print_pager_state(pPager);
	40539	+#endif
	40540	+
39934	40541
39935	40542	/* The eMode parameter is always valid */
39936	40543	assert( eMode==PAGER_JOURNALMODE_DELETE
39937	40544	\|\| eMode==PAGER_JOURNALMODE_TRUNCATE
39938	40545	\|\| eMode==PAGER_JOURNALMODE_PERSIST
		@@ -39955,24 +40562,17 @@
39955	40562	eMode = eOld;
39956	40563	}
39957	40564	}
39958	40565
39959	40566	if( eMode!=eOld ){
39960		- /* When changing between rollback modes, close the journal file prior
39961		- ** to the change. But when changing from a rollback mode to WAL, keep
39962		- ** the journal open since there is a rollback-style transaction in play
39963		- ** used to convert the version numbers in the btree header.
39964		- */
39965		- if( isOpen(pPager->jfd) && eMode!=PAGER_JOURNALMODE_WAL ){
39966		- sqlite3OsClose(pPager->jfd);
39967		- }
39968	40567
39969	40568	/* Change the journal mode. */
	40569	+ assert( pPager->eState!=PAGER_ERROR );
39970	40570	pPager->journalMode = (u8)eMode;
39971	40571
39972	40572	/* When transistioning from TRUNCATE or PERSIST to any other journal
39973		- ** mode except WAL (and we are not in locking_mode=EXCLUSIVE) then
	40573	+ ** mode except WAL, unless the pager is in locking_mode=exclusive mode,
39974	40574	** delete the journal file.
39975	40575	*/
39976	40576	assert( (PAGER_JOURNALMODE_TRUNCATE & 5)==1 );
39977	40577	assert( (PAGER_JOURNALMODE_PERSIST & 5)==1 );
39978	40578	assert( (PAGER_JOURNALMODE_DELETE & 5)==0 );
		@@ -39989,28 +40589,34 @@
39989	40589	**
39990	40590	** Before deleting the journal file, obtain a RESERVED lock on the
39991	40591	** database file. This ensures that the journal file is not deleted
39992	40592	** while it is in use by some other client.
39993	40593	*/
39994		- int rc = SQLITE_OK;
39995		- int state = pPager->state;
39996		- if( state<PAGER_SHARED ){
39997		- rc = sqlite3PagerSharedLock(pPager);
39998		- }
39999		- if( pPager->state==PAGER_SHARED ){
40000		- assert( rc==SQLITE_OK );
40001		- rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
40002		- }
40003		- if( rc==SQLITE_OK ){
	40594	+ sqlite3OsClose(pPager->jfd);
	40595	+ if( pPager->eLock>=RESERVED_LOCK ){
40004	40596	sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
	40597	+ }else{
	40598	+ int rc = SQLITE_OK;
	40599	+ int state = pPager->eState;
	40600	+ assert( state==PAGER_OPEN \|\| state==PAGER_READER );
	40601	+ if( state==PAGER_OPEN ){
	40602	+ rc = sqlite3PagerSharedLock(pPager);
	40603	+ }
	40604	+ if( pPager->eState==PAGER_READER ){
	40605	+ assert( rc==SQLITE_OK );
	40606	+ rc = pagerLockDb(pPager, RESERVED_LOCK);
	40607	+ }
	40608	+ if( rc==SQLITE_OK ){
	40609	+ sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
	40610	+ }
	40611	+ if( rc==SQLITE_OK && state==PAGER_READER ){
	40612	+ pagerUnlockDb(pPager, SHARED_LOCK);
	40613	+ }else if( state==PAGER_OPEN ){
	40614	+ pager_unlock(pPager);
	40615	+ }
	40616	+ assert( state==pPager->eState );
40005	40617	}
40006		- if( rc==SQLITE_OK && state==PAGER_SHARED ){
40007		- sqlite3OsUnlock(pPager->fd, SHARED_LOCK);
40008		- }else if( state==PAGER_UNLOCK ){
40009		- pager_unlock(pPager);
40010		- }
40011		- assert( state==pPager->state );
40012	40618	}
40013	40619	}
40014	40620
40015	40621	/* Return the new journal mode */
40016	40622	return (int)pPager->journalMode;
		@@ -40027,11 +40633,12 @@
40027	40633	** Return TRUE if the pager is in a state where it is OK to change the
40028	40634	** journalmode. Journalmode changes can only happen when the database
40029	40635	** is unmodified.
40030	40636	*/
40031	40637	SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager *pPager){
40032		- if( pPager->dbModified ) return 0;
	40638	+ assert( assert_pager_state(pPager) );
	40639	+ if( pPager->eState>=PAGER_WRITER_CACHEMOD ) return 0;
40033	40640	if( NEVER(isOpen(pPager->jfd) && pPager->journalOff>0) ) return 0;
40034	40641	return 1;
40035	40642	}
40036	40643
40037	40644	/*
		@@ -40092,39 +40699,46 @@
40092	40699	**
40093	40700	** If the pager passed as the first argument is open on a real database
40094	40701	** file (not a temp file or an in-memory database), and the WAL file
40095	40702	** is not already open, make an attempt to open it now. If successful,
40096	40703	** return SQLITE_OK. If an error occurs or the VFS used by the pager does
40097		-** not support the xShmXXX() methods, return an error code. *pisOpen is
	40704	+** not support the xShmXXX() methods, return an error code. *pbOpen is
40098	40705	** not modified in either case.
40099	40706	**
40100	40707	** If the pager is open on a temp-file (or in-memory database), or if
40101		-** the WAL file is already open, set *pisOpen to 1 and return SQLITE_OK
	40708	+** the WAL file is already open, set *pbOpen to 1 and return SQLITE_OK
40102	40709	** without doing anything.
40103	40710	*/
40104	40711	SQLITE_PRIVATE int sqlite3PagerOpenWal(
40105	40712	Pager pPager, / Pager object */
40106		- int pisOpen / OUT: Set to true if call is a no-op */
	40713	+ int pbOpen / OUT: Set to true if call is a no-op */
40107	40714	){
40108	40715	int rc = SQLITE_OK; /* Return code */
40109	40716
40110		- assert( pPager->state>=PAGER_SHARED );
40111		- assert( (pisOpen==0 && !pPager->tempFile && !pPager->pWal) \|\| *pisOpen==0 );
	40717	+ assert( assert_pager_state(pPager) );
	40718	+ assert( pPager->eState==PAGER_OPEN \|\| pbOpen );
	40719	+ assert( pPager->eState==PAGER_READER \|\| !pbOpen );
	40720	+ assert( pbOpen==0 \|\| *pbOpen==0 );
	40721	+ assert( pbOpen!=0 \|\| (!pPager->tempFile && !pPager->pWal) );
40112	40722
40113	40723	if( !pPager->tempFile && !pPager->pWal ){
40114	40724	if( !sqlite3PagerWalSupported(pPager) ) return SQLITE_CANTOPEN;
	40725	+
	40726	+ /* Close any rollback journal previously open */
	40727	+ sqlite3OsClose(pPager->jfd);
40115	40728
40116	40729	/* Open the connection to the log file. If this operation fails,
40117	40730	** (e.g. due to malloc() failure), unlock the database file and
40118	40731	** return an error code.
40119	40732	*/
40120	40733	rc = sqlite3WalOpen(pPager->pVfs, pPager->fd, pPager->zWal, &pPager->pWal);
40121	40734	if( rc==SQLITE_OK ){
40122	40735	pPager->journalMode = PAGER_JOURNALMODE_WAL;
	40736	+ pPager->eState = PAGER_OPEN;
40123	40737	}
40124	40738	}else{
40125		- *pisOpen = 1;
	40739	+ *pbOpen = 1;
40126	40740	}
40127	40741
40128	40742	return rc;
40129	40743	}
40130	40744
		@@ -40146,11 +40760,11 @@
40146	40760	** it may need to be checkpointed before the connection can switch to
40147	40761	** rollback mode. Open it now so this can happen.
40148	40762	*/
40149	40763	if( !pPager->pWal ){
40150	40764	int logexists = 0;
40151		- rc = sqlite3OsLock(pPager->fd, SQLITE_LOCK_SHARED);
	40765	+ rc = pagerLockDb(pPager, SHARED_LOCK);
40152	40766	if( rc==SQLITE_OK ){
40153	40767	rc = sqlite3OsAccess(
40154	40768	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &logexists
40155	40769	);
40156	40770	}
		@@ -40162,21 +40776,21 @@
40162	40776
40163	40777	/* Checkpoint and close the log. Because an EXCLUSIVE lock is held on
40164	40778	** the database file, the log and log-summary files will be deleted.
40165	40779	*/
40166	40780	if( rc==SQLITE_OK && pPager->pWal ){
40167		- rc = sqlite3OsLock(pPager->fd, SQLITE_LOCK_EXCLUSIVE);
	40781	+ rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
40168	40782	if( rc==SQLITE_OK ){
40169	40783	rc = sqlite3WalClose(pPager->pWal,
40170	40784	(pPager->noSync ? 0 : pPager->sync_flags),
40171	40785	pPager->pageSize, (u8*)pPager->pTmpSpace
40172	40786	);
40173	40787	pPager->pWal = 0;
40174	40788	}else{
40175	40789	/* If we cannot get an EXCLUSIVE lock, downgrade the PENDING lock
40176	40790	** that we did get back to SHARED. */
40177		- sqlite3OsUnlock(pPager->fd, SQLITE_LOCK_SHARED);
	40791	+ pagerUnlockDb(pPager, SQLITE_LOCK_SHARED);
40178	40792	}
40179	40793	}
40180	40794	return rc;
40181	40795	}
40182	40796
		@@ -40492,18 +41106,22 @@
40492	41106	/*
40493	41107	** The following object holds a copy of the wal-index header content.
40494	41108	**
40495	41109	** The actual header in the wal-index consists of two copies of this
40496	41110	** object.
	41111	+**
	41112	+** The szPage value can be any power of 2 between 512 and 32768, inclusive.
	41113	+** Or it can be 1 to represent a 65536-byte page. The latter case was
	41114	+** added in 3.7.1 when support for 64K pages was added.
40497	41115	*/
40498	41116	struct WalIndexHdr {
40499	41117	u32 iVersion; /* Wal-index version */
40500	41118	u32 unused; /* Unused (padding) field */
40501	41119	u32 iChange; /* Counter incremented each transaction */
40502	41120	u8 isInit; /* 1 when initialized */
40503	41121	u8 bigEndCksum; /* True if checksums in WAL are big-endian */
40504		- u16 szPage; /* Database page size in bytes */
	41122	+ u16 szPage; /* Database page size in bytes. 1==64K */
40505	41123	u32 mxFrame; /* Index of last valid frame in the WAL */
40506	41124	u32 nPage; /* Size of database in pages */
40507	41125	u32 aFrameCksum[2]; /* Checksum of last frame in log */
40508	41126	u32 aSalt[2]; /* Two salt values copied from WAL header */
40509	41127	u32 aCksum[2]; /* Checksum over all prior fields */
		@@ -40610,11 +41228,11 @@
40610	41228	sqlite3_file pDbFd; / File handle for the database file */
40611	41229	sqlite3_file pWalFd; / File handle for WAL file */
40612	41230	u32 iCallback; /* Value to pass to log callback (or 0) */
40613	41231	int nWiData; /* Size of array apWiData */
40614	41232	volatile u32 *apWiData; / Pointer to wal-index content in memory */
40615		- u16 szPage; /* Database page size */
	41233	+ u32 szPage; /* Database page size */
40616	41234	i16 readLock; /* Which read lock is being held. -1 for none */
40617	41235	u8 exclusiveMode; /* Non-zero if connection is in exclusive mode */
40618	41236	u8 writeLock; /* True if in a write transaction */
40619	41237	u8 ckptLock; /* True if holding a checkpoint lock */
40620	41238	u8 readOnly; /* True if the WAL file is open read-only */
		@@ -41281,11 +41899,11 @@
41281	41899	\|\| szPage<512
41282	41900	){
41283	41901	goto finished;
41284	41902	}
41285	41903	pWal->hdr.bigEndCksum = (u8)(magic&0x00000001);
41286		- pWal->szPage = (u16)szPage;
	41904	+ pWal->szPage = szPage;
41287	41905	pWal->nCkpt = sqlite3Get4byte(&aBuf[12]);
41288	41906	memcpy(&pWal->hdr.aSalt, &aBuf[16], 8);
41289	41907
41290	41908	/* Verify that the WAL header checksum is correct */
41291	41909	walChecksumBytes(pWal->hdr.bigEndCksum==SQLITE_BIGENDIAN,
		@@ -41331,11 +41949,13 @@
41331	41949
41332	41950	/* If nTruncate is non-zero, this is a commit record. */
41333	41951	if( nTruncate ){
41334	41952	pWal->hdr.mxFrame = iFrame;
41335	41953	pWal->hdr.nPage = nTruncate;
41336		- pWal->hdr.szPage = (u16)szPage;
	41954	+ pWal->hdr.szPage = (u16)((szPage&0xff00) \| (szPage>>16));
	41955	+ testcase( szPage<=32768 );
	41956	+ testcase( szPage>=65536 );
41337	41957	aFrameCksum[0] = pWal->hdr.aFrameCksum[0];
41338	41958	aFrameCksum[1] = pWal->hdr.aFrameCksum[1];
41339	41959	}
41340	41960	}
41341	41961
		@@ -41356,10 +41976,21 @@
41356	41976	*/
41357	41977	pInfo = walCkptInfo(pWal);
41358	41978	pInfo->nBackfill = 0;
41359	41979	pInfo->aReadMark[0] = 0;
41360	41980	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;
	41981	+
	41982	+ /* If more than one frame was recovered from the log file, report an
	41983	+ ** event via sqlite3_log(). This is to help with identifying performance
	41984	+ ** problems caused by applications routinely shutting down without
	41985	+ ** checkpointing the log file.
	41986	+ */
	41987	+ if( pWal->hdr.nPage ){
	41988	+ sqlite3_log(SQLITE_OK, "Recovered %d frames from WAL file %s",
	41989	+ pWal->hdr.nPage, pWal->zWalName
	41990	+ );
	41991	+ }
41361	41992	}
41362	41993
41363	41994	recovery_error:
41364	41995	WALTRACE(("WAL%p: recovery %s\n", pWal, rc ? "failed" : "ok"));
41365	41996	walUnlockExclusive(pWal, iLock, nLock);
		@@ -41716,18 +42347,22 @@
41716	42347	int sync_flags, /* Flags for OsSync() (or 0) */
41717	42348	int nBuf, /* Size of zBuf in bytes */
41718	42349	u8 zBuf / Temporary buffer to use */
41719	42350	){
41720	42351	int rc; /* Return code */
41721		- int szPage = pWal->hdr.szPage; /* Database page-size */
	42352	+ int szPage; /* Database page-size */
41722	42353	WalIterator pIter = 0; / Wal iterator context */
41723	42354	u32 iDbpage = 0; /* Next database page to write */
41724	42355	u32 iFrame = 0; /* Wal frame containing data for iDbpage */
41725	42356	u32 mxSafeFrame; /* Max frame that can be backfilled */
	42357	+ u32 mxPage; /* Max database page to write */
41726	42358	int i; /* Loop counter */
41727	42359	volatile WalCkptInfo pInfo; / The checkpoint status information */
41728	42360
	42361	+ szPage = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
	42362	+ testcase( szPage<=32768 );
	42363	+ testcase( szPage>=65536 );
41729	42364	if( pWal->hdr.mxFrame==0 ) return SQLITE_OK;
41730	42365
41731	42366	/* Allocate the iterator */
41732	42367	rc = walIteratorInit(pWal, &pIter);
41733	42368	if( rc!=SQLITE_OK ){
		@@ -41734,11 +42369,11 @@
41734	42369	return rc;
41735	42370	}
41736	42371	assert( pIter );
41737	42372
41738	42373	/* TODO: Move this test out to the caller. Make it an assert() here */
41739		- if( pWal->hdr.szPage!=nBuf ){
	42374	+ if( szPage!=nBuf ){
41740	42375	rc = SQLITE_CORRUPT_BKPT;
41741	42376	goto walcheckpoint_out;
41742	42377	}
41743	42378
41744	42379	/* Compute in mxSafeFrame the index of the last frame of the WAL that is
		@@ -41745,10 +42380,11 @@
41745	42380	** safe to write into the database. Frames beyond mxSafeFrame might
41746	42381	** overwrite database pages that are in use by active readers and thus
41747	42382	** cannot be backfilled from the WAL.
41748	42383	*/
41749	42384	mxSafeFrame = pWal->hdr.mxFrame;
	42385	+ mxPage = pWal->hdr.nPage;
41750	42386	pInfo = walCkptInfo(pWal);
41751	42387	for(i=1; i<WAL_NREADER; i++){
41752	42388	u32 y = pInfo->aReadMark[i];
41753	42389	if( mxSafeFrame>=y ){
41754	42390	assert( y<=pWal->hdr.mxFrame );
		@@ -41765,22 +42401,34 @@
41765	42401	}
41766	42402
41767	42403	if( pInfo->nBackfill<mxSafeFrame
41768	42404	&& (rc = walLockExclusive(pWal, WAL_READ_LOCK(0), 1))==SQLITE_OK
41769	42405	){
	42406	+ i64 nSize; /* Current size of database file */
41770	42407	u32 nBackfill = pInfo->nBackfill;
41771	42408
41772	42409	/* Sync the WAL to disk */
41773	42410	if( sync_flags ){
41774	42411	rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
41775	42412	}
	42413	+
	42414	+ /* If the database file may grow as a result of this checkpoint, hint
	42415	+ ** about the eventual size of the db file to the VFS layer.
	42416	+ */
	42417	+ if( rc==SQLITE_OK ){
	42418	+ i64 nReq = ((i64)mxPage * szPage);
	42419	+ rc = sqlite3OsFileSize(pWal->pDbFd, &nSize);
	42420	+ if( rc==SQLITE_OK && nSize<nReq ){
	42421	+ sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_SIZE_HINT, &nReq);
	42422	+ }
	42423	+ }
41776	42424
41777	42425	/* Iterate through the contents of the WAL, copying data to the db file. */
41778	42426	while( rc==SQLITE_OK && 0==walIteratorNext(pIter, &iDbpage, &iFrame) ){
41779	42427	i64 iOffset;
41780	42428	assert( walFramePgno(pWal, iFrame)==iDbpage );
41781		- if( iFrame<=nBackfill \|\| iFrame>mxSafeFrame ) continue;
	42429	+ if( iFrame<=nBackfill \|\| iFrame>mxSafeFrame \|\| iDbpage>mxPage ) continue;
41782	42430	iOffset = walFrameOffset(iFrame, szPage) + WAL_FRAME_HDRSIZE;
41783	42431	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL file */
41784	42432	rc = sqlite3OsRead(pWal->pWalFd, zBuf, szPage, iOffset);
41785	42433	if( rc!=SQLITE_OK ) break;
41786	42434	iOffset = (iDbpage-1)*(i64)szPage;
		@@ -41883,11 +42531,11 @@
41883	42531	WalIndexHdr volatile aHdr; / Header in shared memory */
41884	42532
41885	42533	/* The first page of the wal-index must be mapped at this point. */
41886	42534	assert( pWal->nWiData>0 && pWal->apWiData[0] );
41887	42535
41888		- /* Read the header. This might happen currently with a write to the
	42536	+ /* Read the header. This might happen concurrently with a write to the
41889	42537	** same area of shared memory on a different CPU in a SMP,
41890	42538	** meaning it is possible that an inconsistent snapshot is read
41891	42539	** from the file. If this happens, return non-zero.
41892	42540	**
41893	42541	** There are two copies of the header at the beginning of the wal-index.
		@@ -41912,11 +42560,13 @@
41912	42560	}
41913	42561
41914	42562	if( memcmp(&pWal->hdr, &h1, sizeof(WalIndexHdr)) ){
41915	42563	*pChanged = 1;
41916	42564	memcpy(&pWal->hdr, &h1, sizeof(WalIndexHdr));
41917		- pWal->szPage = pWal->hdr.szPage;
	42565	+ pWal->szPage = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
	42566	+ testcase( pWal->szPage<=32768 );
	42567	+ testcase( pWal->szPage>=65536 );
41918	42568	}
41919	42569
41920	42570	/* The header was successfully read. Return zero. */
41921	42571	return 0;
41922	42572	}
		@@ -42231,10 +42881,11 @@
42231	42881	/*
42232	42882	** Finish with a read transaction. All this does is release the
42233	42883	** read-lock.
42234	42884	*/
42235	42885	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal){
	42886	+ sqlite3WalEndWriteTransaction(pWal);
42236	42887	if( pWal->readLock>=0 ){
42237	42888	walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock));
42238	42889	pWal->readLock = -1;
42239	42890	}
42240	42891	}
		@@ -42341,11 +42992,17 @@
42341	42992
42342	42993	/* If iRead is non-zero, then it is the log frame number that contains the
42343	42994	** required page. Read and return data from the log file.
42344	42995	*/
42345	42996	if( iRead ){
42346		- i64 iOffset = walFrameOffset(iRead, pWal->hdr.szPage) + WAL_FRAME_HDRSIZE;
	42997	+ int sz;
	42998	+ i64 iOffset;
	42999	+ sz = pWal->hdr.szPage;
	43000	+ sz = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
	43001	+ testcase( sz<=32768 );
	43002	+ testcase( sz>=65536 );
	43003	+ iOffset = walFrameOffset(iRead, sz) + WAL_FRAME_HDRSIZE;
42347	43004	*pInWal = 1;
42348	43005	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL */
42349	43006	return sqlite3OsRead(pWal->pWalFd, pOut, nOut, iOffset);
42350	43007	}
42351	43008
		@@ -42353,15 +43010,17 @@
42353	43010	return SQLITE_OK;
42354	43011	}
42355	43012
42356	43013
42357	43014	/*
42358		-** Set *pPgno to the size of the database file (or zero, if unknown).
	43015	+** Return the size of the database in pages (or zero, if unknown).
42359	43016	*/
42360		-SQLITE_PRIVATE void sqlite3WalDbsize(Wal pWal, Pgno pPgno){
42361		- assert( pWal->readLock>=0 \|\| pWal->lockError );
42362		- *pPgno = pWal->hdr.nPage;
	43017	+SQLITE_PRIVATE Pgno sqlite3WalDbsize(Wal *pWal){
	43018	+ if( pWal && ALWAYS(pWal->readLock>=0) ){
	43019	+ return pWal->hdr.nPage;
	43020	+ }
	43021	+ return 0;
42363	43022	}
42364	43023
42365	43024
42366	43025	/*
42367	43026	** This function starts a write transaction on the WAL.
		@@ -42433,11 +43092,11 @@
42433	43092	** Otherwise, if the callback function does not return an error, this
42434	43093	** function returns SQLITE_OK.
42435	43094	*/
42436	43095	SQLITE_PRIVATE int sqlite3WalUndo(Wal pWal, int (xUndo)(void , Pgno), void pUndoCtx){
42437	43096	int rc = SQLITE_OK;
42438		- if( pWal->writeLock ){
	43097	+ if( ALWAYS(pWal->writeLock) ){
42439	43098	Pgno iMax = pWal->hdr.mxFrame;
42440	43099	Pgno iFrame;
42441	43100
42442	43101	/* Restore the clients cache of the wal-index header to the state it
42443	43102	** was in before the client began writing to the database.
		@@ -42622,11 +43281,11 @@
42622	43281	memcpy(&aWalHdr[16], pWal->hdr.aSalt, 8);
42623	43282	walChecksumBytes(1, aWalHdr, WAL_HDRSIZE-2*4, 0, aCksum);
42624	43283	sqlite3Put4byte(&aWalHdr[24], aCksum[0]);
42625	43284	sqlite3Put4byte(&aWalHdr[28], aCksum[1]);
42626	43285
42627		- pWal->szPage = (u16)szPage;
	43286	+ pWal->szPage = szPage;
42628	43287	pWal->hdr.bigEndCksum = SQLITE_BIGENDIAN;
42629	43288	pWal->hdr.aFrameCksum[0] = aCksum[0];
42630	43289	pWal->hdr.aFrameCksum[1] = aCksum[1];
42631	43290
42632	43291	rc = sqlite3OsWrite(pWal->pWalFd, aWalHdr, sizeof(aWalHdr), 0);
		@@ -42717,11 +43376,13 @@
42717	43376	rc = walIndexAppend(pWal, iFrame, pLast->pgno);
42718	43377	}
42719	43378
42720	43379	if( rc==SQLITE_OK ){
42721	43380	/* Update the private copy of the header. */
42722		- pWal->hdr.szPage = (u16)szPage;
	43381	+ pWal->hdr.szPage = (u16)((szPage&0xff00) \| (szPage>>16));
	43382	+ testcase( szPage<=32768 );
	43383	+ testcase( szPage>=65536 );
42723	43384	pWal->hdr.mxFrame = iFrame;
42724	43385	if( isCommit ){
42725	43386	pWal->hdr.iChange++;
42726	43387	pWal->hdr.nPage = nTruncate;
42727	43388	}
		@@ -42929,11 +43590,11 @@
42929	43590	**
42930	43591	** FORMAT DETAILS
42931	43592	**
42932	43593	** The file is divided into pages. The first page is called page 1,
42933	43594	** the second is page 2, and so forth. A page number of zero indicates
42934		-** "no such page". The page size can be any power of 2 between 512 and 32768.
	43595	+** "no such page". The page size can be any power of 2 between 512 and 65536.
42935	43596	** Each page can be either a btree page, a freelist page, an overflow
42936	43597	** page, or a pointer-map page.
42937	43598	**
42938	43599	** The first page is always a btree page. The first 100 bytes of the first
42939	43600	** page contain a special header (the "file header") that describes the file.
		@@ -43295,18 +43956,18 @@
43295	43956	u8 initiallyEmpty; /* Database is empty at start of transaction */
43296	43957	#ifndef SQLITE_OMIT_AUTOVACUUM
43297	43958	u8 autoVacuum; /* True if auto-vacuum is enabled */
43298	43959	u8 incrVacuum; /* True if incr-vacuum is enabled */
43299	43960	#endif
43300		- u16 pageSize; /* Total number of bytes on a page */
43301		- u16 usableSize; /* Number of usable bytes on each page */
43302	43961	u16 maxLocal; /* Maximum local payload in non-LEAFDATA tables */
43303	43962	u16 minLocal; /* Minimum local payload in non-LEAFDATA tables */
43304	43963	u16 maxLeaf; /* Maximum local payload in a LEAFDATA table */
43305	43964	u16 minLeaf; /* Minimum local payload in a LEAFDATA table */
43306	43965	u8 inTransaction; /* Transaction state */
43307	43966	u8 doNotUseWAL; /* If true, do not open write-ahead-log file */
	43967	+ u32 pageSize; /* Total number of bytes on a page */
	43968	+ u32 usableSize; /* Number of usable bytes on each page */
43308	43969	int nTransaction; /* Number of open transactions (read + write) */
43309	43970	u32 nPage; /* Number of pages in the database */
43310	43971	void pSchema; / Pointer to space allocated by sqlite3BtreeSchema() */
43311	43972	void (xFreeSchema)(void); /* Destructor for BtShared.pSchema */
43312	43973	sqlite3_mutex mutex; / Non-recursive mutex required to access this struct */
		@@ -43901,11 +44562,20 @@
43901	44562	# define TRACE(X) if(sqlite3BtreeTrace){printf X;fflush(stdout);}
43902	44563	#else
43903	44564	# define TRACE(X)
43904	44565	#endif
43905	44566
43906		-
	44567	+/*
	44568	+** Extract a 2-byte big-endian integer from an array of unsigned bytes.
	44569	+** But if the value is zero, make it 65536.
	44570	+**
	44571	+** This routine is used to extract the "offset to cell content area" value
	44572	+** from the header of a btree page. If the page size is 65536 and the page
	44573	+** is empty, the offset should be 65536, but the 2-byte value stores zero.
	44574	+** This routine makes the necessary adjustment to 65536.
	44575	+*/
	44576	+#define get2byteNotZero(X) (((((int)get2byte(X))-1)&0xffff)+1)
43907	44577
43908	44578	#ifndef SQLITE_OMIT_SHARED_CACHE
43909	44579	/*
43910	44580	** A list of BtShared objects that are eligible for participation
43911	44581	** in shared cache. This variable has file scope during normal builds,
		@@ -44590,15 +45260,20 @@
44590	45260	#ifndef SQLITE_OMIT_AUTOVACUUM
44591	45261	/*
44592	45262	** Given a page number of a regular database page, return the page
44593	45263	** number for the pointer-map page that contains the entry for the
44594	45264	** input page number.
	45265	+**
	45266	+** Return 0 (not a valid page) for pgno==1 since there is
	45267	+** no pointer map associated with page 1. The integrity_check logic
	45268	+** requires that ptrmapPageno(*,1)!=1.
44595	45269	*/
44596	45270	static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){
44597	45271	int nPagesPerMapPage;
44598	45272	Pgno iPtrMap, ret;
44599	45273	assert( sqlite3_mutex_held(pBt->mutex) );
	45274	+ if( pgno<2 ) return 0;
44600	45275	nPagesPerMapPage = (pBt->usableSize/5)+1;
44601	45276	iPtrMap = (pgno-2)/nPagesPerMapPage;
44602	45277	ret = (iPtrMap*nPagesPerMapPage) + 2;
44603	45278	if( ret==PENDING_BYTE_PAGE(pBt) ){
44604	45279	ret++;
		@@ -45023,21 +45698,21 @@
45023	45698	assert( nByte < usableSize-8 );
45024	45699
45025	45700	nFrag = data[hdr+7];
45026	45701	assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
45027	45702	gap = pPage->cellOffset + 2*pPage->nCell;
45028		- top = get2byte(&data[hdr+5]);
	45703	+ top = get2byteNotZero(&data[hdr+5]);
45029	45704	if( gap>top ) return SQLITE_CORRUPT_BKPT;
45030	45705	testcase( gap+2==top );
45031	45706	testcase( gap+1==top );
45032	45707	testcase( gap==top );
45033	45708
45034	45709	if( nFrag>=60 ){
45035	45710	/* Always defragment highly fragmented pages */
45036	45711	rc = defragmentPage(pPage);
45037	45712	if( rc ) return rc;
45038		- top = get2byte(&data[hdr+5]);
	45713	+ top = get2byteNotZero(&data[hdr+5]);
45039	45714	}else if( gap+2<=top ){
45040	45715	/* Search the freelist looking for a free slot big enough to satisfy
45041	45716	** the request. The allocation is made from the first free slot in
45042	45717	** the list that is large enough to accomadate it.
45043	45718	*/
		@@ -45075,11 +45750,11 @@
45075	45750	*/
45076	45751	testcase( gap+2+nByte==top );
45077	45752	if( gap+2+nByte>top ){
45078	45753	rc = defragmentPage(pPage);
45079	45754	if( rc ) return rc;
45080		- top = get2byte(&data[hdr+5]);
	45755	+ top = get2byteNotZero(&data[hdr+5]);
45081	45756	assert( gap+nByte<=top );
45082	45757	}
45083	45758
45084	45759
45085	45760	/* Allocate memory from the gap in between the cell pointer array
		@@ -45241,28 +45916,28 @@
45241	45916	if( !pPage->isInit ){
45242	45917	u16 pc; /* Address of a freeblock within pPage->aData[] */
45243	45918	u8 hdr; /* Offset to beginning of page header */
45244	45919	u8 data; / Equal to pPage->aData */
45245	45920	BtShared pBt; / The main btree structure */
45246		- u16 usableSize; /* Amount of usable space on each page */
	45921	+ int usableSize; /* Amount of usable space on each page */
45247	45922	u16 cellOffset; /* Offset from start of page to first cell pointer */
45248		- u16 nFree; /* Number of unused bytes on the page */
45249		- u16 top; /* First byte of the cell content area */
	45923	+ int nFree; /* Number of unused bytes on the page */
	45924	+ int top; /* First byte of the cell content area */
45250	45925	int iCellFirst; /* First allowable cell or freeblock offset */
45251	45926	int iCellLast; /* Last possible cell or freeblock offset */
45252	45927
45253	45928	pBt = pPage->pBt;
45254	45929
45255	45930	hdr = pPage->hdrOffset;
45256	45931	data = pPage->aData;
45257	45932	if( decodeFlags(pPage, data[hdr]) ) return SQLITE_CORRUPT_BKPT;
45258		- assert( pBt->pageSize>=512 && pBt->pageSize<=32768 );
45259		- pPage->maskPage = pBt->pageSize - 1;
	45933	+ assert( pBt->pageSize>=512 && pBt->pageSize<=65536 );
	45934	+ pPage->maskPage = (u16)(pBt->pageSize - 1);
45260	45935	pPage->nOverflow = 0;
45261	45936	usableSize = pBt->usableSize;
45262	45937	pPage->cellOffset = cellOffset = hdr + 12 - 4*pPage->leaf;
45263		- top = get2byte(&data[hdr+5]);
	45938	+ top = get2byteNotZero(&data[hdr+5]);
45264	45939	pPage->nCell = get2byte(&data[hdr+3]);
45265	45940	if( pPage->nCell>MX_CELL(pBt) ){
45266	45941	/* To many cells for a single page. The page must be corrupt */
45267	45942	return SQLITE_CORRUPT_BKPT;
45268	45943	}
		@@ -45357,17 +46032,17 @@
45357	46032	data[hdr] = (char)flags;
45358	46033	first = hdr + 8 + 4*((flags&PTF_LEAF)==0 ?1:0);
45359	46034	memset(&data[hdr+1], 0, 4);
45360	46035	data[hdr+7] = 0;
45361	46036	put2byte(&data[hdr+5], pBt->usableSize);
45362		- pPage->nFree = pBt->usableSize - first;
	46037	+ pPage->nFree = (u16)(pBt->usableSize - first);
45363	46038	decodeFlags(pPage, flags);
45364	46039	pPage->hdrOffset = hdr;
45365	46040	pPage->cellOffset = first;
45366	46041	pPage->nOverflow = 0;
45367		- assert( pBt->pageSize>=512 && pBt->pageSize<=32768 );
45368		- pPage->maskPage = pBt->pageSize - 1;
	46042	+ assert( pBt->pageSize>=512 && pBt->pageSize<=65536 );
	46043	+ pPage->maskPage = (u16)(pBt->pageSize - 1);
45369	46044	pPage->nCell = 0;
45370	46045	pPage->isInit = 1;
45371	46046	}
45372	46047
45373	46048
		@@ -45671,11 +46346,11 @@
45671	46346	pBt->pPage1 = 0;
45672	46347	pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager);
45673	46348	#ifdef SQLITE_SECURE_DELETE
45674	46349	pBt->secureDelete = 1;
45675	46350	#endif
45676		- pBt->pageSize = get2byte(&zDbHeader[16]);
	46351	+ pBt->pageSize = (zDbHeader[16]<<8) \| (zDbHeader[17]<<16);
45677	46352	if( pBt->pageSize<512 \|\| pBt->pageSize>SQLITE_MAX_PAGE_SIZE
45678	46353	\|\| ((pBt->pageSize-1)&pBt->pageSize)!=0 ){
45679	46354	pBt->pageSize = 0;
45680	46355	#ifndef SQLITE_OMIT_AUTOVACUUM
45681	46356	/* If the magic name ":memory:" will create an in-memory database, then
		@@ -45985,11 +46660,11 @@
45985	46660	assert( nReserve>=0 && nReserve<=255 );
45986	46661	if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
45987	46662	((pageSize-1)&pageSize)==0 ){
45988	46663	assert( (pageSize & 7)==0 );
45989	46664	assert( !pBt->pPage1 && !pBt->pCursor );
45990		- pBt->pageSize = (u16)pageSize;
	46665	+ pBt->pageSize = (u32)pageSize;
45991	46666	freeTempSpace(pBt);
45992	46667	}
45993	46668	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
45994	46669	pBt->usableSize = pBt->pageSize - (u16)nReserve;
45995	46670	if( iFix ) pBt->pageSizeFixed = 1;
		@@ -46120,19 +46795,17 @@
46120	46795
46121	46796	/* Do some checking to help insure the file we opened really is
46122	46797	** a valid database file.
46123	46798	*/
46124	46799	nPage = nPageHeader = get4byte(28+(u8*)pPage1->aData);
46125		- if( (rc = sqlite3PagerPagecount(pBt->pPager, &nPageFile))!=SQLITE_OK ){;
46126		- goto page1_init_failed;
46127		- }
	46800	+ sqlite3PagerPagecount(pBt->pPager, &nPageFile);
46128	46801	if( nPage==0 \|\| memcmp(24+(u8)pPage1->aData, 92+(u8)pPage1->aData,4)!=0 ){
46129	46802	nPage = nPageFile;
46130	46803	}
46131	46804	if( nPage>0 ){
46132		- int pageSize;
46133		- int usableSize;
	46805	+ u32 pageSize;
	46806	+ u32 usableSize;
46134	46807	u8 *page1 = pPage1->aData;
46135	46808	rc = SQLITE_NOTADB;
46136	46809	if( memcmp(page1, zMagicHeader, 16)!=0 ){
46137	46810	goto page1_init_failed;
46138	46811	}
		@@ -46179,28 +46852,29 @@
46179	46852	** version 3.6.0, we require them to be fixed.
46180	46853	*/
46181	46854	if( memcmp(&page1[21], "\100\040\040",3)!=0 ){
46182	46855	goto page1_init_failed;
46183	46856	}
46184		- pageSize = get2byte(&page1[16]);
46185		- if( ((pageSize-1)&pageSize)!=0 \|\| pageSize<512 \|\|
46186		- (SQLITE_MAX_PAGE_SIZE<32768 && pageSize>SQLITE_MAX_PAGE_SIZE)
	46857	+ pageSize = (page1[16]<<8) \| (page1[17]<<16);
	46858	+ if( ((pageSize-1)&pageSize)!=0
	46859	+ \|\| pageSize>SQLITE_MAX_PAGE_SIZE
	46860	+ \|\| pageSize<=256
46187	46861	){
46188	46862	goto page1_init_failed;
46189	46863	}
46190	46864	assert( (pageSize & 7)==0 );
46191	46865	usableSize = pageSize - page1[20];
46192		- if( pageSize!=pBt->pageSize ){
	46866	+ if( (u32)pageSize!=pBt->pageSize ){
46193	46867	/* After reading the first page of the database assuming a page size
46194	46868	** of BtShared.pageSize, we have discovered that the page-size is
46195	46869	** actually pageSize. Unlock the database, leave pBt->pPage1 at
46196	46870	** zero and return SQLITE_OK. The caller will call this function
46197	46871	** again with the correct page-size.
46198	46872	*/
46199	46873	releasePage(pPage1);
46200		- pBt->usableSize = (u16)usableSize;
46201		- pBt->pageSize = (u16)pageSize;
	46874	+ pBt->usableSize = usableSize;
	46875	+ pBt->pageSize = pageSize;
46202	46876	freeTempSpace(pBt);
46203	46877	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
46204	46878	pageSize-usableSize);
46205	46879	return rc;
46206	46880	}
		@@ -46209,12 +46883,12 @@
46209	46883	goto page1_init_failed;
46210	46884	}
46211	46885	if( usableSize<480 ){
46212	46886	goto page1_init_failed;
46213	46887	}
46214		- pBt->pageSize = (u16)pageSize;
46215		- pBt->usableSize = (u16)usableSize;
	46888	+ pBt->pageSize = pageSize;
	46889	+ pBt->usableSize = usableSize;
46216	46890	#ifndef SQLITE_OMIT_AUTOVACUUM
46217	46891	pBt->autoVacuum = (get4byte(&page1[36 + 4*4])?1:0);
46218	46892	pBt->incrVacuum = (get4byte(&page1[36 + 7*4])?1:0);
46219	46893	#endif
46220	46894	}
		@@ -46226,18 +46900,18 @@
46226	46900	** 2-byte pointer to the cell
46227	46901	** 4-byte child pointer
46228	46902	** 9-byte nKey value
46229	46903	** 4-byte nData value
46230	46904	** 4-byte overflow page pointer
46231		- ** So a cell consists of a 2-byte poiner, a header which is as much as
	46905	+ ** So a cell consists of a 2-byte pointer, a header which is as much as
46232	46906	** 17 bytes long, 0 to N bytes of payload, and an optional 4 byte overflow
46233	46907	** page pointer.
46234	46908	*/
46235		- pBt->maxLocal = (pBt->usableSize-12)*64/255 - 23;
46236		- pBt->minLocal = (pBt->usableSize-12)*32/255 - 23;
46237		- pBt->maxLeaf = pBt->usableSize - 35;
46238		- pBt->minLeaf = (pBt->usableSize-12)*32/255 - 23;
	46909	+ pBt->maxLocal = (u16)((pBt->usableSize-12)*64/255 - 23);
	46910	+ pBt->minLocal = (u16)((pBt->usableSize-12)*32/255 - 23);
	46911	+ pBt->maxLeaf = (u16)(pBt->usableSize - 35);
	46912	+ pBt->minLeaf = (u16)((pBt->usableSize-12)*32/255 - 23);
46239	46913	assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) );
46240	46914	pBt->pPage1 = pPage1;
46241	46915	pBt->nPage = nPage;
46242	46916	return SQLITE_OK;
46243	46917
		@@ -46286,11 +46960,12 @@
46286	46960	data = pP1->aData;
46287	46961	rc = sqlite3PagerWrite(pP1->pDbPage);
46288	46962	if( rc ) return rc;
46289	46963	memcpy(data, zMagicHeader, sizeof(zMagicHeader));
46290	46964	assert( sizeof(zMagicHeader)==16 );
46291		- put2byte(&data[16], pBt->pageSize);
	46965	+ data[16] = (u8)((pBt->pageSize>>8)&0xff);
	46966	+ data[17] = (u8)((pBt->pageSize>>16)&0xff);
46292	46967	data[18] = 1;
46293	46968	data[19] = 1;
46294	46969	assert( pBt->usableSize<=pBt->pageSize && pBt->usableSize+255>=pBt->pageSize);
46295	46970	data[20] = (u8)(pBt->pageSize - pBt->usableSize);
46296	46971	data[21] = 64;
		@@ -48297,13 +48972,13 @@
48297	48972	c = +1;
48298	48973	}
48299	48974	pCur->validNKey = 1;
48300	48975	pCur->info.nKey = nCellKey;
48301	48976	}else{
48302		- /* The maximum supported page-size is 32768 bytes. This means that
	48977	+ /* The maximum supported page-size is 65536 bytes. This means that
48303	48978	** the maximum number of record bytes stored on an index B-Tree
48304		- ** page is at most 8198 bytes, which may be stored as a 2-byte
	48979	+ ** page is less than 16384 bytes and may be stored as a 2-byte
48305	48980	** varint. This information is used to attempt to avoid parsing
48306	48981	** the entire cell by checking for the cases where the record is
48307	48982	** stored entirely within the b-tree page by inspecting the first
48308	48983	** 2 bytes of the cell.
48309	48984	*/
		@@ -48662,10 +49337,14 @@
48662	49337	}
48663	49338	if( k==0 ){
48664	49339	if( !pPrevTrunk ){
48665	49340	memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
48666	49341	}else{
	49342	+ rc = sqlite3PagerWrite(pPrevTrunk->pDbPage);
	49343	+ if( rc!=SQLITE_OK ){
	49344	+ goto end_allocate_page;
	49345	+ }
48667	49346	memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
48668	49347	}
48669	49348	}else{
48670	49349	/* The trunk page is required by the caller but it contains
48671	49350	** pointers to free-list leaves. The first leaf becomes a trunk
		@@ -48968,11 +49647,11 @@
48968	49647	BtShared *pBt = pPage->pBt;
48969	49648	CellInfo info;
48970	49649	Pgno ovflPgno;
48971	49650	int rc;
48972	49651	int nOvfl;
48973		- u16 ovflPageSize;
	49652	+ u32 ovflPageSize;
48974	49653
48975	49654	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
48976	49655	btreeParseCellPtr(pPage, pCell, &info);
48977	49656	if( info.iOverflow==0 ){
48978	49657	return SQLITE_OK; /* No overflow pages. Return without doing anything */
		@@ -49193,11 +49872,11 @@
49193	49872	**
49194	49873	** "sz" must be the number of bytes in the cell.
49195	49874	*/
49196	49875	static void dropCell(MemPage pPage, int idx, int sz, int pRC){
49197	49876	int i; /* Loop counter */
49198		- int pc; /* Offset to cell content of cell being deleted */
	49877	+ u32 pc; /* Offset to cell content of cell being deleted */
49199	49878	u8 data; / pPage->aData */
49200	49879	u8 ptr; / Used to move bytes around within data[] */
49201	49880	int rc; /* The return code */
49202	49881	int hdr; /* Beginning of the header. 0 most pages. 100 page 1 */
49203	49882
		@@ -49211,11 +49890,11 @@
49211	49890	ptr = &data[pPage->cellOffset + 2*idx];
49212	49891	pc = get2byte(ptr);
49213	49892	hdr = pPage->hdrOffset;
49214	49893	testcase( pc==get2byte(&data[hdr+5]) );
49215	49894	testcase( pc+sz==pPage->pBt->usableSize );
49216		- if( pc < get2byte(&data[hdr+5]) \|\| pc+sz > pPage->pBt->usableSize ){
	49895	+ if( pc < (u32)get2byte(&data[hdr+5]) \|\| pc+sz > pPage->pBt->usableSize ){
49217	49896	*pRC = SQLITE_CORRUPT_BKPT;
49218	49897	return;
49219	49898	}
49220	49899	rc = freeSpace(pPage, pc, sz);
49221	49900	if( rc ){
		@@ -49268,11 +49947,11 @@
49268	49947	int nSkip = (iChild ? 4 : 0);
49269	49948
49270	49949	if( *pRC ) return;
49271	49950
49272	49951	assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
49273		- assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=5460 );
	49952	+ assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921 );
49274	49953	assert( pPage->nOverflow<=ArraySize(pPage->aOvfl) );
49275	49954	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49276	49955	/* The cell should normally be sized correctly. However, when moving a
49277	49956	** malformed cell from a leaf page to an interior page, if the cell size
49278	49957	** wanted to be less than 4 but got rounded up to 4 on the leaf, then size
		@@ -49348,16 +50027,16 @@
49348	50027	const int hdr = pPage->hdrOffset; /* Offset of header on pPage */
49349	50028	const int nUsable = pPage->pBt->usableSize; /* Usable size of page */
49350	50029
49351	50030	assert( pPage->nOverflow==0 );
49352	50031	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49353		- assert( nCell>=0 && nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=5460 );
	50032	+ assert( nCell>=0 && nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921);
49354	50033	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
49355	50034
49356	50035	/* Check that the page has just been zeroed by zeroPage() */
49357	50036	assert( pPage->nCell==0 );
49358		- assert( get2byte(&data[hdr+5])==nUsable );
	50037	+ assert( get2byteNotZero(&data[hdr+5])==nUsable );
49359	50038
49360	50039	pCellptr = &data[pPage->cellOffset + nCell*2];
49361	50040	cellbody = nUsable;
49362	50041	for(i=nCell-1; i>=0; i--){
49363	50042	pCellptr -= 2;
		@@ -49419,10 +50098,11 @@
49419	50098
49420	50099	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49421	50100	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
49422	50101	assert( pPage->nOverflow==1 );
49423	50102
	50103	+ /* This error condition is now caught prior to reaching this function */
49424	50104	if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
49425	50105
49426	50106	/* Allocate a new page. This page will become the right-sibling of
49427	50107	** pPage. Make the parent page writable, so that the new divider cell
49428	50108	** may be inserted. If both these operations are successful, proceed.
		@@ -49748,11 +50428,11 @@
49748	50428	** In this case, temporarily copy the cell into the aOvflSpace[]
49749	50429	** buffer. It will be copied out again as soon as the aSpace[] buffer
49750	50430	** is allocated. */
49751	50431	if( pBt->secureDelete ){
49752	50432	int iOff = SQLITE_PTR_TO_INT(apDiv[i]) - SQLITE_PTR_TO_INT(pParent->aData);
49753		- if( (iOff+szNew[i])>pBt->usableSize ){
	50433	+ if( (iOff+szNew[i])>(int)pBt->usableSize ){
49754	50434	rc = SQLITE_CORRUPT_BKPT;
49755	50435	memset(apOld, 0, (i+1)sizeof(MemPage));
49756	50436	goto balance_cleanup;
49757	50437	}else{
49758	50438	memcpy(&aOvflSpace[iOff], apDiv[i], szNew[i]);
		@@ -49827,11 +50507,11 @@
49827	50507	u8 *pTemp;
49828	50508	assert( nCell<nMaxCells );
49829	50509	szCell[nCell] = sz;
49830	50510	pTemp = &aSpace1[iSpace1];
49831	50511	iSpace1 += sz;
49832		- assert( sz<=pBt->pageSize/4 );
	50512	+ assert( sz<=pBt->maxLocal+23 );
49833	50513	assert( iSpace1<=pBt->pageSize );
49834	50514	memcpy(pTemp, apDiv[i], sz);
49835	50515	apCell[nCell] = pTemp+leafCorrection;
49836	50516	assert( leafCorrection==0 \|\| leafCorrection==4 );
49837	50517	szCell[nCell] = szCell[nCell] - leafCorrection;
		@@ -50073,11 +50753,11 @@
50073	50753	assert(leafCorrection==4);
50074	50754	sz = cellSizePtr(pParent, pCell);
50075	50755	}
50076	50756	}
50077	50757	iOvflSpace += sz;
50078		- assert( sz<=pBt->pageSize/4 );
	50758	+ assert( sz<=pBt->maxLocal+23 );
50079	50759	assert( iOvflSpace<=pBt->pageSize );
50080	50760	insertCell(pParent, nxDiv, pCell, sz, pTemp, pNew->pgno, &rc);
50081	50761	if( rc!=SQLITE_OK ) goto balance_cleanup;
50082	50762	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
50083	50763
		@@ -51317,11 +51997,11 @@
51317	51997	#ifndef SQLITE_OMIT_AUTOVACUUM
51318	51998	if( pCheck->pBt->autoVacuum ){
51319	51999	checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0, zContext);
51320	52000	}
51321	52001	#endif
51322		- if( n>pCheck->pBt->usableSize/4-2 ){
	52002	+ if( n>(int)pCheck->pBt->usableSize/4-2 ){
51323	52003	checkAppendMsg(pCheck, zContext,
51324	52004	"freelist leaf count too big on page %d", iPage);
51325	52005	N--;
51326	52006	}else{
51327	52007	for(i=0; i<n; i++){
		@@ -51528,24 +52208,24 @@
51528	52208	hdr = pPage->hdrOffset;
51529	52209	hit = sqlite3PageMalloc( pBt->pageSize );
51530	52210	if( hit==0 ){
51531	52211	pCheck->mallocFailed = 1;
51532	52212	}else{
51533		- u16 contentOffset = get2byte(&data[hdr+5]);
	52213	+ int contentOffset = get2byteNotZero(&data[hdr+5]);
51534	52214	assert( contentOffset<=usableSize ); /* Enforced by btreeInitPage() */
51535	52215	memset(hit+contentOffset, 0, usableSize-contentOffset);
51536	52216	memset(hit, 1, contentOffset);
51537	52217	nCell = get2byte(&data[hdr+3]);
51538	52218	cellStart = hdr + 12 - 4*pPage->leaf;
51539	52219	for(i=0; i<nCell; i++){
51540	52220	int pc = get2byte(&data[cellStart+i*2]);
51541		- u16 size = 1024;
	52221	+ u32 size = 65536;
51542	52222	int j;
51543	52223	if( pc<=usableSize-4 ){
51544	52224	size = cellSizePtr(pPage, &data[pc]);
51545	52225	}
51546		- if( (pc+size-1)>=usableSize ){
	52226	+ if( (int)(pc+size-1)>=usableSize ){
51547	52227	checkAppendMsg(pCheck, 0,
51548	52228	"Corruption detected in cell %d on page %d",i,iPage);
51549	52229	}else{
51550	52230	for(j=pc+size-1; j>=pc; j--) hit[j]++;
51551	52231	}
		@@ -52164,10 +52844,19 @@
52164	52844	** page sizes of the source and destination differ.
52165	52845	*/
52166	52846	if( nSrcPgsz!=nDestPgsz && sqlite3PagerIsMemdb(pDestPager) ){
52167	52847	rc = SQLITE_READONLY;
52168	52848	}
	52849	+
	52850	+#ifdef SQLITE_HAS_CODEC
	52851	+ /* Backup is not possible if the page size of the destination is changing
	52852	+ ** a a codec is in use.
	52853	+ */
	52854	+ if( nSrcPgsz!=nDestPgsz && sqlite3PagerGetCodec(pDestPager)!=0 ){
	52855	+ rc = SQLITE_READONLY;
	52856	+ }
	52857	+#endif
52169	52858
52170	52859	/* This loop runs once for each destination page spanned by the source
52171	52860	** page. For each iteration, variable iOff is set to the byte offset
52172	52861	** of the destination page.
52173	52862	*/
		@@ -55769,12 +56458,21 @@
55769	56458	mrc = p->rc & 0xff;
55770	56459	assert( p->rc!=SQLITE_IOERR_BLOCKED ); /* This error no longer exists */
55771	56460	isSpecialError = mrc==SQLITE_NOMEM \|\| mrc==SQLITE_IOERR
55772	56461	\|\| mrc==SQLITE_INTERRUPT \|\| mrc==SQLITE_FULL;
55773	56462	if( isSpecialError ){
55774		- /* If the query was read-only, we need do no rollback at all. Otherwise,
55775		- ** proceed with the special handling.
	56463	+ /* If the query was read-only and the error code is SQLITE_INTERRUPT,
	56464	+ ** no rollback is necessary. Otherwise, at least a savepoint
	56465	+ ** transaction must be rolled back to restore the database to a
	56466	+ ** consistent state.
	56467	+ **
	56468	+ ** Even if the statement is read-only, it is important to perform
	56469	+ ** a statement or transaction rollback operation. If the error
	56470	+ ** occured while writing to the journal, sub-journal or database
	56471	+ ** file as part of an effort to free up cache space (see function
	56472	+ ** pagerStress() in pager.c), the rollback is required to restore
	56473	+ ** the pager to a consistent state.
55776	56474	*/
55777	56475	if( !p->readOnly \|\| mrc!=SQLITE_INTERRUPT ){
55778	56476	if( (mrc==SQLITE_NOMEM \|\| mrc==SQLITE_FULL) && p->usesStmtJournal ){
55779	56477	eStatementOp = SAVEPOINT_ROLLBACK;
55780	56478	}else{
		@@ -63200,11 +63898,11 @@
63200	63898	** If P5 is non-zero then the key value is increased by an epsilon
63201	63899	** prior to the comparison. This make the opcode work like IdxGT except
63202	63900	** that if the key from register P3 is a prefix of the key in the cursor,
63203	63901	** the result is false whereas it would be true with IdxGT.
63204	63902	*/
63205		-/* Opcode: IdxLT P1 P2 P3 * P5
	63903	+/* Opcode: IdxLT P1 P2 P3 P4 P5
63206	63904	**
63207	63905	** The P4 register values beginning with P3 form an unpacked index
63208	63906	** key that omits the ROWID. Compare this key value against the index
63209	63907	** that P1 is currently pointing to, ignoring the ROWID on the P1 index.
63210	63908	**
		@@ -67547,22 +68245,23 @@
67547	68245	assert( z[0]=='?' );
67548	68246	pExpr->iColumn = (ynVar)(++pParse->nVar);
67549	68247	}else if( z[0]=='?' ){
67550	68248	/* Wildcard of the form "?nnn". Convert "nnn" to an integer and
67551	68249	** use it as the variable number */
67552		- int i = atoi((char*)&z[1]);
	68250	+ i64 i;
	68251	+ int bOk = sqlite3Atoi64(&z[1], &i);
67553	68252	pExpr->iColumn = (ynVar)i;
67554	68253	testcase( i==0 );
67555	68254	testcase( i==1 );
67556	68255	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
67557	68256	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] );
67558		- if( i<1 \|\| i>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
	68257	+ if( bOk==0 \|\| i<1 \|\| i>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
67559	68258	sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
67560	68259	db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]);
67561	68260	}
67562	68261	if( i>pParse->nVar ){
67563		- pParse->nVar = i;
	68262	+ pParse->nVar = (int)i;
67564	68263	}
67565	68264	}else{
67566	68265	/* Wildcards like ":aaa", "$aaa" or "@aaa". Reuse the same variable
67567	68266	** number as the prior appearance of the same name, or if the name
67568	68267	** has never appeared before, reuse the same variable number
		@@ -72092,10 +72791,11 @@
72092	72791	}
72093	72792	}
72094	72793	sqlite3DbFree(db, pIdx->aSample);
72095	72794	}
72096	72795	#else
	72796	+ UNUSED_PARAMETER(db);
72097	72797	UNUSED_PARAMETER(pIdx);
72098	72798	#endif
72099	72799	}
72100	72800
72101	72801	/*
		@@ -87738,11 +88438,11 @@
87738	88438	** be sent.
87739	88439	**
87740	88440	** regReturn is the number of the register holding the subroutine
87741	88441	** return address.
87742	88442	**
87743		-** If regPrev>0 then it is a the first register in a vector that
	88443	+** If regPrev>0 then it is the first register in a vector that
87744	88444	** records the previous output. mem[regPrev] is a flag that is false
87745	88445	** if there has been no previous output. If regPrev>0 then code is
87746	88446	** generated to suppress duplicates. pKeyInfo is used for comparing
87747	88447	** keys.
87748	88448	**
		@@ -88435,16 +89135,17 @@
88435	89135	** (1) The subquery and the outer query do not both use aggregates.
88436	89136	**
88437	89137	** (2) The subquery is not an aggregate or the outer query is not a join.
88438	89138	**
88439	89139	** (3) The subquery is not the right operand of a left outer join
88440		-** (Originally ticket #306. Strenghtened by ticket #3300)
	89140	+** (Originally ticket #306. Strengthened by ticket #3300)
88441	89141	**
88442		-** (4) The subquery is not DISTINCT or the outer query is not a join.
	89142	+** (4) The subquery is not DISTINCT.
88443	89143	**
88444		-** (5) The subquery is not DISTINCT or the outer query does not use
88445		-** aggregates.
	89144	+ () At one point restrictions (4) and (5) defined a subset of DISTINCT
	89145	+** sub-queries that were excluded from this optimization. Restriction
	89146	+** (4) has since been expanded to exclude all DISTINCT subqueries.
88446	89147	**
88447	89148	** (6) The subquery does not use aggregates or the outer query is not
88448	89149	** DISTINCT.
88449	89150	**
88450	89151	** (7) The subquery has a FROM clause.
		@@ -88460,13 +89161,13 @@
88460	89161	** (11) The subquery and the outer query do not both have ORDER BY clauses.
88461	89162	**
88462	89163	() Not implemented. Subsumed into restriction (3). Was previously
88463	89164	** a separate restriction deriving from ticket #350.
88464	89165	**
88465		-** (13) The subquery and outer query do not both use LIMIT
	89166	+** (13) The subquery and outer query do not both use LIMIT.
88466	89167	**
88467		-** (14) The subquery does not use OFFSET
	89168	+** (14) The subquery does not use OFFSET.
88468	89169	**
88469	89170	** (15) The outer query is not part of a compound select or the
88470	89171	** subquery does not have a LIMIT clause.
88471	89172	** (See ticket #2339 and ticket [02a8e81d44]).
88472	89173	**
		@@ -88553,13 +89254,13 @@
88553	89254	if( pSub->pOffset ) return 0; /* Restriction (14) */
88554	89255	if( p->pRightmost && pSub->pLimit ){
88555	89256	return 0; /* Restriction (15) */
88556	89257	}
88557	89258	if( pSubSrc->nSrc==0 ) return 0; /* Restriction (7) */
88558		- if( ((pSub->selFlags & SF_Distinct)!=0 \|\| pSub->pLimit)
88559		- && (pSrc->nSrc>1 \|\| isAgg) ){ /* Restrictions (4)(5)(8)(9) */
88560		- return 0;
	89259	+ if( pSub->selFlags & SF_Distinct ) return 0; /* Restriction (5) */
	89260	+ if( pSub->pLimit && (pSrc->nSrc>1 \|\| isAgg) ){
	89261	+ return 0; /* Restrictions (8)(9) */
88561	89262	}
88562	89263	if( (p->selFlags & SF_Distinct)!=0 && subqueryIsAgg ){
88563	89264	return 0; /* Restriction (6) */
88564	89265	}
88565	89266	if( p->pOrderBy && pSub->pOrderBy ){
		@@ -93225,11 +93926,11 @@
93225	93926	pParse->pNewTable->aCol = 0;
93226	93927	}
93227	93928	db->pVTab = 0;
93228	93929	}else{
93229	93930	sqlite3Error(db, SQLITE_ERROR, zErr);
93230		- sqlite3_free(zErr);
	93931	+ sqlite3DbFree(db, zErr);
93231	93932	rc = SQLITE_ERROR;
93232	93933	}
93233	93934	pParse->declareVtab = 0;
93234	93935
93235	93936	if( pParse->pVdbe ){
		@@ -96859,39 +97560,39 @@
96859	97560	**
96860	97561	** This case is also used when there are no WHERE clause
96861	97562	** constraints but an index is selected anyway, in order
96862	97563	** to force the output order to conform to an ORDER BY.
96863	97564	*/
96864		- int aStartOp[] = {
	97565	+ static const u8 aStartOp[] = {
96865	97566	0,
96866	97567	0,
96867	97568	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
96868	97569	OP_Last, /* 3: (!start_constraints && startEq && bRev) */
96869	97570	OP_SeekGt, /* 4: (start_constraints && !startEq && !bRev) */
96870	97571	OP_SeekLt, /* 5: (start_constraints && !startEq && bRev) */
96871	97572	OP_SeekGe, /* 6: (start_constraints && startEq && !bRev) */
96872	97573	OP_SeekLe /* 7: (start_constraints && startEq && bRev) */
96873	97574	};
96874		- int aEndOp[] = {
	97575	+ static const u8 aEndOp[] = {
96875	97576	OP_Noop, /* 0: (!end_constraints) */
96876	97577	OP_IdxGE, /* 1: (end_constraints && !bRev) */
96877	97578	OP_IdxLT /* 2: (end_constraints && bRev) */
96878	97579	};
96879		- int nEq = pLevel->plan.nEq;
	97580	+ int nEq = pLevel->plan.nEq; /* Number of == or IN terms */
96880	97581	int isMinQuery = 0; /* If this is an optimized SELECT min(x).. */
96881	97582	int regBase; /* Base register holding constraint values */
96882	97583	int r1; /* Temp register */
96883	97584	WhereTerm pRangeStart = 0; / Inequality constraint at range start */
96884	97585	WhereTerm pRangeEnd = 0; / Inequality constraint at range end */
96885	97586	int startEq; /* True if range start uses ==, >= or <= */
96886	97587	int endEq; /* True if range end uses ==, >= or <= */
96887	97588	int start_constraints; /* Start of range is constrained */
96888	97589	int nConstraint; /* Number of constraint terms */
96889		- Index pIdx; / The index we will be using */
96890		- int iIdxCur; /* The VDBE cursor for the index */
96891		- int nExtraReg = 0; /* Number of extra registers needed */
96892		- int op; /* Instruction opcode */
	97590	+ Index pIdx; / The index we will be using */
	97591	+ int iIdxCur; /* The VDBE cursor for the index */
	97592	+ int nExtraReg = 0; /* Number of extra registers needed */
	97593	+ int op; /* Instruction opcode */
96893	97594	char zStartAff; / Affinity for start of range constraint */
96894	97595	char zEndAff; / Affinity for end of range constraint */
96895	97596
96896	97597	pIdx = pLevel->plan.u.pIdx;
96897	97598	iIdxCur = pLevel->iIdxCur;
		@@ -108720,11 +109421,11 @@
108720	109421	** in files fts3_tokenizer1.c and fts3_porter.c respectively. The following
108721	109422	** two forward declarations are for functions declared in these files
108722	109423	** used to retrieve the respective implementations.
108723	109424	**
108724	109425	** Calling sqlite3Fts3SimpleTokenizerModule() sets the value pointed
108725		-** to by the argument to point a the "simple" tokenizer implementation.
	109426	+** to by the argument to point to the "simple" tokenizer implementation.
108726	109427	** Function ...PorterTokenizerModule() sets *pModule to point to the
108727	109428	** porter tokenizer/stemmer implementation.
108728	109429	*/
108729	109430	SQLITE_PRIVATE void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
108730	109431	SQLITE_PRIVATE void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
		@@ -108922,11 +109623,11 @@
108922	109623	** is defined to accept an argument of type char, and always returns 0 for
108923	109624	** any values that fall outside of the range of the unsigned char type (i.e.
108924	109625	** negative values).
108925	109626	*/
108926	109627	static int fts3isspace(char c){
108927		- return (c&0x80)==0 ? isspace(c) : 0;
	109628	+ return c==' ' \|\| c=='\t' \|\| c=='\n' \|\| c=='\r' \|\| c=='\v' \|\| c=='\f';
108928	109629	}
108929	109630
108930	109631	/*
108931	109632	** Extract the next token from buffer z (length n) using the tokenizer
108932	109633	** and other information (column names etc.) in pParse. Create an Fts3Expr
		@@ -111309,10 +112010,13 @@
111309	112010
111310	112011
111311	112012	static int simpleDelim(simple_tokenizer *t, unsigned char c){
111312	112013	return c<0x80 && t->delim[c];
111313	112014	}
	112015	+static int fts3_isalnum(int x){
	112016	+ return (x>='0' && x<='9') \|\| (x>='A' && x<='Z') \|\| (x>='a' && x<='z');
	112017	+}
111314	112018
111315	112019	/*
111316	112020	** Create a new tokenizer instance.
111317	112021	*/
111318	112022	static int simpleCreate(
		@@ -111343,11 +112047,11 @@
111343	112047	}
111344	112048	} else {
111345	112049	/* Mark non-alphanumeric ASCII characters as delimiters */
111346	112050	int i;
111347	112051	for(i=1; i<0x80; i++){
111348		- t->delim[i] = !isalnum(i) ? -1 : 0;
	112052	+ t->delim[i] = !fts3_isalnum(i) ? -1 : 0;
111349	112053	}
111350	112054	}
111351	112055
111352	112056	*ppTokenizer = &t->base;
111353	112057	return SQLITE_OK;
		@@ -111449,11 +112153,11 @@
111449	112153	for(i=0; i<n; i++){
111450	112154	/* TODO(shess) This needs expansion to handle UTF-8
111451	112155	** case-insensitivity.
111452	112156	*/
111453	112157	unsigned char ch = p[iStartOffset+i];
111454		- c->pToken[i] = (char)(ch<0x80 ? tolower(ch) : ch);
	112158	+ c->pToken[i] = (char)((ch>='A' && ch<='Z') ? ch-'A'+'a' : ch);
111455	112159	}
111456	112160	*ppToken = c->pToken;
111457	112161	*pnBytes = n;
111458	112162	*piStartOffset = iStartOffset;
111459	112163	*piEndOffset = c->iOffset;
		@@ -116355,15 +117059,14 @@
116355	117059	** least desirable):
116356	117060	**
116357	117061	** idxNum idxStr Strategy
116358	117062	** ------------------------------------------------
116359	117063	** 1 Unused Direct lookup by rowid.
116360		-** 2 See below R-tree query.
116361		-** 3 Unused Full table scan.
	117064	+** 2 See below R-tree query or full-table scan.
116362	117065	** ------------------------------------------------
116363	117066	**
116364		-** If strategy 1 or 3 is used, then idxStr is not meaningful. If strategy
	117067	+** If strategy 1 is used, then idxStr is not meaningful. If strategy
116365	117068	** 2 is used, idxStr is formatted to contain 2 bytes for each
116366	117069	** constraint used. The first two bytes of idxStr correspond to
116367	117070	** the constraint in sqlite3_index_info.aConstraintUsage[] with
116368	117071	** (argvIndex==1) etc.
116369	117072	**
116370	117073

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.7.1. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a one translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% are more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -213,24 +213,25 @@
213	*/
214	#ifndef SQLITE_MAX_VARIABLE_NUMBER
215	# define SQLITE_MAX_VARIABLE_NUMBER 999
216	#endif
217
218	/* Maximum page size. The upper bound on this value is 32768. This a limit
219	** imposed by the necessity of storing the value in a 2-byte unsigned integer
220	** and the fact that the page size must be a power of 2.
221	**
222	** If this limit is changed, then the compiled library is technically
223	** incompatible with an SQLite library compiled with a different limit. If
224	** a process operating on a database with a page-size of 65536 bytes
225	** crashes, then an instance of SQLite compiled with the default page-size
226	** limit will not be able to rollback the aborted transaction. This could
227	** lead to database corruption.

228	*/
229	#ifndef SQLITE_MAX_PAGE_SIZE
230	# define SQLITE_MAX_PAGE_SIZE 32768
231	#endif

232
233
234	/*
235	** The default size of a database page.
236	*/
	@@ -631,23 +632,23 @@
631	** be held constant and Z will be incremented or else Y will be incremented
632	** and Z will be reset to zero.
633	**
634	** Since version 3.6.18, SQLite source code has been stored in the
635	** <a href="http://www.fossil-scm.org/">Fossil configuration management
636	** system</a>. ^The SQLITE_SOURCE_ID macro evalutes to
637	** a string which identifies a particular check-in of SQLite
638	** within its configuration management system. ^The SQLITE_SOURCE_ID
639	** string contains the date and time of the check-in (UTC) and an SHA1
640	** hash of the entire source tree.
641	**
642	** See also: [sqlite3_libversion()],
643	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
644	** [sqlite_version()] and [sqlite_source_id()].
645	*/
646	#define SQLITE_VERSION "3.7.1"
647	#define SQLITE_VERSION_NUMBER 3007001
648	#define SQLITE_SOURCE_ID "2010-08-05 03:21:40 fbe70e1106bcc5086ceb9d8f39cc39baf3643092"
649
650	/*
651	** CAPI3REF: Run-Time Library Version Numbers
652	** KEYWORDS: sqlite3_version, sqlite3_sourceid
653	**
	@@ -688,19 +689,19 @@
688	** ^The sqlite3_compileoption_used() function returns 0 or 1
689	** indicating whether the specified option was defined at
690	** compile time. ^The SQLITE_ prefix may be omitted from the
691	** option name passed to sqlite3_compileoption_used().
692	**
693	** ^The sqlite3_compileoption_get() function allows interating
694	** over the list of options that were defined at compile time by
695	** returning the N-th compile time option string. ^If N is out of range,
696	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
697	** prefix is omitted from any strings returned by
698	** sqlite3_compileoption_get().
699	**
700	** ^Support for the diagnostic functions sqlite3_compileoption_used()
701	** and sqlite3_compileoption_get() may be omitted by specifing the
702	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
703	**
704	** See also: SQL functions [sqlite_compileoption_used()] and
705	** [sqlite_compileoption_get()] and the [compile_options pragma].
706	*/
	@@ -802,11 +803,11 @@
802	/*
803	** CAPI3REF: Closing A Database Connection
804	**
805	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
806	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
807	** successfullly destroyed and all associated resources are deallocated.
808	**
809	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
810	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
811	** the [sqlite3] object prior to attempting to close the object. ^If
812	** sqlite3_close() is called on a [database connection] that still has
	@@ -1229,16 +1230,25 @@
1229	** layer a hint of how large the database file will grow to be during the
1230	** current transaction. This hint is not guaranteed to be accurate but it
1231	** is often close. The underlying VFS might choose to preallocate database
1232	** file space based on this hint in order to help writes to the database
1233	** file run faster.








1234	*/
1235	#define SQLITE_FCNTL_LOCKSTATE 1
1236	#define SQLITE_GET_LOCKPROXYFILE 2
1237	#define SQLITE_SET_LOCKPROXYFILE 3
1238	#define SQLITE_LAST_ERRNO 4
1239	#define SQLITE_FCNTL_SIZE_HINT 5

1240
1241	/*
1242	** CAPI3REF: Mutex Handle
1243	**
1244	** The mutex module within SQLite defines [sqlite3_mutex] to be an
	@@ -3197,11 +3207,11 @@
3197	** <li> @VVV
3198	** <li> $VVV
3199	** </ul>
3200	**
3201	** In the templates above, NNN represents an integer literal,
3202	** and VVV represents an alphanumeric identifer.)^ ^The values of these
3203	** parameters (also called "host parameter names" or "SQL parameters")
3204	** can be set using the sqlite3_bind_*() routines defined here.
3205	**
3206	** ^The first argument to the sqlite3_bind_*() routines is always
3207	** a pointer to the [sqlite3_stmt] object returned from
	@@ -3976,11 +3986,11 @@
3976	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3977
3978	/*
3979	** CAPI3REF: Obtain Aggregate Function Context
3980	**
3981	** Implementions of aggregate SQL functions use this
3982	** routine to allocate memory for storing their state.
3983	**
3984	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3985	** for a particular aggregate function, SQLite
3986	** allocates N of memory, zeroes out that memory, and returns a pointer
	@@ -4248,11 +4258,11 @@
4248	** the routine expects pointers to 16-bit word aligned strings
4249	** of UTF-16 in the native byte order.
4250	**
4251	** A pointer to the user supplied routine must be passed as the fifth
4252	** argument. ^If it is NULL, this is the same as deleting the collation
4253	** sequence (so that SQLite cannot call it anymore).
4254	** ^Each time the application supplied function is invoked, it is passed
4255	** as its first parameter a copy of the void* passed as the fourth argument
4256	** to sqlite3_create_collation() or sqlite3_create_collation16().
4257	**
4258	** ^The remaining arguments to the application-supplied routine are two strings,
	@@ -5466,11 +5476,11 @@
5466	** of passing a NULL pointer instead of a valid mutex handle are undefined
5467	** (i.e. it is acceptable to provide an implementation that segfaults if
5468	** it is passed a NULL pointer).
5469	**
5470	** The xMutexInit() method must be threadsafe. ^It must be harmless to
5471	** invoke xMutexInit() mutiple times within the same process and without
5472	** intervening calls to xMutexEnd(). Second and subsequent calls to
5473	** xMutexInit() must be no-ops.
5474	**
5475	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
5476	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
	@@ -5636,11 +5646,11 @@
5636
5637	/*
5638	** CAPI3REF: SQLite Runtime Status
5639	**
5640	** ^This interface is used to retrieve runtime status information
5641	** about the preformance of SQLite, and optionally to reset various
5642	** highwater marks. ^The first argument is an integer code for
5643	** the specific parameter to measure. ^(Recognized integer codes
5644	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5645	** ^The current value of the parameter is returned into *pCurrent.
5646	** ^The highest recorded value is returned in *pHighwater. ^If the
	@@ -5762,11 +5772,11 @@
5762	** ^This interface is used to retrieve runtime status information
5763	** about a single [database connection]. ^The first argument is the
5764	** database connection object to be interrogated. ^The second argument
5765	** is an integer constant, taken from the set of
5766	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5767	** determiness the parameter to interrogate. The set of
5768	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5769	** to grow in future releases of SQLite.
5770	**
5771	** ^The current value of the requested parameter is written into *pCur
5772	** and the highest instantaneous value is written into *pHiwtr. ^If
	@@ -6184,11 +6194,11 @@
6184	**
6185	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
6186	**
6187	** ^Each call to sqlite3_backup_step() sets two values inside
6188	** the [sqlite3_backup] object: the number of pages still to be backed
6189	** up and the total number of pages in the source databae file.
6190	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
6191	** retrieve these two values, respectively.
6192	**
6193	** ^The values returned by these functions are only updated by
6194	** sqlite3_backup_step(). ^If the source database is modified during a backup
	@@ -6280,11 +6290,11 @@
6280	** ^(There may be at most one unlock-notify callback registered by a
6281	** blocked connection. If sqlite3_unlock_notify() is called when the
6282	** blocked connection already has a registered unlock-notify callback,
6283	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
6284	** called with a NULL pointer as its second argument, then any existing
6285	** unlock-notify callback is cancelled. ^The blocked connections
6286	** unlock-notify callback may also be canceled by closing the blocked
6287	** connection using [sqlite3_close()].
6288	**
6289	** The unlock-notify callback is not reentrant. If an application invokes
6290	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -6362,11 +6372,11 @@
6362	/*
6363	** CAPI3REF: String Comparison
6364	**
6365	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
6366	** compare the contents of two buffers containing UTF-8 strings in a
6367	** case-indendent fashion, using the same definition of case independence
6368	** that SQLite uses internally when comparing identifiers.
6369	*/
6370	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
6371
6372	/*
	@@ -7868,11 +7878,11 @@
7868	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager);
7869	SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager, int, unsigned char);
7870
7871	/* Functions used to configure a Pager object. */
7872	SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager, int()(void ), void );
7873	SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager, u16, int);
7874	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int);
7875	SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);
7876	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int);
7877	SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);
7878	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);
	@@ -7895,11 +7905,11 @@
7895	SQLITE_PRIVATE int sqlite3PagerPageRefcount(DbPage*);
7896	SQLITE_PRIVATE void sqlite3PagerGetData(DbPage );
7897	SQLITE_PRIVATE void sqlite3PagerGetExtra(DbPage );
7898
7899	/* Functions used to manage pager transactions and savepoints. */
7900	SQLITE_PRIVATE int sqlite3PagerPagecount(Pager, int);
7901	SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);
7902	SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager,const char zMaster, int);
7903	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);
7904	SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager);
7905	SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);
	@@ -9183,13 +9193,13 @@
9183	** argument to sqlite3VdbeKeyCompare and is used to control the
9184	** comparison of the two index keys.
9185	*/
9186	struct KeyInfo {
9187	sqlite3 db; / The database connection */
9188	u8 enc; /* Text encoding - one of the TEXT_Utf* values */
9189	u16 nField; /* Number of entries in aColl[] */
9190	u8 aSortOrder; / If defined an aSortOrder[i] is true, sort DESC */
9191	CollSeq aColl[1]; / Collating sequence for each term of the key */
9192	};
9193
9194	/*
9195	** An instance of the following structure holds information about a
	@@ -14331,11 +14341,11 @@
14331
14332	/*
14333	** Set the "type" of an allocation.
14334	*/
14335	SQLITE_PRIVATE void sqlite3MemdebugSetType(void *p, u8 eType){
14336	if( p ){
14337	struct MemBlockHdr *pHdr;
14338	pHdr = sqlite3MemsysGetHeader(p);
14339	assert( pHdr->iForeGuard==FOREGUARD );
14340	pHdr->eType = eType;
14341	}
	@@ -14350,11 +14360,11 @@
14350	**
14351	** assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) );
14352	*/
14353	SQLITE_PRIVATE int sqlite3MemdebugHasType(void *p, u8 eType){
14354	int rc = 1;
14355	if( p ){
14356	struct MemBlockHdr *pHdr;
14357	pHdr = sqlite3MemsysGetHeader(p);
14358	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14359	if( (pHdr->eType&eType)==0 ){
14360	rc = 0;
	@@ -14372,11 +14382,11 @@
14372	**
14373	** assert( sqlite3MemdebugNoType(p, MEMTYPE_DB) );
14374	*/
14375	SQLITE_PRIVATE int sqlite3MemdebugNoType(void *p, u8 eType){
14376	int rc = 1;
14377	if( p ){
14378	struct MemBlockHdr *pHdr;
14379	pHdr = sqlite3MemsysGetHeader(p);
14380	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14381	if( (pHdr->eType&eType)!=0 ){
14382	rc = 0;
	@@ -16624,10 +16634,11 @@
16624	#else
16625	/* Use the built-in recursive mutexes if they are available.
16626	*/
16627	pthread_mutex_lock(&p->mutex);
16628	#if SQLITE_MUTEX_NREF

16629	p->owner = pthread_self();
16630	p->nRef++;
16631	#endif
16632	#endif
16633
	@@ -16696,10 +16707,11 @@
16696	*/
16697	static void pthreadMutexLeave(sqlite3_mutex *p){
16698	assert( pthreadMutexHeld(p) );
16699	#if SQLITE_MUTEX_NREF
16700	p->nRef--;

16701	#endif
16702	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16703
16704	#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
16705	if( p->nRef==0 ){
	@@ -16960,11 +16972,11 @@
16960	** allocated mutex. SQLite is careful to deallocate every
16961	** mutex that it allocates.
16962	*/
16963	static void winMutexFree(sqlite3_mutex *p){
16964	assert( p );
16965	assert( p->nRef==0 );
16966	assert( p->id==SQLITE_MUTEX_FAST \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16967	DeleteCriticalSection(&p->mutex);
16968	sqlite3_free(p);
16969	}
16970
	@@ -16984,10 +16996,11 @@
16984	DWORD tid = GetCurrentThreadId();
16985	assert( p->id==SQLITE_MUTEX_RECURSIVE \|\| winMutexNotheld2(p, tid) );
16986	#endif
16987	EnterCriticalSection(&p->mutex);
16988	#ifdef SQLITE_DEBUG

16989	p->owner = tid;
16990	p->nRef++;
16991	if( p->trace ){
16992	printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
16993	}
	@@ -17037,10 +17050,11 @@
17037	#ifndef NDEBUG
17038	DWORD tid = GetCurrentThreadId();
17039	assert( p->nRef>0 );
17040	assert( p->owner==tid );
17041	p->nRef--;

17042	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
17043	#endif
17044	LeaveCriticalSection(&p->mutex);
17045	#ifdef SQLITE_DEBUG
17046	if( p->trace ){
	@@ -22609,10 +22623,11 @@
22609	void lockingContext; / Locking style specific state */
22610	UnixUnusedFd pUnused; / Pre-allocated UnixUnusedFd */
22611	int fileFlags; /* Miscellanous flags */
22612	const char zPath; / Name of the file */
22613	unixShm pShm; / Shared memory segment information */

22614	#if SQLITE_ENABLE_LOCKING_STYLE
22615	int openFlags; /* The flags specified at open() */
22616	#endif
22617	#if SQLITE_ENABLE_LOCKING_STYLE \|\| defined(__APPLE__)
22618	unsigned fsFlags; /* cached details from statfs() */
	@@ -25367,19 +25382,21 @@
25367	offset += wrote;
25368	pBuf = &((char*)pBuf)[wrote];
25369	}
25370	SimulateIOError(( wrote=(-1), amt=1 ));
25371	SimulateDiskfullError(( wrote=0, amt=1 ));

25372	if( amt>0 ){
25373	if( wrote<0 ){
25374	/* lastErrno set by seekAndWrite */
25375	return SQLITE_IOERR_WRITE;
25376	}else{
25377	pFile->lastErrno = 0; /* not a system error */
25378	return SQLITE_FULL;
25379	}
25380	}

25381	return SQLITE_OK;
25382	}
25383
25384	#ifdef SQLITE_TEST
25385	/*
	@@ -25577,16 +25594,27 @@
25577
25578	/*
25579	** Truncate an open file to a specified size
25580	*/
25581	static int unixTruncate(sqlite3_file *id, i64 nByte){

25582	int rc;
25583	assert( id );
25584	SimulateIOError( return SQLITE_IOERR_TRUNCATE );
25585	rc = ftruncate(((unixFile*)id)->h, (off_t)nByte);










25586	if( rc ){
25587	((unixFile*)id)->lastErrno = errno;
25588	return SQLITE_IOERR_TRUNCATE;
25589	}else{
25590	#ifndef NDEBUG
25591	/* If we are doing a normal write to a database file (as opposed to
25592	** doing a hot-journal rollback or a write to some file other than a
	@@ -25593,12 +25621,12 @@
25593	** normal database file) and we truncate the file to zero length,
25594	** that effectively updates the change counter. This might happen
25595	** when restoring a database using the backup API from a zero-length
25596	** source.
25597	*/
25598	if( ((unixFile*)id)->inNormalWrite && nByte==0 ){
25599	((unixFile*)id)->transCntrChng = 1;
25600	}
25601	#endif
25602
25603	return SQLITE_OK;
25604	}
	@@ -25637,10 +25665,58 @@
25637	** proxying locking division.
25638	*/
25639	static int proxyFileControl(sqlite3_file,int,void);
25640	#endif
25641
















































25642
25643	/*
25644	** Information and control of an open file handle.
25645	*/
25646	static int unixFileControl(sqlite3_file id, int op, void pArg){
	@@ -25650,18 +25726,17 @@
25650	return SQLITE_OK;
25651	}
25652	case SQLITE_LAST_ERRNO: {
25653	(int)pArg = ((unixFile*)id)->lastErrno;
25654	return SQLITE_OK;




25655	}
25656	case SQLITE_FCNTL_SIZE_HINT: {
25657	#if 0 /* No performance advantage seen on Linux */
25658	sqlite3_int64 szFile = (sqlite3_int64)pArg;
25659	unixFile pFile = (unixFile)id;
25660	ftruncate(pFile->h, szFile);
25661	#endif
25662	return SQLITE_OK;
25663	}
25664	#ifndef NDEBUG
25665	/* The pager calls this method to signal that it has done
25666	** a rollback and that the database is therefore unchanged and
25667	** it hence it is OK for the transaction change counter to be
	@@ -28522,11 +28597,11 @@
28522	}else{
28523	if( pCtx->conchFile ){
28524	pCtx->conchFile->pMethod->xClose((sqlite3_file *)pCtx->conchFile);
28525	sqlite3_free(pCtx->conchFile);
28526	}
28527	sqlite3_free(pCtx->lockProxyPath);
28528	sqlite3_free(pCtx->conchFilePath);
28529	sqlite3_free(pCtx);
28530	}
28531	OSTRACE(("TRANSPROXY %d %s\n", pFile->h,
28532	(rc==SQLITE_OK ? "ok" : "failed")));
	@@ -28713,13 +28788,13 @@
28713	}
28714	rc = conchFile->pMethod->xClose((sqlite3_file*)conchFile);
28715	if( rc ) return rc;
28716	sqlite3_free(conchFile);
28717	}
28718	sqlite3_free(pCtx->lockProxyPath);
28719	sqlite3_free(pCtx->conchFilePath);
28720	sqlite3_free(pCtx->dbPath);
28721	/* restore the original locking context and pMethod then close it */
28722	pFile->lockingContext = pCtx->oldLockingContext;
28723	pFile->pMethod = pCtx->pOldMethod;
28724	sqlite3_free(pCtx);
28725	return pFile->pMethod->xClose(id);
	@@ -29161,10 +29236,11 @@
29161	short sharedLockByte; /* Randomly chosen byte used as a shared lock */
29162	DWORD lastErrno; /* The Windows errno from the last I/O error */
29163	DWORD sectorSize; /* Sector size of the device file is on */
29164	winShm pShm; / Instance of shared memory on this file */
29165	const char zPath; / Full pathname of this file */

29166	#if SQLITE_OS_WINCE
29167	WCHAR zDeleteOnClose; / Name of file to delete when closing */
29168	HANDLE hMutex; /* Mutex used to control access to shared lock */
29169	HANDLE hShared; /* Shared memory segment used for locking */
29170	winceLock local; /* Locks obtained by this instance of winFile */
	@@ -29671,10 +29747,46 @@
29671
29672	/*****************************************************************************
29673	** The next group of routines implement the I/O methods specified
29674	** by the sqlite3_io_methods object.
29675	******************************************************************************/




































29676
29677	/*
29678	** Close a file.
29679	**
29680	** It is reported that an attempt to close a handle might sometimes
	@@ -29714,17 +29826,10 @@
29714	OSTRACE(("CLOSE %d %s\n", pFile->h, rc ? "ok" : "failed"));
29715	OpenCounter(-1);
29716	return rc ? SQLITE_OK : SQLITE_IOERR;
29717	}
29718
29719	/*
29720	** Some microsoft compilers lack this definition.
29721	*/
29722	#ifndef INVALID_SET_FILE_POINTER
29723	# define INVALID_SET_FILE_POINTER ((DWORD)-1)
29724	#endif
29725
29726	/*
29727	** Read data from a file into a buffer. Return SQLITE_OK if all
29728	** bytes were read successfully and SQLITE_IOERR if anything goes
29729	** wrong.
29730	*/
	@@ -29732,112 +29837,108 @@
29732	sqlite3_file id, / File to read from */
29733	void pBuf, / Write content into this buffer */
29734	int amt, /* Number of bytes to read */
29735	sqlite3_int64 offset /* Begin reading at this offset */
29736	){
29737	LONG upperBits = (LONG)((offset>>32) & 0x7fffffff);
29738	LONG lowerBits = (LONG)(offset & 0xffffffff);
29739	DWORD rc;
29740	winFile pFile = (winFile)id;
29741	DWORD error;
29742	DWORD got;
29743
29744	assert( id!=0 );
29745	SimulateIOError(return SQLITE_IOERR_READ);
29746	OSTRACE(("READ %d lock=%d\n", pFile->h, pFile->locktype));
29747	rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29748	if( rc==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29749	pFile->lastErrno = error;
29750	return SQLITE_FULL;
29751	}
29752	if( !ReadFile(pFile->h, pBuf, amt, &got, 0) ){
29753	pFile->lastErrno = GetLastError();
29754	return SQLITE_IOERR_READ;
29755	}
29756	if( got==(DWORD)amt ){
29757	return SQLITE_OK;
29758	}else{
29759	/* Unread parts of the buffer must be zero-filled */
29760	memset(&((char*)pBuf)[got], 0, amt-got);
29761	return SQLITE_IOERR_SHORT_READ;
29762	}


29763	}
29764
29765	/*
29766	** Write data from a buffer into a file. Return SQLITE_OK on success
29767	** or some other error code on failure.
29768	*/
29769	static int winWrite(
29770	sqlite3_file id, / File to write into */
29771	const void pBuf, / The bytes to be written */
29772	int amt, /* Number of bytes to write */
29773	sqlite3_int64 offset /* Offset into the file to begin writing at */
29774	){
29775	LONG upperBits = (LONG)((offset>>32) & 0x7fffffff);
29776	LONG lowerBits = (LONG)(offset & 0xffffffff);
29777	DWORD rc;
29778	winFile pFile = (winFile)id;
29779	DWORD error;
29780	DWORD wrote = 0;
29781
29782	assert( id!=0 );
29783	SimulateIOError(return SQLITE_IOERR_WRITE);
29784	SimulateDiskfullError(return SQLITE_FULL);
29785	OSTRACE(("WRITE %d lock=%d\n", pFile->h, pFile->locktype));
29786	rc = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29787	if( rc==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29788	pFile->lastErrno = error;
29789	if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
29790	return SQLITE_FULL;
29791	}else{
29792	return SQLITE_IOERR_WRITE;
29793	}
29794	}
29795	assert( amt>0 );
29796	while(
29797	amt>0
29798	&& (rc = WriteFile(pFile->h, pBuf, amt, &wrote, 0))!=0
29799	&& wrote>0
29800	){
29801	amt -= wrote;
29802	pBuf = &((char*)pBuf)[wrote];
29803	}
29804	if( !rc \|\| amt>(int)wrote ){
29805	pFile->lastErrno = GetLastError();
29806	if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
29807	return SQLITE_FULL;
29808	}else{
29809	return SQLITE_IOERR_WRITE;
29810	}
29811	}
29812	return SQLITE_OK;
29813	}
29814
29815	/*
29816	** Truncate an open file to a specified size
29817	*/
29818	static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
29819	LONG upperBits = (LONG)((nByte>>32) & 0x7fffffff);
29820	LONG lowerBits = (LONG)(nByte & 0xffffffff);
29821	DWORD dwRet;
29822	winFile pFile = (winFile)id;
29823	DWORD error;
29824	int rc = SQLITE_OK;
29825
29826	assert( id!=0 );
29827	OSTRACE(("TRUNCATE %d %lld\n", pFile->h, nByte));
29828	SimulateIOError(return SQLITE_IOERR_TRUNCATE);
29829	dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29830	if( dwRet==INVALID_SET_FILE_POINTER && (error=GetLastError())!=NO_ERROR ){
29831	pFile->lastErrno = error;









29832	rc = SQLITE_IOERR_TRUNCATE;
29833	/* SetEndOfFile will fail if nByte is negative */
29834	}else if( !SetEndOfFile(pFile->h) ){
29835	pFile->lastErrno = GetLastError();
29836	rc = SQLITE_IOERR_TRUNCATE;
29837	}
29838	OSTRACE(("TRUNCATE %d %lld %s\n", pFile->h, nByte, rc==SQLITE_OK ? "ok" : "failed"));

29839	return rc;
29840	}
29841
29842	#ifdef SQLITE_TEST
29843	/*
	@@ -30197,10 +30298,14 @@
30197	return SQLITE_OK;
30198	}
30199	case SQLITE_LAST_ERRNO: {
30200	(int)pArg = (int)((winFile*)id)->lastErrno;
30201	return SQLITE_OK;




30202	}
30203	case SQLITE_FCNTL_SIZE_HINT: {
30204	sqlite3_int64 sz = (sqlite3_int64)pArg;
30205	SimulateIOErrorBenign(1);
30206	winTruncate(id, sz);
	@@ -31749,11 +31854,11 @@
31749	** start of a transaction, and is thus usually less than a few thousand,
31750	** but can be as large as 2 billion for a really big database.
31751	*/
31752
31753	/* Size of the Bitvec structure in bytes. */
31754	#define BITVEC_SZ (sizeof(void)128) /* 512 on 32bit. 1024 on 64bit */
31755
31756	/* Round the union size down to the nearest pointer boundary, since that's how
31757	** it will be aligned within the Bitvec struct. */
31758	#define BITVEC_USIZE (((BITVEC_SZ-(3sizeof(u32)))/sizeof(Bitvec))sizeof(Bitvec))
31759
	@@ -32907,10 +33012,29 @@
32907	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize);
32908	sqlite3_free(p);
32909	}
32910	}
32911



















32912	/*
32913	** Allocate a new page object initially associated with cache pCache.
32914	*/
32915	static PgHdr1 pcache1AllocPage(PCache1 pCache){
32916	int nByte = sizeof(PgHdr1) + pCache->szPage;
	@@ -33455,11 +33579,11 @@
33455	int nFree = 0;
33456	if( pcache1.pStart==0 ){
33457	PgHdr1 *p;
33458	pcache1EnterMutex();
33459	while( (nReq<0 \|\| nFree<nReq) && (p=pcache1.pLruTail) ){
33460	nFree += sqlite3MallocSize(PGHDR1_TO_PAGE(p));
33461	pcache1PinPage(p);
33462	pcache1RemoveFromHash(p);
33463	pcache1FreePage(p);
33464	}
33465	pcache1LeaveMutex();
	@@ -33964,11 +34088,11 @@
33964	# define sqlite3WalOpen(x,y,z) 0
33965	# define sqlite3WalClose(w,x,y,z) 0
33966	# define sqlite3WalBeginReadTransaction(y,z) 0
33967	# define sqlite3WalEndReadTransaction(z)
33968	# define sqlite3WalRead(v,w,x,y,z) 0
33969	# define sqlite3WalDbsize(y,z)
33970	# define sqlite3WalBeginWriteTransaction(y) 0
33971	# define sqlite3WalEndWriteTransaction(x) 0
33972	# define sqlite3WalUndo(x,y,z) 0
33973	# define sqlite3WalSavepoint(y,z)
33974	# define sqlite3WalSavepointUndo(y,z) 0
	@@ -34000,13 +34124,12 @@
34000	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal);
34001
34002	/* Read a page from the write-ahead log, if it is present. */
34003	SQLITE_PRIVATE int sqlite3WalRead(Wal pWal, Pgno pgno, int pInWal, int nOut, u8 *pOut);
34004
34005	/* Return the size of the database as it existed at the beginning
34006	** of the snapshot */
34007	SQLITE_PRIVATE void sqlite3WalDbsize(Wal pWal, Pgno pPgno);
34008
34009	/* Obtain or release the WRITER lock. */
34010	SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal);
34011	SQLITE_PRIVATE int sqlite3WalEndWriteTransaction(Wal *pWal);
34012
	@@ -34048,12 +34171,16 @@
34048	#endif /* _WAL_H_ */
34049
34050	/************ End of wal.h ***********************************************/
34051	/************ Continuing where we left off in pager.c ********************/
34052
34053	/*
34054	****************** NOTES ON THE DESIGN OF THE PAGER **********************




34055	**
34056	** Within this comment block, a page is deemed to have been synced
34057	** automatically as soon as it is written when PRAGMA synchronous=OFF.
34058	** Otherwise, the page is not synced until the xSync method of the VFS
34059	** is called successfully on the file containing the page.
	@@ -34083,11 +34210,11 @@
34083	** both the content in the database when the rollback journal was written
34084	** and the content in the database at the beginning of the current
34085	** transaction.
34086	**
34087	** (3) Writes to the database file are an integer multiple of the page size
34088	** in length and are aligned to a page boundary.
34089	**
34090	** (4) Reads from the database file are either aligned on a page boundary and
34091	** an integer multiple of the page size in length or are taken from the
34092	** first 100 bytes of the database file.
34093	**
	@@ -34114,11 +34241,12 @@
34114	** method is a no-op, but that does not change the fact the SQLite will
34115	** invoke it.)
34116	**
34117	** (9) Whenever the database file is modified, at least one bit in the range
34118	** of bytes from 24 through 39 inclusive will be changed prior to releasing
34119	** the EXCLUSIVE lock.

34120	**
34121	** (10) The pattern of bits in bytes 24 through 39 shall not repeat in less
34122	** than one billion transactions.
34123	**
34124	** (11) A database file is well-formed at the beginning and at the conclusion
	@@ -34127,11 +34255,12 @@
34127	** (12) An EXCLUSIVE lock is held on the database file when writing to
34128	** the database file.
34129	**
34130	** (13) A SHARED lock is held on the database file while reading any
34131	** content out of the database file.
34132	*/

34133
34134	/*
34135	** Macros for troubleshooting. Normally turned off
34136	*/
34137	#if 0
	@@ -34152,62 +34281,283 @@
34152	*/
34153	#define PAGERID(p) ((int)(p->fd))
34154	#define FILEHANDLEID(fd) ((int)fd)
34155
34156	/*
34157	** The page cache as a whole is always in one of the following
34158	** states:
34159	**
34160	** PAGER_UNLOCK The page cache is not currently reading or
34161	** writing the database file. There is no
34162	** data held in memory. This is the initial
34163	** state.
34164	**
34165	** PAGER_SHARED The page cache is reading the database.
34166	** Writing is not permitted. There can be
34167	** multiple readers accessing the same database
34168	** file at the same time.
34169	**
34170	** PAGER_RESERVED This process has reserved the database for writing
34171	** but has not yet made any changes. Only one process
34172	** at a time can reserve the database. The original
34173	** database file has not been modified so other
34174	** processes may still be reading the on-disk
34175	** database file.
34176	**
34177	** PAGER_EXCLUSIVE The page cache is writing the database.
34178	** Access is exclusive. No other processes or
34179	** threads can be reading or writing while one
34180	** process is writing.
34181	**
34182	** PAGER_SYNCED The pager moves to this state from PAGER_EXCLUSIVE
34183	** after all dirty pages have been written to the
34184	** database file and the file has been synced to
34185	** disk. All that remains to do is to remove or
34186	** truncate the journal file and the transaction
34187	** will be committed.
34188	**
34189	** The page cache comes up in PAGER_UNLOCK. The first time a
34190	** sqlite3PagerGet() occurs, the state transitions to PAGER_SHARED.
34191	** After all pages have been released using sqlite_page_unref(),
34192	** the state transitions back to PAGER_UNLOCK. The first time
34193	** that sqlite3PagerWrite() is called, the state transitions to
34194	** PAGER_RESERVED. (Note that sqlite3PagerWrite() can only be
34195	** called on an outstanding page which means that the pager must
34196	** be in PAGER_SHARED before it transitions to PAGER_RESERVED.)
34197	** PAGER_RESERVED means that there is an open rollback journal.
34198	** The transition to PAGER_EXCLUSIVE occurs before any changes
34199	** are made to the database file, though writes to the rollback
34200	** journal occurs with just PAGER_RESERVED. After an sqlite3PagerRollback()
34201	** or sqlite3PagerCommitPhaseTwo(), the state can go back to PAGER_SHARED,
34202	** or it can stay at PAGER_EXCLUSIVE if we are in exclusive access mode.
34203	*/
34204	#define PAGER_UNLOCK 0
34205	#define PAGER_SHARED 1 /* same as SHARED_LOCK */
34206	#define PAGER_RESERVED 2 /* same as RESERVED_LOCK */
34207	#define PAGER_EXCLUSIVE 4 /* same as EXCLUSIVE_LOCK */
34208	#define PAGER_SYNCED 5





























































































































































































































34209
34210	/*
34211	** A macro used for invoking the codec if there is one
34212	*/
34213	#ifdef SQLITE_HAS_CODEC
	@@ -34253,37 +34603,32 @@
34253	u32 aWalData[WAL_SAVEPOINT_NDATA]; /* WAL savepoint context */
34254	#endif
34255	};
34256
34257	/*
34258	** A open page cache is an instance of the following structure.
34259	**
34260	** errCode
34261	**
34262	** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, or
34263	** or SQLITE_FULL. Once one of the first three errors occurs, it persists
34264	** and is returned as the result of every major pager API call. The
34265	** SQLITE_FULL return code is slightly different. It persists only until the
34266	** next successful rollback is performed on the pager cache. Also,
34267	** SQLITE_FULL does not affect the sqlite3PagerGet() and sqlite3PagerLookup()
34268	** APIs, they may still be used successfully.
34269	**
34270	** dbSizeValid, dbSize, dbOrigSize, dbFileSize
34271	**
34272	** Managing the size of the database file in pages is a little complicated.
34273	** The variable Pager.dbSize contains the number of pages that the database
34274	** image currently contains. As the database image grows or shrinks this
34275	** variable is updated. The variable Pager.dbFileSize contains the number
34276	** of pages in the database file. This may be different from Pager.dbSize
34277	** if some pages have been appended to the database image but not yet written
34278	** out from the cache to the actual file on disk. Or if the image has been
34279	** truncated by an incremental-vacuum operation. The Pager.dbOrigSize variable
34280	** contains the number of pages in the database image when the current
34281	** transaction was opened. The contents of all three of these variables is
34282	** only guaranteed to be correct if the boolean Pager.dbSizeValid is true.
34283	**
34284	** TODO: Under what conditions is dbSizeValid set? Cleared?
34285	**
34286	** changeCountDone
34287	**
34288	** This boolean variable is used to make sure that the change-counter
34289	** (the 4-byte header field at byte offset 24 of the database file) is
	@@ -34298,28 +34643,10 @@
34298	**
34299	** This mechanism means that when running in exclusive mode, a connection
34300	** need only update the change-counter once, for the first transaction
34301	** committed.
34302	**
34303	** dbModified
34304	**
34305	** The dbModified flag is set whenever a database page is dirtied.
34306	** It is cleared at the end of each transaction.
34307	**
34308	** It is used when committing or otherwise ending a transaction. If
34309	** the dbModified flag is clear then less work has to be done.
34310	**
34311	** journalStarted
34312	**
34313	** This flag is set during a write-transaction after the first
34314	** journal-header is written and synced to disk.
34315	**
34316	** After this has happened, new pages appended to the database
34317	** do not need the PGHDR_NEED_SYNC flag set, as they do not need
34318	** to wait for a journal sync before they can be written out to
34319	** the database file (see function pager_write()).
34320	**
34321	** setMaster
34322	**
34323	** When PagerCommitPhaseOne() is called to commit a transaction, it may
34324	** (or may not) specify a master-journal name to be written into the
34325	** journal file before it is synced to disk.
	@@ -34326,84 +34653,146 @@
34326	**
34327	** Whether or not a journal file contains a master-journal pointer affects
34328	** the way in which the journal file is finalized after the transaction is
34329	** committed or rolled back when running in "journal_mode=PERSIST" mode.
34330	** If a journal file does not contain a master-journal pointer, it is
34331	** finalized by overwriting the first journal header with zeroes. If,
34332	** on the other hand, it does contain a master-journal pointer, the
34333	** journal file is finalized by truncating it to zero bytes, just as if
34334	** the connection were running in "journal_mode=truncate" mode.
34335	**
34336	** Journal files that contain master journal pointers cannot be finalized
34337	** simply by overwriting the first journal-header with zeroes, as the
34338	** master journal pointer could interfere with hot-journal rollback of any
34339	** subsequently interrupted transaction that reuses the journal file.
34340	**
34341	** The flag is cleared as soon as the journal file is finalized (either
34342	** by PagerCommitPhaseTwo or PagerRollback). If an IO error prevents the
34343	** journal file from being successfully finalized, the setMaster flag
34344	** is cleared anyway.
34345	**
34346	** doNotSpill, doNotSyncSpill
34347	**
34348	** When enabled, cache spills are prohibited. The doNotSpill variable
34349	** inhibits all cache spill and doNotSyncSpill inhibits those spills that
34350	** would require a journal sync. The doNotSyncSpill is set and cleared
34351	** by sqlite3PagerWrite() in order to prevent a journal sync from happening
34352	** in between the journalling of two pages on the same sector. The
34353	** doNotSpill value set to prevent pagerStress() from trying to use
34354	** the journal during a rollback.
34355	**
34356	** needSync
34357	**
34358	** TODO: It might be easier to set this variable in writeJournalHdr()
34359	** and writeMasterJournal() only. Change its meaning to "unsynced data
34360	** has been written to the journal".


34361	**
34362	** subjInMemory
34363	**
34364	** This is a boolean variable. If true, then any required sub-journal
34365	** is opened as an in-memory journal file. If false, then in-memory
34366	** sub-journals are only used for in-memory pager files.
































































34367	*/
34368	struct Pager {
34369	sqlite3_vfs pVfs; / OS functions to use for IO */
34370	u8 exclusiveMode; /* Boolean. True if locking_mode==EXCLUSIVE */
34371	u8 journalMode; /* On of the PAGER_JOURNALMODE_* values */
34372	u8 useJournal; /* Use a rollback journal on this file */
34373	u8 noReadlock; /* Do not bother to obtain readlocks */
34374	u8 noSync; /* Do not sync the journal if true */
34375	u8 fullSync; /* Do extra syncs of the journal for robustness */
34376	u8 sync_flags; /* One of SYNC_NORMAL or SYNC_FULL */
34377	u8 tempFile; /* zFilename is a temporary file */
34378	u8 readOnly; /* True for a read-only database */
34379	u8 memDb; /* True to inhibit all file I/O */
34380
34381	/* The following block contains those class members that are dynamically
34382	** modified during normal operations. The other variables in this structure
34383	** are either constant throughout the lifetime of the pager, or else
34384	** used to store configuration parameters that affect the way the pager
34385	** operates.
34386	**
34387	** The 'state' variable is described in more detail along with the
34388	** descriptions of the values it may take - PAGER_UNLOCK etc. Many of the
34389	** other variables in this block are described in the comment directly
34390	** above this class definition.
34391	*/
34392	u8 state; /* PAGER_UNLOCK, _SHARED, _RESERVED, etc. */
34393	u8 dbModified; /* True if there are any changes to the Db */
34394	u8 needSync; /* True if an fsync() is needed on the journal */
34395	u8 journalStarted; /* True if header of journal is synced */
34396	u8 changeCountDone; /* Set after incrementing the change-counter */
34397	u8 setMaster; /* True if a m-j name has been written to jrnl */
34398	u8 doNotSpill; /* Do not spill the cache when non-zero */
34399	u8 doNotSyncSpill; /* Do not do a spill that requires jrnl sync */
34400	u8 dbSizeValid; /* Set when dbSize is correct */
34401	u8 subjInMemory; /* True to use in-memory sub-journals */
34402	Pgno dbSize; /* Number of pages in the database */
34403	Pgno dbOrigSize; /* dbSize before the current transaction */
34404	Pgno dbFileSize; /* Number of pages in the database file */

34405	int errCode; /* One of several kinds of errors */
34406	int nRec; /* Pages journalled since last j-header written */
34407	u32 cksumInit; /* Quasi-random value added to every checksum */
34408	u32 nSubRec; /* Number of records written to sub-journal */
34409	Bitvec pInJournal; / One bit for each page in the database file */
	@@ -34410,21 +34799,25 @@
34410	sqlite3_file fd; / File descriptor for database */
34411	sqlite3_file jfd; / File descriptor for main journal */
34412	sqlite3_file sjfd; / File descriptor for sub-journal */
34413	i64 journalOff; /* Current write offset in the journal file */
34414	i64 journalHdr; /* Byte offset to previous journal header */
34415	i64 journalSizeLimit; /* Size limit for persistent journal files */
34416	PagerSavepoint aSavepoint; / Array of active savepoints */
34417	int nSavepoint; /* Number of elements in aSavepoint[] */
34418	char dbFileVers[16]; /* Changes whenever database file changes */
34419	u32 sectorSize; /* Assumed sector size during rollback */


34420
34421	u16 nExtra; /* Add this many bytes to each in-memory page */
34422	i16 nReserve; /* Number of unused bytes at end of each page */
34423	u32 vfsFlags; /* Flags for sqlite3_vfs.xOpen() */

34424	int pageSize; /* Number of bytes in a page */
34425	Pgno mxPgno; /* Maximum allowed size of the database */

34426	char zFilename; / Name of the database file */
34427	char zJournal; / Name of the journal file */
34428	int (xBusyHandler)(void); /* Function to call when busy */
34429	void pBusyHandlerArg; / Context argument for xBusyHandler */
34430	#ifdef SQLITE_TEST
	@@ -34438,11 +34831,10 @@
34438	void (xCodecFree)(void); /* Destructor for the codec */
34439	void pCodec; / First argument to xCodec... methods */
34440	#endif
34441	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
34442	PCache pPCache; / Pointer to page cache object */
34443	sqlite3_backup pBackup; / Pointer to list of ongoing backup processes */
34444	#ifndef SQLITE_OMIT_WAL
34445	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
34446	char zWal; / File name for write-ahead log */
34447	#endif
34448	};
	@@ -34517,26 +34909,225 @@
34517	/*
34518	** The maximum legal page number is (2^31 - 1).
34519	*/
34520	#define PAGER_MAX_PGNO 2147483647
34521






























34522	#ifndef NDEBUG
34523	/*
34524	** Usage:
34525	**
34526	** assert( assert_pager_state(pPager) );



34527	*/
34528	static int assert_pager_state(Pager *pPager){

34529
34530	/* A temp-file is always in PAGER_EXCLUSIVE or PAGER_SYNCED state. */
34531	assert( pPager->tempFile==0 \|\| pPager->state>=PAGER_EXCLUSIVE );







34532
34533	/* The changeCountDone flag is always set for temp-files */
34534	assert( pPager->tempFile==0 \|\| pPager->changeCountDone );













































































































34535
34536	return 1;
34537	}

















































34538	#endif
34539
34540	/*
34541	** Return true if it is necessary to write page *pPg into the sub-journal.
34542	** A page needs to be written into the sub-journal if there exists one
	@@ -34584,10 +35175,11 @@
34584
34585	/*
34586	** Write a 32-bit integer into a string buffer in big-endian byte order.
34587	*/
34588	#define put32bits(A,B) sqlite3Put4byte((u8*)A,B)

34589
34590	/*
34591	** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK
34592	** on success or an error code is something goes wrong.
34593	*/
	@@ -34596,31 +35188,57 @@
34596	put32bits(ac, val);
34597	return sqlite3OsWrite(fd, ac, 4, offset);
34598	}
34599
34600	/*
34601	** The argument to this macro is a file descriptor (type sqlite3_file*).
34602	** Return 0 if it is not open, or non-zero (but not 1) if it is.
34603	**
34604	** This is so that expressions can be written as:
34605	**
34606	** if( isOpen(pPager->jfd) ){ ...
34607	**
34608	** instead of
34609	**
34610	** if( pPager->jfd->pMethods ){ ...
34611	*/
34612	#define isOpen(pFd) ((pFd)->pMethods)












34613
34614	/*
34615	** If file pFd is open, call sqlite3OsUnlock() on it.







34616	*/
34617	static int osUnlock(sqlite3_file *pFd, int eLock){
34618	if( !isOpen(pFd) ){
34619	return SQLITE_OK;







34620	}
34621	return sqlite3OsUnlock(pFd, eLock);
34622	}
34623
34624	/*
34625	** This function determines whether or not the atomic-write optimization
34626	** can be used with this pager. The optimization can be used if:
	@@ -34692,17 +35310,18 @@
34692	** that the page is either dirty or still matches the calculated page-hash.
34693	*/
34694	#define CHECK_PAGE(x) checkPage(x)
34695	static void checkPage(PgHdr *pPg){
34696	Pager *pPager = pPg->pPager;
34697	assert( !pPg->pageHash \|\| pPager->errCode
34698	\|\| (pPg->flags&PGHDR_DIRTY) \|\| pPg->pageHash==pager_pagehash(pPg) );
34699	}
34700
34701	#else
34702	#define pager_datahash(X,Y) 0
34703	#define pager_pagehash(X) 0

34704	#define CHECK_PAGE(x)
34705	#endif /* SQLITE_CHECK_PAGES */
34706
34707	/*
34708	** When this is called the journal file for pager pPager must be open.
	@@ -34865,11 +35484,11 @@
34865	** Followed by (JOURNAL_HDR_SZ - 28) bytes of unused space.
34866	*/
34867	static int writeJournalHdr(Pager *pPager){
34868	int rc = SQLITE_OK; /* Return code */
34869	char zHeader = pPager->pTmpSpace; / Temporary space used to build header */
34870	u32 nHeader = pPager->pageSize; /* Size of buffer pointed to by zHeader */
34871	u32 nWrite; /* Bytes of header sector written */
34872	int ii; /* Loop counter */
34873
34874	assert( isOpen(pPager->jfd) ); /* Journal file must be open. */
34875
	@@ -34908,11 +35527,11 @@
34908	**
34909	** * When the SQLITE_IOCAP_SAFE_APPEND flag is set. This guarantees
34910	** that garbage data is never appended to the journal file.
34911	*/
34912	assert( isOpen(pPager->fd) \|\| pPager->noSync );
34913	if( (pPager->noSync) \|\| (pPager->journalMode==PAGER_JOURNALMODE_MEMORY)
34914	\|\| (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
34915	){
34916	memcpy(zHeader, aJournalMagic, sizeof(aJournalMagic));
34917	put32bits(&zHeader[sizeof(aJournalMagic)], 0xffffffff);
34918	}else{
	@@ -35032,18 +35651,25 @@
35032	}
35033
35034	if( pPager->journalOff==0 ){
35035	u32 iPageSize; /* Page-size field of journal header */
35036	u32 iSectorSize; /* Sector-size field of journal header */
35037	u16 iPageSize16; /* Copy of iPageSize in 16-bit variable */
35038
35039	/* Read the page-size and sector-size journal header fields. */
35040	if( SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+20, &iSectorSize))
35041	\|\| SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+24, &iPageSize))
35042	){
35043	return rc;
35044	}








35045
35046	/* Check that the values read from the page-size and sector-size fields
35047	** are within range. To be 'in range', both values need to be a power
35048	** of two greater than or equal to 512 or 32, and not greater than their
35049	** respective compile time maximum limits.
	@@ -35062,14 +35688,12 @@
35062
35063	/* Update the page-size to match the value read from the journal.
35064	** Use a testcase() macro to make sure that malloc failure within
35065	** PagerSetPagesize() is tested.
35066	*/
35067	iPageSize16 = (u16)iPageSize;
35068	rc = sqlite3PagerSetPagesize(pPager, &iPageSize16, -1);
35069	testcase( rc!=SQLITE_OK );
35070	assert( rc!=SQLITE_OK \|\| iPageSize16==(u16)iPageSize );
35071
35072	/* Update the assumed sector-size to match the value used by
35073	** the process that created this journal. If this journal was
35074	** created by a process other than this one, then this routine
35075	** is being called from within pager_playback(). The local value
	@@ -35108,10 +35732,12 @@
35108	i64 iHdrOff; /* Offset of header in journal file */
35109	i64 jrnlSize; /* Size of journal file on disk */
35110	u32 cksum = 0; /* Checksum of string zMaster */
35111
35112	assert( pPager->setMaster==0 );


35113	if( !zMaster
35114	\|\| pPager->journalMode==PAGER_JOURNALMODE_MEMORY
35115	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
35116	){
35117	return SQLITE_OK;
	@@ -35144,11 +35770,10 @@
35144	\|\| (0 != (rc = sqlite3OsWrite(pPager->jfd, aJournalMagic, 8, iHdrOff+4+nMaster+8)))
35145	){
35146	return rc;
35147	}
35148	pPager->journalOff += (nMaster+20);
35149	pPager->needSync = !pPager->noSync;
35150
35151	/* If the pager is in peristent-journal mode, then the physical
35152	** journal-file may extend past the end of the master-journal name
35153	** and 8 bytes of magic data just written to the file. This is
35154	** dangerous because the code to rollback a hot-journal file
	@@ -35180,21 +35805,15 @@
35180	(void)sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &p);
35181	return p;
35182	}
35183
35184	/*
35185	** Unless the pager is in error-state, discard all in-memory pages. If
35186	** the pager is in error-state, then this call is a no-op.
35187	**
35188	** TODO: Why can we not reset the pager while in error state?
35189	*/
35190	static void pager_reset(Pager *pPager){
35191	if( SQLITE_OK==pPager->errCode ){
35192	sqlite3BackupRestart(pPager->pBackup);
35193	sqlite3PcacheClear(pPager->pPCache);
35194	pPager->dbSizeValid = 0;
35195	}
35196	}
35197
35198	/*
35199	** Free all structures in the Pager.aSavepoint[] array and set both
35200	** Pager.aSavepoint and Pager.nSavepoint to zero. Close the sub-journal
	@@ -35233,38 +35852,43 @@
35233	}
35234	return rc;
35235	}
35236
35237	/*
35238	** Return true if this pager uses a write-ahead log instead of the usual
35239	** rollback journal. Otherwise false.
35240	*/
35241	#ifndef SQLITE_OMIT_WAL
35242	static int pagerUseWal(Pager *pPager){
35243	return (pPager->pWal!=0);
35244	}
35245	#else
35246	# define pagerUseWal(x) 0
35247	# define pagerRollbackWal(x) 0
35248	# define pagerWalFrames(v,w,x,y,z) 0
35249	# define pagerOpenWalIfPresent(z) SQLITE_OK
35250	# define pagerBeginReadTransaction(z) SQLITE_OK
35251	#endif
35252
35253	/*
35254	** Unlock the database file. This function is a no-op if the pager
35255	** is in exclusive mode.
35256	**
35257	** If the pager is currently in error state, discard the contents of
35258	** the cache and reset the Pager structure internal state. If there is
35259	** an open journal-file, then the next time a shared-lock is obtained
35260	** on the pager file (by this or any other process), it will be
35261	** treated as a hot-journal and rolled back.






35262	*/
35263	static void pager_unlock(Pager *pPager){
35264	if( !pPager->exclusiveMode ){
35265	int rc = SQLITE_OK; /* Return code */














35266	int iDc = isOpen(pPager->fd)?sqlite3OsDeviceCharacteristics(pPager->fd):0;
35267
35268	/* If the operating system support deletion of open files, then
35269	** close the journal file when dropping the database lock. Otherwise
35270	** another connection with journal_mode=delete might delete the file
	@@ -35280,62 +35904,60 @@
35280	\|\| 1!=(pPager->journalMode & 5)
35281	){
35282	sqlite3OsClose(pPager->jfd);
35283	}
35284
35285	sqlite3BitvecDestroy(pPager->pInJournal);
35286	pPager->pInJournal = 0;
35287	releaseAllSavepoints(pPager);
35288
35289	/* If the file is unlocked, somebody else might change it. The
35290	** values stored in Pager.dbSize etc. might become invalid if
35291	** this happens. One can argue that this doesn't need to be cleared
35292	** until the change-counter check fails in PagerSharedLock().
35293	** Clearing the page size cache here is being conservative.
35294	*/
35295	pPager->dbSizeValid = 0;
35296
35297	if( pagerUseWal(pPager) ){
35298	sqlite3WalEndReadTransaction(pPager->pWal);
35299	}else{
35300	rc = osUnlock(pPager->fd, NO_LOCK);
35301	}
35302	if( rc ){
35303	pPager->errCode = rc;
35304	}
35305	IOTRACE(("UNLOCK %p\n", pPager))
35306
35307	/* If Pager.errCode is set, the contents of the pager cache cannot be
35308	** trusted. Now that the pager file is unlocked, the contents of the
35309	** cache can be discarded and the error code safely cleared.
35310	*/
35311	if( pPager->errCode ){
35312	if( rc==SQLITE_OK ){
35313	pPager->errCode = SQLITE_OK;
35314	}
35315	pager_reset(pPager);
35316	}
35317
35318	pPager->changeCountDone = 0;
35319	pPager->state = PAGER_UNLOCK;
35320	pPager->dbModified = 0;
35321	}

















35322	}
35323
35324	/*
35325	** This function should be called when an IOERR, CORRUPT or FULL error
35326	** may have occurred. The first argument is a pointer to the pager
35327	** structure, the second the error-code about to be returned by a pager
35328	** API function. The value returned is a copy of the second argument
35329	** to this function.
35330	**
35331	** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT, or SQLITE_FULL
35332	** the error becomes persistent. Until the persistent error is cleared,
35333	** subsequent API calls on this Pager will immediately return the same
35334	** error code.
35335	**
35336	** A persistent error indicates that the contents of the pager-cache
35337	** cannot be trusted. This state can be cleared by completely discarding
35338	** the contents of the pager-cache. If a transaction was active when
35339	** the persistent error occurred, then the rollback journal may need
35340	** to be replayed to restore the contents of the database file (as if
35341	** it were a hot-journal).
	@@ -35348,49 +35970,25 @@
35348	pPager->errCode==SQLITE_OK \|\|
35349	(pPager->errCode & 0xff)==SQLITE_IOERR
35350	);
35351	if( rc2==SQLITE_FULL \|\| rc2==SQLITE_IOERR ){
35352	pPager->errCode = rc;

35353	}
35354	return rc;
35355	}
35356
35357	/*
35358	** Execute a rollback if a transaction is active and unlock the
35359	** database file.
35360	**
35361	** If the pager has already entered the error state, do not attempt
35362	** the rollback at this time. Instead, pager_unlock() is called. The
35363	** call to pager_unlock() will discard all in-memory pages, unlock
35364	** the database file and clear the error state. If this means that
35365	** there is a hot-journal left in the file-system, the next connection
35366	** to obtain a shared lock on the pager (which may be this one) will
35367	** roll it back.
35368	**
35369	** If the pager has not already entered the error state, but an IO or
35370	** malloc error occurs during a rollback, then this will itself cause
35371	** the pager to enter the error state. Which will be cleared by the
35372	** call to pager_unlock(), as described above.
35373	*/
35374	static void pagerUnlockAndRollback(Pager *pPager){
35375	if( pPager->errCode==SQLITE_OK && pPager->state>=PAGER_RESERVED ){
35376	sqlite3BeginBenignMalloc();
35377	sqlite3PagerRollback(pPager);
35378	sqlite3EndBenignMalloc();
35379	}
35380	pager_unlock(pPager);
35381	}
35382
35383	/*
35384	** This routine ends a transaction. A transaction is usually ended by
35385	** either a COMMIT or a ROLLBACK operation. This routine may be called
35386	** after rollback of a hot-journal, or if an error occurs while opening
35387	** the journal file or writing the very first journal-header of a
35388	** database transaction.
35389	**
35390	** If the pager is in PAGER_SHARED or PAGER_UNLOCK state when this
35391	** routine is called, it is a no-op (returns SQLITE_OK).

35392	**
35393	** Otherwise, any active savepoints are released.
35394	**
35395	** If the journal file is open, then it is "finalized". Once a journal
35396	** file has been finalized it is not possible to use it to roll back a
	@@ -35417,17 +36015,13 @@
35417	** If the pager is running in exclusive mode, this method of finalizing
35418	** the journal file is never used. Instead, if the journalMode is
35419	** DELETE and the pager is in exclusive mode, the method described under
35420	** journalMode==PERSIST is used instead.
35421	**
35422	** After the journal is finalized, if running in non-exclusive mode, the
35423	** pager moves to PAGER_SHARED state (and downgrades the lock on the
35424	** database file accordingly).
35425	**
35426	** If the pager is running in exclusive mode and is in PAGER_SYNCED state,
35427	** it moves to PAGER_EXCLUSIVE. No locks are downgraded when running in
35428	** exclusive mode.
35429	**
35430	** SQLITE_OK is returned if no error occurs. If an error occurs during
35431	** any of the IO operations to finalize the journal file or unlock the
35432	** database then the IO error code is returned to the user. If the
35433	** operation to finalize the journal file fails, then the code still
	@@ -35438,15 +36032,30 @@
35438	*/
35439	static int pager_end_transaction(Pager *pPager, int hasMaster){
35440	int rc = SQLITE_OK; /* Error code from journal finalization operation */
35441	int rc2 = SQLITE_OK; /* Error code from db file unlock operation */
35442
35443	if( pPager->state<PAGER_RESERVED ){















35444	return SQLITE_OK;
35445	}

35446	releaseAllSavepoints(pPager);
35447
35448	assert( isOpen(pPager->jfd) \|\| pPager->pInJournal==0 );
35449	if( isOpen(pPager->jfd) ){
35450	assert( !pagerUseWal(pPager) );
35451
35452	/* Finalize the journal file. */
	@@ -35458,18 +36067,15 @@
35458	rc = SQLITE_OK;
35459	}else{
35460	rc = sqlite3OsTruncate(pPager->jfd, 0);
35461	}
35462	pPager->journalOff = 0;
35463	pPager->journalStarted = 0;
35464	}else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST
35465	\|\| (pPager->exclusiveMode && pPager->journalMode!=PAGER_JOURNALMODE_WAL)
35466	){
35467	rc = zeroJournalHdr(pPager, hasMaster);
35468	pager_error(pPager, rc);
35469	pPager->journalOff = 0;
35470	pPager->journalStarted = 0;
35471	}else{
35472	/* This branch may be executed with Pager.journalMode==MEMORY if
35473	** a hot-journal was just rolled back. In this case the journal
35474	** file should be closed and deleted. If this connection writes to
35475	** the database file, it will do so using an in-memory journal.
	@@ -35481,52 +36087,80 @@
35481	sqlite3OsClose(pPager->jfd);
35482	if( !pPager->tempFile ){
35483	rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
35484	}
35485	}

35486
35487	#ifdef SQLITE_CHECK_PAGES
35488	sqlite3PcacheIterateDirty(pPager->pPCache, pager_set_pagehash);







35489	#endif
35490	}
35491	sqlite3BitvecDestroy(pPager->pInJournal);
35492	pPager->pInJournal = 0;
35493	pPager->nRec = 0;
35494	sqlite3PcacheCleanAll(pPager->pPCache);

35495
35496	if( pagerUseWal(pPager) ){




35497	rc2 = sqlite3WalEndWriteTransaction(pPager->pWal);
35498	assert( rc2==SQLITE_OK );
35499	pPager->state = PAGER_SHARED;
35500
35501	/* If the connection was in locking_mode=exclusive mode but is no longer,
35502	** drop the EXCLUSIVE lock held on the database file.
35503	*/
35504	if( !pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, 0) ){
35505	rc2 = osUnlock(pPager->fd, SHARED_LOCK);
35506	}
35507	}else if( !pPager->exclusiveMode ){
35508	rc2 = osUnlock(pPager->fd, SHARED_LOCK);
35509	pPager->state = PAGER_SHARED;
35510	pPager->changeCountDone = 0;
35511	}else if( pPager->state==PAGER_SYNCED ){
35512	pPager->state = PAGER_EXCLUSIVE;
35513	}
35514	pPager->setMaster = 0;
35515	pPager->needSync = 0;
35516	pPager->dbModified = 0;
35517
35518	/* TODO: Is this optimal? Why is the db size invalidated here
35519	** when the database file is not unlocked? */
35520	pPager->dbOrigSize = 0;
35521	sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
35522	if( !MEMDB ){
35523	pPager->dbSizeValid = 0;
35524	}
35525
35526	return (rc==SQLITE_OK?rc2:rc);
35527	}
































35528
35529	/*
35530	** Parameter aData must point to a buffer of pPager->pageSize bytes
35531	** of data. Compute and return a checksum based ont the contents of the
35532	** page of data and the current value of pPager->cksumInit.
	@@ -35574,13 +36208,12 @@
35574	** Read a single page from either the journal file (if isMainJrnl==1) or
35575	** from the sub-journal (if isMainJrnl==0) and playback that page.
35576	** The page begins at offset pOffset into the file. The pOffset
35577	** value is increased to the start of the next page in the journal.
35578	**
35579	** The isMainJrnl flag is true if this is the main rollback journal and
35580	** false for the statement journal. The main rollback journal uses
35581	** checksums - the statement journal does not.
35582	**
35583	** If the page number of the page record read from the (sub-)journal file
35584	** is greater than the current value of Pager.dbSize, then playback is
35585	** skipped and SQLITE_OK is returned.
35586	**
	@@ -35629,10 +36262,21 @@
35629	assert( isSavepnt \|\| pDone==0 ); /* pDone never used on non-savepoint */
35630
35631	aData = pPager->pTmpSpace;
35632	assert( aData ); /* Temp storage must have already been allocated */
35633	assert( pagerUseWal(pPager)==0 \|\| (!isMainJrnl && isSavepnt) );











35634
35635	/* Read the page number and page data from the journal or sub-journal
35636	** file. Return an error code to the caller if an IO error occurs.
35637	*/
35638	jfd = isMainJrnl ? pPager->jfd : pPager->sjfd;
	@@ -35666,20 +36310,19 @@
35666	** rollback, then don't bother to play it back again.
35667	*/
35668	if( pDone && (rc = sqlite3BitvecSet(pDone, pgno))!=SQLITE_OK ){
35669	return rc;
35670	}
35671	assert( pPager->state==PAGER_RESERVED \|\| pPager->state>=PAGER_EXCLUSIVE );
35672
35673	/* When playing back page 1, restore the nReserve setting
35674	*/
35675	if( pgno==1 && pPager->nReserve!=((u8*)aData)[20] ){
35676	pPager->nReserve = ((u8*)aData)[20];
35677	pagerReportSize(pPager);
35678	}
35679
35680	/* If the pager is in RESERVED state, then there must be a copy of this
35681	** page in the pager cache. In this case just update the pager cache,
35682	** not the database file. The page is left marked dirty in this case.
35683	**
35684	** An exception to the above rule: If the database is in no-sync mode
35685	** and a page is moved during an incremental vacuum then the page may
	@@ -35686,12 +36329,15 @@
35686	** not be in the pager cache. Later: if a malloc() or IO error occurs
35687	** during a Movepage() call, then the page may not be in the cache
35688	** either. So the condition described in the above paragraph is not
35689	** assert()able.
35690	**
35691	** If in EXCLUSIVE state, then we update the pager cache if it exists
35692	** and the main file. The page is then marked not dirty.



35693	**
35694	** Ticket #1171: The statement journal might contain page content that is
35695	** different from the page content at the start of the transaction.
35696	** This occurs when a page is changed prior to the start of a statement
35697	** then changed again within the statement. When rolling back such a
	@@ -35713,21 +36359,22 @@
35713	pPg = 0;
35714	}else{
35715	pPg = pager_lookup(pPager, pgno);
35716	}
35717	assert( pPg \|\| !MEMDB );

35718	PAGERTRACE(("PLAYBACK %d page %d hash(%08x) %s\n",
35719	PAGERID(pPager), pgno, pager_datahash(pPager->pageSize, (u8*)aData),
35720	(isMainJrnl?"main-journal":"sub-journal")
35721	));
35722	if( isMainJrnl ){
35723	isSynced = pPager->noSync \|\| (*pOffset <= pPager->journalHdr);
35724	}else{
35725	isSynced = (pPg==0 \|\| 0==(pPg->flags & PGHDR_NEED_SYNC));
35726	}
35727	if( (pPager->state>=PAGER_EXCLUSIVE)
35728	&& isOpen(pPager->fd)
35729	&& isSynced
35730	){
35731	i64 ofst = (pgno-1)*(i64)pPager->pageSize;
35732	testcase( !isSavepnt && pPg!=0 && (pPg->flags&PGHDR_NEED_SYNC)!=0 );
35733	assert( !pagerUseWal(pPager) );
	@@ -35799,13 +36446,12 @@
35799	** database corruption may ensue.
35800	*/
35801	assert( !pagerUseWal(pPager) );
35802	sqlite3PcacheMakeClean(pPg);
35803	}
35804	#ifdef SQLITE_CHECK_PAGES
35805	pPg->pageHash = pager_pagehash(pPg);
35806	#endif
35807	/* If this was page 1, then restore the value of Pager.dbFileVers.
35808	** Do this before any decoding. */
35809	if( pgno==1 ){
35810	memcpy(&pPager->dbFileVers, &((u8*)pData)[24],sizeof(pPager->dbFileVers));
35811	}
	@@ -35953,14 +36599,14 @@
35953	/*
35954	** This function is used to change the actual size of the database
35955	** file in the file-system. This only happens when committing a transaction,
35956	** or rolling back a transaction (including rolling back a hot-journal).
35957	**
35958	** If the main database file is not open, or an exclusive lock is not
35959	** held, this function is a no-op. Otherwise, the size of the file is
35960	** changed to nPage pages (nPage*pPager->pageSize bytes). If the file
35961	** on disk is currently larger than nPage pages, then use the VFS
35962	** xTruncate() method to truncate it.
35963	**
35964	** Or, it might might be the case that the file on disk is smaller than
35965	** nPage pages. Some operating system implementations can get confused if
35966	** you try to truncate a file to some size that is larger than it
	@@ -35970,12 +36616,18 @@
35970	** If successful, return SQLITE_OK. If an IO error occurs while modifying
35971	** the database file, return the error code to the caller.
35972	*/
35973	static int pager_truncate(Pager *pPager, Pgno nPage){
35974	int rc = SQLITE_OK;
35975	if( pPager->state>=PAGER_EXCLUSIVE && isOpen(pPager->fd) ){





35976	i64 currentSize, newSize;

35977	/* TODO: Is it safe to use Pager.dbFileSize here? */
35978	rc = sqlite3OsFileSize(pPager->fd, &currentSize);
35979	newSize = pPager->pageSize*(i64)nPage;
35980	if( rc==SQLITE_OK && currentSize!=newSize ){
35981	if( currentSize>newSize ){
	@@ -36095,11 +36747,11 @@
36095	/* Figure out how many records are in the journal. Abort early if
36096	** the journal is empty.
36097	*/
36098	assert( isOpen(pPager->jfd) );
36099	rc = sqlite3OsFileSize(pPager->jfd, &szJ);
36100	if( rc!=SQLITE_OK \|\| szJ==0 ){
36101	goto end_playback;
36102	}
36103
36104	/* Read the master journal name from the journal, if it is present.
36105	** If a master journal file name is specified, but the file is not
	@@ -36129,11 +36781,11 @@
36129	** occurs.
36130	*/
36131	while( 1 ){
36132	/* Read the next journal header from the journal file. If there are
36133	** not enough bytes left in the journal file for a complete header, or
36134	** it is corrupted, then a process must of failed while writing it.
36135	** This indicates nothing more needs to be rolled back.
36136	*/
36137	rc = readJournalHdr(pPager, isHot, szJ, &nRec, &mxPg);
36138	if( rc!=SQLITE_OK ){
36139	if( rc==SQLITE_DONE ){
	@@ -36243,14 +36895,13 @@
36243	if( rc==SQLITE_OK ){
36244	zMaster = pPager->pTmpSpace;
36245	rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);
36246	testcase( rc!=SQLITE_OK );
36247	}
36248	if( rc==SQLITE_OK && pPager->noSync==0 && pPager->state>=PAGER_EXCLUSIVE ){
36249	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
36250	}
36251	if( rc==SQLITE_OK && pPager->noSync==0 && pPager->state>=PAGER_EXCLUSIVE ){
36252	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
36253	}
36254	if( rc==SQLITE_OK ){
36255	rc = pager_end_transaction(pPager, zMaster[0]!='\0');
36256	testcase( rc!=SQLITE_OK );
	@@ -36288,11 +36939,11 @@
36288	Pgno pgno = pPg->pgno; /* Page number to read */
36289	int rc = SQLITE_OK; /* Return code */
36290	int isInWal = 0; /* True if page is in log file */
36291	int pgsz = pPager->pageSize; /* Number of bytes to read */
36292
36293	assert( pPager->state>=PAGER_SHARED && !MEMDB );
36294	assert( isOpen(pPager->fd) );
36295
36296	if( NEVER(!isOpen(pPager->fd)) ){
36297	assert( pPager->tempFile );
36298	memset(pPg->pData, 0, pPager->pageSize);
	@@ -36435,10 +37086,18 @@
36435	PgHdr *p;
36436	for(p=pList; p; p=p->pDirty){
36437	sqlite3BackupUpdate(pPager->pBackup, p->pgno, (u8 *)p->pData);
36438	}
36439	}








36440	return rc;
36441	}
36442
36443	/*
36444	** Begin a read transaction on the WAL.
	@@ -36451,31 +37110,82 @@
36451	static int pagerBeginReadTransaction(Pager *pPager){
36452	int rc; /* Return code */
36453	int changed = 0; /* True if cache must be reset */
36454
36455	assert( pagerUseWal(pPager) );

36456
36457	/* sqlite3WalEndReadTransaction() was not called for the previous
36458	** transaction in locking_mode=EXCLUSIVE. So call it now. If we
36459	** are in locking_mode=NORMAL and EndRead() was previously called,
36460	** the duplicate call is harmless.
36461	*/
36462	sqlite3WalEndReadTransaction(pPager->pWal);
36463
36464	rc = sqlite3WalBeginReadTransaction(pPager->pWal, &changed);
36465	if( rc==SQLITE_OK ){
36466	int dummy;
36467	if( changed ){
36468	pager_reset(pPager);
36469	assert( pPager->errCode \|\| pPager->dbSizeValid==0 );
36470	}
36471	rc = sqlite3PagerPagecount(pPager, &dummy);
36472	}
36473	pPager->state = PAGER_SHARED;
36474
36475	return rc;
36476	}
























































36477
36478	/*
36479	** Check if the *-wal file that corresponds to the database opened by pPager
36480	** exists if the database is not empy, or verify that the *-wal file does
36481	** not exist (by deleting it) if the database file is empty.
	@@ -36485,25 +37195,26 @@
36485	** if no error occurs, make sure Pager.journalMode is not set to
36486	** PAGER_JOURNALMODE_WAL.
36487	**
36488	** Return SQLITE_OK or an error code.
36489	**
36490	** If the WAL file is opened, also open a snapshot (read transaction).
36491	**
36492	** The caller must hold a SHARED lock on the database file to call this
36493	** function. Because an EXCLUSIVE lock on the db file is required to delete
36494	** a WAL on a none-empty database, this ensures there is no race condition
36495	** between the xAccess() below and an xDelete() being executed by some
36496	** other connection.
36497	*/
36498	static int pagerOpenWalIfPresent(Pager *pPager){
36499	int rc = SQLITE_OK;



36500	if( !pPager->tempFile ){
36501	int isWal; /* True if WAL file exists */
36502	int nPage; /* Size of the database file */
36503	assert( pPager->state>=SHARED_LOCK );
36504	rc = sqlite3PagerPagecount(pPager, &nPage);
36505	if( rc ) return rc;
36506	if( nPage==0 ){
36507	rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
36508	isWal = 0;
36509	}else{
	@@ -36511,15 +37222,12 @@
36511	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &isWal
36512	);
36513	}
36514	if( rc==SQLITE_OK ){
36515	if( isWal ){
36516	pager_reset(pPager);
36517	rc = sqlite3PagerOpenWal(pPager, 0);
36518	if( rc==SQLITE_OK ){
36519	rc = pagerBeginReadTransaction(pPager);
36520	}
36521	}else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
36522	pPager->journalMode = PAGER_JOURNALMODE_DELETE;
36523	}
36524	}
36525	}
	@@ -36567,11 +37275,12 @@
36567	i64 szJ; /* Effective size of the main journal */
36568	i64 iHdrOff; /* End of first segment of main-journal records */
36569	int rc = SQLITE_OK; /* Return code */
36570	Bitvec pDone = 0; / Bitvec to ensure pages played back only once */
36571
36572	assert( pPager->state>=PAGER_SHARED );

36573
36574	/* Allocate a bitvec to use to store the set of pages rolled back */
36575	if( pSavepoint ){
36576	pDone = sqlite3BitvecCreate(pSavepoint->nOrig);
36577	if( !pDone ){
	@@ -36706,11 +37415,10 @@
36706	#ifndef SQLITE_OMIT_PAGER_PRAGMAS
36707	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int bFullFsync){
36708	pPager->noSync = (level==1 \|\| pPager->tempFile) ?1:0;
36709	pPager->fullSync = (level==3 && !pPager->tempFile) ?1:0;
36710	pPager->sync_flags = (bFullFsync?SQLITE_SYNC_FULL:SQLITE_SYNC_NORMAL);
36711	if( pPager->noSync ) pPager->needSync = 0;
36712	}
36713	#endif
36714
36715	/*
36716	** The following global variable is incremented whenever the library
	@@ -36788,11 +37496,11 @@
36788	** Change the page size used by the Pager object. The new page size
36789	** is passed in *pPageSize.
36790	**
36791	** If the pager is in the error state when this function is called, it
36792	** is a no-op. The value returned is the error state error code (i.e.
36793	** one of SQLITE_IOERR, SQLITE_CORRUPT or SQLITE_FULL).
36794	**
36795	** Otherwise, if all of the following are true:
36796	**
36797	** * the new page size (value of *pPageSize) is valid (a power
36798	** of two between 512 and SQLITE_MAX_PAGE_SIZE, inclusive), and
	@@ -36812,32 +37520,52 @@
36812	** If the page size is not changed, either because one of the enumerated
36813	** conditions above is not true, the pager was in error state when this
36814	** function was called, or because the memory allocation attempt failed,
36815	** then *pPageSize is set to the old, retained page size before returning.
36816	*/
36817	SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager pPager, u16 pPageSize, int nReserve){
36818	int rc = pPager->errCode;
36819
36820	if( rc==SQLITE_OK ){
36821	u16 pageSize = *pPageSize;
36822	assert( pageSize==0 \|\| (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
36823	if( (pPager->memDb==0 \|\| pPager->dbSize==0)
36824	&& sqlite3PcacheRefCount(pPager->pPCache)==0
36825	&& pageSize && pageSize!=pPager->pageSize
36826	){
36827	char pNew = (char )sqlite3PageMalloc(pageSize);
36828	if( !pNew ){
36829	rc = SQLITE_NOMEM;
36830	}else{
36831	pager_reset(pPager);
36832	pPager->pageSize = pageSize;
36833	sqlite3PageFree(pPager->pTmpSpace);
36834	pPager->pTmpSpace = pNew;
36835	sqlite3PcacheSetPageSize(pPager->pPCache, pageSize);
36836	}
36837	}
36838	*pPageSize = (u16)pPager->pageSize;




















36839	if( nReserve<0 ) nReserve = pPager->nReserve;
36840	assert( nReserve>=0 && nReserve<1000 );
36841	pPager->nReserve = (i16)nReserve;
36842	pagerReportSize(pPager);
36843	}
	@@ -36862,17 +37590,15 @@
36862	** maximum page count below the current size of the database.
36863	**
36864	** Regardless of mxPage, return the current maximum page count.
36865	*/
36866	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){
36867	int nPage;
36868	if( mxPage>0 ){
36869	pPager->mxPgno = mxPage;
36870	}
36871	if( pPager->state!=PAGER_UNLOCK ){
36872	sqlite3PagerPagecount(pPager, &nPage);
36873	assert( (int)pPager->mxPgno>=nPage );
36874	}
36875	return pPager->mxPgno;
36876	}
36877
36878	/*
	@@ -36933,70 +37659,20 @@
36933	}
36934	return rc;
36935	}
36936
36937	/*
36938	** Return the total number of pages in the database file associated
36939	** with pPager. Normally, this is calculated as (<db file size>/<page-size>).

36940	** However, if the file is between 1 and <page-size> bytes in size, then
36941	** this is considered a 1 page file.
36942	**
36943	** If the pager is in error state when this function is called, then the
36944	** error state error code is returned and *pnPage left unchanged. Or,
36945	** if the file system has to be queried for the size of the file and
36946	** the query attempt returns an IO error, the IO error code is returned
36947	** and *pnPage is left unchanged.
36948	**
36949	** Otherwise, if everything is successful, then SQLITE_OK is returned
36950	** and *pnPage is set to the number of pages in the database.
36951	*/
36952	SQLITE_PRIVATE int sqlite3PagerPagecount(Pager pPager, int pnPage){
36953	Pgno nPage = 0; /* Value to return via pnPage /
36954
36955	/* Determine the number of pages in the file. Store this in nPage. */
36956	if( pPager->dbSizeValid ){
36957	nPage = pPager->dbSize;
36958	}else{
36959	int rc; /* Error returned by OsFileSize() */
36960	i64 n = 0; /* File size in bytes returned by OsFileSize() */
36961
36962	if( pagerUseWal(pPager) && pPager->state!=PAGER_UNLOCK ){
36963	sqlite3WalDbsize(pPager->pWal, &nPage);
36964	}
36965
36966	if( nPage==0 ){
36967	assert( isOpen(pPager->fd) \|\| pPager->tempFile );
36968	if( isOpen(pPager->fd) ){
36969	if( SQLITE_OK!=(rc = sqlite3OsFileSize(pPager->fd, &n)) ){
36970	pager_error(pPager, rc);
36971	return rc;
36972	}
36973	}
36974	if( n>0 && n<pPager->pageSize ){
36975	nPage = 1;
36976	}else{
36977	nPage = (Pgno)(n / pPager->pageSize);
36978	}
36979	}
36980	if( pPager->state!=PAGER_UNLOCK ){
36981	pPager->dbSize = nPage;
36982	pPager->dbFileSize = nPage;
36983	pPager->dbSizeValid = 1;
36984	}
36985	}
36986
36987	/* If the current number of pages in the file is greater than the
36988	** configured maximum pager number, increase the allowed limit so
36989	** that the file can be read.
36990	*/
36991	if( nPage>pPager->mxPgno ){
36992	pPager->mxPgno = (Pgno)nPage;
36993	}
36994
36995	/* Set the output variable and return SQLITE_OK */
36996	*pnPage = nPage;
36997	return SQLITE_OK;
36998	}
36999
37000
37001	/*
37002	** Try to obtain a lock of type locktype on the database file. If
	@@ -37013,42 +37689,23 @@
37013	** variable to locktype before returning.
37014	*/
37015	static int pager_wait_on_lock(Pager *pPager, int locktype){
37016	int rc; /* Return code */
37017
37018	/* The OS lock values must be the same as the Pager lock values */
37019	assert( PAGER_SHARED==SHARED_LOCK );
37020	assert( PAGER_RESERVED==RESERVED_LOCK );
37021	assert( PAGER_EXCLUSIVE==EXCLUSIVE_LOCK );
37022
37023	/* If the file is currently unlocked then the size must be unknown. It
37024	** must not have been modified at this point.
37025	*/
37026	assert( pPager->state>=PAGER_SHARED \|\| pPager->dbSizeValid==0 );
37027	assert( pPager->state>=PAGER_SHARED \|\| pPager->dbModified==0 );
37028
37029	/* Check that this is either a no-op (because the requested lock is
37030	** already held, or one of the transistions that the busy-handler
37031	** may be invoked during, according to the comment above
37032	** sqlite3PagerSetBusyhandler().
37033	*/
37034	assert( (pPager->state>=locktype)
37035	\|\| (pPager->state==PAGER_UNLOCK && locktype==PAGER_SHARED)
37036	\|\| (pPager->state==PAGER_RESERVED && locktype==PAGER_EXCLUSIVE)
37037	);
37038
37039	if( pPager->state>=locktype ){
37040	rc = SQLITE_OK;
37041	}else{
37042	do {
37043	rc = sqlite3OsLock(pPager->fd, locktype);
37044	}while( rc==SQLITE_BUSY && pPager->xBusyHandler(pPager->pBusyHandlerArg) );
37045	if( rc==SQLITE_OK ){
37046	pPager->state = (u8)locktype;
37047	IOTRACE(("LOCK %p %d\n", pPager, locktype))
37048	}
37049	}
37050	return rc;
37051	}
37052
37053	/*
37054	** Function assertTruncateConstraint(pPager) checks that one of the
	@@ -37089,13 +37746,12 @@
37089	** function does not actually modify the database file on disk. It
37090	** just sets the internal state of the pager object so that the
37091	** truncation will be done when the current transaction is committed.
37092	*/
37093	SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager *pPager, Pgno nPage){
37094	assert( pPager->dbSizeValid );
37095	assert( pPager->dbSize>=nPage );
37096	assert( pPager->state>=PAGER_RESERVED );
37097	pPager->dbSize = nPage;
37098	assertTruncateConstraint(pPager);
37099	}
37100
37101
	@@ -37141,11 +37797,11 @@
37141	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){
37142	u8 pTmp = (u8 )pPager->pTmpSpace;
37143
37144	disable_simulated_io_errors();
37145	sqlite3BeginBenignMalloc();
37146	pPager->errCode = 0;
37147	pPager->exclusiveMode = 0;
37148	#ifndef SQLITE_OMIT_WAL
37149	sqlite3WalClose(pPager->pWal,
37150	(pPager->noSync ? 0 : pPager->sync_flags),
37151	pPager->pageSize, pTmp
	@@ -37154,18 +37810,23 @@
37154	#endif
37155	pager_reset(pPager);
37156	if( MEMDB ){
37157	pager_unlock(pPager);
37158	}else{
37159	/* Set Pager.journalHdr to -1 for the benefit of the pager_playback()
37160	** call which may be made from within pagerUnlockAndRollback(). If it
37161	** is not -1, then the unsynced portion of an open journal file may
37162	** be played back into the database. If a power failure occurs while
37163	** this is happening, the database may become corrupt.





37164	*/
37165	if( isOpen(pPager->jfd) ){
37166	pPager->errCode = pagerSyncHotJournal(pPager);
37167	}
37168	pagerUnlockAndRollback(pPager);
37169	}
37170	sqlite3EndBenignMalloc();
37171	enable_simulated_io_errors();
	@@ -37206,13 +37867,13 @@
37206	/*
37207	** Sync the journal. In other words, make sure all the pages that have
37208	** been written to the journal have actually reached the surface of the
37209	** disk and can be restored in the event of a hot-journal rollback.
37210	**
37211	** If the Pager.needSync flag is not set, then this function is a
37212	** no-op. Otherwise, the actions required depend on the journal-mode
37213	** and the device characteristics of the the file-system, as follows:
37214	**
37215	** * If the journal file is an in-memory journal file, no action need
37216	** be taken.
37217	**
37218	** * Otherwise, if the device does not support the SAFE_APPEND property,
	@@ -37232,22 +37893,29 @@
37232	** <update nRec field>
37233	** }
37234	** if( NOT SEQUENTIAL ) xSync(<journal file>);
37235	** }
37236	**
37237	** The Pager.needSync flag is never be set for temporary files, or any
37238	** file operating in no-sync mode (Pager.noSync set to non-zero).
37239	**
37240	** If successful, this routine clears the PGHDR_NEED_SYNC flag of every
37241	** page currently held in memory before returning SQLITE_OK. If an IO
37242	** error is encountered, then the IO error code is returned to the caller.
37243	*/
37244	static int syncJournal(Pager *pPager){
37245	if( pPager->needSync ){











37246	assert( !pPager->tempFile );
37247	if( pPager->journalMode!=PAGER_JOURNALMODE_MEMORY ){
37248	int rc; /* Return code */
37249	const int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
37250	assert( isOpen(pPager->jfd) );
37251
37252	if( 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
37253	/* This block deals with an obscure problem. If the last connection
	@@ -37318,21 +37986,29 @@
37318	rc = sqlite3OsSync(pPager->jfd, pPager->sync_flags\|
37319	(pPager->sync_flags==SQLITE_SYNC_FULL?SQLITE_SYNC_DATAONLY:0)
37320	);
37321	if( rc!=SQLITE_OK ) return rc;
37322	}
37323	}
37324
37325	/* The journal file was just successfully synced. Set Pager.needSync
37326	** to zero and clear the PGHDR_NEED_SYNC flag on all pagess.
37327	*/
37328	pPager->needSync = 0;
37329	pPager->journalStarted = 1;
37330	pPager->journalHdr = pPager->journalOff;
37331	sqlite3PcacheClearSyncFlags(pPager->pPCache);

37332	}
37333







37334	return SQLITE_OK;
37335	}
37336
37337	/*
37338	** The argument is the first in a linked list of dirty pages connected
	@@ -37365,31 +38041,16 @@
37365	** If everything is successful, SQLITE_OK is returned. If an IO error
37366	** occurs, an IO error code is returned. Or, if the EXCLUSIVE lock cannot
37367	** be obtained, SQLITE_BUSY is returned.
37368	*/
37369	static int pager_write_pagelist(Pager pPager, PgHdr pList){
37370	int rc; /* Return code */
37371
37372	/* At this point there may be either a RESERVED or EXCLUSIVE lock on the
37373	** database file. If there is already an EXCLUSIVE lock, the following
37374	** call is a no-op.
37375	**
37376	** Moving the lock from RESERVED to EXCLUSIVE actually involves going
37377	** through an intermediate state PENDING. A PENDING lock prevents new
37378	** readers from attaching to the database but is unsufficient for us to
37379	** write. The idea of a PENDING lock is to prevent new readers from
37380	** coming in while we wait for existing readers to clear.
37381	**
37382	** While the pager is in the RESERVED state, the original database file
37383	** is unchanged and we can rollback without having to playback the
37384	** journal into the original database file. Once we transition to
37385	** EXCLUSIVE, it means the database file has been changed and any rollback
37386	** will require a journal playback.
37387	*/
37388	assert( !pagerUseWal(pPager) );
37389	assert( pPager->state>=PAGER_RESERVED );
37390	rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
37391
37392	/* If the file is a temp-file has not yet been opened, open it now. It
37393	** is not possible for rc to be other than SQLITE_OK if this branch
37394	** is taken, as pager_wait_on_lock() is a no-op for temp-files.
37395	*/
	@@ -37400,13 +38061,14 @@
37400
37401	/* Before the first write, give the VFS a hint of what the final
37402	** file size will be.
37403	*/
37404	assert( rc!=SQLITE_OK \|\| isOpen(pPager->fd) );
37405	if( rc==SQLITE_OK && pPager->dbSize>(pPager->dbOrigSize+1) ){
37406	sqlite3_int64 szFile = pPager->pageSize * (sqlite3_int64)pPager->dbSize;
37407	sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SIZE_HINT, &szFile);

37408	}
37409
37410	while( rc==SQLITE_OK && pList ){
37411	Pgno pgno = pList->pgno;
37412
	@@ -37419,10 +38081,12 @@
37419	** set (set by sqlite3PagerDontWrite()).
37420	*/
37421	if( pgno<=pPager->dbSize && 0==(pList->flags&PGHDR_DONT_WRITE) ){
37422	i64 offset = (pgno-1)(i64)pPager->pageSize; / Offset to write */
37423	char pData; / Data to write */


37424
37425	/* Encode the database */
37426	CODEC2(pPager, pList->pData, pgno, 6, return SQLITE_NOMEM, pData);
37427
37428	/* Write out the page data. */
	@@ -37448,13 +38112,11 @@
37448	PAGER_INCR(sqlite3_pager_writedb_count);
37449	PAGER_INCR(pPager->nWrite);
37450	}else{
37451	PAGERTRACE(("NOSTORE %d page %d\n", PAGERID(pPager), pgno));
37452	}
37453	#ifdef SQLITE_CHECK_PAGES
37454	pList->pageHash = pager_pagehash(pList);
37455	#endif
37456	pList = pList->pDirty;
37457	}
37458
37459	return rc;
37460	}
	@@ -37562,13 +38224,18 @@
37562	** pages belonging to the same sector.
37563	**
37564	** The doNotSpill flag inhibits all cache spilling regardless of whether
37565	** or not a sync is required. This is set during a rollback.
37566	**
37567	** Spilling is also inhibited when in an error state.





37568	*/
37569	if( pPager->errCode ) return SQLITE_OK;
37570	if( pPager->doNotSpill ) return SQLITE_OK;
37571	if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){
37572	return SQLITE_OK;
37573	}
37574
	@@ -37582,20 +38249,14 @@
37582	rc = pagerWalFrames(pPager, pPg, 0, 0, 0);
37583	}
37584	}else{
37585
37586	/* Sync the journal file if required. */
37587	if( pPg->flags&PGHDR_NEED_SYNC ){
37588	assert( !pPager->noSync );
37589	rc = syncJournal(pPager);
37590	if( rc==SQLITE_OK &&
37591	!(pPager->journalMode==PAGER_JOURNALMODE_MEMORY) &&
37592	!(sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
37593	){
37594	pPager->nRec = 0;
37595	rc = writeJournalHdr(pPager);
37596	}
37597	}
37598
37599	/* If the page number of this page is larger than the current size of
37600	** the database image, it may need to be written to the sub-journal.
37601	** This is because the call to pager_write_pagelist() below will not
	@@ -37629,10 +38290,11 @@
37629	rc = subjournalPage(pPg);
37630	}
37631
37632	/* Write the contents of the page out to the database file. */
37633	if( rc==SQLITE_OK ){

37634	rc = pager_write_pagelist(pPager, pPg);
37635	}
37636	}
37637
37638	/* Mark the page as clean. */
	@@ -37639,11 +38301,11 @@
37639	if( rc==SQLITE_OK ){
37640	PAGERTRACE(("STRESS %d page %d\n", PAGERID(pPager), pPg->pgno));
37641	sqlite3PcacheMakeClean(pPg);
37642	}
37643
37644	return pager_error(pPager, rc);
37645	}
37646
37647
37648	/*
37649	** Allocate and initialize a new Pager object and put a pointer to it
	@@ -37694,11 +38356,11 @@
37694	char zPathname = 0; / Full path to database file */
37695	int nPathname = 0; /* Number of bytes in zPathname */
37696	int useJournal = (flags & PAGER_OMIT_JOURNAL)==0; /* False to omit journal */
37697	int noReadlock = (flags & PAGER_NO_READLOCK)!=0; /* True to omit read-lock */
37698	int pcacheSize = sqlite3PcacheSize(); /* Bytes to allocate for PCache */
37699	u16 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE; /* Default page size */
37700
37701	/* Figure out how much space is required for each journal file-handle
37702	** (there are two of them, the main journal and the sub-journal). This
37703	** is the maximum space required for an in-memory journal file handle
37704	** and a regular journal file-handle. Note that a "regular journal-handle"
	@@ -37829,11 +38491,11 @@
37829	assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
37830	if( szPageDflt<pPager->sectorSize ){
37831	if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
37832	szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
37833	}else{
37834	szPageDflt = (u16)pPager->sectorSize;
37835	}
37836	}
37837	#ifdef SQLITE_ENABLE_ATOMIC_WRITE
37838	{
37839	int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
	@@ -37857,11 +38519,12 @@
37857	** This branch is also run for an in-memory database. An in-memory
37858	** database is the same as a temp-file that is never written out to
37859	** disk and uses an in-memory rollback journal.
37860	*/
37861	tempFile = 1;
37862	pPager->state = PAGER_EXCLUSIVE;

37863	readOnly = (vfsFlags&SQLITE_OPEN_READONLY);
37864	}
37865
37866	/* The following call to PagerSetPagesize() serves to set the value of
37867	** Pager.pageSize and to allocate the Pager.pTmpSpace buffer.
	@@ -37894,27 +38557,27 @@
37894	pPager->useJournal = (u8)useJournal;
37895	pPager->noReadlock = (noReadlock && readOnly) ?1:0;
37896	/* pPager->stmtOpen = 0; */
37897	/* pPager->stmtInUse = 0; */
37898	/* pPager->nRef = 0; */
37899	pPager->dbSizeValid = (u8)memDb;
37900	/* pPager->stmtSize = 0; */
37901	/* pPager->stmtJSize = 0; */
37902	/* pPager->nPage = 0; */
37903	pPager->mxPgno = SQLITE_MAX_PAGE_COUNT;
37904	/* pPager->state = PAGER_UNLOCK; */

37905	assert( pPager->state == (tempFile ? PAGER_EXCLUSIVE : PAGER_UNLOCK) );

37906	/* pPager->errMask = 0; */
37907	pPager->tempFile = (u8)tempFile;
37908	assert( tempFile==PAGER_LOCKINGMODE_NORMAL
37909	\|\| tempFile==PAGER_LOCKINGMODE_EXCLUSIVE );
37910	assert( PAGER_LOCKINGMODE_EXCLUSIVE==1 );
37911	pPager->exclusiveMode = (u8)tempFile;
37912	pPager->changeCountDone = pPager->tempFile;
37913	pPager->memDb = (u8)memDb;
37914	pPager->readOnly = (u8)readOnly;
37915	/* pPager->needSync = 0; */
37916	assert( useJournal \|\| pPager->tempFile );
37917	pPager->noSync = pPager->tempFile;
37918	pPager->fullSync = pPager->noSync ?0:1;
37919	pPager->sync_flags = SQLITE_SYNC_NORMAL;
37920	/* pPager->pFirst = 0; */
	@@ -37975,24 +38638,24 @@
37975	sqlite3_vfs * const pVfs = pPager->pVfs;
37976	int rc = SQLITE_OK; /* Return code */
37977	int exists = 1; /* True if a journal file is present */
37978	int jrnlOpen = !!isOpen(pPager->jfd);
37979
37980	assert( pPager!=0 );
37981	assert( pPager->useJournal );
37982	assert( isOpen(pPager->fd) );
37983	assert( pPager->state <= PAGER_SHARED );

37984	assert( jrnlOpen==0 \|\| ( sqlite3OsDeviceCharacteristics(pPager->jfd) &
37985	SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
37986	));
37987
37988	*pExists = 0;
37989	if( !jrnlOpen ){
37990	rc = sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS, &exists);
37991	}
37992	if( rc==SQLITE_OK && exists ){
37993	int locked; /* True if some process holds a RESERVED lock */
37994
37995	/* Race condition here: Another process might have been holding the
37996	** the RESERVED lock and have a journal open at the sqlite3OsAccess()
37997	** call above, but then delete the journal and drop the lock before
37998	** we get to the following sqlite3OsCheckReservedLock() call. If that
	@@ -38000,25 +38663,25 @@
38000	** in fact there is none. This results in a false-positive which will
38001	** be dealt with by the playback routine. Ticket #3883.
38002	*/
38003	rc = sqlite3OsCheckReservedLock(pPager->fd, &locked);
38004	if( rc==SQLITE_OK && !locked ){
38005	int nPage;
38006
38007	/* Check the size of the database file. If it consists of 0 pages,
38008	** then delete the journal file. See the header comment above for
38009	** the reasoning here. Delete the obsolete journal file under
38010	** a RESERVED lock to avoid race conditions and to avoid violating
38011	** [H33020].
38012	*/
38013	rc = sqlite3PagerPagecount(pPager, &nPage);
38014	if( rc==SQLITE_OK ){
38015	if( nPage==0 ){
38016	sqlite3BeginBenignMalloc();
38017	if( sqlite3OsLock(pPager->fd, RESERVED_LOCK)==SQLITE_OK ){
38018	sqlite3OsDelete(pVfs, pPager->zJournal, 0);
38019	sqlite3OsUnlock(pPager->fd, SHARED_LOCK);
38020	}
38021	sqlite3EndBenignMalloc();
38022	}else{
38023	/* The journal file exists and no other connection has a reserved
38024	** or greater lock on the database file. Now check that there is
	@@ -38067,11 +38730,11 @@
38067	** has been successfully called. If a shared-lock is already held when
38068	** this function is called, it is a no-op.
38069	**
38070	** The following operations are also performed by this function.
38071	**
38072	** 1) If the pager is currently in PAGER_UNLOCK state (no lock held
38073	** on the database file), then an attempt is made to obtain a
38074	** SHARED lock on the database file. Immediately after obtaining
38075	** the SHARED lock, the file-system is checked for a hot-journal,
38076	** which is played back if present. Following any hot-journal
38077	** rollback, the contents of the cache are validated by checking
	@@ -38082,70 +38745,51 @@
38082	** no outstanding references to any pages, and is in the error state,
38083	** then an attempt is made to clear the error state by discarding
38084	** the contents of the page cache and rolling back any open journal
38085	** file.
38086	**
38087	** If the operation described by (2) above is not attempted, and if the
38088	** pager is in an error state other than SQLITE_FULL when this is called,
38089	** the error state error code is returned. It is permitted to read the
38090	** database when in SQLITE_FULL error state.
38091	**
38092	** Otherwise, if everything is successful, SQLITE_OK is returned. If an
38093	** IO error occurs while locking the database, checking for a hot-journal
38094	** file or rolling back a journal file, the IO error code is returned.
38095	*/
38096	SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager){
38097	int rc = SQLITE_OK; /* Return code */
38098	int isErrorReset = 0; /* True if recovering from error state */
38099
38100	/* This routine is only called from b-tree and only when there are no
38101	** outstanding pages */



38102	assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );


38103	if( NEVER(MEMDB && pPager->errCode) ){ return pPager->errCode; }
38104
38105	/* If this database is in an error-state, now is a chance to clear
38106	** the error. Discard the contents of the pager-cache and rollback
38107	** any hot journal in the file-system.
38108	*/
38109	if( pPager->errCode ){
38110	if( isOpen(pPager->jfd) \|\| pPager->zJournal ){
38111	isErrorReset = 1;
38112	}
38113	pPager->errCode = SQLITE_OK;
38114	pager_reset(pPager);
38115	}
38116
38117	if( pagerUseWal(pPager) ){
38118	rc = pagerBeginReadTransaction(pPager);
38119	}else if( pPager->state==PAGER_UNLOCK \|\| isErrorReset ){
38120	sqlite3_vfs * const pVfs = pPager->pVfs;
38121	int isHotJournal = 0;
38122	assert( !MEMDB );
38123	assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
38124	if( pPager->noReadlock ){
38125	assert( pPager->readOnly );
38126	pPager->state = PAGER_SHARED;
38127	}else{
38128	rc = pager_wait_on_lock(pPager, SHARED_LOCK);
38129	if( rc!=SQLITE_OK ){
38130	assert( pPager->state==PAGER_UNLOCK );
38131	return pager_error(pPager, rc);
38132	}
38133	}
38134	assert( pPager->state>=SHARED_LOCK );
38135
38136	/* If a journal file exists, and there is no RESERVED lock on the
38137	** database file, then it either needs to be played back or deleted.
38138	*/
38139	if( !isErrorReset ){
38140	assert( pPager->state <= PAGER_SHARED );
38141	rc = hasHotJournal(pPager, &isHotJournal);
38142	if( rc!=SQLITE_OK ){
38143	goto failed;
38144	}
38145	}
38146	if( isErrorReset \|\| isHotJournal ){
38147	/* Get an EXCLUSIVE lock on the database file. At this point it is
38148	** important that a RESERVED lock is not obtained on the way to the
38149	** EXCLUSIVE lock. If it were, another process might open the
38150	** database file, detect the RESERVED lock, and conclude that the
38151	** database is safe to read while this process is still rolling the
	@@ -38153,62 +38797,49 @@
38153	**
38154	** Because the intermediate RESERVED lock is not requested, any
38155	** other process attempting to access the database file will get to
38156	** this point in the code and fail to obtain its own EXCLUSIVE lock
38157	** on the database file.
38158	*/
38159	if( pPager->state<EXCLUSIVE_LOCK ){
38160	rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK);
38161	if( rc!=SQLITE_OK ){
38162	rc = pager_error(pPager, rc);
38163	goto failed;
38164	}
38165	pPager->state = PAGER_EXCLUSIVE;
38166	}
38167
38168	/* Open the journal for read/write access. This is because in
38169	** exclusive-access mode the file descriptor will be kept open and
38170	** possibly used for a transaction later on. On some systems, the
38171	** OsTruncate() call used in exclusive-access mode also requires
38172	** a read/write file handle.
38173	*/
38174	if( !isOpen(pPager->jfd) ){
38175	int res;
38176	rc = sqlite3OsAccess(pVfs,pPager->zJournal,SQLITE_ACCESS_EXISTS,&res);
38177	if( rc==SQLITE_OK ){
38178	if( res ){
38179	int fout = 0;
38180	int f = SQLITE_OPEN_READWRITE\|SQLITE_OPEN_MAIN_JOURNAL;
38181	assert( !pPager->tempFile );
38182	rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, f, &fout);
38183	assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
38184	if( rc==SQLITE_OK && fout&SQLITE_OPEN_READONLY ){
38185	rc = SQLITE_CANTOPEN_BKPT;
38186	sqlite3OsClose(pPager->jfd);
38187	}
38188	}else{
38189	/* If the journal does not exist, it usually means that some
38190	** other connection managed to get in and roll it back before
38191	** this connection obtained the exclusive lock above. Or, it
38192	** may mean that the pager was in the error-state when this
38193	** function was called and the journal file does not exist. */
38194	rc = pager_end_transaction(pPager, 0);
38195	}
38196	}
38197	}
38198	if( rc!=SQLITE_OK ){
38199	goto failed;
38200	}
38201
38202	/* Reset the journal status fields to indicates that we have no
38203	** rollback journal at this time. */
38204	pPager->journalStarted = 0;
38205	pPager->journalOff = 0;
38206	pPager->setMaster = 0;
38207	pPager->journalHdr = 0;
38208
38209	/* Make sure the journal file has been synced to disk. */
38210
38211	/* Playback and delete the journal. Drop the database write
38212	** lock and reacquire the read lock. Purge the cache before
38213	** playing back the hot-journal so that we don't end up with
38214	** an inconsistent cache. Sync the hot journal before playing
	@@ -38215,25 +38846,50 @@
38215	** it back since the process that crashed and left the hot journal
38216	** probably did not sync it and we are required to always sync
38217	** the journal before playing it back.
38218	*/
38219	if( isOpen(pPager->jfd) ){

38220	rc = pagerSyncHotJournal(pPager);
38221	if( rc==SQLITE_OK ){
38222	rc = pager_playback(pPager, 1);
38223	}
38224	if( rc!=SQLITE_OK ){
38225	rc = pager_error(pPager, rc);
38226	goto failed;
38227	}
38228	}
38229	assert( (pPager->state==PAGER_SHARED)
38230	\|\| (pPager->exclusiveMode && pPager->state>PAGER_SHARED)






















38231	);
38232	}
38233
38234	if( pPager->pBackup \|\| sqlite3PcachePagecount(pPager->pPCache)>0 ){


38235	/* The shared-lock has just been acquired on the database file
38236	** and there are already pages in the cache (from a previous
38237	** read or write transaction). Check to see if the database
38238	** has been modified. If the database has changed, flush the
38239	** cache.
	@@ -38246,18 +38902,15 @@
38246	**
38247	** There is a vanishingly small chance that a change will not be
38248	** detected. The chance of an undetected change is so small that
38249	** it can be neglected.
38250	*/
38251	int nPage = 0;
38252	char dbFileVers[sizeof(pPager->dbFileVers)];
38253	sqlite3PagerPagecount(pPager, &nPage);
38254
38255	if( pPager->errCode ){
38256	rc = pPager->errCode;
38257	goto failed;
38258	}
38259
38260	if( nPage>0 ){
38261	IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
38262	rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
38263	if( rc!=SQLITE_OK ){
	@@ -38269,22 +38922,34 @@
38269
38270	if( memcmp(pPager->dbFileVers, dbFileVers, sizeof(dbFileVers))!=0 ){
38271	pager_reset(pPager);
38272	}
38273	}
38274	assert( pPager->exclusiveMode \|\| pPager->state==PAGER_SHARED );
38275
38276	/* If there is a WAL file in the file-system, open this database in WAL
38277	** mode. Otherwise, the following function call is a no-op.
38278	*/
38279	rc = pagerOpenWalIfPresent(pPager);










38280	}
38281
38282	failed:
38283	if( rc!=SQLITE_OK ){
38284	/* pager_unlock() is a no-op for exclusive mode and in-memory databases. */
38285	pager_unlock(pPager);



38286	}
38287	return rc;
38288	}
38289
38290	/*
	@@ -38294,13 +38959,11 @@
38294	** Except, in locking_mode=EXCLUSIVE when there is nothing to in
38295	** the rollback journal, the unlock is not performed and there is
38296	** nothing to rollback, so this routine is a no-op.
38297	*/
38298	static void pagerUnlockIfUnused(Pager *pPager){
38299	if( (sqlite3PcacheRefCount(pPager->pPCache)==0)
38300	&& (!pPager->exclusiveMode \|\| pPager->journalOff>0)
38301	){
38302	pagerUnlockAndRollback(pPager);
38303	}
38304	}
38305
38306	/*
	@@ -38360,20 +39023,20 @@
38360	int noContent /* Do not bother reading content from disk if true */
38361	){
38362	int rc;
38363	PgHdr *pPg;
38364

38365	assert( assert_pager_state(pPager) );
38366	assert( pPager->state>PAGER_UNLOCK );
38367
38368	if( pgno==0 ){
38369	return SQLITE_CORRUPT_BKPT;
38370	}
38371
38372	/* If the pager is in the error state, return an error immediately.
38373	** Otherwise, request the page from the PCache layer. */
38374	if( pPager->errCode!=SQLITE_OK && pPager->errCode!=SQLITE_FULL ){
38375	rc = pPager->errCode;
38376	}else{
38377	rc = sqlite3PcacheFetch(pPager->pPCache, pgno, 1, ppPage);
38378	}
38379
	@@ -38395,11 +39058,10 @@
38395	return SQLITE_OK;
38396
38397	}else{
38398	/* The pager cache has created a new page. Its content needs to
38399	** be initialized. */
38400	int nMax;
38401
38402	PAGER_INCR(pPager->nMiss);
38403	pPg = *ppPage;
38404	pPg->pPager = pPager;
38405
	@@ -38408,16 +39070,11 @@
38408	if( pgno>PAGER_MAX_PGNO \|\| pgno==PAGER_MJ_PGNO(pPager) ){
38409	rc = SQLITE_CORRUPT_BKPT;
38410	goto pager_acquire_err;
38411	}
38412
38413	rc = sqlite3PagerPagecount(pPager, &nMax);
38414	if( rc!=SQLITE_OK ){
38415	goto pager_acquire_err;
38416	}
38417
38418	if( MEMDB \|\| nMax<(int)pgno \|\| noContent \|\| !isOpen(pPager->fd) ){
38419	if( pgno>pPager->mxPgno ){
38420	rc = SQLITE_FULL;
38421	goto pager_acquire_err;
38422	}
38423	if( noContent ){
	@@ -38443,13 +39100,11 @@
38443	rc = readDbPage(pPg);
38444	if( rc!=SQLITE_OK ){
38445	goto pager_acquire_err;
38446	}
38447	}
38448	#ifdef SQLITE_CHECK_PAGES
38449	pPg->pageHash = pager_pagehash(pPg);
38450	#endif
38451	}
38452
38453	return SQLITE_OK;
38454
38455	pager_acquire_err:
	@@ -38464,13 +39119,11 @@
38464	}
38465
38466	/*
38467	** Acquire a page if it is already in the in-memory cache. Do
38468	** not read the page from disk. Return a pointer to the page,
38469	** or 0 if the page is not in cache. Also, return 0 if the
38470	** pager is in PAGER_UNLOCK state when this function is called,
38471	** or if the pager is in an error state other than SQLITE_FULL.
38472	**
38473	** See also sqlite3PagerGet(). The difference between this routine
38474	** and sqlite3PagerGet() is that _get() will go to the disk and read
38475	** in the page if the page is not already in cache. This routine
38476	** returns NULL if the page is not in cache or if a disk I/O error
	@@ -38479,11 +39132,11 @@
38479	SQLITE_PRIVATE DbPage sqlite3PagerLookup(Pager pPager, Pgno pgno){
38480	PgHdr *pPg = 0;
38481	assert( pPager!=0 );
38482	assert( pgno!=0 );
38483	assert( pPager->pPCache!=0 );
38484	assert( pPager->state > PAGER_UNLOCK );
38485	sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &pPg);
38486	return pPg;
38487	}
38488
38489	/*
	@@ -38524,73 +39177,71 @@
38524	** SQLITE_NOMEM if the attempt to allocate Pager.pInJournal fails, or
38525	** an IO error code if opening or writing the journal file fails.
38526	*/
38527	static int pager_open_journal(Pager *pPager){
38528	int rc = SQLITE_OK; /* Return code */
38529	int nPage; /* Size of database file */
38530	sqlite3_vfs * const pVfs = pPager->pVfs; /* Local cache of vfs pointer */
38531
38532	assert( pPager->state>=PAGER_RESERVED );
38533	assert( pPager->useJournal );
38534	assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF );
38535	assert( pPager->pInJournal==0 );
38536
38537	/* If already in the error state, this function is a no-op. But on
38538	** the other hand, this routine is never called if we are already in
38539	** an error state. */
38540	if( NEVER(pPager->errCode) ) return pPager->errCode;
38541
38542	testcase( pPager->dbSizeValid==0 );
38543	rc = sqlite3PagerPagecount(pPager, &nPage);
38544	if( rc ) return rc;
38545	pPager->pInJournal = sqlite3BitvecCreate(nPage);
38546	if( pPager->pInJournal==0 ){
38547	return SQLITE_NOMEM;
38548	}
38549
38550	/* Open the journal file if it is not already open. */
38551	if( !isOpen(pPager->jfd) ){
38552	if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
38553	sqlite3MemJournalOpen(pPager->jfd);
38554	}else{
38555	const int flags = /* VFS flags to open journal file */
38556	SQLITE_OPEN_READWRITE\|SQLITE_OPEN_CREATE\|
38557	(pPager->tempFile ?
38558	(SQLITE_OPEN_DELETEONCLOSE\|SQLITE_OPEN_TEMP_JOURNAL):
38559	(SQLITE_OPEN_MAIN_JOURNAL)
38560	);
38561	#ifdef SQLITE_ENABLE_ATOMIC_WRITE
38562	rc = sqlite3JournalOpen(
38563	pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
38564	);
38565	#else
38566	rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
38567	#endif
38568	}
38569	assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
38570	}
38571
38572
38573	/* Write the first journal header to the journal file and open
38574	** the sub-journal if necessary.
38575	*/
38576	if( rc==SQLITE_OK ){
38577	/* TODO: Check if all of these are really required. */
38578	pPager->dbOrigSize = pPager->dbSize;
38579	pPager->journalStarted = 0;
38580	pPager->needSync = 0;
38581	pPager->nRec = 0;
38582	pPager->journalOff = 0;
38583	pPager->setMaster = 0;
38584	pPager->journalHdr = 0;
38585	rc = writeJournalHdr(pPager);
38586	}
38587
38588	if( rc!=SQLITE_OK ){
38589	sqlite3BitvecDestroy(pPager->pInJournal);
38590	pPager->pInJournal = 0;



38591	}

38592	return rc;
38593	}
38594
38595	/*
38596	** Begin a write-transaction on the specified pager object. If a
	@@ -38599,18 +39250,10 @@
38599	** If the exFlag argument is false, then acquire at least a RESERVED
38600	** lock on the database file. If exFlag is true, then acquire at least
38601	** an EXCLUSIVE lock. If such a lock is already held, no locking
38602	** functions need be called.
38603	**
38604	** If this is not a temporary or in-memory file and, the journal file is
38605	** opened if it has not been already. For a temporary file, the opening
38606	** of the journal file is deferred until there is an actual need to
38607	** write to the journal. TODO: Why handle temporary files differently?
38608	**
38609	** If the journal file is opened (or if it is already open), then a
38610	** journal-header is written to the start of it.
38611	**
38612	** If the subjInMemory argument is non-zero, then any sub-journal opened
38613	** within this transaction will be opened as an in-memory file. This
38614	** has no effect if the sub-journal is already opened (as it may be when
38615	** running in exclusive mode) or if the transaction does not require a
38616	** sub-journal. If the subjInMemory argument is zero, then any required
	@@ -38617,24 +39260,24 @@
38617	** sub-journal is implemented in-memory if pPager is an in-memory database,
38618	** or using a temporary file otherwise.
38619	*/
38620	SQLITE_PRIVATE int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
38621	int rc = SQLITE_OK;
38622	assert( pPager->state!=PAGER_UNLOCK );


38623	pPager->subjInMemory = (u8)subjInMemory;
38624
38625	if( pPager->state==PAGER_SHARED ){
38626	assert( pPager->pInJournal==0 );
38627	assert( !MEMDB && !pPager->tempFile );
38628
38629	if( pagerUseWal(pPager) ){
38630	/* If the pager is configured to use locking_mode=exclusive, and an
38631	** exclusive lock on the database is not already held, obtain it now.
38632	*/
38633	if( pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, -1) ){
38634	rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK);
38635	pPager->state = PAGER_SHARED;
38636	if( rc!=SQLITE_OK ){
38637	return rc;
38638	}
38639	sqlite3WalExclusiveMode(pPager->pWal, 1);
38640	}
	@@ -38641,56 +39284,44 @@
38641
38642	/* Grab the write lock on the log file. If successful, upgrade to
38643	** PAGER_RESERVED state. Otherwise, return an error code to the caller.
38644	** The busy-handler is not invoked if another connection already
38645	** holds the write-lock. If possible, the upper layer will call it.
38646	**
38647	** WAL mode sets Pager.state to PAGER_RESERVED when it has an open
38648	** transaction, but never to PAGER_EXCLUSIVE. This is because in
38649	** PAGER_EXCLUSIVE state the code to roll back savepoint transactions
38650	** may copy data from the sub-journal into the database file as well
38651	** as into the page cache. Which would be incorrect in WAL mode.
38652	*/
38653	rc = sqlite3WalBeginWriteTransaction(pPager->pWal);
38654	if( rc==SQLITE_OK ){
38655	pPager->dbOrigSize = pPager->dbSize;
38656	pPager->state = PAGER_RESERVED;
38657	pPager->journalOff = 0;
38658	}
38659
38660	assert( rc!=SQLITE_OK \|\| pPager->state==PAGER_RESERVED );
38661	assert( rc==SQLITE_OK \|\| pPager->state==PAGER_SHARED );
38662	}else{
38663	/* Obtain a RESERVED lock on the database file. If the exFlag parameter
38664	** is true, then immediately upgrade this to an EXCLUSIVE lock. The
38665	** busy-handler callback can be used when upgrading to the EXCLUSIVE
38666	** lock, but not when obtaining the RESERVED lock.
38667	*/
38668	rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
38669	if( rc==SQLITE_OK ){
38670	pPager->state = PAGER_RESERVED;
38671	if( exFlag ){
38672	rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
38673	}
38674	}
38675	}
38676
38677	/* No need to open the journal file at this time. It will be
38678	** opened before it is written to. If we defer opening the journal,
38679	** we might save the work of creating a file if the transaction
38680	** ends up being a no-op.
38681	*/
38682
38683	if( rc!=SQLITE_OK ){
38684	assert( !pPager->dbModified );
38685	/* Ignore any IO error that occurs within pager_end_transaction(). The
38686	** purpose of this call is to reset the internal state of the pager
38687	** sub-system. It doesn't matter if the journal-file is not properly
38688	** finalized at this point (since it is not a valid journal file anyway).
38689	*/
38690	pager_end_transaction(pPager, 0);
38691	}


38692	}
38693
38694	PAGERTRACE(("TRANSACTION %d\n", PAGERID(pPager)));
38695	return rc;
38696	}
	@@ -38705,110 +39336,98 @@
38705	static int pager_write(PgHdr *pPg){
38706	void *pData = pPg->pData;
38707	Pager *pPager = pPg->pPager;
38708	int rc = SQLITE_OK;
38709
38710	/* This routine is not called unless a transaction has already been
38711	** started.

38712	*/
38713	assert( pPager->state>=PAGER_RESERVED );




38714
38715	/* If an error has been previously detected, report the same error
38716	** again.
38717	*/
38718	if( NEVER(pPager->errCode) ) return pPager->errCode;
38719
38720	/* Higher-level routines never call this function if database is not
38721	** writable. But check anyway, just for robustness. */
38722	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
38723
38724	assert( !pPager->setMaster );
38725
38726	CHECK_PAGE(pPg);
38727
38728	/* Mark the page as dirty. If the page has already been written
38729	** to the journal then we can return right away.
38730	*/
38731	sqlite3PcacheMakeDirty(pPg);
38732	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
38733	assert( !pagerUseWal(pPager) );
38734	pPager->dbModified = 1;
38735	}else{
38736
38737	/* If we get this far, it means that the page needs to be
38738	** written to the transaction journal or the ckeckpoint journal
38739	** or both.
38740	**
38741	** Higher level routines should have already started a transaction,
38742	** which means they have acquired the necessary locks but the rollback
38743	** journal might not yet be open.
38744	*/
38745	assert( pPager->state>=RESERVED_LOCK );
38746	if( pPager->pInJournal==0
38747	&& pPager->journalMode!=PAGER_JOURNALMODE_OFF
38748	&& !pagerUseWal(pPager)
38749	){
38750	assert( pPager->useJournal );
38751	rc = pager_open_journal(pPager);
38752	if( rc!=SQLITE_OK ) return rc;
38753	}
38754	pPager->dbModified = 1;

38755
38756	/* The transaction journal now exists and we have a RESERVED or an
38757	** EXCLUSIVE lock on the main database file. Write the current page to
38758	** the transaction journal if it is not there already.
38759	*/
38760	if( !pageInJournal(pPg) && isOpen(pPager->jfd) ){
38761	assert( !pagerUseWal(pPager) );
38762	if( pPg->pgno<=pPager->dbOrigSize ){
38763	u32 cksum;
38764	char *pData2;

38765
38766	/* We should never write to the journal file the page that
38767	** contains the database locks. The following assert verifies
38768	** that we do not. */
38769	assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
38770
38771	assert( pPager->journalHdr <= pPager->journalOff );
38772	CODEC2(pPager, pData, pPg->pgno, 7, return SQLITE_NOMEM, pData2);
38773	cksum = pager_cksum(pPager, (u8*)pData2);
38774	rc = write32bits(pPager->jfd, pPager->journalOff, pPg->pgno);
38775	if( rc==SQLITE_OK ){
38776	rc = sqlite3OsWrite(pPager->jfd, pData2, pPager->pageSize,
38777	pPager->journalOff + 4);
38778	pPager->journalOff += pPager->pageSize+4;
38779	}
38780	if( rc==SQLITE_OK ){
38781	rc = write32bits(pPager->jfd, pPager->journalOff, cksum);
38782	pPager->journalOff += 4;
38783	}







38784	IOTRACE(("JOUT %p %d %lld %d\n", pPager, pPg->pgno,
38785	pPager->journalOff, pPager->pageSize));
38786	PAGER_INCR(sqlite3_pager_writej_count);
38787	PAGERTRACE(("JOURNAL %d page %d needSync=%d hash(%08x)\n",
38788	PAGERID(pPager), pPg->pgno,
38789	((pPg->flags&PGHDR_NEED_SYNC)?1:0), pager_pagehash(pPg)));
38790
38791	/* Even if an IO or diskfull error occurred while journalling the
38792	** page in the block above, set the need-sync flag for the page.
38793	** Otherwise, when the transaction is rolled back, the logic in
38794	** playback_one_page() will think that the page needs to be restored
38795	** in the database file. And if an IO error occurs while doing so,
38796	** then corruption may follow.
38797	*/
38798	if( !pPager->noSync ){
38799	pPg->flags \|= PGHDR_NEED_SYNC;
38800	pPager->needSync = 1;
38801	}
38802
38803	/* An error has occurred writing to the journal file. The
38804	** transaction will be rolled back by the layer above.
38805	*/
38806	if( rc!=SQLITE_OK ){
38807	return rc;
38808	}
38809
38810	pPager->nRec++;
38811	assert( pPager->pInJournal!=0 );
38812	rc = sqlite3BitvecSet(pPager->pInJournal, pPg->pgno);
38813	testcase( rc==SQLITE_NOMEM );
38814	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
	@@ -38816,13 +39435,12 @@
38816	if( rc!=SQLITE_OK ){
38817	assert( rc==SQLITE_NOMEM );
38818	return rc;
38819	}
38820	}else{
38821	if( !pPager->journalStarted && !pPager->noSync ){
38822	pPg->flags \|= PGHDR_NEED_SYNC;
38823	pPager->needSync = 1;
38824	}
38825	PAGERTRACE(("APPEND %d page %d needSync=%d\n",
38826	PAGERID(pPager), pPg->pgno,
38827	((pPg->flags&PGHDR_NEED_SYNC)?1:0)));
38828	}
	@@ -38838,11 +39456,10 @@
38838	}
38839	}
38840
38841	/* Update the database size and return.
38842	*/
38843	assert( pPager->state>=PAGER_SHARED );
38844	if( pPager->dbSize<pPg->pgno ){
38845	pPager->dbSize = pPg->pgno;
38846	}
38847	return rc;
38848	}
	@@ -38866,10 +39483,14 @@
38866
38867	PgHdr *pPg = pDbPage;
38868	Pager *pPager = pPg->pPager;
38869	Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
38870




38871	if( nPagePerSector>1 ){
38872	Pgno nPageCount; /* Total number of pages in database file */
38873	Pgno pg1; /* First page of the sector pPg is located on. */
38874	int nPage = 0; /* Number of pages starting at pg1 to journal */
38875	int ii; /* Loop counter */
	@@ -38887,23 +39508,21 @@
38887	** an integer power of 2. It sets variable pg1 to the identifier
38888	** of the first page of the sector pPg is located on.
38889	*/
38890	pg1 = ((pPg->pgno-1) & ~(nPagePerSector-1)) + 1;
38891
38892	rc = sqlite3PagerPagecount(pPager, (int *)&nPageCount);
38893	if( rc==SQLITE_OK ){
38894	if( pPg->pgno>nPageCount ){
38895	nPage = (pPg->pgno - pg1)+1;
38896	}else if( (pg1+nPagePerSector-1)>nPageCount ){
38897	nPage = nPageCount+1-pg1;
38898	}else{
38899	nPage = nPagePerSector;
38900	}
38901	assert(nPage>0);
38902	assert(pg1<=pPg->pgno);
38903	assert((pg1+nPage)>pPg->pgno);
38904	}
38905
38906	for(ii=0; ii<nPage && rc==SQLITE_OK; ii++){
38907	Pgno pg = pg1+ii;
38908	PgHdr *pPage;
38909	if( pg==pPg->pgno \|\| !sqlite3BitvecTest(pPager->pInJournal, pg) ){
	@@ -38911,11 +39530,10 @@
38911	rc = sqlite3PagerGet(pPager, pg, &pPage);
38912	if( rc==SQLITE_OK ){
38913	rc = pager_write(pPage);
38914	if( pPage->flags&PGHDR_NEED_SYNC ){
38915	needSync = 1;
38916	assert(pPager->needSync);
38917	}
38918	sqlite3PagerUnref(pPage);
38919	}
38920	}
38921	}else if( (pPage = pager_lookup(pPager, pg))!=0 ){
	@@ -38931,19 +39549,18 @@
38931	** writing to any of these nPage pages may damage the others, the
38932	** journal file must contain sync()ed copies of all of them
38933	** before any of them can be written out to the database file.
38934	*/
38935	if( rc==SQLITE_OK && needSync ){
38936	assert( !MEMDB && pPager->noSync==0 );
38937	for(ii=0; ii<nPage; ii++){
38938	PgHdr *pPage = pager_lookup(pPager, pg1+ii);
38939	if( pPage ){
38940	pPage->flags \|= PGHDR_NEED_SYNC;
38941	sqlite3PagerUnref(pPage);
38942	}
38943	}
38944	assert(pPager->needSync);
38945	}
38946
38947	assert( pPager->doNotSyncSpill==1 );
38948	pPager->doNotSyncSpill--;
38949	}else{
	@@ -38981,13 +39598,11 @@
38981	Pager *pPager = pPg->pPager;
38982	if( (pPg->flags&PGHDR_DIRTY) && pPager->nSavepoint==0 ){
38983	PAGERTRACE(("DONT_WRITE page %d of %d\n", pPg->pgno, PAGERID(pPager)));
38984	IOTRACE(("CLEAN %p %d\n", pPager, pPg->pgno))
38985	pPg->flags \|= PGHDR_DONT_WRITE;
38986	#ifdef SQLITE_CHECK_PAGES
38987	pPg->pageHash = pager_pagehash(pPg);
38988	#endif
38989	}
38990	}
38991
38992	/*
38993	** This routine is called to increment the value of the database file
	@@ -39005,10 +39620,15 @@
39005	** by writing an updated version of page 1 using a call to the
39006	** sqlite3OsWrite() function.
39007	*/
39008	static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
39009	int rc = SQLITE_OK;





39010
39011	/* Declare and initialize constant integer 'isDirect'. If the
39012	** atomic-write optimization is enabled in this build, then isDirect
39013	** is initialized to the value passed as the isDirectMode parameter
39014	** to this function. Otherwise, it is always set to zero.
	@@ -39024,11 +39644,10 @@
39024	UNUSED_PARAMETER(isDirectMode);
39025	#else
39026	# define DIRECT_MODE isDirectMode
39027	#endif
39028
39029	assert( pPager->state>=PAGER_RESERVED );
39030	if( !pPager->changeCountDone && pPager->dbSize>0 ){
39031	PgHdr pPgHdr; / Reference to page 1 */
39032	u32 change_counter; /* Initial value of change-counter field */
39033
39034	assert( !pPager->tempFile && isOpen(pPager->fd) );
	@@ -39109,13 +39728,17 @@
39109	** Otherwise, either SQLITE_BUSY or an SQLITE_IOERR_XXX error code is
39110	** returned.
39111	*/
39112	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager *pPager){
39113	int rc = SQLITE_OK;
39114	assert( pPager->state>=PAGER_RESERVED );




39115	if( 0==pagerUseWal(pPager) ){
39116	rc = pager_wait_on_lock(pPager, PAGER_EXCLUSIVE);
39117	}
39118	return rc;
39119	}
39120
39121	/*
	@@ -39149,26 +39772,33 @@
39149	const char zMaster, / If not NULL, the master journal name */
39150	int noSync /* True to omit the xSync on the db file */
39151	){
39152	int rc = SQLITE_OK; /* Return code */
39153
39154	/* The dbOrigSize is never set if journal_mode=OFF */
39155	assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF \|\| pPager->dbOrigSize==0 );




39156
39157	/* If a prior error occurred, report that error again. */
39158	if( pPager->errCode ) return pPager->errCode;
39159
39160	PAGERTRACE(("DATABASE SYNC: File=%s zMaster=%s nSize=%d\n",
39161	pPager->zFilename, zMaster, pPager->dbSize));
39162
39163	if( MEMDB && pPager->dbModified ){



39164	/* If this is an in-memory db, or no pages have been written to, or this
39165	** function has already been called, it is mostly a no-op. However, any
39166	** backup in progress needs to be restarted.
39167	*/
39168	sqlite3BackupRestart(pPager->pBackup);
39169	}else if( pPager->dbModified ){
39170	if( pagerUseWal(pPager) ){
39171	PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache);
39172	if( pList ){
39173	rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1,
39174	(pPager->fullSync ? pPager->sync_flags : 0)
	@@ -39207,11 +39837,11 @@
39207	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
39208	\|\| pPager->journalMode==PAGER_JOURNALMODE_WAL
39209	);
39210	if( !zMaster && isOpen(pPager->jfd)
39211	&& pPager->journalOff==jrnlBufferSize(pPager)
39212	&& pPager->dbSize>=pPager->dbFileSize
39213	&& (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) \|\| 0==pPg->pDirty)
39214	){
39215	/* Update the db file change counter via the direct-write method. The
39216	** following call will modify the in-memory representation of page 1
39217	** to include the updated change counter and then write page 1
	@@ -39237,17 +39867,14 @@
39237	** Before reading the pages with page numbers larger than the
39238	** current value of Pager.dbSize, set dbSize back to the value
39239	** that it took at the start of the transaction. Otherwise, the
39240	** calls to sqlite3PagerGet() return zeroed pages instead of
39241	** reading data from the database file.
39242	**
39243	** When journal_mode==OFF the dbOrigSize is always zero, so this
39244	** block never runs if journal_mode=OFF.
39245	*/
39246	#ifndef SQLITE_OMIT_AUTOVACUUM
39247	if( pPager->dbSize<pPager->dbOrigSize
39248	&& ALWAYS(pPager->journalMode!=PAGER_JOURNALMODE_OFF)
39249	){
39250	Pgno i; /* Iterator variable */
39251	const Pgno iSkip = PAGER_MJ_PGNO(pPager); /* Pending lock page */
39252	const Pgno dbSize = pPager->dbSize; /* Database image size */
39253	pPager->dbSize = pPager->dbOrigSize;
	@@ -39270,18 +39897,24 @@
39270	** or if zMaster is NULL (no master journal), then this call is a no-op.
39271	*/
39272	rc = writeMasterJournal(pPager, zMaster);
39273	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39274
39275	/* Sync the journal file. If the atomic-update optimization is being
39276	** used, this call will not create the journal file or perform any
39277	** real IO.







39278	*/
39279	rc = syncJournal(pPager);
39280	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39281
39282	/* Write all dirty pages to the database file. */
39283	rc = pager_write_pagelist(pPager,sqlite3PcacheDirtyList(pPager->pPCache));
39284	if( rc!=SQLITE_OK ){
39285	assert( rc!=SQLITE_IOERR_BLOCKED );
39286	goto commit_phase_one_exit;
39287	}
	@@ -39290,11 +39923,11 @@
39290	/* If the file on disk is not the same size as the database image,
39291	** then use pager_truncate to grow or shrink the file here.
39292	*/
39293	if( pPager->dbSize!=pPager->dbFileSize ){
39294	Pgno nNew = pPager->dbSize - (pPager->dbSize==PAGER_MJ_PGNO(pPager));
39295	assert( pPager->state>=PAGER_EXCLUSIVE );
39296	rc = pager_truncate(pPager, nNew);
39297	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39298	}
39299
39300	/* Finally, sync the database file. */
	@@ -39301,16 +39934,16 @@
39301	if( !pPager->noSync && !noSync ){
39302	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
39303	}
39304	IOTRACE(("DBSYNC %p\n", pPager))
39305	}
39306
39307	assert( pPager->state!=PAGER_SYNCED );
39308	pPager->state = PAGER_SYNCED;
39309	}
39310
39311	commit_phase_one_exit:



39312	return rc;
39313	}
39314
39315
39316	/*
	@@ -39334,16 +39967,15 @@
39334	/* This routine should not be called if a prior error has occurred.
39335	** But if (due to a coding error elsewhere in the system) it does get
39336	** called, just return the same error code without doing anything. */
39337	if( NEVER(pPager->errCode) ) return pPager->errCode;
39338
39339	/* This function should not be called if the pager is not in at least
39340	PAGER_RESERVED state. FIXME**: Make it so that this test always
39341	** fails - make it so that we never reach this point if we do not hold
39342	** all necessary locks.
39343	*/
39344	if( NEVER(pPager->state<PAGER_RESERVED) ) return SQLITE_ERROR;
39345
39346	/* An optimization. If the database was not actually modified during
39347	** this transaction, the pager is running in exclusive-mode and is
39348	** using persistent journals, then this function is a no-op.
39349	**
	@@ -39352,106 +39984,80 @@
39352	** a hot-journal during hot-journal rollback, 0 changes will be made
39353	** to the database file. So there is no need to zero the journal
39354	** header. Since the pager is in exclusive mode, there is no need
39355	** to drop any locks either.
39356	*/
39357	if( pPager->dbModified==0 && pPager->exclusiveMode

39358	&& pPager->journalMode==PAGER_JOURNALMODE_PERSIST
39359	){
39360	assert( pPager->journalOff==JOURNAL_HDR_SZ(pPager) \|\| !pPager->journalOff );

39361	return SQLITE_OK;
39362	}
39363
39364	PAGERTRACE(("COMMIT %d\n", PAGERID(pPager)));
39365	assert( pPager->state==PAGER_SYNCED \|\| MEMDB \|\| !pPager->dbModified );
39366	rc = pager_end_transaction(pPager, pPager->setMaster);
39367	return pager_error(pPager, rc);
39368	}
39369
39370	/*
39371	** Rollback all changes. The database falls back to PAGER_SHARED mode.



39372	**
39373	** This function performs two tasks:



39374	**
39375	** 1) It rolls back the journal file, restoring all database file and
39376	** in-memory cache pages to the state they were in when the transaction
39377	** was opened, and

39378	** 2) It finalizes the journal file, so that it is not used for hot
39379	** rollback at any point in the future.
39380	**
39381	** subject to the following qualifications:
39382	**
39383	** * If the journal file is not yet open when this function is called,
39384	** then only (2) is performed. In this case there is no journal file
39385	** to roll back.
39386	**
39387	** * If in an error state other than SQLITE_FULL, then task (1) is
39388	** performed. If successful, task (2). Regardless of the outcome
39389	** of either, the error state error code is returned to the caller
39390	** (i.e. either SQLITE_IOERR or SQLITE_CORRUPT).
39391	**
39392	** * If the pager is in PAGER_RESERVED state, then attempt (1). Whether
39393	** or not (1) is successful, also attempt (2). If successful, return
39394	** SQLITE_OK. Otherwise, enter the error state and return the first
39395	** error code encountered.
39396	**
39397	** In this case there is no chance that the database was written to.
39398	** So is safe to finalize the journal file even if the playback
39399	** (operation 1) failed. However the pager must enter the error state
39400	** as the contents of the in-memory cache are now suspect.
39401	**
39402	** * Finally, if in PAGER_EXCLUSIVE state, then attempt (1). Only
39403	** attempt (2) if (1) is successful. Return SQLITE_OK if successful,
39404	** otherwise enter the error state and return the error code from the
39405	** failing operation.
39406	**
39407	** In this case the database file may have been written to. So if the
39408	** playback operation did not succeed it would not be safe to finalize
39409	** the journal file. It needs to be left in the file-system so that
39410	** some other process can use it to restore the database state (by
39411	** hot-journal rollback).
39412	*/
39413	SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){
39414	int rc = SQLITE_OK; /* Return code */
39415	PAGERTRACE(("ROLLBACK %d\n", PAGERID(pPager)));









39416	if( pagerUseWal(pPager) ){
39417	int rc2;
39418
39419	rc = sqlite3PagerSavepoint(pPager, SAVEPOINT_ROLLBACK, -1);
39420	rc2 = pager_end_transaction(pPager, pPager->setMaster);
39421	if( rc==SQLITE_OK ) rc = rc2;
39422	rc = pager_error(pPager, rc);
39423	}else if( !pPager->dbModified \|\| !isOpen(pPager->jfd) ){
39424	rc = pager_end_transaction(pPager, pPager->setMaster);
39425	}else if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){
39426	if( pPager->state>=PAGER_EXCLUSIVE ){
39427	pager_playback(pPager, 0);
39428	}
39429	rc = pPager->errCode;
39430	}else{
39431	if( pPager->state==PAGER_RESERVED ){
39432	int rc2;
39433	rc = pager_playback(pPager, 0);
39434	rc2 = pager_end_transaction(pPager, pPager->setMaster);
39435	if( rc==SQLITE_OK ){
39436	rc = rc2;
39437	}
39438	}else{
39439	rc = pager_playback(pPager, 0);
39440	}
39441
39442	if( !MEMDB ){
39443	pPager->dbSizeValid = 0;
39444	}
39445
39446	/* If an error occurs during a ROLLBACK, we can no longer trust the pager
39447	** cache. So call pager_error() on the way out to make any error
39448	** persistent.
39449	*/
39450	rc = pager_error(pPager, rc);
39451	}
39452	return rc;
39453	}
39454
39455	/*
39456	** Return TRUE if the database file is opened read-only. Return FALSE
39457	** if the database is (in theory) writable.
	@@ -39493,12 +40099,12 @@
39493	SQLITE_PRIVATE int sqlite3PagerStats(Pager pPager){
39494	static int a[11];
39495	a[0] = sqlite3PcacheRefCount(pPager->pPCache);
39496	a[1] = sqlite3PcachePagecount(pPager->pPCache);
39497	a[2] = sqlite3PcacheGetCachesize(pPager->pPCache);
39498	a[3] = pPager->dbSizeValid ? (int) pPager->dbSize : -1;
39499	a[4] = pPager->state;
39500	a[5] = pPager->errCode;
39501	a[6] = pPager->nHit;
39502	a[7] = pPager->nMiss;
39503	a[8] = 0; /* Used to be pPager->nOvfl */
39504	a[9] = pPager->nRead;
	@@ -39525,18 +40131,17 @@
39525	** returned. Otherwise, SQLITE_OK.
39526	*/
39527	SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int nSavepoint){
39528	int rc = SQLITE_OK; /* Return code */
39529	int nCurrent = pPager->nSavepoint; /* Current number of savepoints */



39530
39531	if( nSavepoint>nCurrent && pPager->useJournal ){
39532	int ii; /* Iterator variable */
39533	PagerSavepoint aNew; / New Pager.aSavepoint array */
39534	int nPage; /* Size of database file */
39535
39536	rc = sqlite3PagerPagecount(pPager, &nPage);
39537	if( rc ) return rc;
39538
39539	/* Grow the Pager.aSavepoint array using realloc(). Return SQLITE_NOMEM
39540	** if the allocation fails. Otherwise, zero the new portion in case a
39541	** malloc failure occurs while populating it in the for(...) loop below.
39542	*/
	@@ -39549,18 +40154,18 @@
39549	memset(&aNew[nCurrent], 0, (nSavepoint-nCurrent) * sizeof(PagerSavepoint));
39550	pPager->aSavepoint = aNew;
39551
39552	/* Populate the PagerSavepoint structures just allocated. */
39553	for(ii=nCurrent; ii<nSavepoint; ii++){
39554	aNew[ii].nOrig = nPage;
39555	if( isOpen(pPager->jfd) && pPager->journalOff>0 ){
39556	aNew[ii].iOffset = pPager->journalOff;
39557	}else{
39558	aNew[ii].iOffset = JOURNAL_HDR_SZ(pPager);
39559	}
39560	aNew[ii].iSubRec = pPager->nSubRec;
39561	aNew[ii].pInSavepoint = sqlite3BitvecCreate(nPage);
39562	if( !aNew[ii].pInSavepoint ){
39563	return SQLITE_NOMEM;
39564	}
39565	if( pagerUseWal(pPager) ){
39566	sqlite3WalSavepoint(pPager->pWal, aNew[ii].aWalData);
	@@ -39603,16 +40208,16 @@
39603	** This function may return SQLITE_NOMEM if a memory allocation fails,
39604	** or an IO error code if an IO error occurs while rolling back a
39605	** savepoint. If no errors occur, SQLITE_OK is returned.
39606	*/
39607	SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){
39608	int rc = SQLITE_OK;
39609
39610	assert( op==SAVEPOINT_RELEASE \|\| op==SAVEPOINT_ROLLBACK );
39611	assert( iSavepoint>=0 \|\| op==SAVEPOINT_ROLLBACK );
39612
39613	if( iSavepoint<pPager->nSavepoint ){
39614	int ii; /* Iterator variable */
39615	int nNew; /* Number of remaining savepoints after this op. */
39616
39617	/* Figure out how many savepoints will still be active after this
39618	** operation. Store this value in nNew. Then free resources associated
	@@ -39644,12 +40249,12 @@
39644	else if( pagerUseWal(pPager) \|\| isOpen(pPager->jfd) ){
39645	PagerSavepoint *pSavepoint = (nNew==0)?0:&pPager->aSavepoint[nNew-1];
39646	rc = pagerPlaybackSavepoint(pPager, pSavepoint);
39647	assert(rc!=SQLITE_DONE);
39648	}
39649
39650	}

39651	return rc;
39652	}
39653
39654	/*
39655	** Return the full pathname of the database file.
	@@ -39743,10 +40348,14 @@
39743	Pgno needSyncPgno = 0; /* Old value of pPg->pgno, if sync is required */
39744	int rc; /* Return code */
39745	Pgno origPgno; /* The original page number */
39746
39747	assert( pPg->nRef>0 );




39748
39749	/* In order to be able to rollback, an in-memory database must journal
39750	** the page we are moving from.
39751	*/
39752	if( MEMDB ){
	@@ -39792,15 +40401,14 @@
39792	*/
39793	if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
39794	needSyncPgno = pPg->pgno;
39795	assert( pageInJournal(pPg) \|\| pPg->pgno>pPager->dbOrigSize );
39796	assert( pPg->flags&PGHDR_DIRTY );
39797	assert( pPager->needSync );
39798	}
39799
39800	/* If the cache contains a page with page-number pgno, remove it
39801	** from its hash chain. Also, if the PgHdr.needSync was set for
39802	** page pgno before the 'move' operation, it needs to be retained
39803	** for the page moved there.
39804	*/
39805	pPg->flags &= ~PGHDR_NEED_SYNC;
39806	pPgOld = pager_lookup(pPager, pgno);
	@@ -39808,67 +40416,59 @@
39808	if( pPgOld ){
39809	pPg->flags \|= (pPgOld->flags&PGHDR_NEED_SYNC);
39810	if( MEMDB ){
39811	/* Do not discard pages from an in-memory database since we might
39812	** need to rollback later. Just move the page out of the way. */
39813	assert( pPager->dbSizeValid );
39814	sqlite3PcacheMove(pPgOld, pPager->dbSize+1);
39815	}else{
39816	sqlite3PcacheDrop(pPgOld);
39817	}
39818	}
39819
39820	origPgno = pPg->pgno;
39821	sqlite3PcacheMove(pPg, pgno);
39822	sqlite3PcacheMakeDirty(pPg);
39823	pPager->dbModified = 1;









39824
39825	if( needSyncPgno ){
39826	/* If needSyncPgno is non-zero, then the journal file needs to be
39827	** sync()ed before any data is written to database file page needSyncPgno.
39828	** Currently, no such page exists in the page-cache and the
39829	** "is journaled" bitvec flag has been set. This needs to be remedied by
39830	** loading the page into the pager-cache and setting the PgHdr.needSync
39831	** flag.
39832	**
39833	** If the attempt to load the page into the page-cache fails, (due
39834	** to a malloc() or IO failure), clear the bit in the pInJournal[]
39835	** array. Otherwise, if the page is loaded and written again in
39836	** this transaction, it may be written to the database file before
39837	** it is synced into the journal file. This way, it may end up in
39838	** the journal file twice, but that is not a problem.
39839	**
39840	** The sqlite3PagerGet() call may cause the journal to sync. So make
39841	** sure the Pager.needSync flag is set too.
39842	*/
39843	PgHdr *pPgHdr;
39844	assert( pPager->needSync );
39845	rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr);
39846	if( rc!=SQLITE_OK ){
39847	if( needSyncPgno<=pPager->dbOrigSize ){
39848	assert( pPager->pTmpSpace!=0 );
39849	sqlite3BitvecClear(pPager->pInJournal, needSyncPgno, pPager->pTmpSpace);
39850	}
39851	return rc;
39852	}
39853	pPager->needSync = 1;
39854	assert( pPager->noSync==0 && !MEMDB );
39855	pPgHdr->flags \|= PGHDR_NEED_SYNC;
39856	sqlite3PcacheMakeDirty(pPgHdr);
39857	sqlite3PagerUnref(pPgHdr);
39858	}
39859
39860	/*
39861	** For an in-memory database, make sure the original page continues
39862	** to exist, in case the transaction needs to roll back. Use pPgOld
39863	** as the original page since it has already been allocated.
39864	*/
39865	if( MEMDB ){
39866	sqlite3PcacheMove(pPgOld, origPgno);
39867	sqlite3PagerUnref(pPgOld);
39868	}
39869
39870	return SQLITE_OK;
39871	}
39872	#endif
39873
39874	/*
	@@ -39929,10 +40529,17 @@
39929	**
39930	** The returned indicate the current (possibly updated) journal-mode.
39931	*/
39932	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
39933	u8 eOld = pPager->journalMode; /* Prior journalmode */







39934
39935	/* The eMode parameter is always valid */
39936	assert( eMode==PAGER_JOURNALMODE_DELETE
39937	\|\| eMode==PAGER_JOURNALMODE_TRUNCATE
39938	\|\| eMode==PAGER_JOURNALMODE_PERSIST
	@@ -39955,24 +40562,17 @@
39955	eMode = eOld;
39956	}
39957	}
39958
39959	if( eMode!=eOld ){
39960	/* When changing between rollback modes, close the journal file prior
39961	** to the change. But when changing from a rollback mode to WAL, keep
39962	** the journal open since there is a rollback-style transaction in play
39963	** used to convert the version numbers in the btree header.
39964	*/
39965	if( isOpen(pPager->jfd) && eMode!=PAGER_JOURNALMODE_WAL ){
39966	sqlite3OsClose(pPager->jfd);
39967	}
39968
39969	/* Change the journal mode. */

39970	pPager->journalMode = (u8)eMode;
39971
39972	/* When transistioning from TRUNCATE or PERSIST to any other journal
39973	** mode except WAL (and we are not in locking_mode=EXCLUSIVE) then
39974	** delete the journal file.
39975	*/
39976	assert( (PAGER_JOURNALMODE_TRUNCATE & 5)==1 );
39977	assert( (PAGER_JOURNALMODE_PERSIST & 5)==1 );
39978	assert( (PAGER_JOURNALMODE_DELETE & 5)==0 );
	@@ -39989,28 +40589,34 @@
39989	**
39990	** Before deleting the journal file, obtain a RESERVED lock on the
39991	** database file. This ensures that the journal file is not deleted
39992	** while it is in use by some other client.
39993	*/
39994	int rc = SQLITE_OK;
39995	int state = pPager->state;
39996	if( state<PAGER_SHARED ){
39997	rc = sqlite3PagerSharedLock(pPager);
39998	}
39999	if( pPager->state==PAGER_SHARED ){
40000	assert( rc==SQLITE_OK );
40001	rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
40002	}
40003	if( rc==SQLITE_OK ){
40004	sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);




















40005	}
40006	if( rc==SQLITE_OK && state==PAGER_SHARED ){
40007	sqlite3OsUnlock(pPager->fd, SHARED_LOCK);
40008	}else if( state==PAGER_UNLOCK ){
40009	pager_unlock(pPager);
40010	}
40011	assert( state==pPager->state );
40012	}
40013	}
40014
40015	/* Return the new journal mode */
40016	return (int)pPager->journalMode;
	@@ -40027,11 +40633,12 @@
40027	** Return TRUE if the pager is in a state where it is OK to change the
40028	** journalmode. Journalmode changes can only happen when the database
40029	** is unmodified.
40030	*/
40031	SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager *pPager){
40032	if( pPager->dbModified ) return 0;

40033	if( NEVER(isOpen(pPager->jfd) && pPager->journalOff>0) ) return 0;
40034	return 1;
40035	}
40036
40037	/*
	@@ -40092,39 +40699,46 @@
40092	**
40093	** If the pager passed as the first argument is open on a real database
40094	** file (not a temp file or an in-memory database), and the WAL file
40095	** is not already open, make an attempt to open it now. If successful,
40096	** return SQLITE_OK. If an error occurs or the VFS used by the pager does
40097	** not support the xShmXXX() methods, return an error code. *pisOpen is
40098	** not modified in either case.
40099	**
40100	** If the pager is open on a temp-file (or in-memory database), or if
40101	** the WAL file is already open, set *pisOpen to 1 and return SQLITE_OK
40102	** without doing anything.
40103	*/
40104	SQLITE_PRIVATE int sqlite3PagerOpenWal(
40105	Pager pPager, / Pager object */
40106	int pisOpen / OUT: Set to true if call is a no-op */
40107	){
40108	int rc = SQLITE_OK; /* Return code */
40109
40110	assert( pPager->state>=PAGER_SHARED );
40111	assert( (pisOpen==0 && !pPager->tempFile && !pPager->pWal) \|\| *pisOpen==0 );



40112
40113	if( !pPager->tempFile && !pPager->pWal ){
40114	if( !sqlite3PagerWalSupported(pPager) ) return SQLITE_CANTOPEN;



40115
40116	/* Open the connection to the log file. If this operation fails,
40117	** (e.g. due to malloc() failure), unlock the database file and
40118	** return an error code.
40119	*/
40120	rc = sqlite3WalOpen(pPager->pVfs, pPager->fd, pPager->zWal, &pPager->pWal);
40121	if( rc==SQLITE_OK ){
40122	pPager->journalMode = PAGER_JOURNALMODE_WAL;

40123	}
40124	}else{
40125	*pisOpen = 1;
40126	}
40127
40128	return rc;
40129	}
40130
	@@ -40146,11 +40760,11 @@
40146	** it may need to be checkpointed before the connection can switch to
40147	** rollback mode. Open it now so this can happen.
40148	*/
40149	if( !pPager->pWal ){
40150	int logexists = 0;
40151	rc = sqlite3OsLock(pPager->fd, SQLITE_LOCK_SHARED);
40152	if( rc==SQLITE_OK ){
40153	rc = sqlite3OsAccess(
40154	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &logexists
40155	);
40156	}
	@@ -40162,21 +40776,21 @@
40162
40163	/* Checkpoint and close the log. Because an EXCLUSIVE lock is held on
40164	** the database file, the log and log-summary files will be deleted.
40165	*/
40166	if( rc==SQLITE_OK && pPager->pWal ){
40167	rc = sqlite3OsLock(pPager->fd, SQLITE_LOCK_EXCLUSIVE);
40168	if( rc==SQLITE_OK ){
40169	rc = sqlite3WalClose(pPager->pWal,
40170	(pPager->noSync ? 0 : pPager->sync_flags),
40171	pPager->pageSize, (u8*)pPager->pTmpSpace
40172	);
40173	pPager->pWal = 0;
40174	}else{
40175	/* If we cannot get an EXCLUSIVE lock, downgrade the PENDING lock
40176	** that we did get back to SHARED. */
40177	sqlite3OsUnlock(pPager->fd, SQLITE_LOCK_SHARED);
40178	}
40179	}
40180	return rc;
40181	}
40182
	@@ -40492,18 +41106,22 @@
40492	/*
40493	** The following object holds a copy of the wal-index header content.
40494	**
40495	** The actual header in the wal-index consists of two copies of this
40496	** object.




40497	*/
40498	struct WalIndexHdr {
40499	u32 iVersion; /* Wal-index version */
40500	u32 unused; /* Unused (padding) field */
40501	u32 iChange; /* Counter incremented each transaction */
40502	u8 isInit; /* 1 when initialized */
40503	u8 bigEndCksum; /* True if checksums in WAL are big-endian */
40504	u16 szPage; /* Database page size in bytes */
40505	u32 mxFrame; /* Index of last valid frame in the WAL */
40506	u32 nPage; /* Size of database in pages */
40507	u32 aFrameCksum[2]; /* Checksum of last frame in log */
40508	u32 aSalt[2]; /* Two salt values copied from WAL header */
40509	u32 aCksum[2]; /* Checksum over all prior fields */
	@@ -40610,11 +41228,11 @@
40610	sqlite3_file pDbFd; / File handle for the database file */
40611	sqlite3_file pWalFd; / File handle for WAL file */
40612	u32 iCallback; /* Value to pass to log callback (or 0) */
40613	int nWiData; /* Size of array apWiData */
40614	volatile u32 *apWiData; / Pointer to wal-index content in memory */
40615	u16 szPage; /* Database page size */
40616	i16 readLock; /* Which read lock is being held. -1 for none */
40617	u8 exclusiveMode; /* Non-zero if connection is in exclusive mode */
40618	u8 writeLock; /* True if in a write transaction */
40619	u8 ckptLock; /* True if holding a checkpoint lock */
40620	u8 readOnly; /* True if the WAL file is open read-only */
	@@ -41281,11 +41899,11 @@
41281	\|\| szPage<512
41282	){
41283	goto finished;
41284	}
41285	pWal->hdr.bigEndCksum = (u8)(magic&0x00000001);
41286	pWal->szPage = (u16)szPage;
41287	pWal->nCkpt = sqlite3Get4byte(&aBuf[12]);
41288	memcpy(&pWal->hdr.aSalt, &aBuf[16], 8);
41289
41290	/* Verify that the WAL header checksum is correct */
41291	walChecksumBytes(pWal->hdr.bigEndCksum==SQLITE_BIGENDIAN,
	@@ -41331,11 +41949,13 @@
41331
41332	/* If nTruncate is non-zero, this is a commit record. */
41333	if( nTruncate ){
41334	pWal->hdr.mxFrame = iFrame;
41335	pWal->hdr.nPage = nTruncate;
41336	pWal->hdr.szPage = (u16)szPage;


41337	aFrameCksum[0] = pWal->hdr.aFrameCksum[0];
41338	aFrameCksum[1] = pWal->hdr.aFrameCksum[1];
41339	}
41340	}
41341
	@@ -41356,10 +41976,21 @@
41356	*/
41357	pInfo = walCkptInfo(pWal);
41358	pInfo->nBackfill = 0;
41359	pInfo->aReadMark[0] = 0;
41360	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;











41361	}
41362
41363	recovery_error:
41364	WALTRACE(("WAL%p: recovery %s\n", pWal, rc ? "failed" : "ok"));
41365	walUnlockExclusive(pWal, iLock, nLock);
	@@ -41716,18 +42347,22 @@
41716	int sync_flags, /* Flags for OsSync() (or 0) */
41717	int nBuf, /* Size of zBuf in bytes */
41718	u8 zBuf / Temporary buffer to use */
41719	){
41720	int rc; /* Return code */
41721	int szPage = pWal->hdr.szPage; /* Database page-size */
41722	WalIterator pIter = 0; / Wal iterator context */
41723	u32 iDbpage = 0; /* Next database page to write */
41724	u32 iFrame = 0; /* Wal frame containing data for iDbpage */
41725	u32 mxSafeFrame; /* Max frame that can be backfilled */

41726	int i; /* Loop counter */
41727	volatile WalCkptInfo pInfo; / The checkpoint status information */
41728



41729	if( pWal->hdr.mxFrame==0 ) return SQLITE_OK;
41730
41731	/* Allocate the iterator */
41732	rc = walIteratorInit(pWal, &pIter);
41733	if( rc!=SQLITE_OK ){
	@@ -41734,11 +42369,11 @@
41734	return rc;
41735	}
41736	assert( pIter );
41737
41738	/* TODO: Move this test out to the caller. Make it an assert() here */
41739	if( pWal->hdr.szPage!=nBuf ){
41740	rc = SQLITE_CORRUPT_BKPT;
41741	goto walcheckpoint_out;
41742	}
41743
41744	/* Compute in mxSafeFrame the index of the last frame of the WAL that is
	@@ -41745,10 +42380,11 @@
41745	** safe to write into the database. Frames beyond mxSafeFrame might
41746	** overwrite database pages that are in use by active readers and thus
41747	** cannot be backfilled from the WAL.
41748	*/
41749	mxSafeFrame = pWal->hdr.mxFrame;

41750	pInfo = walCkptInfo(pWal);
41751	for(i=1; i<WAL_NREADER; i++){
41752	u32 y = pInfo->aReadMark[i];
41753	if( mxSafeFrame>=y ){
41754	assert( y<=pWal->hdr.mxFrame );
	@@ -41765,22 +42401,34 @@
41765	}
41766
41767	if( pInfo->nBackfill<mxSafeFrame
41768	&& (rc = walLockExclusive(pWal, WAL_READ_LOCK(0), 1))==SQLITE_OK
41769	){

41770	u32 nBackfill = pInfo->nBackfill;
41771
41772	/* Sync the WAL to disk */
41773	if( sync_flags ){
41774	rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
41775	}











41776
41777	/* Iterate through the contents of the WAL, copying data to the db file. */
41778	while( rc==SQLITE_OK && 0==walIteratorNext(pIter, &iDbpage, &iFrame) ){
41779	i64 iOffset;
41780	assert( walFramePgno(pWal, iFrame)==iDbpage );
41781	if( iFrame<=nBackfill \|\| iFrame>mxSafeFrame ) continue;
41782	iOffset = walFrameOffset(iFrame, szPage) + WAL_FRAME_HDRSIZE;
41783	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL file */
41784	rc = sqlite3OsRead(pWal->pWalFd, zBuf, szPage, iOffset);
41785	if( rc!=SQLITE_OK ) break;
41786	iOffset = (iDbpage-1)*(i64)szPage;
	@@ -41883,11 +42531,11 @@
41883	WalIndexHdr volatile aHdr; / Header in shared memory */
41884
41885	/* The first page of the wal-index must be mapped at this point. */
41886	assert( pWal->nWiData>0 && pWal->apWiData[0] );
41887
41888	/* Read the header. This might happen currently with a write to the
41889	** same area of shared memory on a different CPU in a SMP,
41890	** meaning it is possible that an inconsistent snapshot is read
41891	** from the file. If this happens, return non-zero.
41892	**
41893	** There are two copies of the header at the beginning of the wal-index.
	@@ -41912,11 +42560,13 @@
41912	}
41913
41914	if( memcmp(&pWal->hdr, &h1, sizeof(WalIndexHdr)) ){
41915	*pChanged = 1;
41916	memcpy(&pWal->hdr, &h1, sizeof(WalIndexHdr));
41917	pWal->szPage = pWal->hdr.szPage;


41918	}
41919
41920	/* The header was successfully read. Return zero. */
41921	return 0;
41922	}
	@@ -42231,10 +42881,11 @@
42231	/*
42232	** Finish with a read transaction. All this does is release the
42233	** read-lock.
42234	*/
42235	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal){

42236	if( pWal->readLock>=0 ){
42237	walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock));
42238	pWal->readLock = -1;
42239	}
42240	}
	@@ -42341,11 +42992,17 @@
42341
42342	/* If iRead is non-zero, then it is the log frame number that contains the
42343	** required page. Read and return data from the log file.
42344	*/
42345	if( iRead ){
42346	i64 iOffset = walFrameOffset(iRead, pWal->hdr.szPage) + WAL_FRAME_HDRSIZE;






42347	*pInWal = 1;
42348	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL */
42349	return sqlite3OsRead(pWal->pWalFd, pOut, nOut, iOffset);
42350	}
42351
	@@ -42353,15 +43010,17 @@
42353	return SQLITE_OK;
42354	}
42355
42356
42357	/*
42358	** Set *pPgno to the size of the database file (or zero, if unknown).
42359	*/
42360	SQLITE_PRIVATE void sqlite3WalDbsize(Wal pWal, Pgno pPgno){
42361	assert( pWal->readLock>=0 \|\| pWal->lockError );
42362	*pPgno = pWal->hdr.nPage;


42363	}
42364
42365
42366	/*
42367	** This function starts a write transaction on the WAL.
	@@ -42433,11 +43092,11 @@
42433	** Otherwise, if the callback function does not return an error, this
42434	** function returns SQLITE_OK.
42435	*/
42436	SQLITE_PRIVATE int sqlite3WalUndo(Wal pWal, int (xUndo)(void , Pgno), void pUndoCtx){
42437	int rc = SQLITE_OK;
42438	if( pWal->writeLock ){
42439	Pgno iMax = pWal->hdr.mxFrame;
42440	Pgno iFrame;
42441
42442	/* Restore the clients cache of the wal-index header to the state it
42443	** was in before the client began writing to the database.
	@@ -42622,11 +43281,11 @@
42622	memcpy(&aWalHdr[16], pWal->hdr.aSalt, 8);
42623	walChecksumBytes(1, aWalHdr, WAL_HDRSIZE-2*4, 0, aCksum);
42624	sqlite3Put4byte(&aWalHdr[24], aCksum[0]);
42625	sqlite3Put4byte(&aWalHdr[28], aCksum[1]);
42626
42627	pWal->szPage = (u16)szPage;
42628	pWal->hdr.bigEndCksum = SQLITE_BIGENDIAN;
42629	pWal->hdr.aFrameCksum[0] = aCksum[0];
42630	pWal->hdr.aFrameCksum[1] = aCksum[1];
42631
42632	rc = sqlite3OsWrite(pWal->pWalFd, aWalHdr, sizeof(aWalHdr), 0);
	@@ -42717,11 +43376,13 @@
42717	rc = walIndexAppend(pWal, iFrame, pLast->pgno);
42718	}
42719
42720	if( rc==SQLITE_OK ){
42721	/* Update the private copy of the header. */
42722	pWal->hdr.szPage = (u16)szPage;


42723	pWal->hdr.mxFrame = iFrame;
42724	if( isCommit ){
42725	pWal->hdr.iChange++;
42726	pWal->hdr.nPage = nTruncate;
42727	}
	@@ -42929,11 +43590,11 @@
42929	**
42930	** FORMAT DETAILS
42931	**
42932	** The file is divided into pages. The first page is called page 1,
42933	** the second is page 2, and so forth. A page number of zero indicates
42934	** "no such page". The page size can be any power of 2 between 512 and 32768.
42935	** Each page can be either a btree page, a freelist page, an overflow
42936	** page, or a pointer-map page.
42937	**
42938	** The first page is always a btree page. The first 100 bytes of the first
42939	** page contain a special header (the "file header") that describes the file.
	@@ -43295,18 +43956,18 @@
43295	u8 initiallyEmpty; /* Database is empty at start of transaction */
43296	#ifndef SQLITE_OMIT_AUTOVACUUM
43297	u8 autoVacuum; /* True if auto-vacuum is enabled */
43298	u8 incrVacuum; /* True if incr-vacuum is enabled */
43299	#endif
43300	u16 pageSize; /* Total number of bytes on a page */
43301	u16 usableSize; /* Number of usable bytes on each page */
43302	u16 maxLocal; /* Maximum local payload in non-LEAFDATA tables */
43303	u16 minLocal; /* Minimum local payload in non-LEAFDATA tables */
43304	u16 maxLeaf; /* Maximum local payload in a LEAFDATA table */
43305	u16 minLeaf; /* Minimum local payload in a LEAFDATA table */
43306	u8 inTransaction; /* Transaction state */
43307	u8 doNotUseWAL; /* If true, do not open write-ahead-log file */


43308	int nTransaction; /* Number of open transactions (read + write) */
43309	u32 nPage; /* Number of pages in the database */
43310	void pSchema; / Pointer to space allocated by sqlite3BtreeSchema() */
43311	void (xFreeSchema)(void); /* Destructor for BtShared.pSchema */
43312	sqlite3_mutex mutex; / Non-recursive mutex required to access this struct */
	@@ -43901,11 +44562,20 @@
43901	# define TRACE(X) if(sqlite3BtreeTrace){printf X;fflush(stdout);}
43902	#else
43903	# define TRACE(X)
43904	#endif
43905
43906









43907
43908	#ifndef SQLITE_OMIT_SHARED_CACHE
43909	/*
43910	** A list of BtShared objects that are eligible for participation
43911	** in shared cache. This variable has file scope during normal builds,
	@@ -44590,15 +45260,20 @@
44590	#ifndef SQLITE_OMIT_AUTOVACUUM
44591	/*
44592	** Given a page number of a regular database page, return the page
44593	** number for the pointer-map page that contains the entry for the
44594	** input page number.




44595	*/
44596	static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){
44597	int nPagesPerMapPage;
44598	Pgno iPtrMap, ret;
44599	assert( sqlite3_mutex_held(pBt->mutex) );

44600	nPagesPerMapPage = (pBt->usableSize/5)+1;
44601	iPtrMap = (pgno-2)/nPagesPerMapPage;
44602	ret = (iPtrMap*nPagesPerMapPage) + 2;
44603	if( ret==PENDING_BYTE_PAGE(pBt) ){
44604	ret++;
	@@ -45023,21 +45698,21 @@
45023	assert( nByte < usableSize-8 );
45024
45025	nFrag = data[hdr+7];
45026	assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
45027	gap = pPage->cellOffset + 2*pPage->nCell;
45028	top = get2byte(&data[hdr+5]);
45029	if( gap>top ) return SQLITE_CORRUPT_BKPT;
45030	testcase( gap+2==top );
45031	testcase( gap+1==top );
45032	testcase( gap==top );
45033
45034	if( nFrag>=60 ){
45035	/* Always defragment highly fragmented pages */
45036	rc = defragmentPage(pPage);
45037	if( rc ) return rc;
45038	top = get2byte(&data[hdr+5]);
45039	}else if( gap+2<=top ){
45040	/* Search the freelist looking for a free slot big enough to satisfy
45041	** the request. The allocation is made from the first free slot in
45042	** the list that is large enough to accomadate it.
45043	*/
	@@ -45075,11 +45750,11 @@
45075	*/
45076	testcase( gap+2+nByte==top );
45077	if( gap+2+nByte>top ){
45078	rc = defragmentPage(pPage);
45079	if( rc ) return rc;
45080	top = get2byte(&data[hdr+5]);
45081	assert( gap+nByte<=top );
45082	}
45083
45084
45085	/* Allocate memory from the gap in between the cell pointer array
	@@ -45241,28 +45916,28 @@
45241	if( !pPage->isInit ){
45242	u16 pc; /* Address of a freeblock within pPage->aData[] */
45243	u8 hdr; /* Offset to beginning of page header */
45244	u8 data; / Equal to pPage->aData */
45245	BtShared pBt; / The main btree structure */
45246	u16 usableSize; /* Amount of usable space on each page */
45247	u16 cellOffset; /* Offset from start of page to first cell pointer */
45248	u16 nFree; /* Number of unused bytes on the page */
45249	u16 top; /* First byte of the cell content area */
45250	int iCellFirst; /* First allowable cell or freeblock offset */
45251	int iCellLast; /* Last possible cell or freeblock offset */
45252
45253	pBt = pPage->pBt;
45254
45255	hdr = pPage->hdrOffset;
45256	data = pPage->aData;
45257	if( decodeFlags(pPage, data[hdr]) ) return SQLITE_CORRUPT_BKPT;
45258	assert( pBt->pageSize>=512 && pBt->pageSize<=32768 );
45259	pPage->maskPage = pBt->pageSize - 1;
45260	pPage->nOverflow = 0;
45261	usableSize = pBt->usableSize;
45262	pPage->cellOffset = cellOffset = hdr + 12 - 4*pPage->leaf;
45263	top = get2byte(&data[hdr+5]);
45264	pPage->nCell = get2byte(&data[hdr+3]);
45265	if( pPage->nCell>MX_CELL(pBt) ){
45266	/* To many cells for a single page. The page must be corrupt */
45267	return SQLITE_CORRUPT_BKPT;
45268	}
	@@ -45357,17 +46032,17 @@
45357	data[hdr] = (char)flags;
45358	first = hdr + 8 + 4*((flags&PTF_LEAF)==0 ?1:0);
45359	memset(&data[hdr+1], 0, 4);
45360	data[hdr+7] = 0;
45361	put2byte(&data[hdr+5], pBt->usableSize);
45362	pPage->nFree = pBt->usableSize - first;
45363	decodeFlags(pPage, flags);
45364	pPage->hdrOffset = hdr;
45365	pPage->cellOffset = first;
45366	pPage->nOverflow = 0;
45367	assert( pBt->pageSize>=512 && pBt->pageSize<=32768 );
45368	pPage->maskPage = pBt->pageSize - 1;
45369	pPage->nCell = 0;
45370	pPage->isInit = 1;
45371	}
45372
45373
	@@ -45671,11 +46346,11 @@
45671	pBt->pPage1 = 0;
45672	pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager);
45673	#ifdef SQLITE_SECURE_DELETE
45674	pBt->secureDelete = 1;
45675	#endif
45676	pBt->pageSize = get2byte(&zDbHeader[16]);
45677	if( pBt->pageSize<512 \|\| pBt->pageSize>SQLITE_MAX_PAGE_SIZE
45678	\|\| ((pBt->pageSize-1)&pBt->pageSize)!=0 ){
45679	pBt->pageSize = 0;
45680	#ifndef SQLITE_OMIT_AUTOVACUUM
45681	/* If the magic name ":memory:" will create an in-memory database, then
	@@ -45985,11 +46660,11 @@
45985	assert( nReserve>=0 && nReserve<=255 );
45986	if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
45987	((pageSize-1)&pageSize)==0 ){
45988	assert( (pageSize & 7)==0 );
45989	assert( !pBt->pPage1 && !pBt->pCursor );
45990	pBt->pageSize = (u16)pageSize;
45991	freeTempSpace(pBt);
45992	}
45993	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
45994	pBt->usableSize = pBt->pageSize - (u16)nReserve;
45995	if( iFix ) pBt->pageSizeFixed = 1;
	@@ -46120,19 +46795,17 @@
46120
46121	/* Do some checking to help insure the file we opened really is
46122	** a valid database file.
46123	*/
46124	nPage = nPageHeader = get4byte(28+(u8*)pPage1->aData);
46125	if( (rc = sqlite3PagerPagecount(pBt->pPager, &nPageFile))!=SQLITE_OK ){;
46126	goto page1_init_failed;
46127	}
46128	if( nPage==0 \|\| memcmp(24+(u8)pPage1->aData, 92+(u8)pPage1->aData,4)!=0 ){
46129	nPage = nPageFile;
46130	}
46131	if( nPage>0 ){
46132	int pageSize;
46133	int usableSize;
46134	u8 *page1 = pPage1->aData;
46135	rc = SQLITE_NOTADB;
46136	if( memcmp(page1, zMagicHeader, 16)!=0 ){
46137	goto page1_init_failed;
46138	}
	@@ -46179,28 +46852,29 @@
46179	** version 3.6.0, we require them to be fixed.
46180	*/
46181	if( memcmp(&page1[21], "\100\040\040",3)!=0 ){
46182	goto page1_init_failed;
46183	}
46184	pageSize = get2byte(&page1[16]);
46185	if( ((pageSize-1)&pageSize)!=0 \|\| pageSize<512 \|\|
46186	(SQLITE_MAX_PAGE_SIZE<32768 && pageSize>SQLITE_MAX_PAGE_SIZE)

46187	){
46188	goto page1_init_failed;
46189	}
46190	assert( (pageSize & 7)==0 );
46191	usableSize = pageSize - page1[20];
46192	if( pageSize!=pBt->pageSize ){
46193	/* After reading the first page of the database assuming a page size
46194	** of BtShared.pageSize, we have discovered that the page-size is
46195	** actually pageSize. Unlock the database, leave pBt->pPage1 at
46196	** zero and return SQLITE_OK. The caller will call this function
46197	** again with the correct page-size.
46198	*/
46199	releasePage(pPage1);
46200	pBt->usableSize = (u16)usableSize;
46201	pBt->pageSize = (u16)pageSize;
46202	freeTempSpace(pBt);
46203	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
46204	pageSize-usableSize);
46205	return rc;
46206	}
	@@ -46209,12 +46883,12 @@
46209	goto page1_init_failed;
46210	}
46211	if( usableSize<480 ){
46212	goto page1_init_failed;
46213	}
46214	pBt->pageSize = (u16)pageSize;
46215	pBt->usableSize = (u16)usableSize;
46216	#ifndef SQLITE_OMIT_AUTOVACUUM
46217	pBt->autoVacuum = (get4byte(&page1[36 + 4*4])?1:0);
46218	pBt->incrVacuum = (get4byte(&page1[36 + 7*4])?1:0);
46219	#endif
46220	}
	@@ -46226,18 +46900,18 @@
46226	** 2-byte pointer to the cell
46227	** 4-byte child pointer
46228	** 9-byte nKey value
46229	** 4-byte nData value
46230	** 4-byte overflow page pointer
46231	** So a cell consists of a 2-byte poiner, a header which is as much as
46232	** 17 bytes long, 0 to N bytes of payload, and an optional 4 byte overflow
46233	** page pointer.
46234	*/
46235	pBt->maxLocal = (pBt->usableSize-12)*64/255 - 23;
46236	pBt->minLocal = (pBt->usableSize-12)*32/255 - 23;
46237	pBt->maxLeaf = pBt->usableSize - 35;
46238	pBt->minLeaf = (pBt->usableSize-12)*32/255 - 23;
46239	assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) );
46240	pBt->pPage1 = pPage1;
46241	pBt->nPage = nPage;
46242	return SQLITE_OK;
46243
	@@ -46286,11 +46960,12 @@
46286	data = pP1->aData;
46287	rc = sqlite3PagerWrite(pP1->pDbPage);
46288	if( rc ) return rc;
46289	memcpy(data, zMagicHeader, sizeof(zMagicHeader));
46290	assert( sizeof(zMagicHeader)==16 );
46291	put2byte(&data[16], pBt->pageSize);

46292	data[18] = 1;
46293	data[19] = 1;
46294	assert( pBt->usableSize<=pBt->pageSize && pBt->usableSize+255>=pBt->pageSize);
46295	data[20] = (u8)(pBt->pageSize - pBt->usableSize);
46296	data[21] = 64;
	@@ -48297,13 +48972,13 @@
48297	c = +1;
48298	}
48299	pCur->validNKey = 1;
48300	pCur->info.nKey = nCellKey;
48301	}else{
48302	/* The maximum supported page-size is 32768 bytes. This means that
48303	** the maximum number of record bytes stored on an index B-Tree
48304	** page is at most 8198 bytes, which may be stored as a 2-byte
48305	** varint. This information is used to attempt to avoid parsing
48306	** the entire cell by checking for the cases where the record is
48307	** stored entirely within the b-tree page by inspecting the first
48308	** 2 bytes of the cell.
48309	*/
	@@ -48662,10 +49337,14 @@
48662	}
48663	if( k==0 ){
48664	if( !pPrevTrunk ){
48665	memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
48666	}else{




48667	memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
48668	}
48669	}else{
48670	/* The trunk page is required by the caller but it contains
48671	** pointers to free-list leaves. The first leaf becomes a trunk
	@@ -48968,11 +49647,11 @@
48968	BtShared *pBt = pPage->pBt;
48969	CellInfo info;
48970	Pgno ovflPgno;
48971	int rc;
48972	int nOvfl;
48973	u16 ovflPageSize;
48974
48975	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
48976	btreeParseCellPtr(pPage, pCell, &info);
48977	if( info.iOverflow==0 ){
48978	return SQLITE_OK; /* No overflow pages. Return without doing anything */
	@@ -49193,11 +49872,11 @@
49193	**
49194	** "sz" must be the number of bytes in the cell.
49195	*/
49196	static void dropCell(MemPage pPage, int idx, int sz, int pRC){
49197	int i; /* Loop counter */
49198	int pc; /* Offset to cell content of cell being deleted */
49199	u8 data; / pPage->aData */
49200	u8 ptr; / Used to move bytes around within data[] */
49201	int rc; /* The return code */
49202	int hdr; /* Beginning of the header. 0 most pages. 100 page 1 */
49203
	@@ -49211,11 +49890,11 @@
49211	ptr = &data[pPage->cellOffset + 2*idx];
49212	pc = get2byte(ptr);
49213	hdr = pPage->hdrOffset;
49214	testcase( pc==get2byte(&data[hdr+5]) );
49215	testcase( pc+sz==pPage->pBt->usableSize );
49216	if( pc < get2byte(&data[hdr+5]) \|\| pc+sz > pPage->pBt->usableSize ){
49217	*pRC = SQLITE_CORRUPT_BKPT;
49218	return;
49219	}
49220	rc = freeSpace(pPage, pc, sz);
49221	if( rc ){
	@@ -49268,11 +49947,11 @@
49268	int nSkip = (iChild ? 4 : 0);
49269
49270	if( *pRC ) return;
49271
49272	assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
49273	assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=5460 );
49274	assert( pPage->nOverflow<=ArraySize(pPage->aOvfl) );
49275	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49276	/* The cell should normally be sized correctly. However, when moving a
49277	** malformed cell from a leaf page to an interior page, if the cell size
49278	** wanted to be less than 4 but got rounded up to 4 on the leaf, then size
	@@ -49348,16 +50027,16 @@
49348	const int hdr = pPage->hdrOffset; /* Offset of header on pPage */
49349	const int nUsable = pPage->pBt->usableSize; /* Usable size of page */
49350
49351	assert( pPage->nOverflow==0 );
49352	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49353	assert( nCell>=0 && nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=5460 );
49354	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
49355
49356	/* Check that the page has just been zeroed by zeroPage() */
49357	assert( pPage->nCell==0 );
49358	assert( get2byte(&data[hdr+5])==nUsable );
49359
49360	pCellptr = &data[pPage->cellOffset + nCell*2];
49361	cellbody = nUsable;
49362	for(i=nCell-1; i>=0; i--){
49363	pCellptr -= 2;
	@@ -49419,10 +50098,11 @@
49419
49420	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49421	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
49422	assert( pPage->nOverflow==1 );
49423

49424	if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
49425
49426	/* Allocate a new page. This page will become the right-sibling of
49427	** pPage. Make the parent page writable, so that the new divider cell
49428	** may be inserted. If both these operations are successful, proceed.
	@@ -49748,11 +50428,11 @@
49748	** In this case, temporarily copy the cell into the aOvflSpace[]
49749	** buffer. It will be copied out again as soon as the aSpace[] buffer
49750	** is allocated. */
49751	if( pBt->secureDelete ){
49752	int iOff = SQLITE_PTR_TO_INT(apDiv[i]) - SQLITE_PTR_TO_INT(pParent->aData);
49753	if( (iOff+szNew[i])>pBt->usableSize ){
49754	rc = SQLITE_CORRUPT_BKPT;
49755	memset(apOld, 0, (i+1)sizeof(MemPage));
49756	goto balance_cleanup;
49757	}else{
49758	memcpy(&aOvflSpace[iOff], apDiv[i], szNew[i]);
	@@ -49827,11 +50507,11 @@
49827	u8 *pTemp;
49828	assert( nCell<nMaxCells );
49829	szCell[nCell] = sz;
49830	pTemp = &aSpace1[iSpace1];
49831	iSpace1 += sz;
49832	assert( sz<=pBt->pageSize/4 );
49833	assert( iSpace1<=pBt->pageSize );
49834	memcpy(pTemp, apDiv[i], sz);
49835	apCell[nCell] = pTemp+leafCorrection;
49836	assert( leafCorrection==0 \|\| leafCorrection==4 );
49837	szCell[nCell] = szCell[nCell] - leafCorrection;
	@@ -50073,11 +50753,11 @@
50073	assert(leafCorrection==4);
50074	sz = cellSizePtr(pParent, pCell);
50075	}
50076	}
50077	iOvflSpace += sz;
50078	assert( sz<=pBt->pageSize/4 );
50079	assert( iOvflSpace<=pBt->pageSize );
50080	insertCell(pParent, nxDiv, pCell, sz, pTemp, pNew->pgno, &rc);
50081	if( rc!=SQLITE_OK ) goto balance_cleanup;
50082	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
50083
	@@ -51317,11 +51997,11 @@
51317	#ifndef SQLITE_OMIT_AUTOVACUUM
51318	if( pCheck->pBt->autoVacuum ){
51319	checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0, zContext);
51320	}
51321	#endif
51322	if( n>pCheck->pBt->usableSize/4-2 ){
51323	checkAppendMsg(pCheck, zContext,
51324	"freelist leaf count too big on page %d", iPage);
51325	N--;
51326	}else{
51327	for(i=0; i<n; i++){
	@@ -51528,24 +52208,24 @@
51528	hdr = pPage->hdrOffset;
51529	hit = sqlite3PageMalloc( pBt->pageSize );
51530	if( hit==0 ){
51531	pCheck->mallocFailed = 1;
51532	}else{
51533	u16 contentOffset = get2byte(&data[hdr+5]);
51534	assert( contentOffset<=usableSize ); /* Enforced by btreeInitPage() */
51535	memset(hit+contentOffset, 0, usableSize-contentOffset);
51536	memset(hit, 1, contentOffset);
51537	nCell = get2byte(&data[hdr+3]);
51538	cellStart = hdr + 12 - 4*pPage->leaf;
51539	for(i=0; i<nCell; i++){
51540	int pc = get2byte(&data[cellStart+i*2]);
51541	u16 size = 1024;
51542	int j;
51543	if( pc<=usableSize-4 ){
51544	size = cellSizePtr(pPage, &data[pc]);
51545	}
51546	if( (pc+size-1)>=usableSize ){
51547	checkAppendMsg(pCheck, 0,
51548	"Corruption detected in cell %d on page %d",i,iPage);
51549	}else{
51550	for(j=pc+size-1; j>=pc; j--) hit[j]++;
51551	}
	@@ -52164,10 +52844,19 @@
52164	** page sizes of the source and destination differ.
52165	*/
52166	if( nSrcPgsz!=nDestPgsz && sqlite3PagerIsMemdb(pDestPager) ){
52167	rc = SQLITE_READONLY;
52168	}









52169
52170	/* This loop runs once for each destination page spanned by the source
52171	** page. For each iteration, variable iOff is set to the byte offset
52172	** of the destination page.
52173	*/
	@@ -55769,12 +56458,21 @@
55769	mrc = p->rc & 0xff;
55770	assert( p->rc!=SQLITE_IOERR_BLOCKED ); /* This error no longer exists */
55771	isSpecialError = mrc==SQLITE_NOMEM \|\| mrc==SQLITE_IOERR
55772	\|\| mrc==SQLITE_INTERRUPT \|\| mrc==SQLITE_FULL;
55773	if( isSpecialError ){
55774	/* If the query was read-only, we need do no rollback at all. Otherwise,
55775	** proceed with the special handling.









55776	*/
55777	if( !p->readOnly \|\| mrc!=SQLITE_INTERRUPT ){
55778	if( (mrc==SQLITE_NOMEM \|\| mrc==SQLITE_FULL) && p->usesStmtJournal ){
55779	eStatementOp = SAVEPOINT_ROLLBACK;
55780	}else{
	@@ -63200,11 +63898,11 @@
63200	** If P5 is non-zero then the key value is increased by an epsilon
63201	** prior to the comparison. This make the opcode work like IdxGT except
63202	** that if the key from register P3 is a prefix of the key in the cursor,
63203	** the result is false whereas it would be true with IdxGT.
63204	*/
63205	/* Opcode: IdxLT P1 P2 P3 * P5
63206	**
63207	** The P4 register values beginning with P3 form an unpacked index
63208	** key that omits the ROWID. Compare this key value against the index
63209	** that P1 is currently pointing to, ignoring the ROWID on the P1 index.
63210	**
	@@ -67547,22 +68245,23 @@
67547	assert( z[0]=='?' );
67548	pExpr->iColumn = (ynVar)(++pParse->nVar);
67549	}else if( z[0]=='?' ){
67550	/* Wildcard of the form "?nnn". Convert "nnn" to an integer and
67551	** use it as the variable number */
67552	int i = atoi((char*)&z[1]);

67553	pExpr->iColumn = (ynVar)i;
67554	testcase( i==0 );
67555	testcase( i==1 );
67556	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
67557	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] );
67558	if( i<1 \|\| i>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
67559	sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
67560	db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]);
67561	}
67562	if( i>pParse->nVar ){
67563	pParse->nVar = i;
67564	}
67565	}else{
67566	/* Wildcards like ":aaa", "$aaa" or "@aaa". Reuse the same variable
67567	** number as the prior appearance of the same name, or if the name
67568	** has never appeared before, reuse the same variable number
	@@ -72092,10 +72791,11 @@
72092	}
72093	}
72094	sqlite3DbFree(db, pIdx->aSample);
72095	}
72096	#else

72097	UNUSED_PARAMETER(pIdx);
72098	#endif
72099	}
72100
72101	/*
	@@ -87738,11 +88438,11 @@
87738	** be sent.
87739	**
87740	** regReturn is the number of the register holding the subroutine
87741	** return address.
87742	**
87743	** If regPrev>0 then it is a the first register in a vector that
87744	** records the previous output. mem[regPrev] is a flag that is false
87745	** if there has been no previous output. If regPrev>0 then code is
87746	** generated to suppress duplicates. pKeyInfo is used for comparing
87747	** keys.
87748	**
	@@ -88435,16 +89135,17 @@
88435	** (1) The subquery and the outer query do not both use aggregates.
88436	**
88437	** (2) The subquery is not an aggregate or the outer query is not a join.
88438	**
88439	** (3) The subquery is not the right operand of a left outer join
88440	** (Originally ticket #306. Strenghtened by ticket #3300)
88441	**
88442	** (4) The subquery is not DISTINCT or the outer query is not a join.
88443	**
88444	** (5) The subquery is not DISTINCT or the outer query does not use
88445	** aggregates.

88446	**
88447	** (6) The subquery does not use aggregates or the outer query is not
88448	** DISTINCT.
88449	**
88450	** (7) The subquery has a FROM clause.
	@@ -88460,13 +89161,13 @@
88460	** (11) The subquery and the outer query do not both have ORDER BY clauses.
88461	**
88462	() Not implemented. Subsumed into restriction (3). Was previously
88463	** a separate restriction deriving from ticket #350.
88464	**
88465	** (13) The subquery and outer query do not both use LIMIT
88466	**
88467	** (14) The subquery does not use OFFSET
88468	**
88469	** (15) The outer query is not part of a compound select or the
88470	** subquery does not have a LIMIT clause.
88471	** (See ticket #2339 and ticket [02a8e81d44]).
88472	**
	@@ -88553,13 +89254,13 @@
88553	if( pSub->pOffset ) return 0; /* Restriction (14) */
88554	if( p->pRightmost && pSub->pLimit ){
88555	return 0; /* Restriction (15) */
88556	}
88557	if( pSubSrc->nSrc==0 ) return 0; /* Restriction (7) */
88558	if( ((pSub->selFlags & SF_Distinct)!=0 \|\| pSub->pLimit)
88559	&& (pSrc->nSrc>1 \|\| isAgg) ){ /* Restrictions (4)(5)(8)(9) */
88560	return 0;
88561	}
88562	if( (p->selFlags & SF_Distinct)!=0 && subqueryIsAgg ){
88563	return 0; /* Restriction (6) */
88564	}
88565	if( p->pOrderBy && pSub->pOrderBy ){
	@@ -93225,11 +93926,11 @@
93225	pParse->pNewTable->aCol = 0;
93226	}
93227	db->pVTab = 0;
93228	}else{
93229	sqlite3Error(db, SQLITE_ERROR, zErr);
93230	sqlite3_free(zErr);
93231	rc = SQLITE_ERROR;
93232	}
93233	pParse->declareVtab = 0;
93234
93235	if( pParse->pVdbe ){
	@@ -96859,39 +97560,39 @@
96859	**
96860	** This case is also used when there are no WHERE clause
96861	** constraints but an index is selected anyway, in order
96862	** to force the output order to conform to an ORDER BY.
96863	*/
96864	int aStartOp[] = {
96865	0,
96866	0,
96867	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
96868	OP_Last, /* 3: (!start_constraints && startEq && bRev) */
96869	OP_SeekGt, /* 4: (start_constraints && !startEq && !bRev) */
96870	OP_SeekLt, /* 5: (start_constraints && !startEq && bRev) */
96871	OP_SeekGe, /* 6: (start_constraints && startEq && !bRev) */
96872	OP_SeekLe /* 7: (start_constraints && startEq && bRev) */
96873	};
96874	int aEndOp[] = {
96875	OP_Noop, /* 0: (!end_constraints) */
96876	OP_IdxGE, /* 1: (end_constraints && !bRev) */
96877	OP_IdxLT /* 2: (end_constraints && bRev) */
96878	};
96879	int nEq = pLevel->plan.nEq;
96880	int isMinQuery = 0; /* If this is an optimized SELECT min(x).. */
96881	int regBase; /* Base register holding constraint values */
96882	int r1; /* Temp register */
96883	WhereTerm pRangeStart = 0; / Inequality constraint at range start */
96884	WhereTerm pRangeEnd = 0; / Inequality constraint at range end */
96885	int startEq; /* True if range start uses ==, >= or <= */
96886	int endEq; /* True if range end uses ==, >= or <= */
96887	int start_constraints; /* Start of range is constrained */
96888	int nConstraint; /* Number of constraint terms */
96889	Index pIdx; / The index we will be using */
96890	int iIdxCur; /* The VDBE cursor for the index */
96891	int nExtraReg = 0; /* Number of extra registers needed */
96892	int op; /* Instruction opcode */
96893	char zStartAff; / Affinity for start of range constraint */
96894	char zEndAff; / Affinity for end of range constraint */
96895
96896	pIdx = pLevel->plan.u.pIdx;
96897	iIdxCur = pLevel->iIdxCur;
	@@ -108720,11 +109421,11 @@
108720	** in files fts3_tokenizer1.c and fts3_porter.c respectively. The following
108721	** two forward declarations are for functions declared in these files
108722	** used to retrieve the respective implementations.
108723	**
108724	** Calling sqlite3Fts3SimpleTokenizerModule() sets the value pointed
108725	** to by the argument to point a the "simple" tokenizer implementation.
108726	** Function ...PorterTokenizerModule() sets *pModule to point to the
108727	** porter tokenizer/stemmer implementation.
108728	*/
108729	SQLITE_PRIVATE void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
108730	SQLITE_PRIVATE void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
	@@ -108922,11 +109623,11 @@
108922	** is defined to accept an argument of type char, and always returns 0 for
108923	** any values that fall outside of the range of the unsigned char type (i.e.
108924	** negative values).
108925	*/
108926	static int fts3isspace(char c){
108927	return (c&0x80)==0 ? isspace(c) : 0;
108928	}
108929
108930	/*
108931	** Extract the next token from buffer z (length n) using the tokenizer
108932	** and other information (column names etc.) in pParse. Create an Fts3Expr
	@@ -111309,10 +112010,13 @@
111309
111310
111311	static int simpleDelim(simple_tokenizer *t, unsigned char c){
111312	return c<0x80 && t->delim[c];
111313	}



111314
111315	/*
111316	** Create a new tokenizer instance.
111317	*/
111318	static int simpleCreate(
	@@ -111343,11 +112047,11 @@
111343	}
111344	} else {
111345	/* Mark non-alphanumeric ASCII characters as delimiters */
111346	int i;
111347	for(i=1; i<0x80; i++){
111348	t->delim[i] = !isalnum(i) ? -1 : 0;
111349	}
111350	}
111351
111352	*ppTokenizer = &t->base;
111353	return SQLITE_OK;
	@@ -111449,11 +112153,11 @@
111449	for(i=0; i<n; i++){
111450	/* TODO(shess) This needs expansion to handle UTF-8
111451	** case-insensitivity.
111452	*/
111453	unsigned char ch = p[iStartOffset+i];
111454	c->pToken[i] = (char)(ch<0x80 ? tolower(ch) : ch);
111455	}
111456	*ppToken = c->pToken;
111457	*pnBytes = n;
111458	*piStartOffset = iStartOffset;
111459	*piEndOffset = c->iOffset;
	@@ -116355,15 +117059,14 @@
116355	** least desirable):
116356	**
116357	** idxNum idxStr Strategy
116358	** ------------------------------------------------
116359	** 1 Unused Direct lookup by rowid.
116360	** 2 See below R-tree query.
116361	** 3 Unused Full table scan.
116362	** ------------------------------------------------
116363	**
116364	** If strategy 1 or 3 is used, then idxStr is not meaningful. If strategy
116365	** 2 is used, idxStr is formatted to contain 2 bytes for each
116366	** constraint used. The first two bytes of idxStr correspond to
116367	** the constraint in sqlite3_index_info.aConstraintUsage[] with
116368	** (argvIndex==1) etc.
116369	**
116370

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.7.2. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a one translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% are more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -213,24 +213,25 @@
213	*/
214	#ifndef SQLITE_MAX_VARIABLE_NUMBER
215	# define SQLITE_MAX_VARIABLE_NUMBER 999
216	#endif
217
218	/* Maximum page size. The upper bound on this value is 65536. This a limit
219	** imposed by the use of 16-bit offsets within each page.

220	**
221	** Earlier versions of SQLite allowed the user to change this value at
222	** compile time. This is no longer permitted, on the grounds that it creates
223	** a library that is technically incompatible with an SQLite library
224	** compiled with a different limit. If a process operating on a database
225	** with a page-size of 65536 bytes crashes, then an instance of SQLite
226	** compiled with the default page-size limit will not be able to rollback
227	** the aborted transaction. This could lead to database corruption.
228	*/
229	#ifdef SQLITE_MAX_PAGE_SIZE
230	# undef SQLITE_MAX_PAGE_SIZE
231	#endif
232	#define SQLITE_MAX_PAGE_SIZE 65536
233
234
235	/*
236	** The default size of a database page.
237	*/
	@@ -631,23 +632,23 @@
632	** be held constant and Z will be incremented or else Y will be incremented
633	** and Z will be reset to zero.
634	**
635	** Since version 3.6.18, SQLite source code has been stored in the
636	** <a href="http://www.fossil-scm.org/">Fossil configuration management
637	** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to
638	** a string which identifies a particular check-in of SQLite
639	** within its configuration management system. ^The SQLITE_SOURCE_ID
640	** string contains the date and time of the check-in (UTC) and an SHA1
641	** hash of the entire source tree.
642	**
643	** See also: [sqlite3_libversion()],
644	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
645	** [sqlite_version()] and [sqlite_source_id()].
646	*/
647	#define SQLITE_VERSION "3.7.2"
648	#define SQLITE_VERSION_NUMBER 3007002
649	#define SQLITE_SOURCE_ID "2010-08-23 18:52:01 42537b60566f288167f1b5864a5435986838e3a3"
650
651	/*
652	** CAPI3REF: Run-Time Library Version Numbers
653	** KEYWORDS: sqlite3_version, sqlite3_sourceid
654	**
	@@ -688,19 +689,19 @@
689	** ^The sqlite3_compileoption_used() function returns 0 or 1
690	** indicating whether the specified option was defined at
691	** compile time. ^The SQLITE_ prefix may be omitted from the
692	** option name passed to sqlite3_compileoption_used().
693	**
694	** ^The sqlite3_compileoption_get() function allows iterating
695	** over the list of options that were defined at compile time by
696	** returning the N-th compile time option string. ^If N is out of range,
697	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
698	** prefix is omitted from any strings returned by
699	** sqlite3_compileoption_get().
700	**
701	** ^Support for the diagnostic functions sqlite3_compileoption_used()
702	** and sqlite3_compileoption_get() may be omitted by specifying the
703	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
704	**
705	** See also: SQL functions [sqlite_compileoption_used()] and
706	** [sqlite_compileoption_get()] and the [compile_options pragma].
707	*/
	@@ -802,11 +803,11 @@
803	/*
804	** CAPI3REF: Closing A Database Connection
805	**
806	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
807	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
808	** successfully destroyed and all associated resources are deallocated.
809	**
810	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
811	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
812	** the [sqlite3] object prior to attempting to close the object. ^If
813	** sqlite3_close() is called on a [database connection] that still has
	@@ -1229,16 +1230,25 @@
1230	** layer a hint of how large the database file will grow to be during the
1231	** current transaction. This hint is not guaranteed to be accurate but it
1232	** is often close. The underlying VFS might choose to preallocate database
1233	** file space based on this hint in order to help writes to the database
1234	** file run faster.
1235	**
1236	** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
1237	** extends and truncates the database file in chunks of a size specified
1238	** by the user. The fourth argument to [sqlite3_file_control()] should
1239	** point to an integer (type int) containing the new chunk-size to use
1240	** for the nominated database. Allocating database file space in large
1241	** chunks (say 1MB at a time), may reduce file-system fragmentation and
1242	** improve performance on some systems.
1243	*/
1244	#define SQLITE_FCNTL_LOCKSTATE 1
1245	#define SQLITE_GET_LOCKPROXYFILE 2
1246	#define SQLITE_SET_LOCKPROXYFILE 3
1247	#define SQLITE_LAST_ERRNO 4
1248	#define SQLITE_FCNTL_SIZE_HINT 5
1249	#define SQLITE_FCNTL_CHUNK_SIZE 6
1250
1251	/*
1252	** CAPI3REF: Mutex Handle
1253	**
1254	** The mutex module within SQLite defines [sqlite3_mutex] to be an
	@@ -3197,11 +3207,11 @@
3207	** <li> @VVV
3208	** <li> $VVV
3209	** </ul>
3210	**
3211	** In the templates above, NNN represents an integer literal,
3212	** and VVV represents an alphanumeric identifier.)^ ^The values of these
3213	** parameters (also called "host parameter names" or "SQL parameters")
3214	** can be set using the sqlite3_bind_*() routines defined here.
3215	**
3216	** ^The first argument to the sqlite3_bind_*() routines is always
3217	** a pointer to the [sqlite3_stmt] object returned from
	@@ -3976,11 +3986,11 @@
3986	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3987
3988	/*
3989	** CAPI3REF: Obtain Aggregate Function Context
3990	**
3991	** Implementations of aggregate SQL functions use this
3992	** routine to allocate memory for storing their state.
3993	**
3994	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3995	** for a particular aggregate function, SQLite
3996	** allocates N of memory, zeroes out that memory, and returns a pointer
	@@ -4248,11 +4258,11 @@
4258	** the routine expects pointers to 16-bit word aligned strings
4259	** of UTF-16 in the native byte order.
4260	**
4261	** A pointer to the user supplied routine must be passed as the fifth
4262	** argument. ^If it is NULL, this is the same as deleting the collation
4263	** sequence (so that SQLite cannot call it any more).
4264	** ^Each time the application supplied function is invoked, it is passed
4265	** as its first parameter a copy of the void* passed as the fourth argument
4266	** to sqlite3_create_collation() or sqlite3_create_collation16().
4267	**
4268	** ^The remaining arguments to the application-supplied routine are two strings,
	@@ -5466,11 +5476,11 @@
5476	** of passing a NULL pointer instead of a valid mutex handle are undefined
5477	** (i.e. it is acceptable to provide an implementation that segfaults if
5478	** it is passed a NULL pointer).
5479	**
5480	** The xMutexInit() method must be threadsafe. ^It must be harmless to
5481	** invoke xMutexInit() multiple times within the same process and without
5482	** intervening calls to xMutexEnd(). Second and subsequent calls to
5483	** xMutexInit() must be no-ops.
5484	**
5485	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
5486	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
	@@ -5636,11 +5646,11 @@
5646
5647	/*
5648	** CAPI3REF: SQLite Runtime Status
5649	**
5650	** ^This interface is used to retrieve runtime status information
5651	** about the performance of SQLite, and optionally to reset various
5652	** highwater marks. ^The first argument is an integer code for
5653	** the specific parameter to measure. ^(Recognized integer codes
5654	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5655	** ^The current value of the parameter is returned into *pCurrent.
5656	** ^The highest recorded value is returned in *pHighwater. ^If the
	@@ -5762,11 +5772,11 @@
5772	** ^This interface is used to retrieve runtime status information
5773	** about a single [database connection]. ^The first argument is the
5774	** database connection object to be interrogated. ^The second argument
5775	** is an integer constant, taken from the set of
5776	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5777	** determines the parameter to interrogate. The set of
5778	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5779	** to grow in future releases of SQLite.
5780	**
5781	** ^The current value of the requested parameter is written into *pCur
5782	** and the highest instantaneous value is written into *pHiwtr. ^If
	@@ -6184,11 +6194,11 @@
6194	**
6195	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
6196	**
6197	** ^Each call to sqlite3_backup_step() sets two values inside
6198	** the [sqlite3_backup] object: the number of pages still to be backed
6199	** up and the total number of pages in the source database file.
6200	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
6201	** retrieve these two values, respectively.
6202	**
6203	** ^The values returned by these functions are only updated by
6204	** sqlite3_backup_step(). ^If the source database is modified during a backup
	@@ -6280,11 +6290,11 @@
6290	** ^(There may be at most one unlock-notify callback registered by a
6291	** blocked connection. If sqlite3_unlock_notify() is called when the
6292	** blocked connection already has a registered unlock-notify callback,
6293	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
6294	** called with a NULL pointer as its second argument, then any existing
6295	** unlock-notify callback is canceled. ^The blocked connections
6296	** unlock-notify callback may also be canceled by closing the blocked
6297	** connection using [sqlite3_close()].
6298	**
6299	** The unlock-notify callback is not reentrant. If an application invokes
6300	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -6362,11 +6372,11 @@
6372	/*
6373	** CAPI3REF: String Comparison
6374	**
6375	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
6376	** compare the contents of two buffers containing UTF-8 strings in a
6377	** case-independent fashion, using the same definition of case independence
6378	** that SQLite uses internally when comparing identifiers.
6379	*/
6380	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
6381
6382	/*
	@@ -7868,11 +7878,11 @@
7878	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager);
7879	SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager, int, unsigned char);
7880
7881	/* Functions used to configure a Pager object. */
7882	SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager, int()(void ), void );
7883	SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager, u32, int);
7884	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int);
7885	SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);
7886	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int);
7887	SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);
7888	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);
	@@ -7895,11 +7905,11 @@
7905	SQLITE_PRIVATE int sqlite3PagerPageRefcount(DbPage*);
7906	SQLITE_PRIVATE void sqlite3PagerGetData(DbPage );
7907	SQLITE_PRIVATE void sqlite3PagerGetExtra(DbPage );
7908
7909	/* Functions used to manage pager transactions and savepoints. */
7910	SQLITE_PRIVATE void sqlite3PagerPagecount(Pager, int);
7911	SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);
7912	SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager,const char zMaster, int);
7913	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);
7914	SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager);
7915	SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);
	@@ -9183,13 +9193,13 @@
9193	** argument to sqlite3VdbeKeyCompare and is used to control the
9194	** comparison of the two index keys.
9195	*/
9196	struct KeyInfo {
9197	sqlite3 db; / The database connection */
9198	u8 enc; /* Text encoding - one of the SQLITE_UTF* values */
9199	u16 nField; /* Number of entries in aColl[] */
9200	u8 aSortOrder; / Sort order for each column. May be NULL */
9201	CollSeq aColl[1]; / Collating sequence for each term of the key */
9202	};
9203
9204	/*
9205	** An instance of the following structure holds information about a
	@@ -14331,11 +14341,11 @@
14341
14342	/*
14343	** Set the "type" of an allocation.
14344	*/
14345	SQLITE_PRIVATE void sqlite3MemdebugSetType(void *p, u8 eType){
14346	if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14347	struct MemBlockHdr *pHdr;
14348	pHdr = sqlite3MemsysGetHeader(p);
14349	assert( pHdr->iForeGuard==FOREGUARD );
14350	pHdr->eType = eType;
14351	}
	@@ -14350,11 +14360,11 @@
14360	**
14361	** assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) );
14362	*/
14363	SQLITE_PRIVATE int sqlite3MemdebugHasType(void *p, u8 eType){
14364	int rc = 1;
14365	if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14366	struct MemBlockHdr *pHdr;
14367	pHdr = sqlite3MemsysGetHeader(p);
14368	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14369	if( (pHdr->eType&eType)==0 ){
14370	rc = 0;
	@@ -14372,11 +14382,11 @@
14382	**
14383	** assert( sqlite3MemdebugNoType(p, MEMTYPE_DB) );
14384	*/
14385	SQLITE_PRIVATE int sqlite3MemdebugNoType(void *p, u8 eType){
14386	int rc = 1;
14387	if( p && sqlite3GlobalConfig.m.xMalloc==sqlite3MemMalloc ){
14388	struct MemBlockHdr *pHdr;
14389	pHdr = sqlite3MemsysGetHeader(p);
14390	assert( pHdr->iForeGuard==FOREGUARD ); /* Allocation is valid */
14391	if( (pHdr->eType&eType)!=0 ){
14392	rc = 0;
	@@ -16624,10 +16634,11 @@
16634	#else
16635	/* Use the built-in recursive mutexes if they are available.
16636	*/
16637	pthread_mutex_lock(&p->mutex);
16638	#if SQLITE_MUTEX_NREF
16639	assert( p->nRef>0 \|\| p->owner==0 );
16640	p->owner = pthread_self();
16641	p->nRef++;
16642	#endif
16643	#endif
16644
	@@ -16696,10 +16707,11 @@
16707	*/
16708	static void pthreadMutexLeave(sqlite3_mutex *p){
16709	assert( pthreadMutexHeld(p) );
16710	#if SQLITE_MUTEX_NREF
16711	p->nRef--;
16712	if( p->nRef==0 ) p->owner = 0;
16713	#endif
16714	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16715
16716	#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
16717	if( p->nRef==0 ){
	@@ -16960,11 +16972,11 @@
16972	** allocated mutex. SQLite is careful to deallocate every
16973	** mutex that it allocates.
16974	*/
16975	static void winMutexFree(sqlite3_mutex *p){
16976	assert( p );
16977	assert( p->nRef==0 && p->owner==0 );
16978	assert( p->id==SQLITE_MUTEX_FAST \|\| p->id==SQLITE_MUTEX_RECURSIVE );
16979	DeleteCriticalSection(&p->mutex);
16980	sqlite3_free(p);
16981	}
16982
	@@ -16984,10 +16996,11 @@
16996	DWORD tid = GetCurrentThreadId();
16997	assert( p->id==SQLITE_MUTEX_RECURSIVE \|\| winMutexNotheld2(p, tid) );
16998	#endif
16999	EnterCriticalSection(&p->mutex);
17000	#ifdef SQLITE_DEBUG
17001	assert( p->nRef>0 \|\| p->owner==0 );
17002	p->owner = tid;
17003	p->nRef++;
17004	if( p->trace ){
17005	printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
17006	}
	@@ -17037,10 +17050,11 @@
17050	#ifndef NDEBUG
17051	DWORD tid = GetCurrentThreadId();
17052	assert( p->nRef>0 );
17053	assert( p->owner==tid );
17054	p->nRef--;
17055	if( p->nRef==0 ) p->owner = 0;
17056	assert( p->nRef==0 \|\| p->id==SQLITE_MUTEX_RECURSIVE );
17057	#endif
17058	LeaveCriticalSection(&p->mutex);
17059	#ifdef SQLITE_DEBUG
17060	if( p->trace ){
	@@ -22609,10 +22623,11 @@
22623	void lockingContext; / Locking style specific state */
22624	UnixUnusedFd pUnused; / Pre-allocated UnixUnusedFd */
22625	int fileFlags; /* Miscellanous flags */
22626	const char zPath; / Name of the file */
22627	unixShm pShm; / Shared memory segment information */
22628	int szChunk; /* Configured by FCNTL_CHUNK_SIZE */
22629	#if SQLITE_ENABLE_LOCKING_STYLE
22630	int openFlags; /* The flags specified at open() */
22631	#endif
22632	#if SQLITE_ENABLE_LOCKING_STYLE \|\| defined(__APPLE__)
22633	unsigned fsFlags; /* cached details from statfs() */
	@@ -25367,19 +25382,21 @@
25382	offset += wrote;
25383	pBuf = &((char*)pBuf)[wrote];
25384	}
25385	SimulateIOError(( wrote=(-1), amt=1 ));
25386	SimulateDiskfullError(( wrote=0, amt=1 ));
25387
25388	if( amt>0 ){
25389	if( wrote<0 ){
25390	/* lastErrno set by seekAndWrite */
25391	return SQLITE_IOERR_WRITE;
25392	}else{
25393	pFile->lastErrno = 0; /* not a system error */
25394	return SQLITE_FULL;
25395	}
25396	}
25397
25398	return SQLITE_OK;
25399	}
25400
25401	#ifdef SQLITE_TEST
25402	/*
	@@ -25577,16 +25594,27 @@
25594
25595	/*
25596	** Truncate an open file to a specified size
25597	*/
25598	static int unixTruncate(sqlite3_file *id, i64 nByte){
25599	unixFile pFile = (unixFile )id;
25600	int rc;
25601	assert( pFile );
25602	SimulateIOError( return SQLITE_IOERR_TRUNCATE );
25603
25604	/* If the user has configured a chunk-size for this file, truncate the
25605	** file so that it consists of an integer number of chunks (i.e. the
25606	** actual file size after the operation may be larger than the requested
25607	** size).
25608	*/
25609	if( pFile->szChunk ){
25610	nByte = ((nByte + pFile->szChunk - 1)/pFile->szChunk) * pFile->szChunk;
25611	}
25612
25613	rc = ftruncate(pFile->h, (off_t)nByte);
25614	if( rc ){
25615	pFile->lastErrno = errno;
25616	return SQLITE_IOERR_TRUNCATE;
25617	}else{
25618	#ifndef NDEBUG
25619	/* If we are doing a normal write to a database file (as opposed to
25620	** doing a hot-journal rollback or a write to some file other than a
	@@ -25593,12 +25621,12 @@
25621	** normal database file) and we truncate the file to zero length,
25622	** that effectively updates the change counter. This might happen
25623	** when restoring a database using the backup API from a zero-length
25624	** source.
25625	*/
25626	if( pFile->inNormalWrite && nByte==0 ){
25627	pFile->transCntrChng = 1;
25628	}
25629	#endif
25630
25631	return SQLITE_OK;
25632	}
	@@ -25637,10 +25665,58 @@
25665	** proxying locking division.
25666	*/
25667	static int proxyFileControl(sqlite3_file,int,void);
25668	#endif
25669
25670	/*
25671	** This function is called to handle the SQLITE_FCNTL_SIZE_HINT
25672	** file-control operation.
25673	**
25674	** If the user has configured a chunk-size for this file, it could be
25675	** that the file needs to be extended at this point. Otherwise, the
25676	** SQLITE_FCNTL_SIZE_HINT operation is a no-op for Unix.
25677	*/
25678	static int fcntlSizeHint(unixFile *pFile, i64 nByte){
25679	if( pFile->szChunk ){
25680	i64 nSize; /* Required file size */
25681	struct stat buf; /* Used to hold return values of fstat() */
25682
25683	if( fstat(pFile->h, &buf) ) return SQLITE_IOERR_FSTAT;
25684
25685	nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
25686	if( nSize>(i64)buf.st_size ){
25687	#if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
25688	if( posix_fallocate(pFile->h, buf.st_size, nSize-buf.st_size) ){
25689	return SQLITE_IOERR_WRITE;
25690	}
25691	#else
25692	/* If the OS does not have posix_fallocate(), fake it. First use
25693	** ftruncate() to set the file size, then write a single byte to
25694	** the last byte in each block within the extended region. This
25695	** is the same technique used by glibc to implement posix_fallocate()
25696	** on systems that do not have a real fallocate() system call.
25697	*/
25698	int nBlk = buf.st_blksize; /* File-system block size */
25699	i64 iWrite; /* Next offset to write to */
25700	int nWrite; /* Return value from seekAndWrite() */
25701
25702	if( ftruncate(pFile->h, nSize) ){
25703	pFile->lastErrno = errno;
25704	return SQLITE_IOERR_TRUNCATE;
25705	}
25706	iWrite = ((buf.st_size + 2nBlk - 1)/nBlk)nBlk-1;
25707	do {
25708	nWrite = seekAndWrite(pFile, iWrite, "", 1);
25709	iWrite += nBlk;
25710	} while( nWrite==1 && iWrite<nSize );
25711	if( nWrite!=1 ) return SQLITE_IOERR_WRITE;
25712	#endif
25713	}
25714	}
25715
25716	return SQLITE_OK;
25717	}
25718
25719	/*
25720	** Information and control of an open file handle.
25721	*/
25722	static int unixFileControl(sqlite3_file id, int op, void pArg){
	@@ -25650,18 +25726,17 @@
25726	return SQLITE_OK;
25727	}
25728	case SQLITE_LAST_ERRNO: {
25729	(int)pArg = ((unixFile*)id)->lastErrno;
25730	return SQLITE_OK;
25731	}
25732	case SQLITE_FCNTL_CHUNK_SIZE: {
25733	((unixFile)id)->szChunk = (int *)pArg;
25734	return SQLITE_OK;
25735	}
25736	case SQLITE_FCNTL_SIZE_HINT: {
25737	return fcntlSizeHint((unixFile )id, (i64 *)pArg);





25738	}
25739	#ifndef NDEBUG
25740	/* The pager calls this method to signal that it has done
25741	** a rollback and that the database is therefore unchanged and
25742	** it hence it is OK for the transaction change counter to be
	@@ -28522,11 +28597,11 @@
28597	}else{
28598	if( pCtx->conchFile ){
28599	pCtx->conchFile->pMethod->xClose((sqlite3_file *)pCtx->conchFile);
28600	sqlite3_free(pCtx->conchFile);
28601	}
28602	sqlite3DbFree(0, pCtx->lockProxyPath);
28603	sqlite3_free(pCtx->conchFilePath);
28604	sqlite3_free(pCtx);
28605	}
28606	OSTRACE(("TRANSPROXY %d %s\n", pFile->h,
28607	(rc==SQLITE_OK ? "ok" : "failed")));
	@@ -28713,13 +28788,13 @@
28788	}
28789	rc = conchFile->pMethod->xClose((sqlite3_file*)conchFile);
28790	if( rc ) return rc;
28791	sqlite3_free(conchFile);
28792	}
28793	sqlite3DbFree(0, pCtx->lockProxyPath);
28794	sqlite3_free(pCtx->conchFilePath);
28795	sqlite3DbFree(0, pCtx->dbPath);
28796	/* restore the original locking context and pMethod then close it */
28797	pFile->lockingContext = pCtx->oldLockingContext;
28798	pFile->pMethod = pCtx->pOldMethod;
28799	sqlite3_free(pCtx);
28800	return pFile->pMethod->xClose(id);
	@@ -29161,10 +29236,11 @@
29236	short sharedLockByte; /* Randomly chosen byte used as a shared lock */
29237	DWORD lastErrno; /* The Windows errno from the last I/O error */
29238	DWORD sectorSize; /* Sector size of the device file is on */
29239	winShm pShm; / Instance of shared memory on this file */
29240	const char zPath; / Full pathname of this file */
29241	int szChunk; /* Chunk size configured by FCNTL_CHUNK_SIZE */
29242	#if SQLITE_OS_WINCE
29243	WCHAR zDeleteOnClose; / Name of file to delete when closing */
29244	HANDLE hMutex; /* Mutex used to control access to shared lock */
29245	HANDLE hShared; /* Shared memory segment used for locking */
29246	winceLock local; /* Locks obtained by this instance of winFile */
	@@ -29671,10 +29747,46 @@
29747
29748	/*****************************************************************************
29749	** The next group of routines implement the I/O methods specified
29750	** by the sqlite3_io_methods object.
29751	******************************************************************************/
29752
29753	/*
29754	** Some microsoft compilers lack this definition.
29755	*/
29756	#ifndef INVALID_SET_FILE_POINTER
29757	# define INVALID_SET_FILE_POINTER ((DWORD)-1)
29758	#endif
29759
29760	/*
29761	** Move the current position of the file handle passed as the first
29762	** argument to offset iOffset within the file. If successful, return 0.
29763	** Otherwise, set pFile->lastErrno and return non-zero.
29764	*/
29765	static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
29766	LONG upperBits; /* Most sig. 32 bits of new offset */
29767	LONG lowerBits; /* Least sig. 32 bits of new offset */
29768	DWORD dwRet; /* Value returned by SetFilePointer() */
29769
29770	upperBits = (LONG)((iOffset>>32) & 0x7fffffff);
29771	lowerBits = (LONG)(iOffset & 0xffffffff);
29772
29773	/* API oddity: If successful, SetFilePointer() returns a dword
29774	** containing the lower 32-bits of the new file-offset. Or, if it fails,
29775	** it returns INVALID_SET_FILE_POINTER. However according to MSDN,
29776	** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine
29777	** whether an error has actually occured, it is also necessary to call
29778	** GetLastError().
29779	*/
29780	dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
29781	if( (dwRet==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR) ){
29782	pFile->lastErrno = GetLastError();
29783	return 1;
29784	}
29785
29786	return 0;
29787	}
29788
29789	/*
29790	** Close a file.
29791	**
29792	** It is reported that an attempt to close a handle might sometimes
	@@ -29714,17 +29826,10 @@
29826	OSTRACE(("CLOSE %d %s\n", pFile->h, rc ? "ok" : "failed"));
29827	OpenCounter(-1);
29828	return rc ? SQLITE_OK : SQLITE_IOERR;
29829	}
29830







29831	/*
29832	** Read data from a file into a buffer. Return SQLITE_OK if all
29833	** bytes were read successfully and SQLITE_IOERR if anything goes
29834	** wrong.
29835	*/
	@@ -29732,112 +29837,108 @@
29837	sqlite3_file id, / File to read from */
29838	void pBuf, / Write content into this buffer */
29839	int amt, /* Number of bytes to read */
29840	sqlite3_int64 offset /* Begin reading at this offset */
29841	){
29842	winFile pFile = (winFile)id; /* file handle */
29843	DWORD nRead; /* Number of bytes actually read from file */




29844
29845	assert( id!=0 );
29846	SimulateIOError(return SQLITE_IOERR_READ);
29847	OSTRACE(("READ %d lock=%d\n", pFile->h, pFile->locktype));
29848
29849	if( seekWinFile(pFile, offset) ){

29850	return SQLITE_FULL;
29851	}
29852	if( !ReadFile(pFile->h, pBuf, amt, &nRead, 0) ){
29853	pFile->lastErrno = GetLastError();
29854	return SQLITE_IOERR_READ;
29855	}
29856	if( nRead<(DWORD)amt ){


29857	/* Unread parts of the buffer must be zero-filled */
29858	memset(&((char*)pBuf)[nRead], 0, amt-nRead);
29859	return SQLITE_IOERR_SHORT_READ;
29860	}
29861
29862	return SQLITE_OK;
29863	}
29864
29865	/*
29866	** Write data from a buffer into a file. Return SQLITE_OK on success
29867	** or some other error code on failure.
29868	*/
29869	static int winWrite(
29870	sqlite3_file id, / File to write into */
29871	const void pBuf, / The bytes to be written */
29872	int amt, /* Number of bytes to write */
29873	sqlite3_int64 offset /* Offset into the file to begin writing at */
29874	){
29875	int rc; /* True if error has occured, else false */
29876	winFile pFile = (winFile)id; /* File handle */
29877
29878	assert( amt>0 );
29879	assert( pFile );



29880	SimulateIOError(return SQLITE_IOERR_WRITE);
29881	SimulateDiskfullError(return SQLITE_FULL);
29882
29883	OSTRACE(("WRITE %d lock=%d\n", pFile->h, pFile->locktype));
29884
29885	rc = seekWinFile(pFile, offset);
29886	if( rc==0 ){
29887	u8 aRem = (u8 )pBuf; /* Data yet to be written */
29888	int nRem = amt; /* Number of bytes yet to be written */
29889	DWORD nWrite; /* Bytes written by each WriteFile() call */
29890
29891	while( nRem>0 && WriteFile(pFile->h, aRem, nRem, &nWrite, 0) && nWrite>0 ){
29892	aRem += nWrite;
29893	nRem -= nWrite;
29894	}
29895	if( nRem>0 ){
29896	pFile->lastErrno = GetLastError();
29897	rc = 1;
29898	}
29899	}
29900
29901	if( rc ){
29902	if( pFile->lastErrno==ERROR_HANDLE_DISK_FULL ){
29903	return SQLITE_FULL;
29904	}
29905	return SQLITE_IOERR_WRITE;


29906	}
29907	return SQLITE_OK;
29908	}
29909
29910	/*
29911	** Truncate an open file to a specified size
29912	*/
29913	static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
29914	winFile pFile = (winFile)id; /* File handle object */
29915	int rc = SQLITE_OK; /* Return code for this function */
29916
29917	assert( pFile );
29918



29919	OSTRACE(("TRUNCATE %d %lld\n", pFile->h, nByte));
29920	SimulateIOError(return SQLITE_IOERR_TRUNCATE);
29921
29922	/* If the user has configured a chunk-size for this file, truncate the
29923	** file so that it consists of an integer number of chunks (i.e. the
29924	** actual file size after the operation may be larger than the requested
29925	** size).
29926	*/
29927	if( pFile->szChunk ){
29928	nByte = ((nByte + pFile->szChunk - 1)/pFile->szChunk) * pFile->szChunk;
29929	}
29930
29931	/* SetEndOfFile() returns non-zero when successful, or zero when it fails. */
29932	if( seekWinFile(pFile, nByte) ){
29933	rc = SQLITE_IOERR_TRUNCATE;
29934	}else if( 0==SetEndOfFile(pFile->h) ){

29935	pFile->lastErrno = GetLastError();
29936	rc = SQLITE_IOERR_TRUNCATE;
29937	}
29938
29939	OSTRACE(("TRUNCATE %d %lld %s\n", pFile->h, nByte, rc ? "failed" : "ok"));
29940	return rc;
29941	}
29942
29943	#ifdef SQLITE_TEST
29944	/*
	@@ -30197,10 +30298,14 @@
30298	return SQLITE_OK;
30299	}
30300	case SQLITE_LAST_ERRNO: {
30301	(int)pArg = (int)((winFile*)id)->lastErrno;
30302	return SQLITE_OK;
30303	}
30304	case SQLITE_FCNTL_CHUNK_SIZE: {
30305	((winFile)id)->szChunk = (int *)pArg;
30306	return SQLITE_OK;
30307	}
30308	case SQLITE_FCNTL_SIZE_HINT: {
30309	sqlite3_int64 sz = (sqlite3_int64)pArg;
30310	SimulateIOErrorBenign(1);
30311	winTruncate(id, sz);
	@@ -31749,11 +31854,11 @@
31854	** start of a transaction, and is thus usually less than a few thousand,
31855	** but can be as large as 2 billion for a really big database.
31856	*/
31857
31858	/* Size of the Bitvec structure in bytes. */
31859	#define BITVEC_SZ 512
31860
31861	/* Round the union size down to the nearest pointer boundary, since that's how
31862	** it will be aligned within the Bitvec struct. */
31863	#define BITVEC_USIZE (((BITVEC_SZ-(3sizeof(u32)))/sizeof(Bitvec))sizeof(Bitvec))
31864
	@@ -32907,10 +33012,29 @@
33012	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize);
33013	sqlite3_free(p);
33014	}
33015	}
33016
33017	#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
33018	/*
33019	** Return the size of a pache allocation
33020	*/
33021	static int pcache1MemSize(void *p){
33022	assert( sqlite3_mutex_held(pcache1.mutex) );
33023	if( p>=pcache1.pStart && p<pcache1.pEnd ){
33024	return pcache1.szSlot;
33025	}else{
33026	int iSize;
33027	assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
33028	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
33029	iSize = sqlite3MallocSize(p);
33030	sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
33031	return iSize;
33032	}
33033	}
33034	#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT */
33035
33036	/*
33037	** Allocate a new page object initially associated with cache pCache.
33038	*/
33039	static PgHdr1 pcache1AllocPage(PCache1 pCache){
33040	int nByte = sizeof(PgHdr1) + pCache->szPage;
	@@ -33455,11 +33579,11 @@
33579	int nFree = 0;
33580	if( pcache1.pStart==0 ){
33581	PgHdr1 *p;
33582	pcache1EnterMutex();
33583	while( (nReq<0 \|\| nFree<nReq) && (p=pcache1.pLruTail) ){
33584	nFree += pcache1MemSize(PGHDR1_TO_PAGE(p));
33585	pcache1PinPage(p);
33586	pcache1RemoveFromHash(p);
33587	pcache1FreePage(p);
33588	}
33589	pcache1LeaveMutex();
	@@ -33964,11 +34088,11 @@
34088	# define sqlite3WalOpen(x,y,z) 0
34089	# define sqlite3WalClose(w,x,y,z) 0
34090	# define sqlite3WalBeginReadTransaction(y,z) 0
34091	# define sqlite3WalEndReadTransaction(z)
34092	# define sqlite3WalRead(v,w,x,y,z) 0
34093	# define sqlite3WalDbsize(y) 0
34094	# define sqlite3WalBeginWriteTransaction(y) 0
34095	# define sqlite3WalEndWriteTransaction(x) 0
34096	# define sqlite3WalUndo(x,y,z) 0
34097	# define sqlite3WalSavepoint(y,z)
34098	# define sqlite3WalSavepointUndo(y,z) 0
	@@ -34000,13 +34124,12 @@
34124	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal);
34125
34126	/* Read a page from the write-ahead log, if it is present. */
34127	SQLITE_PRIVATE int sqlite3WalRead(Wal pWal, Pgno pgno, int pInWal, int nOut, u8 *pOut);
34128
34129	/* If the WAL is not empty, return the size of the database. */
34130	SQLITE_PRIVATE Pgno sqlite3WalDbsize(Wal *pWal);

34131
34132	/* Obtain or release the WRITER lock. */
34133	SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal);
34134	SQLITE_PRIVATE int sqlite3WalEndWriteTransaction(Wal *pWal);
34135
	@@ -34048,12 +34171,16 @@
34171	#endif /* _WAL_H_ */
34172
34173	/************ End of wal.h ***********************************************/
34174	/************ Continuing where we left off in pager.c ********************/
34175
34176
34177	/***************** NOTES ON THE DESIGN OF THE PAGER **********************
34178	**
34179	** This comment block describes invariants that hold when using a rollback
34180	** journal. These invariants do not apply for journal_mode=WAL,
34181	** journal_mode=MEMORY, or journal_mode=OFF.
34182	**
34183	** Within this comment block, a page is deemed to have been synced
34184	** automatically as soon as it is written when PRAGMA synchronous=OFF.
34185	** Otherwise, the page is not synced until the xSync method of the VFS
34186	** is called successfully on the file containing the page.
	@@ -34083,11 +34210,11 @@
34210	** both the content in the database when the rollback journal was written
34211	** and the content in the database at the beginning of the current
34212	** transaction.
34213	**
34214	** (3) Writes to the database file are an integer multiple of the page size
34215	** in length and are aligned on a page boundary.
34216	**
34217	** (4) Reads from the database file are either aligned on a page boundary and
34218	** an integer multiple of the page size in length or are taken from the
34219	** first 100 bytes of the database file.
34220	**
	@@ -34114,11 +34241,12 @@
34241	** method is a no-op, but that does not change the fact the SQLite will
34242	** invoke it.)
34243	**
34244	** (9) Whenever the database file is modified, at least one bit in the range
34245	** of bytes from 24 through 39 inclusive will be changed prior to releasing
34246	** the EXCLUSIVE lock, thus signaling other connections on the same
34247	** database to flush their caches.
34248	**
34249	** (10) The pattern of bits in bytes 24 through 39 shall not repeat in less
34250	** than one billion transactions.
34251	**
34252	** (11) A database file is well-formed at the beginning and at the conclusion
	@@ -34127,11 +34255,12 @@
34255	** (12) An EXCLUSIVE lock is held on the database file when writing to
34256	** the database file.
34257	**
34258	** (13) A SHARED lock is held on the database file while reading any
34259	** content out of the database file.
34260	**
34261	******************************************************************************/
34262
34263	/*
34264	** Macros for troubleshooting. Normally turned off
34265	*/
34266	#if 0
	@@ -34152,62 +34281,283 @@
34281	*/
34282	#define PAGERID(p) ((int)(p->fd))
34283	#define FILEHANDLEID(fd) ((int)fd)
34284
34285	/*
34286	** The Pager.eState variable stores the current 'state' of a pager. A
34287	** pager may be in any one of the seven states shown in the following
34288	** state diagram.
34289	**
34290	** OPEN <------+------+
34291	** \| \| \|
34292	** V \| \|
34293	** +---------> READER-------+ \|
34294	** \| \| \|
34295	** \| V \|
34296	** \|<-------WRITER_LOCKED------> ERROR
34297	** \| \| ^
34298	** \| V \|
34299	** \|<------WRITER_CACHEMOD-------->\|
34300	** \| \| \|
34301	** \| V \|
34302	** \|<-------WRITER_DBMOD---------->\|
34303	** \| \| \|
34304	** \| V \|
34305	** +<------WRITER_FINISHED-------->+
34306	**
34307	**
34308	** List of state transitions and the C [function] that performs each:
34309	**
34310	** OPEN -> READER [sqlite3PagerSharedLock]
34311	** READER -> OPEN [pager_unlock]
34312	**
34313	** READER -> WRITER_LOCKED [sqlite3PagerBegin]
34314	** WRITER_LOCKED -> WRITER_CACHEMOD [pager_open_journal]
34315	** WRITER_CACHEMOD -> WRITER_DBMOD [syncJournal]
34316	** WRITER_DBMOD -> WRITER_FINISHED [sqlite3PagerCommitPhaseOne]
34317	WRITER_* -> READER [pager_end_transaction]
34318	**
34319	WRITER_* -> ERROR [pager_error]
34320	** ERROR -> OPEN [pager_unlock]
34321	**
34322	**
34323	** OPEN:
34324	**
34325	** The pager starts up in this state. Nothing is guaranteed in this
34326	** state - the file may or may not be locked and the database size is
34327	** unknown. The database may not be read or written.
34328	**
34329	** * No read or write transaction is active.
34330	** * Any lock, or no lock at all, may be held on the database file.
34331	** * The dbSize, dbOrigSize and dbFileSize variables may not be trusted.
34332	**
34333	** READER:
34334	**
34335	** In this state all the requirements for reading the database in
34336	** rollback (non-WAL) mode are met. Unless the pager is (or recently
34337	** was) in exclusive-locking mode, a user-level read transaction is
34338	** open. The database size is known in this state.
34339	**
34340	** A connection running with locking_mode=normal enters this state when
34341	** it opens a read-transaction on the database and returns to state
34342	** OPEN after the read-transaction is completed. However a connection
34343	** running in locking_mode=exclusive (including temp databases) remains in
34344	** this state even after the read-transaction is closed. The only way
34345	** a locking_mode=exclusive connection can transition from READER to OPEN
34346	** is via the ERROR state (see below).
34347	**
34348	** * A read transaction may be active (but a write-transaction cannot).
34349	** * A SHARED or greater lock is held on the database file.
34350	** * The dbSize variable may be trusted (even if a user-level read
34351	** transaction is not active). The dbOrigSize and dbFileSize variables
34352	** may not be trusted at this point.
34353	** * If the database is a WAL database, then the WAL connection is open.
34354	** * Even if a read-transaction is not open, it is guaranteed that
34355	** there is no hot-journal in the file-system.
34356	**
34357	** WRITER_LOCKED:
34358	**
34359	** The pager moves to this state from READER when a write-transaction
34360	** is first opened on the database. In WRITER_LOCKED state, all locks
34361	** required to start a write-transaction are held, but no actual
34362	** modifications to the cache or database have taken place.
34363	**
34364	** In rollback mode, a RESERVED or (if the transaction was opened with
34365	** BEGIN EXCLUSIVE) EXCLUSIVE lock is obtained on the database file when
34366	** moving to this state, but the journal file is not written to or opened
34367	** to in this state. If the transaction is committed or rolled back while
34368	** in WRITER_LOCKED state, all that is required is to unlock the database
34369	** file.
34370	**
34371	** IN WAL mode, WalBeginWriteTransaction() is called to lock the log file.
34372	** If the connection is running with locking_mode=exclusive, an attempt
34373	** is made to obtain an EXCLUSIVE lock on the database file.
34374	**
34375	** * A write transaction is active.
34376	** * If the connection is open in rollback-mode, a RESERVED or greater
34377	** lock is held on the database file.
34378	** * If the connection is open in WAL-mode, a WAL write transaction
34379	** is open (i.e. sqlite3WalBeginWriteTransaction() has been successfully
34380	** called).
34381	** * The dbSize, dbOrigSize and dbFileSize variables are all valid.
34382	** * The contents of the pager cache have not been modified.
34383	** * The journal file may or may not be open.
34384	** * Nothing (not even the first header) has been written to the journal.
34385	**
34386	** WRITER_CACHEMOD:
34387	**
34388	** A pager moves from WRITER_LOCKED state to this state when a page is
34389	** first modified by the upper layer. In rollback mode the journal file
34390	** is opened (if it is not already open) and a header written to the
34391	** start of it. The database file on disk has not been modified.
34392	**
34393	** * A write transaction is active.
34394	** * A RESERVED or greater lock is held on the database file.
34395	** * The journal file is open and the first header has been written
34396	** to it, but the header has not been synced to disk.
34397	** * The contents of the page cache have been modified.
34398	**
34399	** WRITER_DBMOD:
34400	**
34401	** The pager transitions from WRITER_CACHEMOD into WRITER_DBMOD state
34402	** when it modifies the contents of the database file. WAL connections
34403	** never enter this state (since they do not modify the database file,
34404	** just the log file).
34405	**
34406	** * A write transaction is active.
34407	** * An EXCLUSIVE or greater lock is held on the database file.
34408	** * The journal file is open and the first header has been written
34409	** and synced to disk.
34410	** * The contents of the page cache have been modified (and possibly
34411	** written to disk).
34412	**
34413	** WRITER_FINISHED:
34414	**
34415	** It is not possible for a WAL connection to enter this state.
34416	**
34417	** A rollback-mode pager changes to WRITER_FINISHED state from WRITER_DBMOD
34418	** state after the entire transaction has been successfully written into the
34419	** database file. In this state the transaction may be committed simply
34420	** by finalizing the journal file. Once in WRITER_FINISHED state, it is
34421	** not possible to modify the database further. At this point, the upper
34422	** layer must either commit or rollback the transaction.
34423	**
34424	** * A write transaction is active.
34425	** * An EXCLUSIVE or greater lock is held on the database file.
34426	** * All writing and syncing of journal and database data has finished.
34427	** If no error occured, all that remains is to finalize the journal to
34428	** commit the transaction. If an error did occur, the caller will need
34429	** to rollback the transaction.
34430	**
34431	** ERROR:
34432	**
34433	** The ERROR state is entered when an IO or disk-full error (including
34434	** SQLITE_IOERR_NOMEM) occurs at a point in the code that makes it
34435	** difficult to be sure that the in-memory pager state (cache contents,
34436	** db size etc.) are consistent with the contents of the file-system.
34437	**
34438	** Temporary pager files may enter the ERROR state, but in-memory pagers
34439	** cannot.
34440	**
34441	** For example, if an IO error occurs while performing a rollback,
34442	** the contents of the page-cache may be left in an inconsistent state.
34443	** At this point it would be dangerous to change back to READER state
34444	** (as usually happens after a rollback). Any subsequent readers might
34445	** report database corruption (due to the inconsistent cache), and if
34446	** they upgrade to writers, they may inadvertently corrupt the database
34447	** file. To avoid this hazard, the pager switches into the ERROR state
34448	** instead of READER following such an error.
34449	**
34450	** Once it has entered the ERROR state, any attempt to use the pager
34451	** to read or write data returns an error. Eventually, once all
34452	** outstanding transactions have been abandoned, the pager is able to
34453	** transition back to OPEN state, discarding the contents of the
34454	** page-cache and any other in-memory state at the same time. Everything
34455	** is reloaded from disk (and, if necessary, hot-journal rollback peformed)
34456	** when a read-transaction is next opened on the pager (transitioning
34457	** the pager into READER state). At that point the system has recovered
34458	** from the error.
34459	**
34460	** Specifically, the pager jumps into the ERROR state if:
34461	**
34462	** 1. An error occurs while attempting a rollback. This happens in
34463	** function sqlite3PagerRollback().
34464	**
34465	** 2. An error occurs while attempting to finalize a journal file
34466	** following a commit in function sqlite3PagerCommitPhaseTwo().
34467	**
34468	** 3. An error occurs while attempting to write to the journal or
34469	** database file in function pagerStress() in order to free up
34470	** memory.
34471	**
34472	** In other cases, the error is returned to the b-tree layer. The b-tree
34473	** layer then attempts a rollback operation. If the error condition
34474	** persists, the pager enters the ERROR state via condition (1) above.
34475	**
34476	** Condition (3) is necessary because it can be triggered by a read-only
34477	** statement executed within a transaction. In this case, if the error
34478	** code were simply returned to the user, the b-tree layer would not
34479	** automatically attempt a rollback, as it assumes that an error in a
34480	** read-only statement cannot leave the pager in an internally inconsistent
34481	** state.
34482	**
34483	** * The Pager.errCode variable is set to something other than SQLITE_OK.
34484	** * There are one or more outstanding references to pages (after the
34485	** last reference is dropped the pager should move back to OPEN state).
34486	** * The pager is not an in-memory pager.
34487	**
34488	**
34489	** Notes:
34490	**
34491	** * A pager is never in WRITER_DBMOD or WRITER_FINISHED state if the
34492	** connection is open in WAL mode. A WAL connection is always in one
34493	** of the first four states.
34494	**
34495	** * Normally, a connection open in exclusive mode is never in PAGER_OPEN
34496	** state. There are two exceptions: immediately after exclusive-mode has
34497	** been turned on (and before any read or write transactions are
34498	** executed), and when the pager is leaving the "error state".
34499	**
34500	** * See also: assert_pager_state().
34501	*/
34502	#define PAGER_OPEN 0
34503	#define PAGER_READER 1
34504	#define PAGER_WRITER_LOCKED 2
34505	#define PAGER_WRITER_CACHEMOD 3
34506	#define PAGER_WRITER_DBMOD 4
34507	#define PAGER_WRITER_FINISHED 5
34508	#define PAGER_ERROR 6
34509
34510	/*
34511	** The Pager.eLock variable is almost always set to one of the
34512	** following locking-states, according to the lock currently held on
34513	** the database file: NO_LOCK, SHARED_LOCK, RESERVED_LOCK or EXCLUSIVE_LOCK.
34514	** This variable is kept up to date as locks are taken and released by
34515	** the pagerLockDb() and pagerUnlockDb() wrappers.
34516	**
34517	** If the VFS xLock() or xUnlock() returns an error other than SQLITE_BUSY
34518	** (i.e. one of the SQLITE_IOERR subtypes), it is not clear whether or not
34519	** the operation was successful. In these circumstances pagerLockDb() and
34520	** pagerUnlockDb() take a conservative approach - eLock is always updated
34521	** when unlocking the file, and only updated when locking the file if the
34522	** VFS call is successful. This way, the Pager.eLock variable may be set
34523	** to a less exclusive (lower) value than the lock that is actually held
34524	** at the system level, but it is never set to a more exclusive value.
34525	**
34526	** This is usually safe. If an xUnlock fails or appears to fail, there may
34527	** be a few redundant xLock() calls or a lock may be held for longer than
34528	** required, but nothing really goes wrong.
34529	**
34530	** The exception is when the database file is unlocked as the pager moves
34531	** from ERROR to OPEN state. At this point there may be a hot-journal file
34532	** in the file-system that needs to be rolled back (as part of a OPEN->SHARED
34533	** transition, by the same pager or any other). If the call to xUnlock()
34534	** fails at this point and the pager is left holding an EXCLUSIVE lock, this
34535	** can confuse the call to xCheckReservedLock() call made later as part
34536	** of hot-journal detection.
34537	**
34538	** xCheckReservedLock() is defined as returning true "if there is a RESERVED
34539	** lock held by this process or any others". So xCheckReservedLock may
34540	** return true because the caller itself is holding an EXCLUSIVE lock (but
34541	** doesn't know it because of a previous error in xUnlock). If this happens
34542	** a hot-journal may be mistaken for a journal being created by an active
34543	** transaction in another process, causing SQLite to read from the database
34544	** without rolling it back.
34545	**
34546	** To work around this, if a call to xUnlock() fails when unlocking the
34547	** database in the ERROR state, Pager.eLock is set to UNKNOWN_LOCK. It
34548	** is only changed back to a real locking state after a successful call
34549	** to xLock(EXCLUSIVE). Also, the code to do the OPEN->SHARED state transition
34550	** omits the check for a hot-journal if Pager.eLock is set to UNKNOWN_LOCK
34551	** lock. Instead, it assumes a hot-journal exists and obtains an EXCLUSIVE
34552	** lock on the database file before attempting to roll it back. See function
34553	** PagerSharedLock() for more detail.
34554	**
34555	** Pager.eLock may only be set to UNKNOWN_LOCK when the pager is in
34556	** PAGER_OPEN state.
34557	*/
34558	#define UNKNOWN_LOCK (EXCLUSIVE_LOCK+1)
34559
34560	/*
34561	** A macro used for invoking the codec if there is one
34562	*/
34563	#ifdef SQLITE_HAS_CODEC
	@@ -34253,37 +34603,32 @@
34603	u32 aWalData[WAL_SAVEPOINT_NDATA]; /* WAL savepoint context */
34604	#endif
34605	};
34606
34607	/*
34608	** A open page cache is an instance of struct Pager. A description of
34609	** some of the more important member variables follows:
34610	**
34611	** eState
34612	**
34613	** The current 'state' of the pager object. See the comment and state
34614	** diagram above for a description of the pager state.
34615	**
34616	** eLock
34617	**
34618	** For a real on-disk database, the current lock held on the database file -
34619	** NO_LOCK, SHARED_LOCK, RESERVED_LOCK or EXCLUSIVE_LOCK.
34620	**
34621	** For a temporary or in-memory database (neither of which require any
34622	** locks), this variable is always set to EXCLUSIVE_LOCK. Since such
34623	** databases always have Pager.exclusiveMode==1, this tricks the pager
34624	** logic into thinking that it already has all the locks it will ever
34625	** need (and no reason to release them).
34626	**
34627	** In some (obscure) circumstances, this variable may also be set to
34628	** UNKNOWN_LOCK. See the comment above the #define of UNKNOWN_LOCK for
34629	** details.





34630	**
34631	** changeCountDone
34632	**
34633	** This boolean variable is used to make sure that the change-counter
34634	** (the 4-byte header field at byte offset 24 of the database file) is
	@@ -34298,28 +34643,10 @@
34643	**
34644	** This mechanism means that when running in exclusive mode, a connection
34645	** need only update the change-counter once, for the first transaction
34646	** committed.
34647	**


















34648	** setMaster
34649	**
34650	** When PagerCommitPhaseOne() is called to commit a transaction, it may
34651	** (or may not) specify a master-journal name to be written into the
34652	** journal file before it is synced to disk.
	@@ -34326,84 +34653,146 @@
34653	**
34654	** Whether or not a journal file contains a master-journal pointer affects
34655	** the way in which the journal file is finalized after the transaction is
34656	** committed or rolled back when running in "journal_mode=PERSIST" mode.
34657	** If a journal file does not contain a master-journal pointer, it is
34658	** finalized by overwriting the first journal header with zeroes. If
34659	** it does contain a master-journal pointer the journal file is finalized
34660	** by truncating it to zero bytes, just as if the connection were
34661	** running in "journal_mode=truncate" mode.
34662	**
34663	** Journal files that contain master journal pointers cannot be finalized
34664	** simply by overwriting the first journal-header with zeroes, as the
34665	** master journal pointer could interfere with hot-journal rollback of any
34666	** subsequently interrupted transaction that reuses the journal file.
34667	**
34668	** The flag is cleared as soon as the journal file is finalized (either
34669	** by PagerCommitPhaseTwo or PagerRollback). If an IO error prevents the
34670	** journal file from being successfully finalized, the setMaster flag
34671	** is cleared anyway (and the pager will move to ERROR state).
34672	**
34673	** doNotSpill, doNotSyncSpill
34674	**
34675	** These two boolean variables control the behaviour of cache-spills
34676	** (calls made by the pcache module to the pagerStress() routine to
34677	** write cached data to the file-system in order to free up memory).
34678	**
34679	** When doNotSpill is non-zero, writing to the database from pagerStress()
34680	** is disabled altogether. This is done in a very obscure case that
34681	** comes up during savepoint rollback that requires the pcache module
34682	** to allocate a new page to prevent the journal file from being written
34683	** while it is being traversed by code in pager_playback().
34684	**
34685	** If doNotSyncSpill is non-zero, writing to the database from pagerStress()
34686	** is permitted, but syncing the journal file is not. This flag is set
34687	** by sqlite3PagerWrite() when the file-system sector-size is larger than
34688	** the database page-size in order to prevent a journal sync from happening
34689	** in between the journalling of two pages on the same sector.
34690	**
34691	** subjInMemory
34692	**
34693	** This is a boolean variable. If true, then any required sub-journal
34694	** is opened as an in-memory journal file. If false, then in-memory
34695	** sub-journals are only used for in-memory pager files.
34696	**
34697	** This variable is updated by the upper layer each time a new
34698	** write-transaction is opened.
34699	**
34700	** dbSize, dbOrigSize, dbFileSize
34701	**
34702	** Variable dbSize is set to the number of pages in the database file.
34703	** It is valid in PAGER_READER and higher states (all states except for
34704	** OPEN and ERROR).
34705	**
34706	** dbSize is set based on the size of the database file, which may be
34707	** larger than the size of the database (the value stored at offset
34708	** 28 of the database header by the btree). If the size of the file
34709	** is not an integer multiple of the page-size, the value stored in
34710	** dbSize is rounded down (i.e. a 5KB file with 2K page-size has dbSize==2).
34711	** Except, any file that is greater than 0 bytes in size is considered
34712	** to have at least one page. (i.e. a 1KB file with 2K page-size leads
34713	** to dbSize==1).
34714	**
34715	** During a write-transaction, if pages with page-numbers greater than
34716	** dbSize are modified in the cache, dbSize is updated accordingly.
34717	** Similarly, if the database is truncated using PagerTruncateImage(),
34718	** dbSize is updated.
34719	**
34720	** Variables dbOrigSize and dbFileSize are valid in states
34721	** PAGER_WRITER_LOCKED and higher. dbOrigSize is a copy of the dbSize
34722	** variable at the start of the transaction. It is used during rollback,
34723	** and to determine whether or not pages need to be journalled before
34724	** being modified.
34725	**
34726	** Throughout a write-transaction, dbFileSize contains the size of
34727	** the file on disk in pages. It is set to a copy of dbSize when the
34728	** write-transaction is first opened, and updated when VFS calls are made
34729	** to write or truncate the database file on disk.
34730	**
34731	** The only reason the dbFileSize variable is required is to suppress
34732	** unnecessary calls to xTruncate() after committing a transaction. If,
34733	** when a transaction is committed, the dbFileSize variable indicates
34734	** that the database file is larger than the database image (Pager.dbSize),
34735	** pager_truncate() is called. The pager_truncate() call uses xFilesize()
34736	** to measure the database file on disk, and then truncates it if required.
34737	** dbFileSize is not used when rolling back a transaction. In this case
34738	** pager_truncate() is called unconditionally (which means there may be
34739	** a call to xFilesize() that is not strictly required). In either case,
34740	** pager_truncate() may cause the file to become smaller or larger.
34741	**
34742	** dbHintSize
34743	**
34744	** The dbHintSize variable is used to limit the number of calls made to
34745	** the VFS xFileControl(FCNTL_SIZE_HINT) method.
34746	**
34747	** dbHintSize is set to a copy of the dbSize variable when a
34748	** write-transaction is opened (at the same time as dbFileSize and
34749	** dbOrigSize). If the xFileControl(FCNTL_SIZE_HINT) method is called,
34750	** dbHintSize is increased to the number of pages that correspond to the
34751	** size-hint passed to the method call. See pager_write_pagelist() for
34752	** details.
34753	**
34754	** errCode
34755	**
34756	** The Pager.errCode variable is only ever used in PAGER_ERROR state. It
34757	** is set to zero in all other states. In PAGER_ERROR state, Pager.errCode
34758	** is always set to SQLITE_FULL, SQLITE_IOERR or one of the SQLITE_IOERR_XXX
34759	** sub-codes.
34760	*/
34761	struct Pager {
34762	sqlite3_vfs pVfs; / OS functions to use for IO */
34763	u8 exclusiveMode; /* Boolean. True if locking_mode==EXCLUSIVE */
34764	u8 journalMode; /* One of the PAGER_JOURNALMODE_* values */
34765	u8 useJournal; /* Use a rollback journal on this file */
34766	u8 noReadlock; /* Do not bother to obtain readlocks */
34767	u8 noSync; /* Do not sync the journal if true */
34768	u8 fullSync; /* Do extra syncs of the journal for robustness */
34769	u8 sync_flags; /* One of SYNC_NORMAL or SYNC_FULL */
34770	u8 tempFile; /* zFilename is a temporary file */
34771	u8 readOnly; /* True for a read-only database */
34772	u8 memDb; /* True to inhibit all file I/O */
34773
34774	/**************************************************************************
34775	** The following block contains those class members that change during
34776	** routine opertion. Class members not in this block are either fixed
34777	** when the pager is first created or else only change when there is a
34778	** significant mode change (such as changing the page_size, locking_mode,
34779	** or the journal_mode). From another view, these class members describe
34780	** the "state" of the pager, while other class members describe the
34781	** "configuration" of the pager.


34782	*/
34783	u8 eState; /* Pager state (OPEN, READER, WRITER_LOCKED..) */
34784	u8 eLock; /* Current lock held on database file */


34785	u8 changeCountDone; /* Set after incrementing the change-counter */
34786	u8 setMaster; /* True if a m-j name has been written to jrnl */
34787	u8 doNotSpill; /* Do not spill the cache when non-zero */
34788	u8 doNotSyncSpill; /* Do not do a spill that requires jrnl sync */

34789	u8 subjInMemory; /* True to use in-memory sub-journals */
34790	Pgno dbSize; /* Number of pages in the database */
34791	Pgno dbOrigSize; /* dbSize before the current transaction */
34792	Pgno dbFileSize; /* Number of pages in the database file */
34793	Pgno dbHintSize; /* Value passed to FCNTL_SIZE_HINT call */
34794	int errCode; /* One of several kinds of errors */
34795	int nRec; /* Pages journalled since last j-header written */
34796	u32 cksumInit; /* Quasi-random value added to every checksum */
34797	u32 nSubRec; /* Number of records written to sub-journal */
34798	Bitvec pInJournal; / One bit for each page in the database file */
	@@ -34410,21 +34799,25 @@
34799	sqlite3_file fd; / File descriptor for database */
34800	sqlite3_file jfd; / File descriptor for main journal */
34801	sqlite3_file sjfd; / File descriptor for sub-journal */
34802	i64 journalOff; /* Current write offset in the journal file */
34803	i64 journalHdr; /* Byte offset to previous journal header */
34804	sqlite3_backup pBackup; / Pointer to list of ongoing backup processes */
34805	PagerSavepoint aSavepoint; / Array of active savepoints */
34806	int nSavepoint; /* Number of elements in aSavepoint[] */
34807	char dbFileVers[16]; /* Changes whenever database file changes */
34808	/*
34809	** End of the routinely-changing class members
34810	***************************************************************************/
34811
34812	u16 nExtra; /* Add this many bytes to each in-memory page */
34813	i16 nReserve; /* Number of unused bytes at end of each page */
34814	u32 vfsFlags; /* Flags for sqlite3_vfs.xOpen() */
34815	u32 sectorSize; /* Assumed sector size during rollback */
34816	int pageSize; /* Number of bytes in a page */
34817	Pgno mxPgno; /* Maximum allowed size of the database */
34818	i64 journalSizeLimit; /* Size limit for persistent journal files */
34819	char zFilename; / Name of the database file */
34820	char zJournal; / Name of the journal file */
34821	int (xBusyHandler)(void); /* Function to call when busy */
34822	void pBusyHandlerArg; / Context argument for xBusyHandler */
34823	#ifdef SQLITE_TEST
	@@ -34438,11 +34831,10 @@
34831	void (xCodecFree)(void); /* Destructor for the codec */
34832	void pCodec; / First argument to xCodec... methods */
34833	#endif
34834	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
34835	PCache pPCache; / Pointer to page cache object */

34836	#ifndef SQLITE_OMIT_WAL
34837	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
34838	char zWal; / File name for write-ahead log */
34839	#endif
34840	};
	@@ -34517,26 +34909,225 @@
34909	/*
34910	** The maximum legal page number is (2^31 - 1).
34911	*/
34912	#define PAGER_MAX_PGNO 2147483647
34913
34914	/*
34915	** The argument to this macro is a file descriptor (type sqlite3_file*).
34916	** Return 0 if it is not open, or non-zero (but not 1) if it is.
34917	**
34918	** This is so that expressions can be written as:
34919	**
34920	** if( isOpen(pPager->jfd) ){ ...
34921	**
34922	** instead of
34923	**
34924	** if( pPager->jfd->pMethods ){ ...
34925	*/
34926	#define isOpen(pFd) ((pFd)->pMethods)
34927
34928	/*
34929	** Return true if this pager uses a write-ahead log instead of the usual
34930	** rollback journal. Otherwise false.
34931	*/
34932	#ifndef SQLITE_OMIT_WAL
34933	static int pagerUseWal(Pager *pPager){
34934	return (pPager->pWal!=0);
34935	}
34936	#else
34937	# define pagerUseWal(x) 0
34938	# define pagerRollbackWal(x) 0
34939	# define pagerWalFrames(v,w,x,y,z) 0
34940	# define pagerOpenWalIfPresent(z) SQLITE_OK
34941	# define pagerBeginReadTransaction(z) SQLITE_OK
34942	#endif
34943
34944	#ifndef NDEBUG
34945	/*
34946	** Usage:
34947	**
34948	** assert( assert_pager_state(pPager) );
34949	**
34950	** This function runs many asserts to try to find inconsistencies in
34951	** the internal state of the Pager object.
34952	*/
34953	static int assert_pager_state(Pager *p){
34954	Pager *pPager = p;
34955
34956	/* State must be valid. */
34957	assert( p->eState==PAGER_OPEN
34958	\|\| p->eState==PAGER_READER
34959	\|\| p->eState==PAGER_WRITER_LOCKED
34960	\|\| p->eState==PAGER_WRITER_CACHEMOD
34961	\|\| p->eState==PAGER_WRITER_DBMOD
34962	\|\| p->eState==PAGER_WRITER_FINISHED
34963	\|\| p->eState==PAGER_ERROR
34964	);
34965
34966	/* Regardless of the current state, a temp-file connection always behaves
34967	** as if it has an exclusive lock on the database file. It never updates
34968	** the change-counter field, so the changeCountDone flag is always set.
34969	*/
34970	assert( p->tempFile==0 \|\| p->eLock==EXCLUSIVE_LOCK );
34971	assert( p->tempFile==0 \|\| pPager->changeCountDone );
34972
34973	/* If the useJournal flag is clear, the journal-mode must be "OFF".
34974	** And if the journal-mode is "OFF", the journal file must not be open.
34975	*/
34976	assert( p->journalMode==PAGER_JOURNALMODE_OFF \|\| p->useJournal );
34977	assert( p->journalMode!=PAGER_JOURNALMODE_OFF \|\| !isOpen(p->jfd) );
34978
34979	/* Check that MEMDB implies noSync. And an in-memory journal. Since
34980	** this means an in-memory pager performs no IO at all, it cannot encounter
34981	** either SQLITE_IOERR or SQLITE_FULL during rollback or while finalizing
34982	** a journal file. (although the in-memory journal implementation may
34983	** return SQLITE_IOERR_NOMEM while the journal file is being written). It
34984	** is therefore not possible for an in-memory pager to enter the ERROR
34985	** state.
34986	*/
34987	if( MEMDB ){
34988	assert( p->noSync );
34989	assert( p->journalMode==PAGER_JOURNALMODE_OFF
34990	\|\| p->journalMode==PAGER_JOURNALMODE_MEMORY
34991	);
34992	assert( p->eState!=PAGER_ERROR && p->eState!=PAGER_OPEN );
34993	assert( pagerUseWal(p)==0 );
34994	}
34995
34996	/* If changeCountDone is set, a RESERVED lock or greater must be held
34997	** on the file.
34998	*/
34999	assert( pPager->changeCountDone==0 \|\| pPager->eLock>=RESERVED_LOCK );
35000	assert( p->eLock!=PENDING_LOCK );
35001
35002	switch( p->eState ){
35003	case PAGER_OPEN:
35004	assert( !MEMDB );
35005	assert( pPager->errCode==SQLITE_OK );
35006	assert( sqlite3PcacheRefCount(pPager->pPCache)==0 \|\| pPager->tempFile );
35007	break;
35008
35009	case PAGER_READER:
35010	assert( pPager->errCode==SQLITE_OK );
35011	assert( p->eLock!=UNKNOWN_LOCK );
35012	assert( p->eLock>=SHARED_LOCK \|\| p->noReadlock );
35013	break;
35014
35015	case PAGER_WRITER_LOCKED:
35016	assert( p->eLock!=UNKNOWN_LOCK );
35017	assert( pPager->errCode==SQLITE_OK );
35018	if( !pagerUseWal(pPager) ){
35019	assert( p->eLock>=RESERVED_LOCK );
35020	}
35021	assert( pPager->dbSize==pPager->dbOrigSize );
35022	assert( pPager->dbOrigSize==pPager->dbFileSize );
35023	assert( pPager->dbOrigSize==pPager->dbHintSize );
35024	assert( pPager->setMaster==0 );
35025	break;
35026
35027	case PAGER_WRITER_CACHEMOD:
35028	assert( p->eLock!=UNKNOWN_LOCK );
35029	assert( pPager->errCode==SQLITE_OK );
35030	if( !pagerUseWal(pPager) ){
35031	/* It is possible that if journal_mode=wal here that neither the
35032	** journal file nor the WAL file are open. This happens during
35033	** a rollback transaction that switches from journal_mode=off
35034	** to journal_mode=wal.
35035	*/
35036	assert( p->eLock>=RESERVED_LOCK );
35037	assert( isOpen(p->jfd)
35038	\|\| p->journalMode==PAGER_JOURNALMODE_OFF
35039	\|\| p->journalMode==PAGER_JOURNALMODE_WAL
35040	);
35041	}
35042	assert( pPager->dbOrigSize==pPager->dbFileSize );
35043	assert( pPager->dbOrigSize==pPager->dbHintSize );
35044	break;
35045
35046	case PAGER_WRITER_DBMOD:
35047	assert( p->eLock==EXCLUSIVE_LOCK );
35048	assert( pPager->errCode==SQLITE_OK );
35049	assert( !pagerUseWal(pPager) );
35050	assert( p->eLock>=EXCLUSIVE_LOCK );
35051	assert( isOpen(p->jfd)
35052	\|\| p->journalMode==PAGER_JOURNALMODE_OFF
35053	\|\| p->journalMode==PAGER_JOURNALMODE_WAL
35054	);
35055	assert( pPager->dbOrigSize<=pPager->dbHintSize );
35056	break;
35057
35058	case PAGER_WRITER_FINISHED:
35059	assert( p->eLock==EXCLUSIVE_LOCK );
35060	assert( pPager->errCode==SQLITE_OK );
35061	assert( !pagerUseWal(pPager) );
35062	assert( isOpen(p->jfd)
35063	\|\| p->journalMode==PAGER_JOURNALMODE_OFF
35064	\|\| p->journalMode==PAGER_JOURNALMODE_WAL
35065	);
35066	break;
35067
35068	case PAGER_ERROR:
35069	/* There must be at least one outstanding reference to the pager if
35070	** in ERROR state. Otherwise the pager should have already dropped
35071	** back to OPEN state.
35072	*/
35073	assert( pPager->errCode!=SQLITE_OK );
35074	assert( sqlite3PcacheRefCount(pPager->pPCache)>0 );
35075	break;
35076	}
35077
35078	return 1;
35079	}
35080
35081	/*
35082	** Return a pointer to a human readable string in a static buffer
35083	** containing the state of the Pager object passed as an argument. This
35084	** is intended to be used within debuggers. For example, as an alternative
35085	** to "print *pPager" in gdb:
35086	**
35087	** (gdb) printf "%s", print_pager_state(pPager)
35088	*/
35089	static char print_pager_state(Pager p){
35090	static char zRet[1024];
35091
35092	sqlite3_snprintf(1024, zRet,
35093	"Filename: %s\n"
35094	"State: %s errCode=%d\n"
35095	"Lock: %s\n"
35096	"Locking mode: locking_mode=%s\n"
35097	"Journal mode: journal_mode=%s\n"
35098	"Backing store: tempFile=%d memDb=%d useJournal=%d\n"
35099	"Journal: journalOff=%lld journalHdr=%lld\n"
35100	"Size: dbsize=%d dbOrigSize=%d dbFileSize=%d\n"
35101	, p->zFilename
35102	, p->eState==PAGER_OPEN ? "OPEN" :
35103	p->eState==PAGER_READER ? "READER" :
35104	p->eState==PAGER_WRITER_LOCKED ? "WRITER_LOCKED" :
35105	p->eState==PAGER_WRITER_CACHEMOD ? "WRITER_CACHEMOD" :
35106	p->eState==PAGER_WRITER_DBMOD ? "WRITER_DBMOD" :
35107	p->eState==PAGER_WRITER_FINISHED ? "WRITER_FINISHED" :
35108	p->eState==PAGER_ERROR ? "ERROR" : "?error?"
35109	, (int)p->errCode
35110	, p->eLock==NO_LOCK ? "NO_LOCK" :
35111	p->eLock==RESERVED_LOCK ? "RESERVED" :
35112	p->eLock==EXCLUSIVE_LOCK ? "EXCLUSIVE" :
35113	p->eLock==SHARED_LOCK ? "SHARED" :
35114	p->eLock==UNKNOWN_LOCK ? "UNKNOWN" : "?error?"
35115	, p->exclusiveMode ? "exclusive" : "normal"
35116	, p->journalMode==PAGER_JOURNALMODE_MEMORY ? "memory" :
35117	p->journalMode==PAGER_JOURNALMODE_OFF ? "off" :
35118	p->journalMode==PAGER_JOURNALMODE_DELETE ? "delete" :
35119	p->journalMode==PAGER_JOURNALMODE_PERSIST ? "persist" :
35120	p->journalMode==PAGER_JOURNALMODE_TRUNCATE ? "truncate" :
35121	p->journalMode==PAGER_JOURNALMODE_WAL ? "wal" : "?error?"
35122	, (int)p->tempFile, (int)p->memDb, (int)p->useJournal
35123	, p->journalOff, p->journalHdr
35124	, (int)p->dbSize, (int)p->dbOrigSize, (int)p->dbFileSize
35125	);
35126
35127	return zRet;
35128	}
35129	#endif
35130
35131	/*
35132	** Return true if it is necessary to write page *pPg into the sub-journal.
35133	** A page needs to be written into the sub-journal if there exists one
	@@ -34584,10 +35175,11 @@
35175
35176	/*
35177	** Write a 32-bit integer into a string buffer in big-endian byte order.
35178	*/
35179	#define put32bits(A,B) sqlite3Put4byte((u8*)A,B)
35180
35181
35182	/*
35183	** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK
35184	** on success or an error code is something goes wrong.
35185	*/
	@@ -34596,31 +35188,57 @@
35188	put32bits(ac, val);
35189	return sqlite3OsWrite(fd, ac, 4, offset);
35190	}
35191
35192	/*
35193	** Unlock the database file to level eLock, which must be either NO_LOCK
35194	** or SHARED_LOCK. Regardless of whether or not the call to xUnlock()
35195	** succeeds, set the Pager.eLock variable to match the (attempted) new lock.
35196	**
35197	** Except, if Pager.eLock is set to UNKNOWN_LOCK when this function is
35198	** called, do not modify it. See the comment above the #define of
35199	** UNKNOWN_LOCK for an explanation of this.
35200	*/
35201	static int pagerUnlockDb(Pager *pPager, int eLock){
35202	int rc = SQLITE_OK;
35203
35204	assert( !pPager->exclusiveMode );
35205	assert( eLock==NO_LOCK \|\| eLock==SHARED_LOCK );
35206	assert( eLock!=NO_LOCK \|\| pagerUseWal(pPager)==0 );
35207	if( isOpen(pPager->fd) ){
35208	assert( pPager->eLock>=eLock );
35209	rc = sqlite3OsUnlock(pPager->fd, eLock);
35210	if( pPager->eLock!=UNKNOWN_LOCK ){
35211	pPager->eLock = (u8)eLock;
35212	}
35213	IOTRACE(("UNLOCK %p %d\n", pPager, eLock))
35214	}
35215	return rc;
35216	}
35217
35218	/*
35219	** Lock the database file to level eLock, which must be either SHARED_LOCK,
35220	** RESERVED_LOCK or EXCLUSIVE_LOCK. If the caller is successful, set the
35221	** Pager.eLock variable to the new locking state.
35222	**
35223	** Except, if Pager.eLock is set to UNKNOWN_LOCK when this function is
35224	** called, do not modify it unless the new locking state is EXCLUSIVE_LOCK.
35225	** See the comment above the #define of UNKNOWN_LOCK for an explanation
35226	** of this.
35227	*/
35228	static int pagerLockDb(Pager *pPager, int eLock){
35229	int rc = SQLITE_OK;
35230
35231	assert( eLock==SHARED_LOCK \|\| eLock==RESERVED_LOCK \|\| eLock==EXCLUSIVE_LOCK );
35232	if( pPager->eLock<eLock \|\| pPager->eLock==UNKNOWN_LOCK ){
35233	rc = sqlite3OsLock(pPager->fd, eLock);
35234	if( rc==SQLITE_OK && (pPager->eLock!=UNKNOWN_LOCK\|\|eLock==EXCLUSIVE_LOCK) ){
35235	pPager->eLock = (u8)eLock;
35236	IOTRACE(("LOCK %p %d\n", pPager, eLock))
35237	}
35238	}
35239	return rc;
35240	}
35241
35242	/*
35243	** This function determines whether or not the atomic-write optimization
35244	** can be used with this pager. The optimization can be used if:
	@@ -34692,17 +35310,18 @@
35310	** that the page is either dirty or still matches the calculated page-hash.
35311	*/
35312	#define CHECK_PAGE(x) checkPage(x)
35313	static void checkPage(PgHdr *pPg){
35314	Pager *pPager = pPg->pPager;
35315	assert( pPager->eState!=PAGER_ERROR );
35316	assert( (pPg->flags&PGHDR_DIRTY) \|\| pPg->pageHash==pager_pagehash(pPg) );
35317	}
35318
35319	#else
35320	#define pager_datahash(X,Y) 0
35321	#define pager_pagehash(X) 0
35322	#define pager_set_pagehash(X)
35323	#define CHECK_PAGE(x)
35324	#endif /* SQLITE_CHECK_PAGES */
35325
35326	/*
35327	** When this is called the journal file for pager pPager must be open.
	@@ -34865,11 +35484,11 @@
35484	** Followed by (JOURNAL_HDR_SZ - 28) bytes of unused space.
35485	*/
35486	static int writeJournalHdr(Pager *pPager){
35487	int rc = SQLITE_OK; /* Return code */
35488	char zHeader = pPager->pTmpSpace; / Temporary space used to build header */
35489	u32 nHeader = (u32)pPager->pageSize;/* Size of buffer pointed to by zHeader */
35490	u32 nWrite; /* Bytes of header sector written */
35491	int ii; /* Loop counter */
35492
35493	assert( isOpen(pPager->jfd) ); /* Journal file must be open. */
35494
	@@ -34908,11 +35527,11 @@
35527	**
35528	** * When the SQLITE_IOCAP_SAFE_APPEND flag is set. This guarantees
35529	** that garbage data is never appended to the journal file.
35530	*/
35531	assert( isOpen(pPager->fd) \|\| pPager->noSync );
35532	if( pPager->noSync \|\| (pPager->journalMode==PAGER_JOURNALMODE_MEMORY)
35533	\|\| (sqlite3OsDeviceCharacteristics(pPager->fd)&SQLITE_IOCAP_SAFE_APPEND)
35534	){
35535	memcpy(zHeader, aJournalMagic, sizeof(aJournalMagic));
35536	put32bits(&zHeader[sizeof(aJournalMagic)], 0xffffffff);
35537	}else{
	@@ -35032,18 +35651,25 @@
35651	}
35652
35653	if( pPager->journalOff==0 ){
35654	u32 iPageSize; /* Page-size field of journal header */
35655	u32 iSectorSize; /* Sector-size field of journal header */

35656
35657	/* Read the page-size and sector-size journal header fields. */
35658	if( SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+20, &iSectorSize))
35659	\|\| SQLITE_OK!=(rc = read32bits(pPager->jfd, iHdrOff+24, &iPageSize))
35660	){
35661	return rc;
35662	}
35663
35664	/* Versions of SQLite prior to 3.5.8 set the page-size field of the
35665	** journal header to zero. In this case, assume that the Pager.pageSize
35666	** variable is already set to the correct page size.
35667	*/
35668	if( iPageSize==0 ){
35669	iPageSize = pPager->pageSize;
35670	}
35671
35672	/* Check that the values read from the page-size and sector-size fields
35673	** are within range. To be 'in range', both values need to be a power
35674	** of two greater than or equal to 512 or 32, and not greater than their
35675	** respective compile time maximum limits.
	@@ -35062,14 +35688,12 @@
35688
35689	/* Update the page-size to match the value read from the journal.
35690	** Use a testcase() macro to make sure that malloc failure within
35691	** PagerSetPagesize() is tested.
35692	*/
35693	rc = sqlite3PagerSetPagesize(pPager, &iPageSize, -1);

35694	testcase( rc!=SQLITE_OK );

35695
35696	/* Update the assumed sector-size to match the value used by
35697	** the process that created this journal. If this journal was
35698	** created by a process other than this one, then this routine
35699	** is being called from within pager_playback(). The local value
	@@ -35108,10 +35732,12 @@
35732	i64 iHdrOff; /* Offset of header in journal file */
35733	i64 jrnlSize; /* Size of journal file on disk */
35734	u32 cksum = 0; /* Checksum of string zMaster */
35735
35736	assert( pPager->setMaster==0 );
35737	assert( !pagerUseWal(pPager) );
35738
35739	if( !zMaster
35740	\|\| pPager->journalMode==PAGER_JOURNALMODE_MEMORY
35741	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
35742	){
35743	return SQLITE_OK;
	@@ -35144,11 +35770,10 @@
35770	\|\| (0 != (rc = sqlite3OsWrite(pPager->jfd, aJournalMagic, 8, iHdrOff+4+nMaster+8)))
35771	){
35772	return rc;
35773	}
35774	pPager->journalOff += (nMaster+20);

35775
35776	/* If the pager is in peristent-journal mode, then the physical
35777	** journal-file may extend past the end of the master-journal name
35778	** and 8 bytes of magic data just written to the file. This is
35779	** dangerous because the code to rollback a hot-journal file
	@@ -35180,21 +35805,15 @@
35805	(void)sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &p);
35806	return p;
35807	}
35808
35809	/*
35810	** Discard the entire contents of the in-memory page-cache.



35811	*/
35812	static void pager_reset(Pager *pPager){
35813	sqlite3BackupRestart(pPager->pBackup);
35814	sqlite3PcacheClear(pPager->pPCache);



35815	}
35816
35817	/*
35818	** Free all structures in the Pager.aSavepoint[] array and set both
35819	** Pager.aSavepoint and Pager.nSavepoint to zero. Close the sub-journal
	@@ -35233,38 +35852,43 @@
35852	}
35853	return rc;
35854	}
35855
35856	/*
35857	** This function is a no-op if the pager is in exclusive mode and not
35858	** in the ERROR state. Otherwise, it switches the pager to PAGER_OPEN
35859	** state.















35860	**
35861	** If the pager is not in exclusive-access mode, the database file is
35862	** completely unlocked. If the file is unlocked and the file-system does
35863	** not exhibit the UNDELETABLE_WHEN_OPEN property, the journal file is
35864	** closed (if it is open).
35865	**
35866	** If the pager is in ERROR state when this function is called, the
35867	** contents of the pager cache are discarded before switching back to
35868	** the OPEN state. Regardless of whether the pager is in exclusive-mode
35869	** or not, any journal file left in the file-system will be treated
35870	** as a hot-journal and rolled back the next time a read-transaction
35871	** is opened (by this or by any other connection).
35872	*/
35873	static void pager_unlock(Pager *pPager){
35874
35875	assert( pPager->eState==PAGER_READER
35876	\|\| pPager->eState==PAGER_OPEN
35877	\|\| pPager->eState==PAGER_ERROR
35878	);
35879
35880	sqlite3BitvecDestroy(pPager->pInJournal);
35881	pPager->pInJournal = 0;
35882	releaseAllSavepoints(pPager);
35883
35884	if( pagerUseWal(pPager) ){
35885	assert( !isOpen(pPager->jfd) );
35886	sqlite3WalEndReadTransaction(pPager->pWal);
35887	pPager->eState = PAGER_OPEN;
35888	}else if( !pPager->exclusiveMode ){
35889	int rc; /* Error code returned by pagerUnlockDb() */
35890	int iDc = isOpen(pPager->fd)?sqlite3OsDeviceCharacteristics(pPager->fd):0;
35891
35892	/* If the operating system support deletion of open files, then
35893	** close the journal file when dropping the database lock. Otherwise
35894	** another connection with journal_mode=delete might delete the file
	@@ -35280,62 +35904,60 @@
35904	\|\| 1!=(pPager->journalMode & 5)
35905	){
35906	sqlite3OsClose(pPager->jfd);
35907	}
35908
35909	/* If the pager is in the ERROR state and the call to unlock the database
35910	** file fails, set the current lock to UNKNOWN_LOCK. See the comment
35911	** above the #define for UNKNOWN_LOCK for an explanation of why this
35912	** is necessary.
35913	*/
35914	rc = pagerUnlockDb(pPager, NO_LOCK);
35915	if( rc!=SQLITE_OK && pPager->eState==PAGER_ERROR ){
35916	pPager->eLock = UNKNOWN_LOCK;
35917	}
35918
35919	/* The pager state may be changed from PAGER_ERROR to PAGER_OPEN here
35920	** without clearing the error code. This is intentional - the error
35921	** code is cleared and the cache reset in the block below.
35922	*/
35923	assert( pPager->errCode \|\| pPager->eState!=PAGER_ERROR );


















35924	pPager->changeCountDone = 0;
35925	pPager->eState = PAGER_OPEN;

35926	}
35927
35928	/* If Pager.errCode is set, the contents of the pager cache cannot be
35929	** trusted. Now that there are no outstanding references to the pager,
35930	** it can safely move back to PAGER_OPEN state. This happens in both
35931	** normal and exclusive-locking mode.
35932	*/
35933	if( pPager->errCode ){
35934	assert( !MEMDB );
35935	pager_reset(pPager);
35936	pPager->changeCountDone = pPager->tempFile;
35937	pPager->eState = PAGER_OPEN;
35938	pPager->errCode = SQLITE_OK;
35939	}
35940
35941	pPager->journalOff = 0;
35942	pPager->journalHdr = 0;
35943	pPager->setMaster = 0;
35944	}
35945
35946	/*
35947	** This function is called whenever an IOERR or FULL error that requires
35948	** the pager to transition into the ERROR state may ahve occurred.
35949	** The first argument is a pointer to the pager structure, the second
35950	** the error-code about to be returned by a pager API function. The
35951	** value returned is a copy of the second argument to this function.
35952	**
35953	** If the second argument is SQLITE_FULL, SQLITE_IOERR or one of the
35954	** IOERR sub-codes, the pager enters the ERROR state and the error code
35955	** is stored in Pager.errCode. While the pager remains in the ERROR state,
35956	** all major API calls on the Pager will immediately return Pager.errCode.
35957	**
35958	** The ERROR state indicates that the contents of the pager-cache
35959	** cannot be trusted. This state can be cleared by completely discarding
35960	** the contents of the pager-cache. If a transaction was active when
35961	** the persistent error occurred, then the rollback journal may need
35962	** to be replayed to restore the contents of the database file (as if
35963	** it were a hot-journal).
	@@ -35348,49 +35970,25 @@
35970	pPager->errCode==SQLITE_OK \|\|
35971	(pPager->errCode & 0xff)==SQLITE_IOERR
35972	);
35973	if( rc2==SQLITE_FULL \|\| rc2==SQLITE_IOERR ){
35974	pPager->errCode = rc;
35975	pPager->eState = PAGER_ERROR;
35976	}
35977	return rc;
35978	}
35979


























35980	/*
35981	** This routine ends a transaction. A transaction is usually ended by
35982	** either a COMMIT or a ROLLBACK operation. This routine may be called
35983	** after rollback of a hot-journal, or if an error occurs while opening
35984	** the journal file or writing the very first journal-header of a
35985	** database transaction.
35986	**
35987	** This routine is never called in PAGER_ERROR state. If it is called
35988	** in PAGER_NONE or PAGER_SHARED state and the lock held is less
35989	** exclusive than a RESERVED lock, it is a no-op.
35990	**
35991	** Otherwise, any active savepoints are released.
35992	**
35993	** If the journal file is open, then it is "finalized". Once a journal
35994	** file has been finalized it is not possible to use it to roll back a
	@@ -35417,17 +36015,13 @@
36015	** If the pager is running in exclusive mode, this method of finalizing
36016	** the journal file is never used. Instead, if the journalMode is
36017	** DELETE and the pager is in exclusive mode, the method described under
36018	** journalMode==PERSIST is used instead.
36019	**
36020	** After the journal is finalized, the pager moves to PAGER_READER state.
36021	** If running in non-exclusive rollback mode, the lock on the file is
36022	** downgraded to a SHARED_LOCK.




36023	**
36024	** SQLITE_OK is returned if no error occurs. If an error occurs during
36025	** any of the IO operations to finalize the journal file or unlock the
36026	** database then the IO error code is returned to the user. If the
36027	** operation to finalize the journal file fails, then the code still
	@@ -35438,15 +36032,30 @@
36032	*/
36033	static int pager_end_transaction(Pager *pPager, int hasMaster){
36034	int rc = SQLITE_OK; /* Error code from journal finalization operation */
36035	int rc2 = SQLITE_OK; /* Error code from db file unlock operation */
36036
36037	/* Do nothing if the pager does not have an open write transaction
36038	** or at least a RESERVED lock. This function may be called when there
36039	** is no write-transaction active but a RESERVED or greater lock is
36040	** held under two circumstances:
36041	**
36042	** 1. After a successful hot-journal rollback, it is called with
36043	** eState==PAGER_NONE and eLock==EXCLUSIVE_LOCK.
36044	**
36045	** 2. If a connection with locking_mode=exclusive holding an EXCLUSIVE
36046	** lock switches back to locking_mode=normal and then executes a
36047	** read-transaction, this function is called with eState==PAGER_READER
36048	** and eLock==EXCLUSIVE_LOCK when the read-transaction is closed.
36049	*/
36050	assert( assert_pager_state(pPager) );
36051	assert( pPager->eState!=PAGER_ERROR );
36052	if( pPager->eState<PAGER_WRITER_LOCKED && pPager->eLock<RESERVED_LOCK ){
36053	return SQLITE_OK;
36054	}
36055
36056	releaseAllSavepoints(pPager);

36057	assert( isOpen(pPager->jfd) \|\| pPager->pInJournal==0 );
36058	if( isOpen(pPager->jfd) ){
36059	assert( !pagerUseWal(pPager) );
36060
36061	/* Finalize the journal file. */
	@@ -35458,18 +36067,15 @@
36067	rc = SQLITE_OK;
36068	}else{
36069	rc = sqlite3OsTruncate(pPager->jfd, 0);
36070	}
36071	pPager->journalOff = 0;

36072	}else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST
36073	\|\| (pPager->exclusiveMode && pPager->journalMode!=PAGER_JOURNALMODE_WAL)
36074	){
36075	rc = zeroJournalHdr(pPager, hasMaster);

36076	pPager->journalOff = 0;

36077	}else{
36078	/* This branch may be executed with Pager.journalMode==MEMORY if
36079	** a hot-journal was just rolled back. In this case the journal
36080	** file should be closed and deleted. If this connection writes to
36081	** the database file, it will do so using an in-memory journal.
	@@ -35481,52 +36087,80 @@
36087	sqlite3OsClose(pPager->jfd);
36088	if( !pPager->tempFile ){
36089	rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
36090	}
36091	}
36092	}
36093
36094	#ifdef SQLITE_CHECK_PAGES
36095	sqlite3PcacheIterateDirty(pPager->pPCache, pager_set_pagehash);
36096	if( pPager->dbSize==0 && sqlite3PcacheRefCount(pPager->pPCache)>0 ){
36097	PgHdr *p = pager_lookup(pPager, 1);
36098	if( p ){
36099	p->pageHash = 0;
36100	sqlite3PagerUnref(p);
36101	}
36102	}
36103	#endif
36104
36105	sqlite3BitvecDestroy(pPager->pInJournal);
36106	pPager->pInJournal = 0;
36107	pPager->nRec = 0;
36108	sqlite3PcacheCleanAll(pPager->pPCache);
36109	sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
36110
36111	if( pagerUseWal(pPager) ){
36112	/* Drop the WAL write-lock, if any. Also, if the connection was in
36113	** locking_mode=exclusive mode but is no longer, drop the EXCLUSIVE
36114	** lock held on the database file.
36115	*/
36116	rc2 = sqlite3WalEndWriteTransaction(pPager->pWal);
36117	assert( rc2==SQLITE_OK );
36118	}
36119	if( !pPager->exclusiveMode
36120	&& (!pagerUseWal(pPager) \|\| sqlite3WalExclusiveMode(pPager->pWal, 0))
36121	){
36122	rc2 = pagerUnlockDb(pPager, SHARED_LOCK);






36123	pPager->changeCountDone = 0;
36124	}
36125	pPager->eState = PAGER_READER;
36126	pPager->setMaster = 0;











36127
36128	return (rc==SQLITE_OK?rc2:rc);
36129	}
36130
36131	/*
36132	** Execute a rollback if a transaction is active and unlock the
36133	** database file.
36134	**
36135	** If the pager has already entered the ERROR state, do not attempt
36136	** the rollback at this time. Instead, pager_unlock() is called. The
36137	** call to pager_unlock() will discard all in-memory pages, unlock
36138	** the database file and move the pager back to OPEN state. If this
36139	** means that there is a hot-journal left in the file-system, the next
36140	** connection to obtain a shared lock on the pager (which may be this one)
36141	** will roll it back.
36142	**
36143	** If the pager has not already entered the ERROR state, but an IO or
36144	** malloc error occurs during a rollback, then this will itself cause
36145	** the pager to enter the ERROR state. Which will be cleared by the
36146	** call to pager_unlock(), as described above.
36147	*/
36148	static void pagerUnlockAndRollback(Pager *pPager){
36149	if( pPager->eState!=PAGER_ERROR && pPager->eState!=PAGER_OPEN ){
36150	assert( assert_pager_state(pPager) );
36151	if( pPager->eState>=PAGER_WRITER_LOCKED ){
36152	sqlite3BeginBenignMalloc();
36153	sqlite3PagerRollback(pPager);
36154	sqlite3EndBenignMalloc();
36155	}else if( !pPager->exclusiveMode ){
36156	assert( pPager->eState==PAGER_READER );
36157	pager_end_transaction(pPager, 0);
36158	}
36159	}
36160	pager_unlock(pPager);
36161	}
36162
36163	/*
36164	** Parameter aData must point to a buffer of pPager->pageSize bytes
36165	** of data. Compute and return a checksum based ont the contents of the
36166	** page of data and the current value of pPager->cksumInit.
	@@ -35574,13 +36208,12 @@
36208	** Read a single page from either the journal file (if isMainJrnl==1) or
36209	** from the sub-journal (if isMainJrnl==0) and playback that page.
36210	** The page begins at offset pOffset into the file. The pOffset
36211	** value is increased to the start of the next page in the journal.
36212	**
36213	** The main rollback journal uses checksums - the statement journal does
36214	** not.

36215	**
36216	** If the page number of the page record read from the (sub-)journal file
36217	** is greater than the current value of Pager.dbSize, then playback is
36218	** skipped and SQLITE_OK is returned.
36219	**
	@@ -35629,10 +36262,21 @@
36262	assert( isSavepnt \|\| pDone==0 ); /* pDone never used on non-savepoint */
36263
36264	aData = pPager->pTmpSpace;
36265	assert( aData ); /* Temp storage must have already been allocated */
36266	assert( pagerUseWal(pPager)==0 \|\| (!isMainJrnl && isSavepnt) );
36267
36268	/* Either the state is greater than PAGER_WRITER_CACHEMOD (a transaction
36269	** or savepoint rollback done at the request of the caller) or this is
36270	** a hot-journal rollback. If it is a hot-journal rollback, the pager
36271	** is in state OPEN and holds an EXCLUSIVE lock. Hot-journal rollback
36272	** only reads from the main journal, not the sub-journal.
36273	*/
36274	assert( pPager->eState>=PAGER_WRITER_CACHEMOD
36275	\|\| (pPager->eState==PAGER_OPEN && pPager->eLock==EXCLUSIVE_LOCK)
36276	);
36277	assert( pPager->eState>=PAGER_WRITER_CACHEMOD \|\| isMainJrnl );
36278
36279	/* Read the page number and page data from the journal or sub-journal
36280	** file. Return an error code to the caller if an IO error occurs.
36281	*/
36282	jfd = isMainJrnl ? pPager->jfd : pPager->sjfd;
	@@ -35666,20 +36310,19 @@
36310	** rollback, then don't bother to play it back again.
36311	*/
36312	if( pDone && (rc = sqlite3BitvecSet(pDone, pgno))!=SQLITE_OK ){
36313	return rc;
36314	}

36315
36316	/* When playing back page 1, restore the nReserve setting
36317	*/
36318	if( pgno==1 && pPager->nReserve!=((u8*)aData)[20] ){
36319	pPager->nReserve = ((u8*)aData)[20];
36320	pagerReportSize(pPager);
36321	}
36322
36323	/* If the pager is in CACHEMOD state, then there must be a copy of this
36324	** page in the pager cache. In this case just update the pager cache,
36325	** not the database file. The page is left marked dirty in this case.
36326	**
36327	** An exception to the above rule: If the database is in no-sync mode
36328	** and a page is moved during an incremental vacuum then the page may
	@@ -35686,12 +36329,15 @@
36329	** not be in the pager cache. Later: if a malloc() or IO error occurs
36330	** during a Movepage() call, then the page may not be in the cache
36331	** either. So the condition described in the above paragraph is not
36332	** assert()able.
36333	**
36334	** If in WRITER_DBMOD, WRITER_FINISHED or OPEN state, then we update the
36335	** pager cache if it exists and the main file. The page is then marked
36336	** not dirty. Since this code is only executed in PAGER_OPEN state for
36337	** a hot-journal rollback, it is guaranteed that the page-cache is empty
36338	** if the pager is in OPEN state.
36339	**
36340	** Ticket #1171: The statement journal might contain page content that is
36341	** different from the page content at the start of the transaction.
36342	** This occurs when a page is changed prior to the start of a statement
36343	** then changed again within the statement. When rolling back such a
	@@ -35713,21 +36359,22 @@
36359	pPg = 0;
36360	}else{
36361	pPg = pager_lookup(pPager, pgno);
36362	}
36363	assert( pPg \|\| !MEMDB );
36364	assert( pPager->eState!=PAGER_OPEN \|\| pPg==0 );
36365	PAGERTRACE(("PLAYBACK %d page %d hash(%08x) %s\n",
36366	PAGERID(pPager), pgno, pager_datahash(pPager->pageSize, (u8*)aData),
36367	(isMainJrnl?"main-journal":"sub-journal")
36368	));
36369	if( isMainJrnl ){
36370	isSynced = pPager->noSync \|\| (*pOffset <= pPager->journalHdr);
36371	}else{
36372	isSynced = (pPg==0 \|\| 0==(pPg->flags & PGHDR_NEED_SYNC));
36373	}
36374	if( isOpen(pPager->fd)
36375	&& (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
36376	&& isSynced
36377	){
36378	i64 ofst = (pgno-1)*(i64)pPager->pageSize;
36379	testcase( !isSavepnt && pPg!=0 && (pPg->flags&PGHDR_NEED_SYNC)!=0 );
36380	assert( !pagerUseWal(pPager) );
	@@ -35799,13 +36446,12 @@
36446	** database corruption may ensue.
36447	*/
36448	assert( !pagerUseWal(pPager) );
36449	sqlite3PcacheMakeClean(pPg);
36450	}
36451	pager_set_pagehash(pPg);
36452

36453	/* If this was page 1, then restore the value of Pager.dbFileVers.
36454	** Do this before any decoding. */
36455	if( pgno==1 ){
36456	memcpy(&pPager->dbFileVers, &((u8*)pData)[24],sizeof(pPager->dbFileVers));
36457	}
	@@ -35953,14 +36599,14 @@
36599	/*
36600	** This function is used to change the actual size of the database
36601	** file in the file-system. This only happens when committing a transaction,
36602	** or rolling back a transaction (including rolling back a hot-journal).
36603	**
36604	** If the main database file is not open, or the pager is not in either
36605	** DBMOD or OPEN state, this function is a no-op. Otherwise, the size
36606	** of the file is changed to nPage pages (nPage*pPager->pageSize bytes).
36607	** If the file on disk is currently larger than nPage pages, then use the VFS
36608	** xTruncate() method to truncate it.
36609	**
36610	** Or, it might might be the case that the file on disk is smaller than
36611	** nPage pages. Some operating system implementations can get confused if
36612	** you try to truncate a file to some size that is larger than it
	@@ -35970,12 +36616,18 @@
36616	** If successful, return SQLITE_OK. If an IO error occurs while modifying
36617	** the database file, return the error code to the caller.
36618	*/
36619	static int pager_truncate(Pager *pPager, Pgno nPage){
36620	int rc = SQLITE_OK;
36621	assert( pPager->eState!=PAGER_ERROR );
36622	assert( pPager->eState!=PAGER_READER );
36623
36624	if( isOpen(pPager->fd)
36625	&& (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
36626	){
36627	i64 currentSize, newSize;
36628	assert( pPager->eLock==EXCLUSIVE_LOCK );
36629	/* TODO: Is it safe to use Pager.dbFileSize here? */
36630	rc = sqlite3OsFileSize(pPager->fd, &currentSize);
36631	newSize = pPager->pageSize*(i64)nPage;
36632	if( rc==SQLITE_OK && currentSize!=newSize ){
36633	if( currentSize>newSize ){
	@@ -36095,11 +36747,11 @@
36747	/* Figure out how many records are in the journal. Abort early if
36748	** the journal is empty.
36749	*/
36750	assert( isOpen(pPager->jfd) );
36751	rc = sqlite3OsFileSize(pPager->jfd, &szJ);
36752	if( rc!=SQLITE_OK ){
36753	goto end_playback;
36754	}
36755
36756	/* Read the master journal name from the journal, if it is present.
36757	** If a master journal file name is specified, but the file is not
	@@ -36129,11 +36781,11 @@
36781	** occurs.
36782	*/
36783	while( 1 ){
36784	/* Read the next journal header from the journal file. If there are
36785	** not enough bytes left in the journal file for a complete header, or
36786	** it is corrupted, then a process must have failed while writing it.
36787	** This indicates nothing more needs to be rolled back.
36788	*/
36789	rc = readJournalHdr(pPager, isHot, szJ, &nRec, &mxPg);
36790	if( rc!=SQLITE_OK ){
36791	if( rc==SQLITE_DONE ){
	@@ -36243,14 +36895,13 @@
36895	if( rc==SQLITE_OK ){
36896	zMaster = pPager->pTmpSpace;
36897	rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);
36898	testcase( rc!=SQLITE_OK );
36899	}
36900	if( rc==SQLITE_OK && !pPager->noSync
36901	&& (pPager->eState>=PAGER_WRITER_DBMOD \|\| pPager->eState==PAGER_OPEN)
36902	){

36903	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
36904	}
36905	if( rc==SQLITE_OK ){
36906	rc = pager_end_transaction(pPager, zMaster[0]!='\0');
36907	testcase( rc!=SQLITE_OK );
	@@ -36288,11 +36939,11 @@
36939	Pgno pgno = pPg->pgno; /* Page number to read */
36940	int rc = SQLITE_OK; /* Return code */
36941	int isInWal = 0; /* True if page is in log file */
36942	int pgsz = pPager->pageSize; /* Number of bytes to read */
36943
36944	assert( pPager->eState>=PAGER_READER && !MEMDB );
36945	assert( isOpen(pPager->fd) );
36946
36947	if( NEVER(!isOpen(pPager->fd)) ){
36948	assert( pPager->tempFile );
36949	memset(pPg->pData, 0, pPager->pageSize);
	@@ -36435,10 +37086,18 @@
37086	PgHdr *p;
37087	for(p=pList; p; p=p->pDirty){
37088	sqlite3BackupUpdate(pPager->pBackup, p->pgno, (u8 *)p->pData);
37089	}
37090	}
37091
37092	#ifdef SQLITE_CHECK_PAGES
37093	{
37094	PgHdr *p;
37095	for(p=pList; p; p=p->pDirty) pager_set_pagehash(p);
37096	}
37097	#endif
37098
37099	return rc;
37100	}
37101
37102	/*
37103	** Begin a read transaction on the WAL.
	@@ -36451,31 +37110,82 @@
37110	static int pagerBeginReadTransaction(Pager *pPager){
37111	int rc; /* Return code */
37112	int changed = 0; /* True if cache must be reset */
37113
37114	assert( pagerUseWal(pPager) );
37115	assert( pPager->eState==PAGER_OPEN \|\| pPager->eState==PAGER_READER );
37116
37117	/* sqlite3WalEndReadTransaction() was not called for the previous
37118	** transaction in locking_mode=EXCLUSIVE. So call it now. If we
37119	** are in locking_mode=NORMAL and EndRead() was previously called,
37120	** the duplicate call is harmless.
37121	*/
37122	sqlite3WalEndReadTransaction(pPager->pWal);
37123
37124	rc = sqlite3WalBeginReadTransaction(pPager->pWal, &changed);
37125	if( rc==SQLITE_OK && changed ){
37126	pager_reset(pPager);
37127	}






37128
37129	return rc;
37130	}
37131
37132	/*
37133	** This function is called as part of the transition from PAGER_OPEN
37134	** to PAGER_READER state to determine the size of the database file
37135	** in pages (assuming the page size currently stored in Pager.pageSize).
37136	**
37137	** If no error occurs, SQLITE_OK is returned and the size of the database
37138	** in pages is stored in *pnPage. Otherwise, an error code (perhaps
37139	** SQLITE_IOERR_FSTAT) is returned and *pnPage is left unmodified.
37140	*/
37141	static int pagerPagecount(Pager pPager, Pgno pnPage){
37142	Pgno nPage; /* Value to return via pnPage /
37143
37144	/* Query the WAL sub-system for the database size. The WalDbsize()
37145	** function returns zero if the WAL is not open (i.e. Pager.pWal==0), or
37146	** if the database size is not available. The database size is not
37147	** available from the WAL sub-system if the log file is empty or
37148	** contains no valid committed transactions.
37149	*/
37150	assert( pPager->eState==PAGER_OPEN );
37151	assert( pPager->eLock>=SHARED_LOCK \|\| pPager->noReadlock );
37152	nPage = sqlite3WalDbsize(pPager->pWal);
37153
37154	/* If the database size was not available from the WAL sub-system,
37155	** determine it based on the size of the database file. If the size
37156	** of the database file is not an integer multiple of the page-size,
37157	** round down to the nearest page. Except, any file larger than 0
37158	** bytes in size is considered to contain at least one page.
37159	*/
37160	if( nPage==0 ){
37161	i64 n = 0; /* Size of db file in bytes */
37162	assert( isOpen(pPager->fd) \|\| pPager->tempFile );
37163	if( isOpen(pPager->fd) ){
37164	int rc = sqlite3OsFileSize(pPager->fd, &n);
37165	if( rc!=SQLITE_OK ){
37166	return rc;
37167	}
37168	}
37169	nPage = (Pgno)(n / pPager->pageSize);
37170	if( nPage==0 && n>0 ){
37171	nPage = 1;
37172	}
37173	}
37174
37175	/* If the current number of pages in the file is greater than the
37176	** configured maximum pager number, increase the allowed limit so
37177	** that the file can be read.
37178	*/
37179	if( nPage>pPager->mxPgno ){
37180	pPager->mxPgno = (Pgno)nPage;
37181	}
37182
37183	*pnPage = nPage;
37184	return SQLITE_OK;
37185	}
37186
37187
37188	/*
37189	** Check if the *-wal file that corresponds to the database opened by pPager
37190	** exists if the database is not empy, or verify that the *-wal file does
37191	** not exist (by deleting it) if the database file is empty.
	@@ -36485,25 +37195,26 @@
37195	** if no error occurs, make sure Pager.journalMode is not set to
37196	** PAGER_JOURNALMODE_WAL.
37197	**
37198	** Return SQLITE_OK or an error code.
37199	**


37200	** The caller must hold a SHARED lock on the database file to call this
37201	** function. Because an EXCLUSIVE lock on the db file is required to delete
37202	** a WAL on a none-empty database, this ensures there is no race condition
37203	** between the xAccess() below and an xDelete() being executed by some
37204	** other connection.
37205	*/
37206	static int pagerOpenWalIfPresent(Pager *pPager){
37207	int rc = SQLITE_OK;
37208	assert( pPager->eState==PAGER_OPEN );
37209	assert( pPager->eLock>=SHARED_LOCK \|\| pPager->noReadlock );
37210
37211	if( !pPager->tempFile ){
37212	int isWal; /* True if WAL file exists */
37213	Pgno nPage; /* Size of the database file */
37214
37215	rc = pagerPagecount(pPager, &nPage);
37216	if( rc ) return rc;
37217	if( nPage==0 ){
37218	rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
37219	isWal = 0;
37220	}else{
	@@ -36511,15 +37222,12 @@
37222	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &isWal
37223	);
37224	}
37225	if( rc==SQLITE_OK ){
37226	if( isWal ){
37227	testcase( sqlite3PcachePagecount(pPager->pPCache)==0 );
37228	rc = sqlite3PagerOpenWal(pPager, 0);



37229	}else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
37230	pPager->journalMode = PAGER_JOURNALMODE_DELETE;
37231	}
37232	}
37233	}
	@@ -36567,11 +37275,12 @@
37275	i64 szJ; /* Effective size of the main journal */
37276	i64 iHdrOff; /* End of first segment of main-journal records */
37277	int rc = SQLITE_OK; /* Return code */
37278	Bitvec pDone = 0; / Bitvec to ensure pages played back only once */
37279
37280	assert( pPager->eState!=PAGER_ERROR );
37281	assert( pPager->eState>=PAGER_WRITER_LOCKED );
37282
37283	/* Allocate a bitvec to use to store the set of pages rolled back */
37284	if( pSavepoint ){
37285	pDone = sqlite3BitvecCreate(pSavepoint->nOrig);
37286	if( !pDone ){
	@@ -36706,11 +37415,10 @@
37415	#ifndef SQLITE_OMIT_PAGER_PRAGMAS
37416	SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int bFullFsync){
37417	pPager->noSync = (level==1 \|\| pPager->tempFile) ?1:0;
37418	pPager->fullSync = (level==3 && !pPager->tempFile) ?1:0;
37419	pPager->sync_flags = (bFullFsync?SQLITE_SYNC_FULL:SQLITE_SYNC_NORMAL);

37420	}
37421	#endif
37422
37423	/*
37424	** The following global variable is incremented whenever the library
	@@ -36788,11 +37496,11 @@
37496	** Change the page size used by the Pager object. The new page size
37497	** is passed in *pPageSize.
37498	**
37499	** If the pager is in the error state when this function is called, it
37500	** is a no-op. The value returned is the error state error code (i.e.
37501	** one of SQLITE_IOERR, an SQLITE_IOERR_xxx sub-code or SQLITE_FULL).
37502	**
37503	** Otherwise, if all of the following are true:
37504	**
37505	** * the new page size (value of *pPageSize) is valid (a power
37506	** of two between 512 and SQLITE_MAX_PAGE_SIZE, inclusive), and
	@@ -36812,32 +37520,52 @@
37520	** If the page size is not changed, either because one of the enumerated
37521	** conditions above is not true, the pager was in error state when this
37522	** function was called, or because the memory allocation attempt failed,
37523	** then *pPageSize is set to the old, retained page size before returning.
37524	*/
37525	SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager pPager, u32 pPageSize, int nReserve){
37526	int rc = SQLITE_OK;
37527
37528	/* It is not possible to do a full assert_pager_state() here, as this
37529	** function may be called from within PagerOpen(), before the state
37530	** of the Pager object is internally consistent.
37531	**
37532	** At one point this function returned an error if the pager was in
37533	** PAGER_ERROR state. But since PAGER_ERROR state guarantees that
37534	** there is at least one outstanding page reference, this function
37535	** is a no-op for that case anyhow.
37536	*/
37537
37538	u32 pageSize = *pPageSize;
37539	assert( pageSize==0 \|\| (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
37540	if( (pPager->memDb==0 \|\| pPager->dbSize==0)
37541	&& sqlite3PcacheRefCount(pPager->pPCache)==0
37542	&& pageSize && pageSize!=(u32)pPager->pageSize
37543	){
37544	char pNew = NULL; / New temp space */
37545	i64 nByte = 0;
37546
37547	if( pPager->eState>PAGER_OPEN && isOpen(pPager->fd) ){
37548	rc = sqlite3OsFileSize(pPager->fd, &nByte);
37549	}
37550	if( rc==SQLITE_OK ){
37551	pNew = (char *)sqlite3PageMalloc(pageSize);
37552	if( !pNew ) rc = SQLITE_NOMEM;
37553	}
37554
37555	if( rc==SQLITE_OK ){
37556	pager_reset(pPager);
37557	pPager->dbSize = (Pgno)(nByte/pageSize);
37558	pPager->pageSize = pageSize;
37559	sqlite3PageFree(pPager->pTmpSpace);
37560	pPager->pTmpSpace = pNew;
37561	sqlite3PcacheSetPageSize(pPager->pPCache, pageSize);
37562	}
37563	}
37564
37565	*pPageSize = pPager->pageSize;
37566	if( rc==SQLITE_OK ){
37567	if( nReserve<0 ) nReserve = pPager->nReserve;
37568	assert( nReserve>=0 && nReserve<1000 );
37569	pPager->nReserve = (i16)nReserve;
37570	pagerReportSize(pPager);
37571	}
	@@ -36862,17 +37590,15 @@
37590	** maximum page count below the current size of the database.
37591	**
37592	** Regardless of mxPage, return the current maximum page count.
37593	*/
37594	SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){

37595	if( mxPage>0 ){
37596	pPager->mxPgno = mxPage;
37597	}
37598	if( pPager->eState!=PAGER_OPEN && pPager->mxPgno<pPager->dbSize ){
37599	pPager->mxPgno = pPager->dbSize;

37600	}
37601	return pPager->mxPgno;
37602	}
37603
37604	/*
	@@ -36933,70 +37659,20 @@
37659	}
37660	return rc;
37661	}
37662
37663	/*
37664	** This function may only be called when a read-transaction is open on
37665	** the pager. It returns the total number of pages in the database.
37666	**
37667	** However, if the file is between 1 and <page-size> bytes in size, then
37668	** this is considered a 1 page file.
37669	*/
37670	SQLITE_PRIVATE void sqlite3PagerPagecount(Pager pPager, int pnPage){
37671	assert( pPager->eState>=PAGER_READER );
37672	assert( pPager->eState!=PAGER_WRITER_FINISHED );
37673	*pnPage = (int)pPager->dbSize;



















































37674	}
37675
37676
37677	/*
37678	** Try to obtain a lock of type locktype on the database file. If
	@@ -37013,42 +37689,23 @@
37689	** variable to locktype before returning.
37690	*/
37691	static int pager_wait_on_lock(Pager *pPager, int locktype){
37692	int rc; /* Return code */
37693











37694	/* Check that this is either a no-op (because the requested lock is
37695	** already held, or one of the transistions that the busy-handler
37696	** may be invoked during, according to the comment above
37697	** sqlite3PagerSetBusyhandler().
37698	*/
37699	assert( (pPager->eLock>=locktype)
37700	\|\| (pPager->eLock==NO_LOCK && locktype==SHARED_LOCK)
37701	\|\| (pPager->eLock==RESERVED_LOCK && locktype==EXCLUSIVE_LOCK)
37702	);
37703
37704	do {
37705	rc = pagerLockDb(pPager, locktype);
37706	}while( rc==SQLITE_BUSY && pPager->xBusyHandler(pPager->pBusyHandlerArg) );








37707	return rc;
37708	}
37709
37710	/*
37711	** Function assertTruncateConstraint(pPager) checks that one of the
	@@ -37089,13 +37746,12 @@
37746	** function does not actually modify the database file on disk. It
37747	** just sets the internal state of the pager object so that the
37748	** truncation will be done when the current transaction is committed.
37749	*/
37750	SQLITE_PRIVATE void sqlite3PagerTruncateImage(Pager *pPager, Pgno nPage){

37751	assert( pPager->dbSize>=nPage );
37752	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
37753	pPager->dbSize = nPage;
37754	assertTruncateConstraint(pPager);
37755	}
37756
37757
	@@ -37141,11 +37797,11 @@
37797	SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){
37798	u8 pTmp = (u8 )pPager->pTmpSpace;
37799
37800	disable_simulated_io_errors();
37801	sqlite3BeginBenignMalloc();
37802	/* pPager->errCode = 0; */
37803	pPager->exclusiveMode = 0;
37804	#ifndef SQLITE_OMIT_WAL
37805	sqlite3WalClose(pPager->pWal,
37806	(pPager->noSync ? 0 : pPager->sync_flags),
37807	pPager->pageSize, pTmp
	@@ -37154,18 +37810,23 @@
37810	#endif
37811	pager_reset(pPager);
37812	if( MEMDB ){
37813	pager_unlock(pPager);
37814	}else{
37815	/* If it is open, sync the journal file before calling UnlockAndRollback.
37816	** If this is not done, then an unsynced portion of the open journal
37817	** file may be played back into the database. If a power failure occurs
37818	** while this is happening, the database could become corrupt.
37819	**
37820	** If an error occurs while trying to sync the journal, shift the pager
37821	** into the ERROR state. This causes UnlockAndRollback to unlock the
37822	** database and close the journal file without attempting to roll it
37823	** back or finalize it. The next database user will have to do hot-journal
37824	** rollback before accessing the database file.
37825	*/
37826	if( isOpen(pPager->jfd) ){
37827	pager_error(pPager, pagerSyncHotJournal(pPager));
37828	}
37829	pagerUnlockAndRollback(pPager);
37830	}
37831	sqlite3EndBenignMalloc();
37832	enable_simulated_io_errors();
	@@ -37206,13 +37867,13 @@
37867	/*
37868	** Sync the journal. In other words, make sure all the pages that have
37869	** been written to the journal have actually reached the surface of the
37870	** disk and can be restored in the event of a hot-journal rollback.
37871	**
37872	** If the Pager.noSync flag is set, then this function is a no-op.
37873	** Otherwise, the actions required depend on the journal-mode and the
37874	** device characteristics of the the file-system, as follows:
37875	**
37876	** * If the journal file is an in-memory journal file, no action need
37877	** be taken.
37878	**
37879	** * Otherwise, if the device does not support the SAFE_APPEND property,
	@@ -37232,22 +37893,29 @@
37893	** <update nRec field>
37894	** }
37895	** if( NOT SEQUENTIAL ) xSync(<journal file>);
37896	** }
37897	**



37898	** If successful, this routine clears the PGHDR_NEED_SYNC flag of every
37899	** page currently held in memory before returning SQLITE_OK. If an IO
37900	** error is encountered, then the IO error code is returned to the caller.
37901	*/
37902	static int syncJournal(Pager *pPager, int newHdr){
37903	int rc; /* Return code */
37904
37905	assert( pPager->eState==PAGER_WRITER_CACHEMOD
37906	\|\| pPager->eState==PAGER_WRITER_DBMOD
37907	);
37908	assert( assert_pager_state(pPager) );
37909	assert( !pagerUseWal(pPager) );
37910
37911	rc = sqlite3PagerExclusiveLock(pPager);
37912	if( rc!=SQLITE_OK ) return rc;
37913
37914	if( !pPager->noSync ){
37915	assert( !pPager->tempFile );
37916	if( isOpen(pPager->jfd) && pPager->journalMode!=PAGER_JOURNALMODE_MEMORY ){

37917	const int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
37918	assert( isOpen(pPager->jfd) );
37919
37920	if( 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
37921	/* This block deals with an obscure problem. If the last connection
	@@ -37318,21 +37986,29 @@
37986	rc = sqlite3OsSync(pPager->jfd, pPager->sync_flags\|
37987	(pPager->sync_flags==SQLITE_SYNC_FULL?SQLITE_SYNC_DATAONLY:0)
37988	);
37989	if( rc!=SQLITE_OK ) return rc;
37990	}
37991
37992	pPager->journalHdr = pPager->journalOff;
37993	if( newHdr && 0==(iDc&SQLITE_IOCAP_SAFE_APPEND) ){
37994	pPager->nRec = 0;
37995	rc = writeJournalHdr(pPager);
37996	if( rc!=SQLITE_OK ) return rc;
37997	}
37998	}else{
37999	pPager->journalHdr = pPager->journalOff;
38000	}
38001	}
38002
38003	/* Unless the pager is in noSync mode, the journal file was just
38004	** successfully synced. Either way, clear the PGHDR_NEED_SYNC flag on
38005	** all pages.
38006	*/
38007	sqlite3PcacheClearSyncFlags(pPager->pPCache);
38008	pPager->eState = PAGER_WRITER_DBMOD;
38009	assert( assert_pager_state(pPager) );
38010	return SQLITE_OK;
38011	}
38012
38013	/*
38014	** The argument is the first in a linked list of dirty pages connected
	@@ -37365,31 +38041,16 @@
38041	** If everything is successful, SQLITE_OK is returned. If an IO error
38042	** occurs, an IO error code is returned. Or, if the EXCLUSIVE lock cannot
38043	** be obtained, SQLITE_BUSY is returned.
38044	*/
38045	static int pager_write_pagelist(Pager pPager, PgHdr pList){
38046	int rc = SQLITE_OK; /* Return code */
38047
38048	/* This function is only called for rollback pagers in WRITER_DBMOD state. */















38049	assert( !pagerUseWal(pPager) );
38050	assert( pPager->eState==PAGER_WRITER_DBMOD );
38051	assert( pPager->eLock==EXCLUSIVE_LOCK );
38052
38053	/* If the file is a temp-file has not yet been opened, open it now. It
38054	** is not possible for rc to be other than SQLITE_OK if this branch
38055	** is taken, as pager_wait_on_lock() is a no-op for temp-files.
38056	*/
	@@ -37400,13 +38061,14 @@
38061
38062	/* Before the first write, give the VFS a hint of what the final
38063	** file size will be.
38064	*/
38065	assert( rc!=SQLITE_OK \|\| isOpen(pPager->fd) );
38066	if( rc==SQLITE_OK && pPager->dbSize>pPager->dbHintSize ){
38067	sqlite3_int64 szFile = pPager->pageSize * (sqlite3_int64)pPager->dbSize;
38068	sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SIZE_HINT, &szFile);
38069	pPager->dbHintSize = pPager->dbSize;
38070	}
38071
38072	while( rc==SQLITE_OK && pList ){
38073	Pgno pgno = pList->pgno;
38074
	@@ -37419,10 +38081,12 @@
38081	** set (set by sqlite3PagerDontWrite()).
38082	*/
38083	if( pgno<=pPager->dbSize && 0==(pList->flags&PGHDR_DONT_WRITE) ){
38084	i64 offset = (pgno-1)(i64)pPager->pageSize; / Offset to write */
38085	char pData; / Data to write */
38086
38087	assert( (pList->flags&PGHDR_NEED_SYNC)==0 );
38088
38089	/* Encode the database */
38090	CODEC2(pPager, pList->pData, pgno, 6, return SQLITE_NOMEM, pData);
38091
38092	/* Write out the page data. */
	@@ -37448,13 +38112,11 @@
38112	PAGER_INCR(sqlite3_pager_writedb_count);
38113	PAGER_INCR(pPager->nWrite);
38114	}else{
38115	PAGERTRACE(("NOSTORE %d page %d\n", PAGERID(pPager), pgno));
38116	}
38117	pager_set_pagehash(pList);


38118	pList = pList->pDirty;
38119	}
38120
38121	return rc;
38122	}
	@@ -37562,13 +38224,18 @@
38224	** pages belonging to the same sector.
38225	**
38226	** The doNotSpill flag inhibits all cache spilling regardless of whether
38227	** or not a sync is required. This is set during a rollback.
38228	**
38229	** Spilling is also prohibited when in an error state since that could
38230	** lead to database corruption. In the current implementaton it
38231	** is impossible for sqlite3PCacheFetch() to be called with createFlag==1
38232	** while in the error state, hence it is impossible for this routine to
38233	** be called in the error state. Nevertheless, we include a NEVER()
38234	** test for the error state as a safeguard against future changes.
38235	*/
38236	if( NEVER(pPager->errCode) ) return SQLITE_OK;
38237	if( pPager->doNotSpill ) return SQLITE_OK;
38238	if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){
38239	return SQLITE_OK;
38240	}
38241
	@@ -37582,20 +38249,14 @@
38249	rc = pagerWalFrames(pPager, pPg, 0, 0, 0);
38250	}
38251	}else{
38252
38253	/* Sync the journal file if required. */
38254	if( pPg->flags&PGHDR_NEED_SYNC
38255	\|\| pPager->eState==PAGER_WRITER_CACHEMOD
38256	){
38257	rc = syncJournal(pPager, 1);






38258	}
38259
38260	/* If the page number of this page is larger than the current size of
38261	** the database image, it may need to be written to the sub-journal.
38262	** This is because the call to pager_write_pagelist() below will not
	@@ -37629,10 +38290,11 @@
38290	rc = subjournalPage(pPg);
38291	}
38292
38293	/* Write the contents of the page out to the database file. */
38294	if( rc==SQLITE_OK ){
38295	assert( (pPg->flags&PGHDR_NEED_SYNC)==0 );
38296	rc = pager_write_pagelist(pPager, pPg);
38297	}
38298	}
38299
38300	/* Mark the page as clean. */
	@@ -37639,11 +38301,11 @@
38301	if( rc==SQLITE_OK ){
38302	PAGERTRACE(("STRESS %d page %d\n", PAGERID(pPager), pPg->pgno));
38303	sqlite3PcacheMakeClean(pPg);
38304	}
38305
38306	return pager_error(pPager, rc);
38307	}
38308
38309
38310	/*
38311	** Allocate and initialize a new Pager object and put a pointer to it
	@@ -37694,11 +38356,11 @@
38356	char zPathname = 0; / Full path to database file */
38357	int nPathname = 0; /* Number of bytes in zPathname */
38358	int useJournal = (flags & PAGER_OMIT_JOURNAL)==0; /* False to omit journal */
38359	int noReadlock = (flags & PAGER_NO_READLOCK)!=0; /* True to omit read-lock */
38360	int pcacheSize = sqlite3PcacheSize(); /* Bytes to allocate for PCache */
38361	u32 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE; /* Default page size */
38362
38363	/* Figure out how much space is required for each journal file-handle
38364	** (there are two of them, the main journal and the sub-journal). This
38365	** is the maximum space required for an in-memory journal file handle
38366	** and a regular journal file-handle. Note that a "regular journal-handle"
	@@ -37829,11 +38491,11 @@
38491	assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
38492	if( szPageDflt<pPager->sectorSize ){
38493	if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
38494	szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
38495	}else{
38496	szPageDflt = (u32)pPager->sectorSize;
38497	}
38498	}
38499	#ifdef SQLITE_ENABLE_ATOMIC_WRITE
38500	{
38501	int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
	@@ -37857,11 +38519,12 @@
38519	** This branch is also run for an in-memory database. An in-memory
38520	** database is the same as a temp-file that is never written out to
38521	** disk and uses an in-memory rollback journal.
38522	*/
38523	tempFile = 1;
38524	pPager->eState = PAGER_READER;
38525	pPager->eLock = EXCLUSIVE_LOCK;
38526	readOnly = (vfsFlags&SQLITE_OPEN_READONLY);
38527	}
38528
38529	/* The following call to PagerSetPagesize() serves to set the value of
38530	** Pager.pageSize and to allocate the Pager.pTmpSpace buffer.
	@@ -37894,27 +38557,27 @@
38557	pPager->useJournal = (u8)useJournal;
38558	pPager->noReadlock = (noReadlock && readOnly) ?1:0;
38559	/* pPager->stmtOpen = 0; */
38560	/* pPager->stmtInUse = 0; */
38561	/* pPager->nRef = 0; */

38562	/* pPager->stmtSize = 0; */
38563	/* pPager->stmtJSize = 0; */
38564	/* pPager->nPage = 0; */
38565	pPager->mxPgno = SQLITE_MAX_PAGE_COUNT;
38566	/* pPager->state = PAGER_UNLOCK; */
38567	#if 0
38568	assert( pPager->state == (tempFile ? PAGER_EXCLUSIVE : PAGER_UNLOCK) );
38569	#endif
38570	/* pPager->errMask = 0; */
38571	pPager->tempFile = (u8)tempFile;
38572	assert( tempFile==PAGER_LOCKINGMODE_NORMAL
38573	\|\| tempFile==PAGER_LOCKINGMODE_EXCLUSIVE );
38574	assert( PAGER_LOCKINGMODE_EXCLUSIVE==1 );
38575	pPager->exclusiveMode = (u8)tempFile;
38576	pPager->changeCountDone = pPager->tempFile;
38577	pPager->memDb = (u8)memDb;
38578	pPager->readOnly = (u8)readOnly;

38579	assert( useJournal \|\| pPager->tempFile );
38580	pPager->noSync = pPager->tempFile;
38581	pPager->fullSync = pPager->noSync ?0:1;
38582	pPager->sync_flags = SQLITE_SYNC_NORMAL;
38583	/* pPager->pFirst = 0; */
	@@ -37975,24 +38638,24 @@
38638	sqlite3_vfs * const pVfs = pPager->pVfs;
38639	int rc = SQLITE_OK; /* Return code */
38640	int exists = 1; /* True if a journal file is present */
38641	int jrnlOpen = !!isOpen(pPager->jfd);
38642

38643	assert( pPager->useJournal );
38644	assert( isOpen(pPager->fd) );
38645	assert( pPager->eState==PAGER_OPEN );
38646
38647	assert( jrnlOpen==0 \|\| ( sqlite3OsDeviceCharacteristics(pPager->jfd) &
38648	SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
38649	));
38650
38651	*pExists = 0;
38652	if( !jrnlOpen ){
38653	rc = sqlite3OsAccess(pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS, &exists);
38654	}
38655	if( rc==SQLITE_OK && exists ){
38656	int locked = 0; /* True if some process holds a RESERVED lock */
38657
38658	/* Race condition here: Another process might have been holding the
38659	** the RESERVED lock and have a journal open at the sqlite3OsAccess()
38660	** call above, but then delete the journal and drop the lock before
38661	** we get to the following sqlite3OsCheckReservedLock() call. If that
	@@ -38000,25 +38663,25 @@
38663	** in fact there is none. This results in a false-positive which will
38664	** be dealt with by the playback routine. Ticket #3883.
38665	*/
38666	rc = sqlite3OsCheckReservedLock(pPager->fd, &locked);
38667	if( rc==SQLITE_OK && !locked ){
38668	Pgno nPage; /* Number of pages in database file */
38669
38670	/* Check the size of the database file. If it consists of 0 pages,
38671	** then delete the journal file. See the header comment above for
38672	** the reasoning here. Delete the obsolete journal file under
38673	** a RESERVED lock to avoid race conditions and to avoid violating
38674	** [H33020].
38675	*/
38676	rc = pagerPagecount(pPager, &nPage);
38677	if( rc==SQLITE_OK ){
38678	if( nPage==0 ){
38679	sqlite3BeginBenignMalloc();
38680	if( pagerLockDb(pPager, RESERVED_LOCK)==SQLITE_OK ){
38681	sqlite3OsDelete(pVfs, pPager->zJournal, 0);
38682	pagerUnlockDb(pPager, SHARED_LOCK);
38683	}
38684	sqlite3EndBenignMalloc();
38685	}else{
38686	/* The journal file exists and no other connection has a reserved
38687	** or greater lock on the database file. Now check that there is
	@@ -38067,11 +38730,11 @@
38730	** has been successfully called. If a shared-lock is already held when
38731	** this function is called, it is a no-op.
38732	**
38733	** The following operations are also performed by this function.
38734	**
38735	** 1) If the pager is currently in PAGER_OPEN state (no lock held
38736	** on the database file), then an attempt is made to obtain a
38737	** SHARED lock on the database file. Immediately after obtaining
38738	** the SHARED lock, the file-system is checked for a hot-journal,
38739	** which is played back if present. Following any hot-journal
38740	** rollback, the contents of the cache are validated by checking
	@@ -38082,70 +38745,51 @@
38745	** no outstanding references to any pages, and is in the error state,
38746	** then an attempt is made to clear the error state by discarding
38747	** the contents of the page cache and rolling back any open journal
38748	** file.
38749	**
38750	** If everything is successful, SQLITE_OK is returned. If an IO error
38751	** occurs while locking the database, checking for a hot-journal file or
38752	** rolling back a journal file, the IO error code is returned.





38753	*/
38754	SQLITE_PRIVATE int sqlite3PagerSharedLock(Pager *pPager){
38755	int rc = SQLITE_OK; /* Return code */

38756
38757	/* This routine is only called from b-tree and only when there are no
38758	** outstanding pages. This implies that the pager state should either
38759	** be OPEN or READER. READER is only possible if the pager is or was in
38760	** exclusive access mode.
38761	*/
38762	assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
38763	assert( assert_pager_state(pPager) );
38764	assert( pPager->eState==PAGER_OPEN \|\| pPager->eState==PAGER_READER );
38765	if( NEVER(MEMDB && pPager->errCode) ){ return pPager->errCode; }
38766
38767	if( !pagerUseWal(pPager) && pPager->eState==PAGER_OPEN ){
38768	int bHotJournal = 1; /* True if there exists a hot journal-file */
38769














38770	assert( !MEMDB );
38771	assert( pPager->noReadlock==0 \|\| pPager->readOnly );
38772
38773	if( pPager->noReadlock==0 ){


38774	rc = pager_wait_on_lock(pPager, SHARED_LOCK);
38775	if( rc!=SQLITE_OK ){
38776	assert( pPager->eLock==NO_LOCK \|\| pPager->eLock==UNKNOWN_LOCK );
38777	goto failed;
38778	}
38779	}

38780
38781	/* If a journal file exists, and there is no RESERVED lock on the
38782	** database file, then it either needs to be played back or deleted.
38783	*/
38784	if( pPager->eLock<=SHARED_LOCK ){
38785	rc = hasHotJournal(pPager, &bHotJournal);
38786	}
38787	if( rc!=SQLITE_OK ){
38788	goto failed;
38789	}
38790	if( bHotJournal ){

38791	/* Get an EXCLUSIVE lock on the database file. At this point it is
38792	** important that a RESERVED lock is not obtained on the way to the
38793	** EXCLUSIVE lock. If it were, another process might open the
38794	** database file, detect the RESERVED lock, and conclude that the
38795	** database is safe to read while this process is still rolling the
	@@ -38153,62 +38797,49 @@
38797	**
38798	** Because the intermediate RESERVED lock is not requested, any
38799	** other process attempting to access the database file will get to
38800	** this point in the code and fail to obtain its own EXCLUSIVE lock
38801	** on the database file.
38802	**
38803	** Unless the pager is in locking_mode=exclusive mode, the lock is
38804	** downgraded to SHARED_LOCK before this function returns.
38805	*/
38806	rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
38807	if( rc!=SQLITE_OK ){
38808	goto failed;
38809	}
38810
38811	/* If it is not already open and the file exists on disk, open the
38812	** journal for read/write access. Write access is required because
38813	** in exclusive-access mode the file descriptor will be kept open
38814	** and possibly used for a transaction later on. Also, write-access
38815	** is usually required to finalize the journal in journal_mode=persist
38816	** mode (and also for journal_mode=truncate on some systems).
38817	**
38818	** If the journal does not exist, it usually means that some
38819	** other connection managed to get in and roll it back before
38820	** this connection obtained the exclusive lock above. Or, it
38821	** may mean that the pager was in the error-state when this
38822	** function was called and the journal file does not exist.
38823	*/
38824	if( !isOpen(pPager->jfd) ){
38825	sqlite3_vfs * const pVfs = pPager->pVfs;
38826	int bExists; /* True if journal file exists */
38827	rc = sqlite3OsAccess(
38828	pVfs, pPager->zJournal, SQLITE_ACCESS_EXISTS, &bExists);
38829	if( rc==SQLITE_OK && bExists ){
38830	int fout = 0;
38831	int f = SQLITE_OPEN_READWRITE\|SQLITE_OPEN_MAIN_JOURNAL;
38832	assert( !pPager->tempFile );
38833	rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, f, &fout);
38834	assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
38835	if( rc==SQLITE_OK && fout&SQLITE_OPEN_READONLY ){
38836	rc = SQLITE_CANTOPEN_BKPT;
38837	sqlite3OsClose(pPager->jfd);
38838	}
38839	}
38840	}













38841
38842	/* Playback and delete the journal. Drop the database write
38843	** lock and reacquire the read lock. Purge the cache before
38844	** playing back the hot-journal so that we don't end up with
38845	** an inconsistent cache. Sync the hot journal before playing
	@@ -38215,25 +38846,50 @@
38846	** it back since the process that crashed and left the hot journal
38847	** probably did not sync it and we are required to always sync
38848	** the journal before playing it back.
38849	*/
38850	if( isOpen(pPager->jfd) ){
38851	assert( rc==SQLITE_OK );
38852	rc = pagerSyncHotJournal(pPager);
38853	if( rc==SQLITE_OK ){
38854	rc = pager_playback(pPager, 1);
38855	pPager->eState = PAGER_OPEN;
38856	}
38857	}else if( !pPager->exclusiveMode ){
38858	pagerUnlockDb(pPager, SHARED_LOCK);
38859	}
38860
38861	if( rc!=SQLITE_OK ){
38862	/* This branch is taken if an error occurs while trying to open
38863	** or roll back a hot-journal while holding an EXCLUSIVE lock. The
38864	** pager_unlock() routine will be called before returning to unlock
38865	** the file. If the unlock attempt fails, then Pager.eLock must be
38866	** set to UNKNOWN_LOCK (see the comment above the #define for
38867	** UNKNOWN_LOCK above for an explanation).
38868	**
38869	** In order to get pager_unlock() to do this, set Pager.eState to
38870	** PAGER_ERROR now. This is not actually counted as a transition
38871	** to ERROR state in the state diagram at the top of this file,
38872	** since we know that the same call to pager_unlock() will very
38873	** shortly transition the pager object to the OPEN state. Calling
38874	** assert_pager_state() would fail now, as it should not be possible
38875	** to be in ERROR state when there are zero outstanding page
38876	** references.
38877	*/
38878	pager_error(pPager, rc);
38879	goto failed;
38880	}
38881
38882	assert( pPager->eState==PAGER_OPEN );
38883	assert( (pPager->eLock==SHARED_LOCK)
38884	\|\| (pPager->exclusiveMode && pPager->eLock>SHARED_LOCK)
38885	);
38886	}
38887
38888	if( !pPager->tempFile
38889	&& (pPager->pBackup \|\| sqlite3PcachePagecount(pPager->pPCache)>0)
38890	){
38891	/* The shared-lock has just been acquired on the database file
38892	** and there are already pages in the cache (from a previous
38893	** read or write transaction). Check to see if the database
38894	** has been modified. If the database has changed, flush the
38895	** cache.
	@@ -38246,18 +38902,15 @@
38902	**
38903	** There is a vanishingly small chance that a change will not be
38904	** detected. The chance of an undetected change is so small that
38905	** it can be neglected.
38906	*/
38907	Pgno nPage = 0;
38908	char dbFileVers[sizeof(pPager->dbFileVers)];

38909
38910	rc = pagerPagecount(pPager, &nPage);
38911	if( rc ) goto failed;


38912
38913	if( nPage>0 ){
38914	IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers)));
38915	rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers), 24);
38916	if( rc!=SQLITE_OK ){
	@@ -38269,22 +38922,34 @@
38922
38923	if( memcmp(pPager->dbFileVers, dbFileVers, sizeof(dbFileVers))!=0 ){
38924	pager_reset(pPager);
38925	}
38926	}

38927
38928	/* If there is a WAL file in the file-system, open this database in WAL
38929	** mode. Otherwise, the following function call is a no-op.
38930	*/
38931	rc = pagerOpenWalIfPresent(pPager);
38932	assert( pPager->pWal==0 \|\| rc==SQLITE_OK );
38933	}
38934
38935	if( pagerUseWal(pPager) ){
38936	assert( rc==SQLITE_OK );
38937	rc = pagerBeginReadTransaction(pPager);
38938	}
38939
38940	if( pPager->eState==PAGER_OPEN && rc==SQLITE_OK ){
38941	rc = pagerPagecount(pPager, &pPager->dbSize);
38942	}
38943
38944	failed:
38945	if( rc!=SQLITE_OK ){
38946	assert( !MEMDB );
38947	pager_unlock(pPager);
38948	assert( pPager->eState==PAGER_OPEN );
38949	}else{
38950	pPager->eState = PAGER_READER;
38951	}
38952	return rc;
38953	}
38954
38955	/*
	@@ -38294,13 +38959,11 @@
38959	** Except, in locking_mode=EXCLUSIVE when there is nothing to in
38960	** the rollback journal, the unlock is not performed and there is
38961	** nothing to rollback, so this routine is a no-op.
38962	*/
38963	static void pagerUnlockIfUnused(Pager *pPager){
38964	if( (sqlite3PcacheRefCount(pPager->pPCache)==0) ){


38965	pagerUnlockAndRollback(pPager);
38966	}
38967	}
38968
38969	/*
	@@ -38360,20 +39023,20 @@
39023	int noContent /* Do not bother reading content from disk if true */
39024	){
39025	int rc;
39026	PgHdr *pPg;
39027
39028	assert( pPager->eState>=PAGER_READER );
39029	assert( assert_pager_state(pPager) );

39030
39031	if( pgno==0 ){
39032	return SQLITE_CORRUPT_BKPT;
39033	}
39034
39035	/* If the pager is in the error state, return an error immediately.
39036	** Otherwise, request the page from the PCache layer. */
39037	if( pPager->errCode!=SQLITE_OK ){
39038	rc = pPager->errCode;
39039	}else{
39040	rc = sqlite3PcacheFetch(pPager->pPCache, pgno, 1, ppPage);
39041	}
39042
	@@ -38395,11 +39058,10 @@
39058	return SQLITE_OK;
39059
39060	}else{
39061	/* The pager cache has created a new page. Its content needs to
39062	** be initialized. */

39063
39064	PAGER_INCR(pPager->nMiss);
39065	pPg = *ppPage;
39066	pPg->pPager = pPager;
39067
	@@ -38408,16 +39070,11 @@
39070	if( pgno>PAGER_MAX_PGNO \|\| pgno==PAGER_MJ_PGNO(pPager) ){
39071	rc = SQLITE_CORRUPT_BKPT;
39072	goto pager_acquire_err;
39073	}
39074
39075	if( MEMDB \|\| pPager->dbSize<pgno \|\| noContent \|\| !isOpen(pPager->fd) ){





39076	if( pgno>pPager->mxPgno ){
39077	rc = SQLITE_FULL;
39078	goto pager_acquire_err;
39079	}
39080	if( noContent ){
	@@ -38443,13 +39100,11 @@
39100	rc = readDbPage(pPg);
39101	if( rc!=SQLITE_OK ){
39102	goto pager_acquire_err;
39103	}
39104	}
39105	pager_set_pagehash(pPg);


39106	}
39107
39108	return SQLITE_OK;
39109
39110	pager_acquire_err:
	@@ -38464,13 +39119,11 @@
39119	}
39120
39121	/*
39122	** Acquire a page if it is already in the in-memory cache. Do
39123	** not read the page from disk. Return a pointer to the page,
39124	** or 0 if the page is not in cache.


39125	**
39126	** See also sqlite3PagerGet(). The difference between this routine
39127	** and sqlite3PagerGet() is that _get() will go to the disk and read
39128	** in the page if the page is not already in cache. This routine
39129	** returns NULL if the page is not in cache or if a disk I/O error
	@@ -38479,11 +39132,11 @@
39132	SQLITE_PRIVATE DbPage sqlite3PagerLookup(Pager pPager, Pgno pgno){
39133	PgHdr *pPg = 0;
39134	assert( pPager!=0 );
39135	assert( pgno!=0 );
39136	assert( pPager->pPCache!=0 );
39137	assert( pPager->eState>=PAGER_READER && pPager->eState!=PAGER_ERROR );
39138	sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &pPg);
39139	return pPg;
39140	}
39141
39142	/*
	@@ -38524,73 +39177,71 @@
39177	** SQLITE_NOMEM if the attempt to allocate Pager.pInJournal fails, or
39178	** an IO error code if opening or writing the journal file fails.
39179	*/
39180	static int pager_open_journal(Pager *pPager){
39181	int rc = SQLITE_OK; /* Return code */

39182	sqlite3_vfs * const pVfs = pPager->pVfs; /* Local cache of vfs pointer */
39183
39184	assert( pPager->eState==PAGER_WRITER_LOCKED );
39185	assert( assert_pager_state(pPager) );

39186	assert( pPager->pInJournal==0 );
39187
39188	/* If already in the error state, this function is a no-op. But on
39189	** the other hand, this routine is never called if we are already in
39190	** an error state. */
39191	if( NEVER(pPager->errCode) ) return pPager->errCode;
39192
39193	if( !pagerUseWal(pPager) && pPager->journalMode!=PAGER_JOURNALMODE_OFF ){
39194	pPager->pInJournal = sqlite3BitvecCreate(pPager->dbSize);
39195	if( pPager->pInJournal==0 ){
39196	return SQLITE_NOMEM;
39197	}
39198
39199	/* Open the journal file if it is not already open. */
39200	if( !isOpen(pPager->jfd) ){
39201	if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
39202	sqlite3MemJournalOpen(pPager->jfd);
39203	}else{
39204	const int flags = /* VFS flags to open journal file */
39205	SQLITE_OPEN_READWRITE\|SQLITE_OPEN_CREATE\|
39206	(pPager->tempFile ?
39207	(SQLITE_OPEN_DELETEONCLOSE\|SQLITE_OPEN_TEMP_JOURNAL):
39208	(SQLITE_OPEN_MAIN_JOURNAL)
39209	);
39210	#ifdef SQLITE_ENABLE_ATOMIC_WRITE
39211	rc = sqlite3JournalOpen(
39212	pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
39213	);
39214	#else
39215	rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
39216	#endif
39217	}
39218	assert( rc!=SQLITE_OK \|\| isOpen(pPager->jfd) );
39219	}
39220
39221
39222	/* Write the first journal header to the journal file and open
39223	** the sub-journal if necessary.
39224	*/
39225	if( rc==SQLITE_OK ){
39226	/* TODO: Check if all of these are really required. */
39227	pPager->nRec = 0;
39228	pPager->journalOff = 0;
39229	pPager->setMaster = 0;
39230	pPager->journalHdr = 0;
39231	rc = writeJournalHdr(pPager);
39232	}




39233	}
39234
39235	if( rc!=SQLITE_OK ){
39236	sqlite3BitvecDestroy(pPager->pInJournal);
39237	pPager->pInJournal = 0;
39238	}else{
39239	assert( pPager->eState==PAGER_WRITER_LOCKED );
39240	pPager->eState = PAGER_WRITER_CACHEMOD;
39241	}
39242
39243	return rc;
39244	}
39245
39246	/*
39247	** Begin a write-transaction on the specified pager object. If a
	@@ -38599,18 +39250,10 @@
39250	** If the exFlag argument is false, then acquire at least a RESERVED
39251	** lock on the database file. If exFlag is true, then acquire at least
39252	** an EXCLUSIVE lock. If such a lock is already held, no locking
39253	** functions need be called.
39254	**








39255	** If the subjInMemory argument is non-zero, then any sub-journal opened
39256	** within this transaction will be opened as an in-memory file. This
39257	** has no effect if the sub-journal is already opened (as it may be when
39258	** running in exclusive mode) or if the transaction does not require a
39259	** sub-journal. If the subjInMemory argument is zero, then any required
	@@ -38617,24 +39260,24 @@
39260	** sub-journal is implemented in-memory if pPager is an in-memory database,
39261	** or using a temporary file otherwise.
39262	*/
39263	SQLITE_PRIVATE int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
39264	int rc = SQLITE_OK;
39265
39266	if( pPager->errCode ) return pPager->errCode;
39267	assert( pPager->eState>=PAGER_READER && pPager->eState<PAGER_ERROR );
39268	pPager->subjInMemory = (u8)subjInMemory;
39269
39270	if( ALWAYS(pPager->eState==PAGER_READER) ){
39271	assert( pPager->pInJournal==0 );

39272
39273	if( pagerUseWal(pPager) ){
39274	/* If the pager is configured to use locking_mode=exclusive, and an
39275	** exclusive lock on the database is not already held, obtain it now.
39276	*/
39277	if( pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, -1) ){
39278	rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);

39279	if( rc!=SQLITE_OK ){
39280	return rc;
39281	}
39282	sqlite3WalExclusiveMode(pPager->pWal, 1);
39283	}
	@@ -38641,56 +39284,44 @@
39284
39285	/* Grab the write lock on the log file. If successful, upgrade to
39286	** PAGER_RESERVED state. Otherwise, return an error code to the caller.
39287	** The busy-handler is not invoked if another connection already
39288	** holds the write-lock. If possible, the upper layer will call it.






39289	*/
39290	rc = sqlite3WalBeginWriteTransaction(pPager->pWal);








39291	}else{
39292	/* Obtain a RESERVED lock on the database file. If the exFlag parameter
39293	** is true, then immediately upgrade this to an EXCLUSIVE lock. The
39294	** busy-handler callback can be used when upgrading to the EXCLUSIVE
39295	** lock, but not when obtaining the RESERVED lock.
39296	*/
39297	rc = pagerLockDb(pPager, RESERVED_LOCK);
39298	if( rc==SQLITE_OK && exFlag ){
39299	rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
39300	}
39301	}
39302
39303	if( rc==SQLITE_OK ){
39304	/* Change to WRITER_LOCKED state.
39305	**
39306	** WAL mode sets Pager.eState to PAGER_WRITER_LOCKED or CACHEMOD
39307	** when it has an open transaction, but never to DBMOD or FINISHED.
39308	** This is because in those states the code to roll back savepoint
39309	** transactions may copy data from the sub-journal into the database
39310	** file as well as into the page cache. Which would be incorrect in
39311	** WAL mode.
39312	*/
39313	pPager->eState = PAGER_WRITER_LOCKED;
39314	pPager->dbHintSize = pPager->dbSize;
39315	pPager->dbFileSize = pPager->dbSize;
39316	pPager->dbOrigSize = pPager->dbSize;
39317	pPager->journalOff = 0;
39318	}
39319
39320	assert( rc==SQLITE_OK \|\| pPager->eState==PAGER_READER );
39321	assert( rc!=SQLITE_OK \|\| pPager->eState==PAGER_WRITER_LOCKED );
39322	assert( assert_pager_state(pPager) );
39323	}
39324
39325	PAGERTRACE(("TRANSACTION %d\n", PAGERID(pPager)));
39326	return rc;
39327	}
	@@ -38705,110 +39336,98 @@
39336	static int pager_write(PgHdr *pPg){
39337	void *pData = pPg->pData;
39338	Pager *pPager = pPg->pPager;
39339	int rc = SQLITE_OK;
39340
39341	/* This routine is not called unless a write-transaction has already
39342	** been started. The journal file may or may not be open at this point.
39343	** It is never called in the ERROR state.
39344	*/
39345	assert( pPager->eState==PAGER_WRITER_LOCKED
39346	\|\| pPager->eState==PAGER_WRITER_CACHEMOD
39347	\|\| pPager->eState==PAGER_WRITER_DBMOD
39348	);
39349	assert( assert_pager_state(pPager) );
39350
39351	/* If an error has been previously detected, report the same error
39352	** again. This should not happen, but the check provides robustness. */

39353	if( NEVER(pPager->errCode) ) return pPager->errCode;
39354
39355	/* Higher-level routines never call this function if database is not
39356	** writable. But check anyway, just for robustness. */
39357	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
39358


39359	CHECK_PAGE(pPg);
39360
39361	/* Mark the page as dirty. If the page has already been written
39362	** to the journal then we can return right away.
39363	*/
39364	sqlite3PcacheMakeDirty(pPg);
39365	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
39366	assert( !pagerUseWal(pPager) );
39367	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39368	}else{
39369
39370	/* If we get this far, it means that the page needs to be
39371	** written to the transaction journal or the checkpoint journal
39372	** or both.
39373	**
39374	** Higher level routines have already obtained the necessary locks
39375	** to begin the write-transaction, but the rollback journal might not
39376	** yet be open. Open it now if this is the case.
39377	*/
39378	if( pPager->eState==PAGER_WRITER_LOCKED ){





39379	rc = pager_open_journal(pPager);
39380	if( rc!=SQLITE_OK ) return rc;
39381	}
39382	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39383	assert( assert_pager_state(pPager) );
39384
39385	/* The transaction journal now exists and we have a RESERVED or an
39386	** EXCLUSIVE lock on the main database file. Write the current page to
39387	** the transaction journal if it is not there already.
39388	*/
39389	if( !pageInJournal(pPg) && !pagerUseWal(pPager) ){
39390	assert( pagerUseWal(pPager)==0 );
39391	if( pPg->pgno<=pPager->dbOrigSize && isOpen(pPager->jfd) ){
39392	u32 cksum;
39393	char *pData2;
39394	i64 iOff = pPager->journalOff;
39395
39396	/* We should never write to the journal file the page that
39397	** contains the database locks. The following assert verifies
39398	** that we do not. */
39399	assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
39400
39401	assert( pPager->journalHdr<=pPager->journalOff );
39402	CODEC2(pPager, pData, pPg->pgno, 7, return SQLITE_NOMEM, pData2);
39403	cksum = pager_cksum(pPager, (u8*)pData2);
39404
39405	/* Even if an IO or diskfull error occurs while journalling the
39406	** page in the block above, set the need-sync flag for the page.
39407	** Otherwise, when the transaction is rolled back, the logic in
39408	** playback_one_page() will think that the page needs to be restored
39409	** in the database file. And if an IO error occurs while doing so,
39410	** then corruption may follow.
39411	*/
39412	pPg->flags \|= PGHDR_NEED_SYNC;
39413
39414	rc = write32bits(pPager->jfd, iOff, pPg->pgno);
39415	if( rc!=SQLITE_OK ) return rc;
39416	rc = sqlite3OsWrite(pPager->jfd, pData2, pPager->pageSize, iOff+4);
39417	if( rc!=SQLITE_OK ) return rc;
39418	rc = write32bits(pPager->jfd, iOff+pPager->pageSize+4, cksum);
39419	if( rc!=SQLITE_OK ) return rc;
39420
39421	IOTRACE(("JOUT %p %d %lld %d\n", pPager, pPg->pgno,
39422	pPager->journalOff, pPager->pageSize));
39423	PAGER_INCR(sqlite3_pager_writej_count);
39424	PAGERTRACE(("JOURNAL %d page %d needSync=%d hash(%08x)\n",
39425	PAGERID(pPager), pPg->pgno,
39426	((pPg->flags&PGHDR_NEED_SYNC)?1:0), pager_pagehash(pPg)));
39427
39428	pPager->journalOff += 8 + pPager->pageSize;


















39429	pPager->nRec++;
39430	assert( pPager->pInJournal!=0 );
39431	rc = sqlite3BitvecSet(pPager->pInJournal, pPg->pgno);
39432	testcase( rc==SQLITE_NOMEM );
39433	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
	@@ -38816,13 +39435,12 @@
39435	if( rc!=SQLITE_OK ){
39436	assert( rc==SQLITE_NOMEM );
39437	return rc;
39438	}
39439	}else{
39440	if( pPager->eState!=PAGER_WRITER_DBMOD ){
39441	pPg->flags \|= PGHDR_NEED_SYNC;

39442	}
39443	PAGERTRACE(("APPEND %d page %d needSync=%d\n",
39444	PAGERID(pPager), pPg->pgno,
39445	((pPg->flags&PGHDR_NEED_SYNC)?1:0)));
39446	}
	@@ -38838,11 +39456,10 @@
39456	}
39457	}
39458
39459	/* Update the database size and return.
39460	*/

39461	if( pPager->dbSize<pPg->pgno ){
39462	pPager->dbSize = pPg->pgno;
39463	}
39464	return rc;
39465	}
	@@ -38866,10 +39483,14 @@
39483
39484	PgHdr *pPg = pDbPage;
39485	Pager *pPager = pPg->pPager;
39486	Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
39487
39488	assert( pPager->eState>=PAGER_WRITER_LOCKED );
39489	assert( pPager->eState!=PAGER_ERROR );
39490	assert( assert_pager_state(pPager) );
39491
39492	if( nPagePerSector>1 ){
39493	Pgno nPageCount; /* Total number of pages in database file */
39494	Pgno pg1; /* First page of the sector pPg is located on. */
39495	int nPage = 0; /* Number of pages starting at pg1 to journal */
39496	int ii; /* Loop counter */
	@@ -38887,23 +39508,21 @@
39508	** an integer power of 2. It sets variable pg1 to the identifier
39509	** of the first page of the sector pPg is located on.
39510	*/
39511	pg1 = ((pPg->pgno-1) & ~(nPagePerSector-1)) + 1;
39512
39513	nPageCount = pPager->dbSize;
39514	if( pPg->pgno>nPageCount ){
39515	nPage = (pPg->pgno - pg1)+1;
39516	}else if( (pg1+nPagePerSector-1)>nPageCount ){
39517	nPage = nPageCount+1-pg1;
39518	}else{
39519	nPage = nPagePerSector;
39520	}
39521	assert(nPage>0);
39522	assert(pg1<=pPg->pgno);
39523	assert((pg1+nPage)>pPg->pgno);


39524
39525	for(ii=0; ii<nPage && rc==SQLITE_OK; ii++){
39526	Pgno pg = pg1+ii;
39527	PgHdr *pPage;
39528	if( pg==pPg->pgno \|\| !sqlite3BitvecTest(pPager->pInJournal, pg) ){
	@@ -38911,11 +39530,10 @@
39530	rc = sqlite3PagerGet(pPager, pg, &pPage);
39531	if( rc==SQLITE_OK ){
39532	rc = pager_write(pPage);
39533	if( pPage->flags&PGHDR_NEED_SYNC ){
39534	needSync = 1;

39535	}
39536	sqlite3PagerUnref(pPage);
39537	}
39538	}
39539	}else if( (pPage = pager_lookup(pPager, pg))!=0 ){
	@@ -38931,19 +39549,18 @@
39549	** writing to any of these nPage pages may damage the others, the
39550	** journal file must contain sync()ed copies of all of them
39551	** before any of them can be written out to the database file.
39552	*/
39553	if( rc==SQLITE_OK && needSync ){
39554	assert( !MEMDB );
39555	for(ii=0; ii<nPage; ii++){
39556	PgHdr *pPage = pager_lookup(pPager, pg1+ii);
39557	if( pPage ){
39558	pPage->flags \|= PGHDR_NEED_SYNC;
39559	sqlite3PagerUnref(pPage);
39560	}
39561	}

39562	}
39563
39564	assert( pPager->doNotSyncSpill==1 );
39565	pPager->doNotSyncSpill--;
39566	}else{
	@@ -38981,13 +39598,11 @@
39598	Pager *pPager = pPg->pPager;
39599	if( (pPg->flags&PGHDR_DIRTY) && pPager->nSavepoint==0 ){
39600	PAGERTRACE(("DONT_WRITE page %d of %d\n", pPg->pgno, PAGERID(pPager)));
39601	IOTRACE(("CLEAN %p %d\n", pPager, pPg->pgno))
39602	pPg->flags \|= PGHDR_DONT_WRITE;
39603	pager_set_pagehash(pPg);


39604	}
39605	}
39606
39607	/*
39608	** This routine is called to increment the value of the database file
	@@ -39005,10 +39620,15 @@
39620	** by writing an updated version of page 1 using a call to the
39621	** sqlite3OsWrite() function.
39622	*/
39623	static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
39624	int rc = SQLITE_OK;
39625
39626	assert( pPager->eState==PAGER_WRITER_CACHEMOD
39627	\|\| pPager->eState==PAGER_WRITER_DBMOD
39628	);
39629	assert( assert_pager_state(pPager) );
39630
39631	/* Declare and initialize constant integer 'isDirect'. If the
39632	** atomic-write optimization is enabled in this build, then isDirect
39633	** is initialized to the value passed as the isDirectMode parameter
39634	** to this function. Otherwise, it is always set to zero.
	@@ -39024,11 +39644,10 @@
39644	UNUSED_PARAMETER(isDirectMode);
39645	#else
39646	# define DIRECT_MODE isDirectMode
39647	#endif
39648

39649	if( !pPager->changeCountDone && pPager->dbSize>0 ){
39650	PgHdr pPgHdr; / Reference to page 1 */
39651	u32 change_counter; /* Initial value of change-counter field */
39652
39653	assert( !pPager->tempFile && isOpen(pPager->fd) );
	@@ -39109,13 +39728,17 @@
39728	** Otherwise, either SQLITE_BUSY or an SQLITE_IOERR_XXX error code is
39729	** returned.
39730	*/
39731	SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager *pPager){
39732	int rc = SQLITE_OK;
39733	assert( pPager->eState==PAGER_WRITER_CACHEMOD
39734	\|\| pPager->eState==PAGER_WRITER_DBMOD
39735	\|\| pPager->eState==PAGER_WRITER_LOCKED
39736	);
39737	assert( assert_pager_state(pPager) );
39738	if( 0==pagerUseWal(pPager) ){
39739	rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
39740	}
39741	return rc;
39742	}
39743
39744	/*
	@@ -39149,26 +39772,33 @@
39772	const char zMaster, / If not NULL, the master journal name */
39773	int noSync /* True to omit the xSync on the db file */
39774	){
39775	int rc = SQLITE_OK; /* Return code */
39776
39777	assert( pPager->eState==PAGER_WRITER_LOCKED
39778	\|\| pPager->eState==PAGER_WRITER_CACHEMOD
39779	\|\| pPager->eState==PAGER_WRITER_DBMOD
39780	\|\| pPager->eState==PAGER_ERROR
39781	);
39782	assert( assert_pager_state(pPager) );
39783
39784	/* If a prior error occurred, report that error again. */
39785	if( NEVER(pPager->errCode) ) return pPager->errCode;
39786
39787	PAGERTRACE(("DATABASE SYNC: File=%s zMaster=%s nSize=%d\n",
39788	pPager->zFilename, zMaster, pPager->dbSize));
39789
39790	/* If no database changes have been made, return early. */
39791	if( pPager->eState<PAGER_WRITER_CACHEMOD ) return SQLITE_OK;
39792
39793	if( MEMDB ){
39794	/* If this is an in-memory db, or no pages have been written to, or this
39795	** function has already been called, it is mostly a no-op. However, any
39796	** backup in progress needs to be restarted.
39797	*/
39798	sqlite3BackupRestart(pPager->pBackup);
39799	}else{
39800	if( pagerUseWal(pPager) ){
39801	PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache);
39802	if( pList ){
39803	rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1,
39804	(pPager->fullSync ? pPager->sync_flags : 0)
	@@ -39207,11 +39837,11 @@
39837	\|\| pPager->journalMode==PAGER_JOURNALMODE_OFF
39838	\|\| pPager->journalMode==PAGER_JOURNALMODE_WAL
39839	);
39840	if( !zMaster && isOpen(pPager->jfd)
39841	&& pPager->journalOff==jrnlBufferSize(pPager)
39842	&& pPager->dbSize>=pPager->dbOrigSize
39843	&& (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) \|\| 0==pPg->pDirty)
39844	){
39845	/* Update the db file change counter via the direct-write method. The
39846	** following call will modify the in-memory representation of page 1
39847	** to include the updated change counter and then write page 1
	@@ -39237,17 +39867,14 @@
39867	** Before reading the pages with page numbers larger than the
39868	** current value of Pager.dbSize, set dbSize back to the value
39869	** that it took at the start of the transaction. Otherwise, the
39870	** calls to sqlite3PagerGet() return zeroed pages instead of
39871	** reading data from the database file.



39872	*/
39873	#ifndef SQLITE_OMIT_AUTOVACUUM
39874	if( pPager->dbSize<pPager->dbOrigSize
39875	&& pPager->journalMode!=PAGER_JOURNALMODE_OFF
39876	){
39877	Pgno i; /* Iterator variable */
39878	const Pgno iSkip = PAGER_MJ_PGNO(pPager); /* Pending lock page */
39879	const Pgno dbSize = pPager->dbSize; /* Database image size */
39880	pPager->dbSize = pPager->dbOrigSize;
	@@ -39270,18 +39897,24 @@
39897	** or if zMaster is NULL (no master journal), then this call is a no-op.
39898	*/
39899	rc = writeMasterJournal(pPager, zMaster);
39900	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39901
39902	/* Sync the journal file and write all dirty pages to the database.
39903	** If the atomic-update optimization is being used, this sync will not
39904	** create the journal file or perform any real IO.
39905	**
39906	** Because the change-counter page was just modified, unless the
39907	** atomic-update optimization is used it is almost certain that the
39908	** journal requires a sync here. However, in locking_mode=exclusive
39909	** on a system under memory pressure it is just possible that this is
39910	** not the case. In this case it is likely enough that the redundant
39911	** xSync() call will be changed to a no-op by the OS anyhow.
39912	*/
39913	rc = syncJournal(pPager, 0);
39914	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39915

39916	rc = pager_write_pagelist(pPager,sqlite3PcacheDirtyList(pPager->pPCache));
39917	if( rc!=SQLITE_OK ){
39918	assert( rc!=SQLITE_IOERR_BLOCKED );
39919	goto commit_phase_one_exit;
39920	}
	@@ -39290,11 +39923,11 @@
39923	/* If the file on disk is not the same size as the database image,
39924	** then use pager_truncate to grow or shrink the file here.
39925	*/
39926	if( pPager->dbSize!=pPager->dbFileSize ){
39927	Pgno nNew = pPager->dbSize - (pPager->dbSize==PAGER_MJ_PGNO(pPager));
39928	assert( pPager->eState==PAGER_WRITER_DBMOD );
39929	rc = pager_truncate(pPager, nNew);
39930	if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
39931	}
39932
39933	/* Finally, sync the database file. */
	@@ -39301,16 +39934,16 @@
39934	if( !pPager->noSync && !noSync ){
39935	rc = sqlite3OsSync(pPager->fd, pPager->sync_flags);
39936	}
39937	IOTRACE(("DBSYNC %p\n", pPager))
39938	}



39939	}
39940
39941	commit_phase_one_exit:
39942	if( rc==SQLITE_OK && !pagerUseWal(pPager) ){
39943	pPager->eState = PAGER_WRITER_FINISHED;
39944	}
39945	return rc;
39946	}
39947
39948
39949	/*
	@@ -39334,16 +39967,15 @@
39967	/* This routine should not be called if a prior error has occurred.
39968	** But if (due to a coding error elsewhere in the system) it does get
39969	** called, just return the same error code without doing anything. */
39970	if( NEVER(pPager->errCode) ) return pPager->errCode;
39971
39972	assert( pPager->eState==PAGER_WRITER_LOCKED
39973	\|\| pPager->eState==PAGER_WRITER_FINISHED
39974	\|\| (pagerUseWal(pPager) && pPager->eState==PAGER_WRITER_CACHEMOD)
39975	);
39976	assert( assert_pager_state(pPager) );

39977
39978	/* An optimization. If the database was not actually modified during
39979	** this transaction, the pager is running in exclusive-mode and is
39980	** using persistent journals, then this function is a no-op.
39981	**
	@@ -39352,106 +39984,80 @@
39984	** a hot-journal during hot-journal rollback, 0 changes will be made
39985	** to the database file. So there is no need to zero the journal
39986	** header. Since the pager is in exclusive mode, there is no need
39987	** to drop any locks either.
39988	*/
39989	if( pPager->eState==PAGER_WRITER_LOCKED
39990	&& pPager->exclusiveMode
39991	&& pPager->journalMode==PAGER_JOURNALMODE_PERSIST
39992	){
39993	assert( pPager->journalOff==JOURNAL_HDR_SZ(pPager) \|\| !pPager->journalOff );
39994	pPager->eState = PAGER_READER;
39995	return SQLITE_OK;
39996	}
39997
39998	PAGERTRACE(("COMMIT %d\n", PAGERID(pPager)));

39999	rc = pager_end_transaction(pPager, pPager->setMaster);
40000	return pager_error(pPager, rc);
40001	}
40002
40003	/*
40004	** If a write transaction is open, then all changes made within the
40005	** transaction are reverted and the current write-transaction is closed.
40006	** The pager falls back to PAGER_READER state if successful, or PAGER_ERROR
40007	** state if an error occurs.
40008	**
40009	** If the pager is already in PAGER_ERROR state when this function is called,
40010	** it returns Pager.errCode immediately. No work is performed in this case.
40011	**
40012	** Otherwise, in rollback mode, this function performs two functions:
40013	**
40014	** 1) It rolls back the journal file, restoring all database file and
40015	** in-memory cache pages to the state they were in when the transaction
40016	** was opened, and
40017	**
40018	** 2) It finalizes the journal file, so that it is not used for hot
40019	** rollback at any point in the future.
40020	**
40021	** Finalization of the journal file (task 2) is only performed if the
40022	** rollback is successful.
40023	**
40024	** In WAL mode, all cache-entries containing data modified within the
40025	** current transaction are either expelled from the cache or reverted to
40026	** their pre-transaction state by re-reading data from the database or
40027	** WAL files. The WAL transaction is then closed.
























40028	*/
40029	SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){
40030	int rc = SQLITE_OK; /* Return code */
40031	PAGERTRACE(("ROLLBACK %d\n", PAGERID(pPager)));
40032
40033	/* PagerRollback() is a no-op if called in READER or OPEN state. If
40034	** the pager is already in the ERROR state, the rollback is not
40035	** attempted here. Instead, the error code is returned to the caller.
40036	*/
40037	assert( assert_pager_state(pPager) );
40038	if( pPager->eState==PAGER_ERROR ) return pPager->errCode;
40039	if( pPager->eState<=PAGER_READER ) return SQLITE_OK;
40040
40041	if( pagerUseWal(pPager) ){
40042	int rc2;

40043	rc = sqlite3PagerSavepoint(pPager, SAVEPOINT_ROLLBACK, -1);
40044	rc2 = pager_end_transaction(pPager, pPager->setMaster);
40045	if( rc==SQLITE_OK ) rc = rc2;
40046	}else if( !isOpen(pPager->jfd) \|\| pPager->eState==PAGER_WRITER_LOCKED ){
40047	rc = pager_end_transaction(pPager, 0);
40048	}else{
40049	rc = pager_playback(pPager, 0);
40050	}
40051
40052	assert( pPager->eState==PAGER_READER \|\| rc!=SQLITE_OK );
40053	assert( rc==SQLITE_OK \|\| rc==SQLITE_FULL \|\| (rc&0xFF)==SQLITE_IOERR );
40054
40055	/* If an error occurs during a ROLLBACK, we can no longer trust the pager
40056	** cache. So call pager_error() on the way out to make any error persistent.
40057	*/
40058	return pager_error(pPager, rc);


















40059	}
40060
40061	/*
40062	** Return TRUE if the database file is opened read-only. Return FALSE
40063	** if the database is (in theory) writable.
	@@ -39493,12 +40099,12 @@
40099	SQLITE_PRIVATE int sqlite3PagerStats(Pager pPager){
40100	static int a[11];
40101	a[0] = sqlite3PcacheRefCount(pPager->pPCache);
40102	a[1] = sqlite3PcachePagecount(pPager->pPCache);
40103	a[2] = sqlite3PcacheGetCachesize(pPager->pPCache);
40104	a[3] = pPager->eState==PAGER_OPEN ? -1 : (int) pPager->dbSize;
40105	a[4] = pPager->eState;
40106	a[5] = pPager->errCode;
40107	a[6] = pPager->nHit;
40108	a[7] = pPager->nMiss;
40109	a[8] = 0; /* Used to be pPager->nOvfl */
40110	a[9] = pPager->nRead;
	@@ -39525,18 +40131,17 @@
40131	** returned. Otherwise, SQLITE_OK.
40132	*/
40133	SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int nSavepoint){
40134	int rc = SQLITE_OK; /* Return code */
40135	int nCurrent = pPager->nSavepoint; /* Current number of savepoints */
40136
40137	assert( pPager->eState>=PAGER_WRITER_LOCKED );
40138	assert( assert_pager_state(pPager) );
40139
40140	if( nSavepoint>nCurrent && pPager->useJournal ){
40141	int ii; /* Iterator variable */
40142	PagerSavepoint aNew; / New Pager.aSavepoint array */




40143
40144	/* Grow the Pager.aSavepoint array using realloc(). Return SQLITE_NOMEM
40145	** if the allocation fails. Otherwise, zero the new portion in case a
40146	** malloc failure occurs while populating it in the for(...) loop below.
40147	*/
	@@ -39549,18 +40154,18 @@
40154	memset(&aNew[nCurrent], 0, (nSavepoint-nCurrent) * sizeof(PagerSavepoint));
40155	pPager->aSavepoint = aNew;
40156
40157	/* Populate the PagerSavepoint structures just allocated. */
40158	for(ii=nCurrent; ii<nSavepoint; ii++){
40159	aNew[ii].nOrig = pPager->dbSize;
40160	if( isOpen(pPager->jfd) && pPager->journalOff>0 ){
40161	aNew[ii].iOffset = pPager->journalOff;
40162	}else{
40163	aNew[ii].iOffset = JOURNAL_HDR_SZ(pPager);
40164	}
40165	aNew[ii].iSubRec = pPager->nSubRec;
40166	aNew[ii].pInSavepoint = sqlite3BitvecCreate(pPager->dbSize);
40167	if( !aNew[ii].pInSavepoint ){
40168	return SQLITE_NOMEM;
40169	}
40170	if( pagerUseWal(pPager) ){
40171	sqlite3WalSavepoint(pPager->pWal, aNew[ii].aWalData);
	@@ -39603,16 +40208,16 @@
40208	** This function may return SQLITE_NOMEM if a memory allocation fails,
40209	** or an IO error code if an IO error occurs while rolling back a
40210	** savepoint. If no errors occur, SQLITE_OK is returned.
40211	*/
40212	SQLITE_PRIVATE int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint){
40213	int rc = pPager->errCode; /* Return code */
40214
40215	assert( op==SAVEPOINT_RELEASE \|\| op==SAVEPOINT_ROLLBACK );
40216	assert( iSavepoint>=0 \|\| op==SAVEPOINT_ROLLBACK );
40217
40218	if( rc==SQLITE_OK && iSavepoint<pPager->nSavepoint ){
40219	int ii; /* Iterator variable */
40220	int nNew; /* Number of remaining savepoints after this op. */
40221
40222	/* Figure out how many savepoints will still be active after this
40223	** operation. Store this value in nNew. Then free resources associated
	@@ -39644,12 +40249,12 @@
40249	else if( pagerUseWal(pPager) \|\| isOpen(pPager->jfd) ){
40250	PagerSavepoint *pSavepoint = (nNew==0)?0:&pPager->aSavepoint[nNew-1];
40251	rc = pagerPlaybackSavepoint(pPager, pSavepoint);
40252	assert(rc!=SQLITE_DONE);
40253	}

40254	}
40255
40256	return rc;
40257	}
40258
40259	/*
40260	** Return the full pathname of the database file.
	@@ -39743,10 +40348,14 @@
40348	Pgno needSyncPgno = 0; /* Old value of pPg->pgno, if sync is required */
40349	int rc; /* Return code */
40350	Pgno origPgno; /* The original page number */
40351
40352	assert( pPg->nRef>0 );
40353	assert( pPager->eState==PAGER_WRITER_CACHEMOD
40354	\|\| pPager->eState==PAGER_WRITER_DBMOD
40355	);
40356	assert( assert_pager_state(pPager) );
40357
40358	/* In order to be able to rollback, an in-memory database must journal
40359	** the page we are moving from.
40360	*/
40361	if( MEMDB ){
	@@ -39792,15 +40401,14 @@
40401	*/
40402	if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
40403	needSyncPgno = pPg->pgno;
40404	assert( pageInJournal(pPg) \|\| pPg->pgno>pPager->dbOrigSize );
40405	assert( pPg->flags&PGHDR_DIRTY );

40406	}
40407
40408	/* If the cache contains a page with page-number pgno, remove it
40409	** from its hash chain. Also, if the PGHDR_NEED_SYNC flag was set for
40410	** page pgno before the 'move' operation, it needs to be retained
40411	** for the page moved there.
40412	*/
40413	pPg->flags &= ~PGHDR_NEED_SYNC;
40414	pPgOld = pager_lookup(pPager, pgno);
	@@ -39808,67 +40416,59 @@
40416	if( pPgOld ){
40417	pPg->flags \|= (pPgOld->flags&PGHDR_NEED_SYNC);
40418	if( MEMDB ){
40419	/* Do not discard pages from an in-memory database since we might
40420	** need to rollback later. Just move the page out of the way. */

40421	sqlite3PcacheMove(pPgOld, pPager->dbSize+1);
40422	}else{
40423	sqlite3PcacheDrop(pPgOld);
40424	}
40425	}
40426
40427	origPgno = pPg->pgno;
40428	sqlite3PcacheMove(pPg, pgno);
40429	sqlite3PcacheMakeDirty(pPg);
40430
40431	/* For an in-memory database, make sure the original page continues
40432	** to exist, in case the transaction needs to roll back. Use pPgOld
40433	** as the original page since it has already been allocated.
40434	*/
40435	if( MEMDB ){
40436	assert( pPgOld );
40437	sqlite3PcacheMove(pPgOld, origPgno);
40438	sqlite3PagerUnref(pPgOld);
40439	}
40440
40441	if( needSyncPgno ){
40442	/* If needSyncPgno is non-zero, then the journal file needs to be
40443	** sync()ed before any data is written to database file page needSyncPgno.
40444	** Currently, no such page exists in the page-cache and the
40445	** "is journaled" bitvec flag has been set. This needs to be remedied by
40446	** loading the page into the pager-cache and setting the PGHDR_NEED_SYNC
40447	** flag.
40448	**
40449	** If the attempt to load the page into the page-cache fails, (due
40450	** to a malloc() or IO failure), clear the bit in the pInJournal[]
40451	** array. Otherwise, if the page is loaded and written again in
40452	** this transaction, it may be written to the database file before
40453	** it is synced into the journal file. This way, it may end up in
40454	** the journal file twice, but that is not a problem.



40455	*/
40456	PgHdr *pPgHdr;

40457	rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr);
40458	if( rc!=SQLITE_OK ){
40459	if( needSyncPgno<=pPager->dbOrigSize ){
40460	assert( pPager->pTmpSpace!=0 );
40461	sqlite3BitvecClear(pPager->pInJournal, needSyncPgno, pPager->pTmpSpace);
40462	}
40463	return rc;
40464	}


40465	pPgHdr->flags \|= PGHDR_NEED_SYNC;
40466	sqlite3PcacheMakeDirty(pPgHdr);
40467	sqlite3PagerUnref(pPgHdr);
40468	}
40469










40470	return SQLITE_OK;
40471	}
40472	#endif
40473
40474	/*
	@@ -39929,10 +40529,17 @@
40529	**
40530	** The returned indicate the current (possibly updated) journal-mode.
40531	*/
40532	SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
40533	u8 eOld = pPager->journalMode; /* Prior journalmode */
40534
40535	#ifdef SQLITE_DEBUG
40536	/* The print_pager_state() routine is intended to be used by the debugger
40537	** only. We invoke it once here to suppress a compiler warning. */
40538	print_pager_state(pPager);
40539	#endif
40540
40541
40542	/* The eMode parameter is always valid */
40543	assert( eMode==PAGER_JOURNALMODE_DELETE
40544	\|\| eMode==PAGER_JOURNALMODE_TRUNCATE
40545	\|\| eMode==PAGER_JOURNALMODE_PERSIST
	@@ -39955,24 +40562,17 @@
40562	eMode = eOld;
40563	}
40564	}
40565
40566	if( eMode!=eOld ){








40567
40568	/* Change the journal mode. */
40569	assert( pPager->eState!=PAGER_ERROR );
40570	pPager->journalMode = (u8)eMode;
40571
40572	/* When transistioning from TRUNCATE or PERSIST to any other journal
40573	** mode except WAL, unless the pager is in locking_mode=exclusive mode,
40574	** delete the journal file.
40575	*/
40576	assert( (PAGER_JOURNALMODE_TRUNCATE & 5)==1 );
40577	assert( (PAGER_JOURNALMODE_PERSIST & 5)==1 );
40578	assert( (PAGER_JOURNALMODE_DELETE & 5)==0 );
	@@ -39989,28 +40589,34 @@
40589	**
40590	** Before deleting the journal file, obtain a RESERVED lock on the
40591	** database file. This ensures that the journal file is not deleted
40592	** while it is in use by some other client.
40593	*/
40594	sqlite3OsClose(pPager->jfd);
40595	if( pPager->eLock>=RESERVED_LOCK ){








40596	sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
40597	}else{
40598	int rc = SQLITE_OK;
40599	int state = pPager->eState;
40600	assert( state==PAGER_OPEN \|\| state==PAGER_READER );
40601	if( state==PAGER_OPEN ){
40602	rc = sqlite3PagerSharedLock(pPager);
40603	}
40604	if( pPager->eState==PAGER_READER ){
40605	assert( rc==SQLITE_OK );
40606	rc = pagerLockDb(pPager, RESERVED_LOCK);
40607	}
40608	if( rc==SQLITE_OK ){
40609	sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
40610	}
40611	if( rc==SQLITE_OK && state==PAGER_READER ){
40612	pagerUnlockDb(pPager, SHARED_LOCK);
40613	}else if( state==PAGER_OPEN ){
40614	pager_unlock(pPager);
40615	}
40616	assert( state==pPager->eState );
40617	}






40618	}
40619	}
40620
40621	/* Return the new journal mode */
40622	return (int)pPager->journalMode;
	@@ -40027,11 +40633,12 @@
40633	** Return TRUE if the pager is in a state where it is OK to change the
40634	** journalmode. Journalmode changes can only happen when the database
40635	** is unmodified.
40636	*/
40637	SQLITE_PRIVATE int sqlite3PagerOkToChangeJournalMode(Pager *pPager){
40638	assert( assert_pager_state(pPager) );
40639	if( pPager->eState>=PAGER_WRITER_CACHEMOD ) return 0;
40640	if( NEVER(isOpen(pPager->jfd) && pPager->journalOff>0) ) return 0;
40641	return 1;
40642	}
40643
40644	/*
	@@ -40092,39 +40699,46 @@
40699	**
40700	** If the pager passed as the first argument is open on a real database
40701	** file (not a temp file or an in-memory database), and the WAL file
40702	** is not already open, make an attempt to open it now. If successful,
40703	** return SQLITE_OK. If an error occurs or the VFS used by the pager does
40704	** not support the xShmXXX() methods, return an error code. *pbOpen is
40705	** not modified in either case.
40706	**
40707	** If the pager is open on a temp-file (or in-memory database), or if
40708	** the WAL file is already open, set *pbOpen to 1 and return SQLITE_OK
40709	** without doing anything.
40710	*/
40711	SQLITE_PRIVATE int sqlite3PagerOpenWal(
40712	Pager pPager, / Pager object */
40713	int pbOpen / OUT: Set to true if call is a no-op */
40714	){
40715	int rc = SQLITE_OK; /* Return code */
40716
40717	assert( assert_pager_state(pPager) );
40718	assert( pPager->eState==PAGER_OPEN \|\| pbOpen );
40719	assert( pPager->eState==PAGER_READER \|\| !pbOpen );
40720	assert( pbOpen==0 \|\| *pbOpen==0 );
40721	assert( pbOpen!=0 \|\| (!pPager->tempFile && !pPager->pWal) );
40722
40723	if( !pPager->tempFile && !pPager->pWal ){
40724	if( !sqlite3PagerWalSupported(pPager) ) return SQLITE_CANTOPEN;
40725
40726	/* Close any rollback journal previously open */
40727	sqlite3OsClose(pPager->jfd);
40728
40729	/* Open the connection to the log file. If this operation fails,
40730	** (e.g. due to malloc() failure), unlock the database file and
40731	** return an error code.
40732	*/
40733	rc = sqlite3WalOpen(pPager->pVfs, pPager->fd, pPager->zWal, &pPager->pWal);
40734	if( rc==SQLITE_OK ){
40735	pPager->journalMode = PAGER_JOURNALMODE_WAL;
40736	pPager->eState = PAGER_OPEN;
40737	}
40738	}else{
40739	*pbOpen = 1;
40740	}
40741
40742	return rc;
40743	}
40744
	@@ -40146,11 +40760,11 @@
40760	** it may need to be checkpointed before the connection can switch to
40761	** rollback mode. Open it now so this can happen.
40762	*/
40763	if( !pPager->pWal ){
40764	int logexists = 0;
40765	rc = pagerLockDb(pPager, SHARED_LOCK);
40766	if( rc==SQLITE_OK ){
40767	rc = sqlite3OsAccess(
40768	pPager->pVfs, pPager->zWal, SQLITE_ACCESS_EXISTS, &logexists
40769	);
40770	}
	@@ -40162,21 +40776,21 @@
40776
40777	/* Checkpoint and close the log. Because an EXCLUSIVE lock is held on
40778	** the database file, the log and log-summary files will be deleted.
40779	*/
40780	if( rc==SQLITE_OK && pPager->pWal ){
40781	rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
40782	if( rc==SQLITE_OK ){
40783	rc = sqlite3WalClose(pPager->pWal,
40784	(pPager->noSync ? 0 : pPager->sync_flags),
40785	pPager->pageSize, (u8*)pPager->pTmpSpace
40786	);
40787	pPager->pWal = 0;
40788	}else{
40789	/* If we cannot get an EXCLUSIVE lock, downgrade the PENDING lock
40790	** that we did get back to SHARED. */
40791	pagerUnlockDb(pPager, SQLITE_LOCK_SHARED);
40792	}
40793	}
40794	return rc;
40795	}
40796
	@@ -40492,18 +41106,22 @@
41106	/*
41107	** The following object holds a copy of the wal-index header content.
41108	**
41109	** The actual header in the wal-index consists of two copies of this
41110	** object.
41111	**
41112	** The szPage value can be any power of 2 between 512 and 32768, inclusive.
41113	** Or it can be 1 to represent a 65536-byte page. The latter case was
41114	** added in 3.7.1 when support for 64K pages was added.
41115	*/
41116	struct WalIndexHdr {
41117	u32 iVersion; /* Wal-index version */
41118	u32 unused; /* Unused (padding) field */
41119	u32 iChange; /* Counter incremented each transaction */
41120	u8 isInit; /* 1 when initialized */
41121	u8 bigEndCksum; /* True if checksums in WAL are big-endian */
41122	u16 szPage; /* Database page size in bytes. 1==64K */
41123	u32 mxFrame; /* Index of last valid frame in the WAL */
41124	u32 nPage; /* Size of database in pages */
41125	u32 aFrameCksum[2]; /* Checksum of last frame in log */
41126	u32 aSalt[2]; /* Two salt values copied from WAL header */
41127	u32 aCksum[2]; /* Checksum over all prior fields */
	@@ -40610,11 +41228,11 @@
41228	sqlite3_file pDbFd; / File handle for the database file */
41229	sqlite3_file pWalFd; / File handle for WAL file */
41230	u32 iCallback; /* Value to pass to log callback (or 0) */
41231	int nWiData; /* Size of array apWiData */
41232	volatile u32 *apWiData; / Pointer to wal-index content in memory */
41233	u32 szPage; /* Database page size */
41234	i16 readLock; /* Which read lock is being held. -1 for none */
41235	u8 exclusiveMode; /* Non-zero if connection is in exclusive mode */
41236	u8 writeLock; /* True if in a write transaction */
41237	u8 ckptLock; /* True if holding a checkpoint lock */
41238	u8 readOnly; /* True if the WAL file is open read-only */
	@@ -41281,11 +41899,11 @@
41899	\|\| szPage<512
41900	){
41901	goto finished;
41902	}
41903	pWal->hdr.bigEndCksum = (u8)(magic&0x00000001);
41904	pWal->szPage = szPage;
41905	pWal->nCkpt = sqlite3Get4byte(&aBuf[12]);
41906	memcpy(&pWal->hdr.aSalt, &aBuf[16], 8);
41907
41908	/* Verify that the WAL header checksum is correct */
41909	walChecksumBytes(pWal->hdr.bigEndCksum==SQLITE_BIGENDIAN,
	@@ -41331,11 +41949,13 @@
41949
41950	/* If nTruncate is non-zero, this is a commit record. */
41951	if( nTruncate ){
41952	pWal->hdr.mxFrame = iFrame;
41953	pWal->hdr.nPage = nTruncate;
41954	pWal->hdr.szPage = (u16)((szPage&0xff00) \| (szPage>>16));
41955	testcase( szPage<=32768 );
41956	testcase( szPage>=65536 );
41957	aFrameCksum[0] = pWal->hdr.aFrameCksum[0];
41958	aFrameCksum[1] = pWal->hdr.aFrameCksum[1];
41959	}
41960	}
41961
	@@ -41356,10 +41976,21 @@
41976	*/
41977	pInfo = walCkptInfo(pWal);
41978	pInfo->nBackfill = 0;
41979	pInfo->aReadMark[0] = 0;
41980	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;
41981
41982	/* If more than one frame was recovered from the log file, report an
41983	** event via sqlite3_log(). This is to help with identifying performance
41984	** problems caused by applications routinely shutting down without
41985	** checkpointing the log file.
41986	*/
41987	if( pWal->hdr.nPage ){
41988	sqlite3_log(SQLITE_OK, "Recovered %d frames from WAL file %s",
41989	pWal->hdr.nPage, pWal->zWalName
41990	);
41991	}
41992	}
41993
41994	recovery_error:
41995	WALTRACE(("WAL%p: recovery %s\n", pWal, rc ? "failed" : "ok"));
41996	walUnlockExclusive(pWal, iLock, nLock);
	@@ -41716,18 +42347,22 @@
42347	int sync_flags, /* Flags for OsSync() (or 0) */
42348	int nBuf, /* Size of zBuf in bytes */
42349	u8 zBuf / Temporary buffer to use */
42350	){
42351	int rc; /* Return code */
42352	int szPage; /* Database page-size */
42353	WalIterator pIter = 0; / Wal iterator context */
42354	u32 iDbpage = 0; /* Next database page to write */
42355	u32 iFrame = 0; /* Wal frame containing data for iDbpage */
42356	u32 mxSafeFrame; /* Max frame that can be backfilled */
42357	u32 mxPage; /* Max database page to write */
42358	int i; /* Loop counter */
42359	volatile WalCkptInfo pInfo; / The checkpoint status information */
42360
42361	szPage = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
42362	testcase( szPage<=32768 );
42363	testcase( szPage>=65536 );
42364	if( pWal->hdr.mxFrame==0 ) return SQLITE_OK;
42365
42366	/* Allocate the iterator */
42367	rc = walIteratorInit(pWal, &pIter);
42368	if( rc!=SQLITE_OK ){
	@@ -41734,11 +42369,11 @@
42369	return rc;
42370	}
42371	assert( pIter );
42372
42373	/* TODO: Move this test out to the caller. Make it an assert() here */
42374	if( szPage!=nBuf ){
42375	rc = SQLITE_CORRUPT_BKPT;
42376	goto walcheckpoint_out;
42377	}
42378
42379	/* Compute in mxSafeFrame the index of the last frame of the WAL that is
	@@ -41745,10 +42380,11 @@
42380	** safe to write into the database. Frames beyond mxSafeFrame might
42381	** overwrite database pages that are in use by active readers and thus
42382	** cannot be backfilled from the WAL.
42383	*/
42384	mxSafeFrame = pWal->hdr.mxFrame;
42385	mxPage = pWal->hdr.nPage;
42386	pInfo = walCkptInfo(pWal);
42387	for(i=1; i<WAL_NREADER; i++){
42388	u32 y = pInfo->aReadMark[i];
42389	if( mxSafeFrame>=y ){
42390	assert( y<=pWal->hdr.mxFrame );
	@@ -41765,22 +42401,34 @@
42401	}
42402
42403	if( pInfo->nBackfill<mxSafeFrame
42404	&& (rc = walLockExclusive(pWal, WAL_READ_LOCK(0), 1))==SQLITE_OK
42405	){
42406	i64 nSize; /* Current size of database file */
42407	u32 nBackfill = pInfo->nBackfill;
42408
42409	/* Sync the WAL to disk */
42410	if( sync_flags ){
42411	rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
42412	}
42413
42414	/* If the database file may grow as a result of this checkpoint, hint
42415	** about the eventual size of the db file to the VFS layer.
42416	*/
42417	if( rc==SQLITE_OK ){
42418	i64 nReq = ((i64)mxPage * szPage);
42419	rc = sqlite3OsFileSize(pWal->pDbFd, &nSize);
42420	if( rc==SQLITE_OK && nSize<nReq ){
42421	sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_SIZE_HINT, &nReq);
42422	}
42423	}
42424
42425	/* Iterate through the contents of the WAL, copying data to the db file. */
42426	while( rc==SQLITE_OK && 0==walIteratorNext(pIter, &iDbpage, &iFrame) ){
42427	i64 iOffset;
42428	assert( walFramePgno(pWal, iFrame)==iDbpage );
42429	if( iFrame<=nBackfill \|\| iFrame>mxSafeFrame \|\| iDbpage>mxPage ) continue;
42430	iOffset = walFrameOffset(iFrame, szPage) + WAL_FRAME_HDRSIZE;
42431	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL file */
42432	rc = sqlite3OsRead(pWal->pWalFd, zBuf, szPage, iOffset);
42433	if( rc!=SQLITE_OK ) break;
42434	iOffset = (iDbpage-1)*(i64)szPage;
	@@ -41883,11 +42531,11 @@
42531	WalIndexHdr volatile aHdr; / Header in shared memory */
42532
42533	/* The first page of the wal-index must be mapped at this point. */
42534	assert( pWal->nWiData>0 && pWal->apWiData[0] );
42535
42536	/* Read the header. This might happen concurrently with a write to the
42537	** same area of shared memory on a different CPU in a SMP,
42538	** meaning it is possible that an inconsistent snapshot is read
42539	** from the file. If this happens, return non-zero.
42540	**
42541	** There are two copies of the header at the beginning of the wal-index.
	@@ -41912,11 +42560,13 @@
42560	}
42561
42562	if( memcmp(&pWal->hdr, &h1, sizeof(WalIndexHdr)) ){
42563	*pChanged = 1;
42564	memcpy(&pWal->hdr, &h1, sizeof(WalIndexHdr));
42565	pWal->szPage = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
42566	testcase( pWal->szPage<=32768 );
42567	testcase( pWal->szPage>=65536 );
42568	}
42569
42570	/* The header was successfully read. Return zero. */
42571	return 0;
42572	}
	@@ -42231,10 +42881,11 @@
42881	/*
42882	** Finish with a read transaction. All this does is release the
42883	** read-lock.
42884	*/
42885	SQLITE_PRIVATE void sqlite3WalEndReadTransaction(Wal *pWal){
42886	sqlite3WalEndWriteTransaction(pWal);
42887	if( pWal->readLock>=0 ){
42888	walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock));
42889	pWal->readLock = -1;
42890	}
42891	}
	@@ -42341,11 +42992,17 @@
42992
42993	/* If iRead is non-zero, then it is the log frame number that contains the
42994	** required page. Read and return data from the log file.
42995	*/
42996	if( iRead ){
42997	int sz;
42998	i64 iOffset;
42999	sz = pWal->hdr.szPage;
43000	sz = (pWal->hdr.szPage&0xfe00) + ((pWal->hdr.szPage&0x0001)<<16);
43001	testcase( sz<=32768 );
43002	testcase( sz>=65536 );
43003	iOffset = walFrameOffset(iRead, sz) + WAL_FRAME_HDRSIZE;
43004	*pInWal = 1;
43005	/* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL */
43006	return sqlite3OsRead(pWal->pWalFd, pOut, nOut, iOffset);
43007	}
43008
	@@ -42353,15 +43010,17 @@
43010	return SQLITE_OK;
43011	}
43012
43013
43014	/*
43015	** Return the size of the database in pages (or zero, if unknown).
43016	*/
43017	SQLITE_PRIVATE Pgno sqlite3WalDbsize(Wal *pWal){
43018	if( pWal && ALWAYS(pWal->readLock>=0) ){
43019	return pWal->hdr.nPage;
43020	}
43021	return 0;
43022	}
43023
43024
43025	/*
43026	** This function starts a write transaction on the WAL.
	@@ -42433,11 +43092,11 @@
43092	** Otherwise, if the callback function does not return an error, this
43093	** function returns SQLITE_OK.
43094	*/
43095	SQLITE_PRIVATE int sqlite3WalUndo(Wal pWal, int (xUndo)(void , Pgno), void pUndoCtx){
43096	int rc = SQLITE_OK;
43097	if( ALWAYS(pWal->writeLock) ){
43098	Pgno iMax = pWal->hdr.mxFrame;
43099	Pgno iFrame;
43100
43101	/* Restore the clients cache of the wal-index header to the state it
43102	** was in before the client began writing to the database.
	@@ -42622,11 +43281,11 @@
43281	memcpy(&aWalHdr[16], pWal->hdr.aSalt, 8);
43282	walChecksumBytes(1, aWalHdr, WAL_HDRSIZE-2*4, 0, aCksum);
43283	sqlite3Put4byte(&aWalHdr[24], aCksum[0]);
43284	sqlite3Put4byte(&aWalHdr[28], aCksum[1]);
43285
43286	pWal->szPage = szPage;
43287	pWal->hdr.bigEndCksum = SQLITE_BIGENDIAN;
43288	pWal->hdr.aFrameCksum[0] = aCksum[0];
43289	pWal->hdr.aFrameCksum[1] = aCksum[1];
43290
43291	rc = sqlite3OsWrite(pWal->pWalFd, aWalHdr, sizeof(aWalHdr), 0);
	@@ -42717,11 +43376,13 @@
43376	rc = walIndexAppend(pWal, iFrame, pLast->pgno);
43377	}
43378
43379	if( rc==SQLITE_OK ){
43380	/* Update the private copy of the header. */
43381	pWal->hdr.szPage = (u16)((szPage&0xff00) \| (szPage>>16));
43382	testcase( szPage<=32768 );
43383	testcase( szPage>=65536 );
43384	pWal->hdr.mxFrame = iFrame;
43385	if( isCommit ){
43386	pWal->hdr.iChange++;
43387	pWal->hdr.nPage = nTruncate;
43388	}
	@@ -42929,11 +43590,11 @@
43590	**
43591	** FORMAT DETAILS
43592	**
43593	** The file is divided into pages. The first page is called page 1,
43594	** the second is page 2, and so forth. A page number of zero indicates
43595	** "no such page". The page size can be any power of 2 between 512 and 65536.
43596	** Each page can be either a btree page, a freelist page, an overflow
43597	** page, or a pointer-map page.
43598	**
43599	** The first page is always a btree page. The first 100 bytes of the first
43600	** page contain a special header (the "file header") that describes the file.
	@@ -43295,18 +43956,18 @@
43956	u8 initiallyEmpty; /* Database is empty at start of transaction */
43957	#ifndef SQLITE_OMIT_AUTOVACUUM
43958	u8 autoVacuum; /* True if auto-vacuum is enabled */
43959	u8 incrVacuum; /* True if incr-vacuum is enabled */
43960	#endif


43961	u16 maxLocal; /* Maximum local payload in non-LEAFDATA tables */
43962	u16 minLocal; /* Minimum local payload in non-LEAFDATA tables */
43963	u16 maxLeaf; /* Maximum local payload in a LEAFDATA table */
43964	u16 minLeaf; /* Minimum local payload in a LEAFDATA table */
43965	u8 inTransaction; /* Transaction state */
43966	u8 doNotUseWAL; /* If true, do not open write-ahead-log file */
43967	u32 pageSize; /* Total number of bytes on a page */
43968	u32 usableSize; /* Number of usable bytes on each page */
43969	int nTransaction; /* Number of open transactions (read + write) */
43970	u32 nPage; /* Number of pages in the database */
43971	void pSchema; / Pointer to space allocated by sqlite3BtreeSchema() */
43972	void (xFreeSchema)(void); /* Destructor for BtShared.pSchema */
43973	sqlite3_mutex mutex; / Non-recursive mutex required to access this struct */
	@@ -43901,11 +44562,20 @@
44562	# define TRACE(X) if(sqlite3BtreeTrace){printf X;fflush(stdout);}
44563	#else
44564	# define TRACE(X)
44565	#endif
44566
44567	/*
44568	** Extract a 2-byte big-endian integer from an array of unsigned bytes.
44569	** But if the value is zero, make it 65536.
44570	**
44571	** This routine is used to extract the "offset to cell content area" value
44572	** from the header of a btree page. If the page size is 65536 and the page
44573	** is empty, the offset should be 65536, but the 2-byte value stores zero.
44574	** This routine makes the necessary adjustment to 65536.
44575	*/
44576	#define get2byteNotZero(X) (((((int)get2byte(X))-1)&0xffff)+1)
44577
44578	#ifndef SQLITE_OMIT_SHARED_CACHE
44579	/*
44580	** A list of BtShared objects that are eligible for participation
44581	** in shared cache. This variable has file scope during normal builds,
	@@ -44590,15 +45260,20 @@
45260	#ifndef SQLITE_OMIT_AUTOVACUUM
45261	/*
45262	** Given a page number of a regular database page, return the page
45263	** number for the pointer-map page that contains the entry for the
45264	** input page number.
45265	**
45266	** Return 0 (not a valid page) for pgno==1 since there is
45267	** no pointer map associated with page 1. The integrity_check logic
45268	** requires that ptrmapPageno(*,1)!=1.
45269	*/
45270	static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){
45271	int nPagesPerMapPage;
45272	Pgno iPtrMap, ret;
45273	assert( sqlite3_mutex_held(pBt->mutex) );
45274	if( pgno<2 ) return 0;
45275	nPagesPerMapPage = (pBt->usableSize/5)+1;
45276	iPtrMap = (pgno-2)/nPagesPerMapPage;
45277	ret = (iPtrMap*nPagesPerMapPage) + 2;
45278	if( ret==PENDING_BYTE_PAGE(pBt) ){
45279	ret++;
	@@ -45023,21 +45698,21 @@
45698	assert( nByte < usableSize-8 );
45699
45700	nFrag = data[hdr+7];
45701	assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
45702	gap = pPage->cellOffset + 2*pPage->nCell;
45703	top = get2byteNotZero(&data[hdr+5]);
45704	if( gap>top ) return SQLITE_CORRUPT_BKPT;
45705	testcase( gap+2==top );
45706	testcase( gap+1==top );
45707	testcase( gap==top );
45708
45709	if( nFrag>=60 ){
45710	/* Always defragment highly fragmented pages */
45711	rc = defragmentPage(pPage);
45712	if( rc ) return rc;
45713	top = get2byteNotZero(&data[hdr+5]);
45714	}else if( gap+2<=top ){
45715	/* Search the freelist looking for a free slot big enough to satisfy
45716	** the request. The allocation is made from the first free slot in
45717	** the list that is large enough to accomadate it.
45718	*/
	@@ -45075,11 +45750,11 @@
45750	*/
45751	testcase( gap+2+nByte==top );
45752	if( gap+2+nByte>top ){
45753	rc = defragmentPage(pPage);
45754	if( rc ) return rc;
45755	top = get2byteNotZero(&data[hdr+5]);
45756	assert( gap+nByte<=top );
45757	}
45758
45759
45760	/* Allocate memory from the gap in between the cell pointer array
	@@ -45241,28 +45916,28 @@
45916	if( !pPage->isInit ){
45917	u16 pc; /* Address of a freeblock within pPage->aData[] */
45918	u8 hdr; /* Offset to beginning of page header */
45919	u8 data; / Equal to pPage->aData */
45920	BtShared pBt; / The main btree structure */
45921	int usableSize; /* Amount of usable space on each page */
45922	u16 cellOffset; /* Offset from start of page to first cell pointer */
45923	int nFree; /* Number of unused bytes on the page */
45924	int top; /* First byte of the cell content area */
45925	int iCellFirst; /* First allowable cell or freeblock offset */
45926	int iCellLast; /* Last possible cell or freeblock offset */
45927
45928	pBt = pPage->pBt;
45929
45930	hdr = pPage->hdrOffset;
45931	data = pPage->aData;
45932	if( decodeFlags(pPage, data[hdr]) ) return SQLITE_CORRUPT_BKPT;
45933	assert( pBt->pageSize>=512 && pBt->pageSize<=65536 );
45934	pPage->maskPage = (u16)(pBt->pageSize - 1);
45935	pPage->nOverflow = 0;
45936	usableSize = pBt->usableSize;
45937	pPage->cellOffset = cellOffset = hdr + 12 - 4*pPage->leaf;
45938	top = get2byteNotZero(&data[hdr+5]);
45939	pPage->nCell = get2byte(&data[hdr+3]);
45940	if( pPage->nCell>MX_CELL(pBt) ){
45941	/* To many cells for a single page. The page must be corrupt */
45942	return SQLITE_CORRUPT_BKPT;
45943	}
	@@ -45357,17 +46032,17 @@
46032	data[hdr] = (char)flags;
46033	first = hdr + 8 + 4*((flags&PTF_LEAF)==0 ?1:0);
46034	memset(&data[hdr+1], 0, 4);
46035	data[hdr+7] = 0;
46036	put2byte(&data[hdr+5], pBt->usableSize);
46037	pPage->nFree = (u16)(pBt->usableSize - first);
46038	decodeFlags(pPage, flags);
46039	pPage->hdrOffset = hdr;
46040	pPage->cellOffset = first;
46041	pPage->nOverflow = 0;
46042	assert( pBt->pageSize>=512 && pBt->pageSize<=65536 );
46043	pPage->maskPage = (u16)(pBt->pageSize - 1);
46044	pPage->nCell = 0;
46045	pPage->isInit = 1;
46046	}
46047
46048
	@@ -45671,11 +46346,11 @@
46346	pBt->pPage1 = 0;
46347	pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager);
46348	#ifdef SQLITE_SECURE_DELETE
46349	pBt->secureDelete = 1;
46350	#endif
46351	pBt->pageSize = (zDbHeader[16]<<8) \| (zDbHeader[17]<<16);
46352	if( pBt->pageSize<512 \|\| pBt->pageSize>SQLITE_MAX_PAGE_SIZE
46353	\|\| ((pBt->pageSize-1)&pBt->pageSize)!=0 ){
46354	pBt->pageSize = 0;
46355	#ifndef SQLITE_OMIT_AUTOVACUUM
46356	/* If the magic name ":memory:" will create an in-memory database, then
	@@ -45985,11 +46660,11 @@
46660	assert( nReserve>=0 && nReserve<=255 );
46661	if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
46662	((pageSize-1)&pageSize)==0 ){
46663	assert( (pageSize & 7)==0 );
46664	assert( !pBt->pPage1 && !pBt->pCursor );
46665	pBt->pageSize = (u32)pageSize;
46666	freeTempSpace(pBt);
46667	}
46668	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
46669	pBt->usableSize = pBt->pageSize - (u16)nReserve;
46670	if( iFix ) pBt->pageSizeFixed = 1;
	@@ -46120,19 +46795,17 @@
46795
46796	/* Do some checking to help insure the file we opened really is
46797	** a valid database file.
46798	*/
46799	nPage = nPageHeader = get4byte(28+(u8*)pPage1->aData);
46800	sqlite3PagerPagecount(pBt->pPager, &nPageFile);


46801	if( nPage==0 \|\| memcmp(24+(u8)pPage1->aData, 92+(u8)pPage1->aData,4)!=0 ){
46802	nPage = nPageFile;
46803	}
46804	if( nPage>0 ){
46805	u32 pageSize;
46806	u32 usableSize;
46807	u8 *page1 = pPage1->aData;
46808	rc = SQLITE_NOTADB;
46809	if( memcmp(page1, zMagicHeader, 16)!=0 ){
46810	goto page1_init_failed;
46811	}
	@@ -46179,28 +46852,29 @@
46852	** version 3.6.0, we require them to be fixed.
46853	*/
46854	if( memcmp(&page1[21], "\100\040\040",3)!=0 ){
46855	goto page1_init_failed;
46856	}
46857	pageSize = (page1[16]<<8) \| (page1[17]<<16);
46858	if( ((pageSize-1)&pageSize)!=0
46859	\|\| pageSize>SQLITE_MAX_PAGE_SIZE
46860	\|\| pageSize<=256
46861	){
46862	goto page1_init_failed;
46863	}
46864	assert( (pageSize & 7)==0 );
46865	usableSize = pageSize - page1[20];
46866	if( (u32)pageSize!=pBt->pageSize ){
46867	/* After reading the first page of the database assuming a page size
46868	** of BtShared.pageSize, we have discovered that the page-size is
46869	** actually pageSize. Unlock the database, leave pBt->pPage1 at
46870	** zero and return SQLITE_OK. The caller will call this function
46871	** again with the correct page-size.
46872	*/
46873	releasePage(pPage1);
46874	pBt->usableSize = usableSize;
46875	pBt->pageSize = pageSize;
46876	freeTempSpace(pBt);
46877	rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize,
46878	pageSize-usableSize);
46879	return rc;
46880	}
	@@ -46209,12 +46883,12 @@
46883	goto page1_init_failed;
46884	}
46885	if( usableSize<480 ){
46886	goto page1_init_failed;
46887	}
46888	pBt->pageSize = pageSize;
46889	pBt->usableSize = usableSize;
46890	#ifndef SQLITE_OMIT_AUTOVACUUM
46891	pBt->autoVacuum = (get4byte(&page1[36 + 4*4])?1:0);
46892	pBt->incrVacuum = (get4byte(&page1[36 + 7*4])?1:0);
46893	#endif
46894	}
	@@ -46226,18 +46900,18 @@
46900	** 2-byte pointer to the cell
46901	** 4-byte child pointer
46902	** 9-byte nKey value
46903	** 4-byte nData value
46904	** 4-byte overflow page pointer
46905	** So a cell consists of a 2-byte pointer, a header which is as much as
46906	** 17 bytes long, 0 to N bytes of payload, and an optional 4 byte overflow
46907	** page pointer.
46908	*/
46909	pBt->maxLocal = (u16)((pBt->usableSize-12)*64/255 - 23);
46910	pBt->minLocal = (u16)((pBt->usableSize-12)*32/255 - 23);
46911	pBt->maxLeaf = (u16)(pBt->usableSize - 35);
46912	pBt->minLeaf = (u16)((pBt->usableSize-12)*32/255 - 23);
46913	assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) );
46914	pBt->pPage1 = pPage1;
46915	pBt->nPage = nPage;
46916	return SQLITE_OK;
46917
	@@ -46286,11 +46960,12 @@
46960	data = pP1->aData;
46961	rc = sqlite3PagerWrite(pP1->pDbPage);
46962	if( rc ) return rc;
46963	memcpy(data, zMagicHeader, sizeof(zMagicHeader));
46964	assert( sizeof(zMagicHeader)==16 );
46965	data[16] = (u8)((pBt->pageSize>>8)&0xff);
46966	data[17] = (u8)((pBt->pageSize>>16)&0xff);
46967	data[18] = 1;
46968	data[19] = 1;
46969	assert( pBt->usableSize<=pBt->pageSize && pBt->usableSize+255>=pBt->pageSize);
46970	data[20] = (u8)(pBt->pageSize - pBt->usableSize);
46971	data[21] = 64;
	@@ -48297,13 +48972,13 @@
48972	c = +1;
48973	}
48974	pCur->validNKey = 1;
48975	pCur->info.nKey = nCellKey;
48976	}else{
48977	/* The maximum supported page-size is 65536 bytes. This means that
48978	** the maximum number of record bytes stored on an index B-Tree
48979	** page is less than 16384 bytes and may be stored as a 2-byte
48980	** varint. This information is used to attempt to avoid parsing
48981	** the entire cell by checking for the cases where the record is
48982	** stored entirely within the b-tree page by inspecting the first
48983	** 2 bytes of the cell.
48984	*/
	@@ -48662,10 +49337,14 @@
49337	}
49338	if( k==0 ){
49339	if( !pPrevTrunk ){
49340	memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
49341	}else{
49342	rc = sqlite3PagerWrite(pPrevTrunk->pDbPage);
49343	if( rc!=SQLITE_OK ){
49344	goto end_allocate_page;
49345	}
49346	memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
49347	}
49348	}else{
49349	/* The trunk page is required by the caller but it contains
49350	** pointers to free-list leaves. The first leaf becomes a trunk
	@@ -48968,11 +49647,11 @@
49647	BtShared *pBt = pPage->pBt;
49648	CellInfo info;
49649	Pgno ovflPgno;
49650	int rc;
49651	int nOvfl;
49652	u32 ovflPageSize;
49653
49654	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49655	btreeParseCellPtr(pPage, pCell, &info);
49656	if( info.iOverflow==0 ){
49657	return SQLITE_OK; /* No overflow pages. Return without doing anything */
	@@ -49193,11 +49872,11 @@
49872	**
49873	** "sz" must be the number of bytes in the cell.
49874	*/
49875	static void dropCell(MemPage pPage, int idx, int sz, int pRC){
49876	int i; /* Loop counter */
49877	u32 pc; /* Offset to cell content of cell being deleted */
49878	u8 data; / pPage->aData */
49879	u8 ptr; / Used to move bytes around within data[] */
49880	int rc; /* The return code */
49881	int hdr; /* Beginning of the header. 0 most pages. 100 page 1 */
49882
	@@ -49211,11 +49890,11 @@
49890	ptr = &data[pPage->cellOffset + 2*idx];
49891	pc = get2byte(ptr);
49892	hdr = pPage->hdrOffset;
49893	testcase( pc==get2byte(&data[hdr+5]) );
49894	testcase( pc+sz==pPage->pBt->usableSize );
49895	if( pc < (u32)get2byte(&data[hdr+5]) \|\| pc+sz > pPage->pBt->usableSize ){
49896	*pRC = SQLITE_CORRUPT_BKPT;
49897	return;
49898	}
49899	rc = freeSpace(pPage, pc, sz);
49900	if( rc ){
	@@ -49268,11 +49947,11 @@
49947	int nSkip = (iChild ? 4 : 0);
49948
49949	if( *pRC ) return;
49950
49951	assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
49952	assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921 );
49953	assert( pPage->nOverflow<=ArraySize(pPage->aOvfl) );
49954	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
49955	/* The cell should normally be sized correctly. However, when moving a
49956	** malformed cell from a leaf page to an interior page, if the cell size
49957	** wanted to be less than 4 but got rounded up to 4 on the leaf, then size
	@@ -49348,16 +50027,16 @@
50027	const int hdr = pPage->hdrOffset; /* Offset of header on pPage */
50028	const int nUsable = pPage->pBt->usableSize; /* Usable size of page */
50029
50030	assert( pPage->nOverflow==0 );
50031	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
50032	assert( nCell>=0 && nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921);
50033	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
50034
50035	/* Check that the page has just been zeroed by zeroPage() */
50036	assert( pPage->nCell==0 );
50037	assert( get2byteNotZero(&data[hdr+5])==nUsable );
50038
50039	pCellptr = &data[pPage->cellOffset + nCell*2];
50040	cellbody = nUsable;
50041	for(i=nCell-1; i>=0; i--){
50042	pCellptr -= 2;
	@@ -49419,10 +50098,11 @@
50098
50099	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
50100	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
50101	assert( pPage->nOverflow==1 );
50102
50103	/* This error condition is now caught prior to reaching this function */
50104	if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
50105
50106	/* Allocate a new page. This page will become the right-sibling of
50107	** pPage. Make the parent page writable, so that the new divider cell
50108	** may be inserted. If both these operations are successful, proceed.
	@@ -49748,11 +50428,11 @@
50428	** In this case, temporarily copy the cell into the aOvflSpace[]
50429	** buffer. It will be copied out again as soon as the aSpace[] buffer
50430	** is allocated. */
50431	if( pBt->secureDelete ){
50432	int iOff = SQLITE_PTR_TO_INT(apDiv[i]) - SQLITE_PTR_TO_INT(pParent->aData);
50433	if( (iOff+szNew[i])>(int)pBt->usableSize ){
50434	rc = SQLITE_CORRUPT_BKPT;
50435	memset(apOld, 0, (i+1)sizeof(MemPage));
50436	goto balance_cleanup;
50437	}else{
50438	memcpy(&aOvflSpace[iOff], apDiv[i], szNew[i]);
	@@ -49827,11 +50507,11 @@
50507	u8 *pTemp;
50508	assert( nCell<nMaxCells );
50509	szCell[nCell] = sz;
50510	pTemp = &aSpace1[iSpace1];
50511	iSpace1 += sz;
50512	assert( sz<=pBt->maxLocal+23 );
50513	assert( iSpace1<=pBt->pageSize );
50514	memcpy(pTemp, apDiv[i], sz);
50515	apCell[nCell] = pTemp+leafCorrection;
50516	assert( leafCorrection==0 \|\| leafCorrection==4 );
50517	szCell[nCell] = szCell[nCell] - leafCorrection;
	@@ -50073,11 +50753,11 @@
50753	assert(leafCorrection==4);
50754	sz = cellSizePtr(pParent, pCell);
50755	}
50756	}
50757	iOvflSpace += sz;
50758	assert( sz<=pBt->maxLocal+23 );
50759	assert( iOvflSpace<=pBt->pageSize );
50760	insertCell(pParent, nxDiv, pCell, sz, pTemp, pNew->pgno, &rc);
50761	if( rc!=SQLITE_OK ) goto balance_cleanup;
50762	assert( sqlite3PagerIswriteable(pParent->pDbPage) );
50763
	@@ -51317,11 +51997,11 @@
51997	#ifndef SQLITE_OMIT_AUTOVACUUM
51998	if( pCheck->pBt->autoVacuum ){
51999	checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0, zContext);
52000	}
52001	#endif
52002	if( n>(int)pCheck->pBt->usableSize/4-2 ){
52003	checkAppendMsg(pCheck, zContext,
52004	"freelist leaf count too big on page %d", iPage);
52005	N--;
52006	}else{
52007	for(i=0; i<n; i++){
	@@ -51528,24 +52208,24 @@
52208	hdr = pPage->hdrOffset;
52209	hit = sqlite3PageMalloc( pBt->pageSize );
52210	if( hit==0 ){
52211	pCheck->mallocFailed = 1;
52212	}else{
52213	int contentOffset = get2byteNotZero(&data[hdr+5]);
52214	assert( contentOffset<=usableSize ); /* Enforced by btreeInitPage() */
52215	memset(hit+contentOffset, 0, usableSize-contentOffset);
52216	memset(hit, 1, contentOffset);
52217	nCell = get2byte(&data[hdr+3]);
52218	cellStart = hdr + 12 - 4*pPage->leaf;
52219	for(i=0; i<nCell; i++){
52220	int pc = get2byte(&data[cellStart+i*2]);
52221	u32 size = 65536;
52222	int j;
52223	if( pc<=usableSize-4 ){
52224	size = cellSizePtr(pPage, &data[pc]);
52225	}
52226	if( (int)(pc+size-1)>=usableSize ){
52227	checkAppendMsg(pCheck, 0,
52228	"Corruption detected in cell %d on page %d",i,iPage);
52229	}else{
52230	for(j=pc+size-1; j>=pc; j--) hit[j]++;
52231	}
	@@ -52164,10 +52844,19 @@
52844	** page sizes of the source and destination differ.
52845	*/
52846	if( nSrcPgsz!=nDestPgsz && sqlite3PagerIsMemdb(pDestPager) ){
52847	rc = SQLITE_READONLY;
52848	}
52849
52850	#ifdef SQLITE_HAS_CODEC
52851	/* Backup is not possible if the page size of the destination is changing
52852	** a a codec is in use.
52853	*/
52854	if( nSrcPgsz!=nDestPgsz && sqlite3PagerGetCodec(pDestPager)!=0 ){
52855	rc = SQLITE_READONLY;
52856	}
52857	#endif
52858
52859	/* This loop runs once for each destination page spanned by the source
52860	** page. For each iteration, variable iOff is set to the byte offset
52861	** of the destination page.
52862	*/
	@@ -55769,12 +56458,21 @@
56458	mrc = p->rc & 0xff;
56459	assert( p->rc!=SQLITE_IOERR_BLOCKED ); /* This error no longer exists */
56460	isSpecialError = mrc==SQLITE_NOMEM \|\| mrc==SQLITE_IOERR
56461	\|\| mrc==SQLITE_INTERRUPT \|\| mrc==SQLITE_FULL;
56462	if( isSpecialError ){
56463	/* If the query was read-only and the error code is SQLITE_INTERRUPT,
56464	** no rollback is necessary. Otherwise, at least a savepoint
56465	** transaction must be rolled back to restore the database to a
56466	** consistent state.
56467	**
56468	** Even if the statement is read-only, it is important to perform
56469	** a statement or transaction rollback operation. If the error
56470	** occured while writing to the journal, sub-journal or database
56471	** file as part of an effort to free up cache space (see function
56472	** pagerStress() in pager.c), the rollback is required to restore
56473	** the pager to a consistent state.
56474	*/
56475	if( !p->readOnly \|\| mrc!=SQLITE_INTERRUPT ){
56476	if( (mrc==SQLITE_NOMEM \|\| mrc==SQLITE_FULL) && p->usesStmtJournal ){
56477	eStatementOp = SAVEPOINT_ROLLBACK;
56478	}else{
	@@ -63200,11 +63898,11 @@
63898	** If P5 is non-zero then the key value is increased by an epsilon
63899	** prior to the comparison. This make the opcode work like IdxGT except
63900	** that if the key from register P3 is a prefix of the key in the cursor,
63901	** the result is false whereas it would be true with IdxGT.
63902	*/
63903	/* Opcode: IdxLT P1 P2 P3 P4 P5
63904	**
63905	** The P4 register values beginning with P3 form an unpacked index
63906	** key that omits the ROWID. Compare this key value against the index
63907	** that P1 is currently pointing to, ignoring the ROWID on the P1 index.
63908	**
	@@ -67547,22 +68245,23 @@
68245	assert( z[0]=='?' );
68246	pExpr->iColumn = (ynVar)(++pParse->nVar);
68247	}else if( z[0]=='?' ){
68248	/* Wildcard of the form "?nnn". Convert "nnn" to an integer and
68249	** use it as the variable number */
68250	i64 i;
68251	int bOk = sqlite3Atoi64(&z[1], &i);
68252	pExpr->iColumn = (ynVar)i;
68253	testcase( i==0 );
68254	testcase( i==1 );
68255	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
68256	testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] );
68257	if( bOk==0 \|\| i<1 \|\| i>db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER] ){
68258	sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
68259	db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]);
68260	}
68261	if( i>pParse->nVar ){
68262	pParse->nVar = (int)i;
68263	}
68264	}else{
68265	/* Wildcards like ":aaa", "$aaa" or "@aaa". Reuse the same variable
68266	** number as the prior appearance of the same name, or if the name
68267	** has never appeared before, reuse the same variable number
	@@ -72092,10 +72791,11 @@
72791	}
72792	}
72793	sqlite3DbFree(db, pIdx->aSample);
72794	}
72795	#else
72796	UNUSED_PARAMETER(db);
72797	UNUSED_PARAMETER(pIdx);
72798	#endif
72799	}
72800
72801	/*
	@@ -87738,11 +88438,11 @@
88438	** be sent.
88439	**
88440	** regReturn is the number of the register holding the subroutine
88441	** return address.
88442	**
88443	** If regPrev>0 then it is the first register in a vector that
88444	** records the previous output. mem[regPrev] is a flag that is false
88445	** if there has been no previous output. If regPrev>0 then code is
88446	** generated to suppress duplicates. pKeyInfo is used for comparing
88447	** keys.
88448	**
	@@ -88435,16 +89135,17 @@
89135	** (1) The subquery and the outer query do not both use aggregates.
89136	**
89137	** (2) The subquery is not an aggregate or the outer query is not a join.
89138	**
89139	** (3) The subquery is not the right operand of a left outer join
89140	** (Originally ticket #306. Strengthened by ticket #3300)
89141	**
89142	** (4) The subquery is not DISTINCT.
89143	**
89144	() At one point restrictions (4) and (5) defined a subset of DISTINCT
89145	** sub-queries that were excluded from this optimization. Restriction
89146	** (4) has since been expanded to exclude all DISTINCT subqueries.
89147	**
89148	** (6) The subquery does not use aggregates or the outer query is not
89149	** DISTINCT.
89150	**
89151	** (7) The subquery has a FROM clause.
	@@ -88460,13 +89161,13 @@
89161	** (11) The subquery and the outer query do not both have ORDER BY clauses.
89162	**
89163	() Not implemented. Subsumed into restriction (3). Was previously
89164	** a separate restriction deriving from ticket #350.
89165	**
89166	** (13) The subquery and outer query do not both use LIMIT.
89167	**
89168	** (14) The subquery does not use OFFSET.
89169	**
89170	** (15) The outer query is not part of a compound select or the
89171	** subquery does not have a LIMIT clause.
89172	** (See ticket #2339 and ticket [02a8e81d44]).
89173	**
	@@ -88553,13 +89254,13 @@
89254	if( pSub->pOffset ) return 0; /* Restriction (14) */
89255	if( p->pRightmost && pSub->pLimit ){
89256	return 0; /* Restriction (15) */
89257	}
89258	if( pSubSrc->nSrc==0 ) return 0; /* Restriction (7) */
89259	if( pSub->selFlags & SF_Distinct ) return 0; /* Restriction (5) */
89260	if( pSub->pLimit && (pSrc->nSrc>1 \|\| isAgg) ){
89261	return 0; /* Restrictions (8)(9) */
89262	}
89263	if( (p->selFlags & SF_Distinct)!=0 && subqueryIsAgg ){
89264	return 0; /* Restriction (6) */
89265	}
89266	if( p->pOrderBy && pSub->pOrderBy ){
	@@ -93225,11 +93926,11 @@
93926	pParse->pNewTable->aCol = 0;
93927	}
93928	db->pVTab = 0;
93929	}else{
93930	sqlite3Error(db, SQLITE_ERROR, zErr);
93931	sqlite3DbFree(db, zErr);
93932	rc = SQLITE_ERROR;
93933	}
93934	pParse->declareVtab = 0;
93935
93936	if( pParse->pVdbe ){
	@@ -96859,39 +97560,39 @@
97560	**
97561	** This case is also used when there are no WHERE clause
97562	** constraints but an index is selected anyway, in order
97563	** to force the output order to conform to an ORDER BY.
97564	*/
97565	static const u8 aStartOp[] = {
97566	0,
97567	0,
97568	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
97569	OP_Last, /* 3: (!start_constraints && startEq && bRev) */
97570	OP_SeekGt, /* 4: (start_constraints && !startEq && !bRev) */
97571	OP_SeekLt, /* 5: (start_constraints && !startEq && bRev) */
97572	OP_SeekGe, /* 6: (start_constraints && startEq && !bRev) */
97573	OP_SeekLe /* 7: (start_constraints && startEq && bRev) */
97574	};
97575	static const u8 aEndOp[] = {
97576	OP_Noop, /* 0: (!end_constraints) */
97577	OP_IdxGE, /* 1: (end_constraints && !bRev) */
97578	OP_IdxLT /* 2: (end_constraints && bRev) */
97579	};
97580	int nEq = pLevel->plan.nEq; /* Number of == or IN terms */
97581	int isMinQuery = 0; /* If this is an optimized SELECT min(x).. */
97582	int regBase; /* Base register holding constraint values */
97583	int r1; /* Temp register */
97584	WhereTerm pRangeStart = 0; / Inequality constraint at range start */
97585	WhereTerm pRangeEnd = 0; / Inequality constraint at range end */
97586	int startEq; /* True if range start uses ==, >= or <= */
97587	int endEq; /* True if range end uses ==, >= or <= */
97588	int start_constraints; /* Start of range is constrained */
97589	int nConstraint; /* Number of constraint terms */
97590	Index pIdx; / The index we will be using */
97591	int iIdxCur; /* The VDBE cursor for the index */
97592	int nExtraReg = 0; /* Number of extra registers needed */
97593	int op; /* Instruction opcode */
97594	char zStartAff; / Affinity for start of range constraint */
97595	char zEndAff; / Affinity for end of range constraint */
97596
97597	pIdx = pLevel->plan.u.pIdx;
97598	iIdxCur = pLevel->iIdxCur;
	@@ -108720,11 +109421,11 @@
109421	** in files fts3_tokenizer1.c and fts3_porter.c respectively. The following
109422	** two forward declarations are for functions declared in these files
109423	** used to retrieve the respective implementations.
109424	**
109425	** Calling sqlite3Fts3SimpleTokenizerModule() sets the value pointed
109426	** to by the argument to point to the "simple" tokenizer implementation.
109427	** Function ...PorterTokenizerModule() sets *pModule to point to the
109428	** porter tokenizer/stemmer implementation.
109429	*/
109430	SQLITE_PRIVATE void sqlite3Fts3SimpleTokenizerModule(sqlite3_tokenizer_module const**ppModule);
109431	SQLITE_PRIVATE void sqlite3Fts3PorterTokenizerModule(sqlite3_tokenizer_module const**ppModule);
	@@ -108922,11 +109623,11 @@
109623	** is defined to accept an argument of type char, and always returns 0 for
109624	** any values that fall outside of the range of the unsigned char type (i.e.
109625	** negative values).
109626	*/
109627	static int fts3isspace(char c){
109628	return c==' ' \|\| c=='\t' \|\| c=='\n' \|\| c=='\r' \|\| c=='\v' \|\| c=='\f';
109629	}
109630
109631	/*
109632	** Extract the next token from buffer z (length n) using the tokenizer
109633	** and other information (column names etc.) in pParse. Create an Fts3Expr
	@@ -111309,10 +112010,13 @@
112010
112011
112012	static int simpleDelim(simple_tokenizer *t, unsigned char c){
112013	return c<0x80 && t->delim[c];
112014	}
112015	static int fts3_isalnum(int x){
112016	return (x>='0' && x<='9') \|\| (x>='A' && x<='Z') \|\| (x>='a' && x<='z');
112017	}
112018
112019	/*
112020	** Create a new tokenizer instance.
112021	*/
112022	static int simpleCreate(
	@@ -111343,11 +112047,11 @@
112047	}
112048	} else {
112049	/* Mark non-alphanumeric ASCII characters as delimiters */
112050	int i;
112051	for(i=1; i<0x80; i++){
112052	t->delim[i] = !fts3_isalnum(i) ? -1 : 0;
112053	}
112054	}
112055
112056	*ppTokenizer = &t->base;
112057	return SQLITE_OK;
	@@ -111449,11 +112153,11 @@
112153	for(i=0; i<n; i++){
112154	/* TODO(shess) This needs expansion to handle UTF-8
112155	** case-insensitivity.
112156	*/
112157	unsigned char ch = p[iStartOffset+i];
112158	c->pToken[i] = (char)((ch>='A' && ch<='Z') ? ch-'A'+'a' : ch);
112159	}
112160	*ppToken = c->pToken;
112161	*pnBytes = n;
112162	*piStartOffset = iStartOffset;
112163	*piEndOffset = c->iOffset;
	@@ -116355,15 +117059,14 @@
117059	** least desirable):
117060	**
117061	** idxNum idxStr Strategy
117062	** ------------------------------------------------
117063	** 1 Unused Direct lookup by rowid.
117064	** 2 See below R-tree query or full-table scan.

117065	** ------------------------------------------------
117066	**
117067	** If strategy 1 is used, then idxStr is not meaningful. If strategy
117068	** 2 is used, idxStr is formatted to contain 2 bytes for each
117069	** constraint used. The first two bytes of idxStr correspond to
117070	** the constraint in sqlite3_index_info.aConstraintUsage[] with
117071	** (argvIndex==1) etc.
117072	**
117073

M src/sqlite3.h

+25 -16

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -95,23 +95,23 @@
95	95	** be held constant and Z will be incremented or else Y will be incremented
96	96	** and Z will be reset to zero.
97	97	**
98	98	** Since version 3.6.18, SQLite source code has been stored in the
99	99	** <a href="http://www.fossil-scm.org/">Fossil configuration management
100		-** system</a>. ^The SQLITE_SOURCE_ID macro evalutes to
	100	+** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to
101	101	** a string which identifies a particular check-in of SQLite
102	102	** within its configuration management system. ^The SQLITE_SOURCE_ID
103	103	** string contains the date and time of the check-in (UTC) and an SHA1
104	104	** hash of the entire source tree.
105	105	**
106	106	** See also: [sqlite3_libversion()],
107	107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	108	** [sqlite_version()] and [sqlite_source_id()].
109	109	*/
110		-#define SQLITE_VERSION "3.7.1"
111		-#define SQLITE_VERSION_NUMBER 3007001
112		-#define SQLITE_SOURCE_ID "2010-08-05 03:21:40 fbe70e1106bcc5086ceb9d8f39cc39baf3643092"
	110	+#define SQLITE_VERSION "3.7.2"
	111	+#define SQLITE_VERSION_NUMBER 3007002
	112	+#define SQLITE_SOURCE_ID "2010-08-23 18:52:01 42537b60566f288167f1b5864a5435986838e3a3"
113	113
114	114	/*
115	115	** CAPI3REF: Run-Time Library Version Numbers
116	116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	117	**
		@@ -152,19 +152,19 @@
152	152	** ^The sqlite3_compileoption_used() function returns 0 or 1
153	153	** indicating whether the specified option was defined at
154	154	** compile time. ^The SQLITE_ prefix may be omitted from the
155	155	** option name passed to sqlite3_compileoption_used().
156	156	**
157		-** ^The sqlite3_compileoption_get() function allows interating
	157	+** ^The sqlite3_compileoption_get() function allows iterating
158	158	** over the list of options that were defined at compile time by
159	159	** returning the N-th compile time option string. ^If N is out of range,
160	160	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
161	161	** prefix is omitted from any strings returned by
162	162	** sqlite3_compileoption_get().
163	163	**
164	164	** ^Support for the diagnostic functions sqlite3_compileoption_used()
165		-** and sqlite3_compileoption_get() may be omitted by specifing the
	165	+** and sqlite3_compileoption_get() may be omitted by specifying the
166	166	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
167	167	**
168	168	** See also: SQL functions [sqlite_compileoption_used()] and
169	169	** [sqlite_compileoption_get()] and the [compile_options pragma].
170	170	*/
		@@ -266,11 +266,11 @@
266	266	/*
267	267	** CAPI3REF: Closing A Database Connection
268	268	**
269	269	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
270	270	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
271		-** successfullly destroyed and all associated resources are deallocated.
	271	+** successfully destroyed and all associated resources are deallocated.
272	272	**
273	273	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
274	274	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
275	275	** the [sqlite3] object prior to attempting to close the object. ^If
276	276	** sqlite3_close() is called on a [database connection] that still has
		@@ -693,16 +693,25 @@
693	693	** layer a hint of how large the database file will grow to be during the
694	694	** current transaction. This hint is not guaranteed to be accurate but it
695	695	** is often close. The underlying VFS might choose to preallocate database
696	696	** file space based on this hint in order to help writes to the database
697	697	** file run faster.
	698	+**
	699	+** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
	700	+** extends and truncates the database file in chunks of a size specified
	701	+** by the user. The fourth argument to [sqlite3_file_control()] should
	702	+** point to an integer (type int) containing the new chunk-size to use
	703	+** for the nominated database. Allocating database file space in large
	704	+** chunks (say 1MB at a time), may reduce file-system fragmentation and
	705	+** improve performance on some systems.
698	706	*/
699	707	#define SQLITE_FCNTL_LOCKSTATE 1
700	708	#define SQLITE_GET_LOCKPROXYFILE 2
701	709	#define SQLITE_SET_LOCKPROXYFILE 3
702	710	#define SQLITE_LAST_ERRNO 4
703	711	#define SQLITE_FCNTL_SIZE_HINT 5
	712	+#define SQLITE_FCNTL_CHUNK_SIZE 6
704	713
705	714	/*
706	715	** CAPI3REF: Mutex Handle
707	716	**
708	717	** The mutex module within SQLite defines [sqlite3_mutex] to be an
		@@ -2661,11 +2670,11 @@
2661	2670	** <li> @VVV
2662	2671	** <li> $VVV
2663	2672	** </ul>
2664	2673	**
2665	2674	** In the templates above, NNN represents an integer literal,
2666		-** and VVV represents an alphanumeric identifer.)^ ^The values of these
	2675	+** and VVV represents an alphanumeric identifier.)^ ^The values of these
2667	2676	** parameters (also called "host parameter names" or "SQL parameters")
2668	2677	** can be set using the sqlite3_bind_*() routines defined here.
2669	2678	**
2670	2679	** ^The first argument to the sqlite3_bind_*() routines is always
2671	2680	** a pointer to the [sqlite3_stmt] object returned from
		@@ -3440,11 +3449,11 @@
3440	3449	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3441	3450
3442	3451	/*
3443	3452	** CAPI3REF: Obtain Aggregate Function Context
3444	3453	**
3445		-** Implementions of aggregate SQL functions use this
	3454	+** Implementations of aggregate SQL functions use this
3446	3455	** routine to allocate memory for storing their state.
3447	3456	**
3448	3457	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3449	3458	** for a particular aggregate function, SQLite
3450	3459	** allocates N of memory, zeroes out that memory, and returns a pointer
		@@ -3712,11 +3721,11 @@
3712	3721	** the routine expects pointers to 16-bit word aligned strings
3713	3722	** of UTF-16 in the native byte order.
3714	3723	**
3715	3724	** A pointer to the user supplied routine must be passed as the fifth
3716	3725	** argument. ^If it is NULL, this is the same as deleting the collation
3717		-** sequence (so that SQLite cannot call it anymore).
	3726	+** sequence (so that SQLite cannot call it any more).
3718	3727	** ^Each time the application supplied function is invoked, it is passed
3719	3728	** as its first parameter a copy of the void* passed as the fourth argument
3720	3729	** to sqlite3_create_collation() or sqlite3_create_collation16().
3721	3730	**
3722	3731	** ^The remaining arguments to the application-supplied routine are two strings,
		@@ -4930,11 +4939,11 @@
4930	4939	** of passing a NULL pointer instead of a valid mutex handle are undefined
4931	4940	** (i.e. it is acceptable to provide an implementation that segfaults if
4932	4941	** it is passed a NULL pointer).
4933	4942	**
4934	4943	** The xMutexInit() method must be threadsafe. ^It must be harmless to
4935		-** invoke xMutexInit() mutiple times within the same process and without
	4944	+** invoke xMutexInit() multiple times within the same process and without
4936	4945	** intervening calls to xMutexEnd(). Second and subsequent calls to
4937	4946	** xMutexInit() must be no-ops.
4938	4947	**
4939	4948	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
4940	4949	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
		@@ -5100,11 +5109,11 @@
5100	5109
5101	5110	/*
5102	5111	** CAPI3REF: SQLite Runtime Status
5103	5112	**
5104	5113	** ^This interface is used to retrieve runtime status information
5105		-** about the preformance of SQLite, and optionally to reset various
	5114	+** about the performance of SQLite, and optionally to reset various
5106	5115	** highwater marks. ^The first argument is an integer code for
5107	5116	** the specific parameter to measure. ^(Recognized integer codes
5108	5117	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5109	5118	** ^The current value of the parameter is returned into *pCurrent.
5110	5119	** ^The highest recorded value is returned in *pHighwater. ^If the
		@@ -5226,11 +5235,11 @@
5226	5235	** ^This interface is used to retrieve runtime status information
5227	5236	** about a single [database connection]. ^The first argument is the
5228	5237	** database connection object to be interrogated. ^The second argument
5229	5238	** is an integer constant, taken from the set of
5230	5239	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5231		-** determiness the parameter to interrogate. The set of
	5240	+** determines the parameter to interrogate. The set of
5232	5241	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5233	5242	** to grow in future releases of SQLite.
5234	5243	**
5235	5244	** ^The current value of the requested parameter is written into *pCur
5236	5245	** and the highest instantaneous value is written into *pHiwtr. ^If
		@@ -5648,11 +5657,11 @@
5648	5657	**
5649	5658	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
5650	5659	**
5651	5660	** ^Each call to sqlite3_backup_step() sets two values inside
5652	5661	** the [sqlite3_backup] object: the number of pages still to be backed
5653		-** up and the total number of pages in the source databae file.
	5662	+** up and the total number of pages in the source database file.
5654	5663	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
5655	5664	** retrieve these two values, respectively.
5656	5665	**
5657	5666	** ^The values returned by these functions are only updated by
5658	5667	** sqlite3_backup_step(). ^If the source database is modified during a backup
		@@ -5744,11 +5753,11 @@
5744	5753	** ^(There may be at most one unlock-notify callback registered by a
5745	5754	** blocked connection. If sqlite3_unlock_notify() is called when the
5746	5755	** blocked connection already has a registered unlock-notify callback,
5747	5756	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
5748	5757	** called with a NULL pointer as its second argument, then any existing
5749		-** unlock-notify callback is cancelled. ^The blocked connections
	5758	+** unlock-notify callback is canceled. ^The blocked connections
5750	5759	** unlock-notify callback may also be canceled by closing the blocked
5751	5760	** connection using [sqlite3_close()].
5752	5761	**
5753	5762	** The unlock-notify callback is not reentrant. If an application invokes
5754	5763	** any sqlite3_xxx API functions from within an unlock-notify callback, a
		@@ -5826,11 +5835,11 @@
5826	5835	/*
5827	5836	** CAPI3REF: String Comparison
5828	5837	**
5829	5838	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
5830	5839	** compare the contents of two buffers containing UTF-8 strings in a
5831		-** case-indendent fashion, using the same definition of case independence
	5840	+** case-independent fashion, using the same definition of case independence
5832	5841	** that SQLite uses internally when comparing identifiers.
5833	5842	*/
5834	5843	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
5835	5844
5836	5845	/*
5837	5846

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -95,23 +95,23 @@
95	** be held constant and Z will be incremented or else Y will be incremented
96	** and Z will be reset to zero.
97	**
98	** Since version 3.6.18, SQLite source code has been stored in the
99	** <a href="http://www.fossil-scm.org/">Fossil configuration management
100	** system</a>. ^The SQLITE_SOURCE_ID macro evalutes to
101	** a string which identifies a particular check-in of SQLite
102	** within its configuration management system. ^The SQLITE_SOURCE_ID
103	** string contains the date and time of the check-in (UTC) and an SHA1
104	** hash of the entire source tree.
105	**
106	** See also: [sqlite3_libversion()],
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.7.1"
111	#define SQLITE_VERSION_NUMBER 3007001
112	#define SQLITE_SOURCE_ID "2010-08-05 03:21:40 fbe70e1106bcc5086ceb9d8f39cc39baf3643092"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
	@@ -152,19 +152,19 @@
152	** ^The sqlite3_compileoption_used() function returns 0 or 1
153	** indicating whether the specified option was defined at
154	** compile time. ^The SQLITE_ prefix may be omitted from the
155	** option name passed to sqlite3_compileoption_used().
156	**
157	** ^The sqlite3_compileoption_get() function allows interating
158	** over the list of options that were defined at compile time by
159	** returning the N-th compile time option string. ^If N is out of range,
160	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
161	** prefix is omitted from any strings returned by
162	** sqlite3_compileoption_get().
163	**
164	** ^Support for the diagnostic functions sqlite3_compileoption_used()
165	** and sqlite3_compileoption_get() may be omitted by specifing the
166	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
167	**
168	** See also: SQL functions [sqlite_compileoption_used()] and
169	** [sqlite_compileoption_get()] and the [compile_options pragma].
170	*/
	@@ -266,11 +266,11 @@
266	/*
267	** CAPI3REF: Closing A Database Connection
268	**
269	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
270	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
271	** successfullly destroyed and all associated resources are deallocated.
272	**
273	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
274	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
275	** the [sqlite3] object prior to attempting to close the object. ^If
276	** sqlite3_close() is called on a [database connection] that still has
	@@ -693,16 +693,25 @@
693	** layer a hint of how large the database file will grow to be during the
694	** current transaction. This hint is not guaranteed to be accurate but it
695	** is often close. The underlying VFS might choose to preallocate database
696	** file space based on this hint in order to help writes to the database
697	** file run faster.








698	*/
699	#define SQLITE_FCNTL_LOCKSTATE 1
700	#define SQLITE_GET_LOCKPROXYFILE 2
701	#define SQLITE_SET_LOCKPROXYFILE 3
702	#define SQLITE_LAST_ERRNO 4
703	#define SQLITE_FCNTL_SIZE_HINT 5

704
705	/*
706	** CAPI3REF: Mutex Handle
707	**
708	** The mutex module within SQLite defines [sqlite3_mutex] to be an
	@@ -2661,11 +2670,11 @@
2661	** <li> @VVV
2662	** <li> $VVV
2663	** </ul>
2664	**
2665	** In the templates above, NNN represents an integer literal,
2666	** and VVV represents an alphanumeric identifer.)^ ^The values of these
2667	** parameters (also called "host parameter names" or "SQL parameters")
2668	** can be set using the sqlite3_bind_*() routines defined here.
2669	**
2670	** ^The first argument to the sqlite3_bind_*() routines is always
2671	** a pointer to the [sqlite3_stmt] object returned from
	@@ -3440,11 +3449,11 @@
3440	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3441
3442	/*
3443	** CAPI3REF: Obtain Aggregate Function Context
3444	**
3445	** Implementions of aggregate SQL functions use this
3446	** routine to allocate memory for storing their state.
3447	**
3448	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3449	** for a particular aggregate function, SQLite
3450	** allocates N of memory, zeroes out that memory, and returns a pointer
	@@ -3712,11 +3721,11 @@
3712	** the routine expects pointers to 16-bit word aligned strings
3713	** of UTF-16 in the native byte order.
3714	**
3715	** A pointer to the user supplied routine must be passed as the fifth
3716	** argument. ^If it is NULL, this is the same as deleting the collation
3717	** sequence (so that SQLite cannot call it anymore).
3718	** ^Each time the application supplied function is invoked, it is passed
3719	** as its first parameter a copy of the void* passed as the fourth argument
3720	** to sqlite3_create_collation() or sqlite3_create_collation16().
3721	**
3722	** ^The remaining arguments to the application-supplied routine are two strings,
	@@ -4930,11 +4939,11 @@
4930	** of passing a NULL pointer instead of a valid mutex handle are undefined
4931	** (i.e. it is acceptable to provide an implementation that segfaults if
4932	** it is passed a NULL pointer).
4933	**
4934	** The xMutexInit() method must be threadsafe. ^It must be harmless to
4935	** invoke xMutexInit() mutiple times within the same process and without
4936	** intervening calls to xMutexEnd(). Second and subsequent calls to
4937	** xMutexInit() must be no-ops.
4938	**
4939	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
4940	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
	@@ -5100,11 +5109,11 @@
5100
5101	/*
5102	** CAPI3REF: SQLite Runtime Status
5103	**
5104	** ^This interface is used to retrieve runtime status information
5105	** about the preformance of SQLite, and optionally to reset various
5106	** highwater marks. ^The first argument is an integer code for
5107	** the specific parameter to measure. ^(Recognized integer codes
5108	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5109	** ^The current value of the parameter is returned into *pCurrent.
5110	** ^The highest recorded value is returned in *pHighwater. ^If the
	@@ -5226,11 +5235,11 @@
5226	** ^This interface is used to retrieve runtime status information
5227	** about a single [database connection]. ^The first argument is the
5228	** database connection object to be interrogated. ^The second argument
5229	** is an integer constant, taken from the set of
5230	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5231	** determiness the parameter to interrogate. The set of
5232	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5233	** to grow in future releases of SQLite.
5234	**
5235	** ^The current value of the requested parameter is written into *pCur
5236	** and the highest instantaneous value is written into *pHiwtr. ^If
	@@ -5648,11 +5657,11 @@
5648	**
5649	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
5650	**
5651	** ^Each call to sqlite3_backup_step() sets two values inside
5652	** the [sqlite3_backup] object: the number of pages still to be backed
5653	** up and the total number of pages in the source databae file.
5654	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
5655	** retrieve these two values, respectively.
5656	**
5657	** ^The values returned by these functions are only updated by
5658	** sqlite3_backup_step(). ^If the source database is modified during a backup
	@@ -5744,11 +5753,11 @@
5744	** ^(There may be at most one unlock-notify callback registered by a
5745	** blocked connection. If sqlite3_unlock_notify() is called when the
5746	** blocked connection already has a registered unlock-notify callback,
5747	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
5748	** called with a NULL pointer as its second argument, then any existing
5749	** unlock-notify callback is cancelled. ^The blocked connections
5750	** unlock-notify callback may also be canceled by closing the blocked
5751	** connection using [sqlite3_close()].
5752	**
5753	** The unlock-notify callback is not reentrant. If an application invokes
5754	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -5826,11 +5835,11 @@
5826	/*
5827	** CAPI3REF: String Comparison
5828	**
5829	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
5830	** compare the contents of two buffers containing UTF-8 strings in a
5831	** case-indendent fashion, using the same definition of case independence
5832	** that SQLite uses internally when comparing identifiers.
5833	*/
5834	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
5835
5836	/*
5837

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -95,23 +95,23 @@
95	** be held constant and Z will be incremented or else Y will be incremented
96	** and Z will be reset to zero.
97	**
98	** Since version 3.6.18, SQLite source code has been stored in the
99	** <a href="http://www.fossil-scm.org/">Fossil configuration management
100	** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to
101	** a string which identifies a particular check-in of SQLite
102	** within its configuration management system. ^The SQLITE_SOURCE_ID
103	** string contains the date and time of the check-in (UTC) and an SHA1
104	** hash of the entire source tree.
105	**
106	** See also: [sqlite3_libversion()],
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.7.2"
111	#define SQLITE_VERSION_NUMBER 3007002
112	#define SQLITE_SOURCE_ID "2010-08-23 18:52:01 42537b60566f288167f1b5864a5435986838e3a3"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
	@@ -152,19 +152,19 @@
152	** ^The sqlite3_compileoption_used() function returns 0 or 1
153	** indicating whether the specified option was defined at
154	** compile time. ^The SQLITE_ prefix may be omitted from the
155	** option name passed to sqlite3_compileoption_used().
156	**
157	** ^The sqlite3_compileoption_get() function allows iterating
158	** over the list of options that were defined at compile time by
159	** returning the N-th compile time option string. ^If N is out of range,
160	** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
161	** prefix is omitted from any strings returned by
162	** sqlite3_compileoption_get().
163	**
164	** ^Support for the diagnostic functions sqlite3_compileoption_used()
165	** and sqlite3_compileoption_get() may be omitted by specifying the
166	** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
167	**
168	** See also: SQL functions [sqlite_compileoption_used()] and
169	** [sqlite_compileoption_get()] and the [compile_options pragma].
170	*/
	@@ -266,11 +266,11 @@
266	/*
267	** CAPI3REF: Closing A Database Connection
268	**
269	** ^The sqlite3_close() routine is the destructor for the [sqlite3] object.
270	** ^Calls to sqlite3_close() return SQLITE_OK if the [sqlite3] object is
271	** successfully destroyed and all associated resources are deallocated.
272	**
273	** Applications must [sqlite3_finalize \| finalize] all [prepared statements]
274	** and [sqlite3_blob_close \| close] all [BLOB handles] associated with
275	** the [sqlite3] object prior to attempting to close the object. ^If
276	** sqlite3_close() is called on a [database connection] that still has
	@@ -693,16 +693,25 @@
693	** layer a hint of how large the database file will grow to be during the
694	** current transaction. This hint is not guaranteed to be accurate but it
695	** is often close. The underlying VFS might choose to preallocate database
696	** file space based on this hint in order to help writes to the database
697	** file run faster.
698	**
699	** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
700	** extends and truncates the database file in chunks of a size specified
701	** by the user. The fourth argument to [sqlite3_file_control()] should
702	** point to an integer (type int) containing the new chunk-size to use
703	** for the nominated database. Allocating database file space in large
704	** chunks (say 1MB at a time), may reduce file-system fragmentation and
705	** improve performance on some systems.
706	*/
707	#define SQLITE_FCNTL_LOCKSTATE 1
708	#define SQLITE_GET_LOCKPROXYFILE 2
709	#define SQLITE_SET_LOCKPROXYFILE 3
710	#define SQLITE_LAST_ERRNO 4
711	#define SQLITE_FCNTL_SIZE_HINT 5
712	#define SQLITE_FCNTL_CHUNK_SIZE 6
713
714	/*
715	** CAPI3REF: Mutex Handle
716	**
717	** The mutex module within SQLite defines [sqlite3_mutex] to be an
	@@ -2661,11 +2670,11 @@
2670	** <li> @VVV
2671	** <li> $VVV
2672	** </ul>
2673	**
2674	** In the templates above, NNN represents an integer literal,
2675	** and VVV represents an alphanumeric identifier.)^ ^The values of these
2676	** parameters (also called "host parameter names" or "SQL parameters")
2677	** can be set using the sqlite3_bind_*() routines defined here.
2678	**
2679	** ^The first argument to the sqlite3_bind_*() routines is always
2680	** a pointer to the [sqlite3_stmt] object returned from
	@@ -3440,11 +3449,11 @@
3449	SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
3450
3451	/*
3452	** CAPI3REF: Obtain Aggregate Function Context
3453	**
3454	** Implementations of aggregate SQL functions use this
3455	** routine to allocate memory for storing their state.
3456	**
3457	** ^The first time the sqlite3_aggregate_context(C,N) routine is called
3458	** for a particular aggregate function, SQLite
3459	** allocates N of memory, zeroes out that memory, and returns a pointer
	@@ -3712,11 +3721,11 @@
3721	** the routine expects pointers to 16-bit word aligned strings
3722	** of UTF-16 in the native byte order.
3723	**
3724	** A pointer to the user supplied routine must be passed as the fifth
3725	** argument. ^If it is NULL, this is the same as deleting the collation
3726	** sequence (so that SQLite cannot call it any more).
3727	** ^Each time the application supplied function is invoked, it is passed
3728	** as its first parameter a copy of the void* passed as the fourth argument
3729	** to sqlite3_create_collation() or sqlite3_create_collation16().
3730	**
3731	** ^The remaining arguments to the application-supplied routine are two strings,
	@@ -4930,11 +4939,11 @@
4939	** of passing a NULL pointer instead of a valid mutex handle are undefined
4940	** (i.e. it is acceptable to provide an implementation that segfaults if
4941	** it is passed a NULL pointer).
4942	**
4943	** The xMutexInit() method must be threadsafe. ^It must be harmless to
4944	** invoke xMutexInit() multiple times within the same process and without
4945	** intervening calls to xMutexEnd(). Second and subsequent calls to
4946	** xMutexInit() must be no-ops.
4947	**
4948	** ^xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
4949	** and its associates). ^Similarly, xMutexAlloc() must not use SQLite memory
	@@ -5100,11 +5109,11 @@
5109
5110	/*
5111	** CAPI3REF: SQLite Runtime Status
5112	**
5113	** ^This interface is used to retrieve runtime status information
5114	** about the performance of SQLite, and optionally to reset various
5115	** highwater marks. ^The first argument is an integer code for
5116	** the specific parameter to measure. ^(Recognized integer codes
5117	** are of the form [SQLITE_STATUS_MEMORY_USED \| SQLITE_STATUS_...].)^
5118	** ^The current value of the parameter is returned into *pCurrent.
5119	** ^The highest recorded value is returned in *pHighwater. ^If the
	@@ -5226,11 +5235,11 @@
5235	** ^This interface is used to retrieve runtime status information
5236	** about a single [database connection]. ^The first argument is the
5237	** database connection object to be interrogated. ^The second argument
5238	** is an integer constant, taken from the set of
5239	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros, that
5240	** determines the parameter to interrogate. The set of
5241	** [SQLITE_DBSTATUS_LOOKASIDE_USED \| SQLITE_DBSTATUS_*] macros is likely
5242	** to grow in future releases of SQLite.
5243	**
5244	** ^The current value of the requested parameter is written into *pCur
5245	** and the highest instantaneous value is written into *pHiwtr. ^If
	@@ -5648,11 +5657,11 @@
5657	**
5658	** <b>sqlite3_backup_remaining(), sqlite3_backup_pagecount()</b>
5659	**
5660	** ^Each call to sqlite3_backup_step() sets two values inside
5661	** the [sqlite3_backup] object: the number of pages still to be backed
5662	** up and the total number of pages in the source database file.
5663	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
5664	** retrieve these two values, respectively.
5665	**
5666	** ^The values returned by these functions are only updated by
5667	** sqlite3_backup_step(). ^If the source database is modified during a backup
	@@ -5744,11 +5753,11 @@
5753	** ^(There may be at most one unlock-notify callback registered by a
5754	** blocked connection. If sqlite3_unlock_notify() is called when the
5755	** blocked connection already has a registered unlock-notify callback,
5756	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
5757	** called with a NULL pointer as its second argument, then any existing
5758	** unlock-notify callback is canceled. ^The blocked connections
5759	** unlock-notify callback may also be canceled by closing the blocked
5760	** connection using [sqlite3_close()].
5761	**
5762	** The unlock-notify callback is not reentrant. If an application invokes
5763	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -5826,11 +5835,11 @@
5835	/*
5836	** CAPI3REF: String Comparison
5837	**
5838	** ^The [sqlite3_strnicmp()] API allows applications and extensions to
5839	** compare the contents of two buffers containing UTF-8 strings in a
5840	** case-independent fashion, using the same definition of case independence
5841	** that SQLite uses internally when comparing identifiers.
5842	*/
5843	SQLITE_API int sqlite3_strnicmp(const char , const char , int);
5844
5845	/*
5846

M src/stat.c

+18 -6

		--- src/stat.c
		+++ src/stat.c
		@@ -28,15 +28,17 @@
28	28	** Show statistics and global information about the repository.
29	29	*/
30	30	void stat_page(void){
31	31	i64 t;
32	32	int n, m, fsize;
	33	+ int szMax, szAvg;
33	34	char zBuf[100];
	35	+
34	36	login_check_credentials();
35	37	if( !g.okRead ){ login_needed(); return; }
36	38	style_header("Repository Statistics");
37		- @ <p><table class="label-value">
	39	+ @ <table class="label-value">
38	40	@ <tr><th>Repository Size:</th><td>
39	41	fsize = file_size(g.zRepositoryName);
40	42	@ %d(fsize) bytes
41	43	@ </td></tr>
42	44	@ <tr><th>Number Of Artifacts:</th><td>
		@@ -44,14 +46,21 @@
44	46	m = db_int(0, "SELECT count(*) FROM delta");
45	47	@ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
46	48	@ </td></tr>
47	49	if( n>0 ){
48	50	int a, b;
	51	+ Stmt q;
49	52	@ <tr><th>Uncompressed Artifact Size:</th><td>
50		- t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0");
	53	+ db_prepare(&q, "SELECT total(size), avg(size), max(size)"
	54	+ " FROM blob WHERE size>0");
	55	+ db_step(&q);
	56	+ t = db_column_int64(&q, 0);
	57	+ szAvg = db_column_int(&q, 1);
	58	+ szMax = db_column_int(&q, 2);
	59	+ db_finalize(&q);
51	60	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t);
52		- @ %d((int)(((double)t)/(double)n)) bytes average, %s(zBuf) bytes total
	61	+ @ %d(szAvg) bytes average, %d(szMax) bytes max, %s(zBuf) bytes total
53	62	@ </td></tr>
54	63	@ <tr><th>Compression Ratio:</th><td>
55	64	if( t/fsize < 5 ){
56	65	b = 10;
57	66	fsize /= 10;
		@@ -82,10 +91,12 @@
82	91	@ </td></tr>
83	92	@ <tr><th>Duration Of Project:</th><td>
84	93	n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
85	94	" + 0.99");
86	95	@ %d(n) days
	96	+ sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24);
	97	+ @ or approximately %s(zBuf) years
87	98	@ </td></tr>
88	99	@ <tr><th>Project ID:</th><td>
89	100	@ %h(db_get("project-code",""))
90	101	@ </td></tr>
91	102	@ <tr><th>Server ID:</th><td>
		@@ -94,19 +105,20 @@
94	105
95	106	@ <tr><th>Fossil Version:</th><td>
96	107	@ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
97	108	@ </td></tr>
98	109	@ <tr><th>SQLite Version:</th><td>
99		- @ %h(db_text(0, "SELECT substr(sqlite_source_id(),1,30)"))
100		- @ (%h(SQLITE_VERSION))
	110	+ sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
	111	+ SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
	112	+ @ %s(zBuf)
101	113	@ </td></tr>
102	114	@ <tr><th>Database Stats:</th><td>
103	115	@ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
104	116	@ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
105	117	@ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
106	118	@ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
107	119	@ %s(db_text(0, "PRAGMA %s.journal_mode", g.zRepoDb)) mode
108	120	@ </td></tr>
109	121
110		- @ </table></p>
	122	+ @ </table>
111	123	style_footer();
112	124	}
113	125

	--- src/stat.c
	+++ src/stat.c
	@@ -28,15 +28,17 @@
28	** Show statistics and global information about the repository.
29	*/
30	void stat_page(void){
31	i64 t;
32	int n, m, fsize;

33	char zBuf[100];

34	login_check_credentials();
35	if( !g.okRead ){ login_needed(); return; }
36	style_header("Repository Statistics");
37	@ <p><table class="label-value">
38	@ <tr><th>Repository Size:</th><td>
39	fsize = file_size(g.zRepositoryName);
40	@ %d(fsize) bytes
41	@ </td></tr>
42	@ <tr><th>Number Of Artifacts:</th><td>
	@@ -44,14 +46,21 @@
44	m = db_int(0, "SELECT count(*) FROM delta");
45	@ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
46	@ </td></tr>
47	if( n>0 ){
48	int a, b;

49	@ <tr><th>Uncompressed Artifact Size:</th><td>
50	t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0");






51	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t);
52	@ %d((int)(((double)t)/(double)n)) bytes average, %s(zBuf) bytes total
53	@ </td></tr>
54	@ <tr><th>Compression Ratio:</th><td>
55	if( t/fsize < 5 ){
56	b = 10;
57	fsize /= 10;
	@@ -82,10 +91,12 @@
82	@ </td></tr>
83	@ <tr><th>Duration Of Project:</th><td>
84	n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
85	" + 0.99");
86	@ %d(n) days


87	@ </td></tr>
88	@ <tr><th>Project ID:</th><td>
89	@ %h(db_get("project-code",""))
90	@ </td></tr>
91	@ <tr><th>Server ID:</th><td>
	@@ -94,19 +105,20 @@
94
95	@ <tr><th>Fossil Version:</th><td>
96	@ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
97	@ </td></tr>
98	@ <tr><th>SQLite Version:</th><td>
99	@ %h(db_text(0, "SELECT substr(sqlite_source_id(),1,30)"))
100	@ (%h(SQLITE_VERSION))

101	@ </td></tr>
102	@ <tr><th>Database Stats:</th><td>
103	@ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
104	@ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
105	@ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
106	@ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
107	@ %s(db_text(0, "PRAGMA %s.journal_mode", g.zRepoDb)) mode
108	@ </td></tr>
109
110	@ </table></p>
111	style_footer();
112	}
113

	--- src/stat.c
	+++ src/stat.c
	@@ -28,15 +28,17 @@
28	** Show statistics and global information about the repository.
29	*/
30	void stat_page(void){
31	i64 t;
32	int n, m, fsize;
33	int szMax, szAvg;
34	char zBuf[100];
35
36	login_check_credentials();
37	if( !g.okRead ){ login_needed(); return; }
38	style_header("Repository Statistics");
39	@ <table class="label-value">
40	@ <tr><th>Repository Size:</th><td>
41	fsize = file_size(g.zRepositoryName);
42	@ %d(fsize) bytes
43	@ </td></tr>
44	@ <tr><th>Number Of Artifacts:</th><td>
	@@ -44,14 +46,21 @@
46	m = db_int(0, "SELECT count(*) FROM delta");
47	@ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
48	@ </td></tr>
49	if( n>0 ){
50	int a, b;
51	Stmt q;
52	@ <tr><th>Uncompressed Artifact Size:</th><td>
53	db_prepare(&q, "SELECT total(size), avg(size), max(size)"
54	" FROM blob WHERE size>0");
55	db_step(&q);
56	t = db_column_int64(&q, 0);
57	szAvg = db_column_int(&q, 1);
58	szMax = db_column_int(&q, 2);
59	db_finalize(&q);
60	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t);
61	@ %d(szAvg) bytes average, %d(szMax) bytes max, %s(zBuf) bytes total
62	@ </td></tr>
63	@ <tr><th>Compression Ratio:</th><td>
64	if( t/fsize < 5 ){
65	b = 10;
66	fsize /= 10;
	@@ -82,10 +91,12 @@
91	@ </td></tr>
92	@ <tr><th>Duration Of Project:</th><td>
93	n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event)"
94	" + 0.99");
95	@ %d(n) days
96	sqlite3_snprintf(sizeof(zBuf), zBuf, "%.2f", n/365.24);
97	@ or approximately %s(zBuf) years
98	@ </td></tr>
99	@ <tr><th>Project ID:</th><td>
100	@ %h(db_get("project-code",""))
101	@ </td></tr>
102	@ <tr><th>Server ID:</th><td>
	@@ -94,19 +105,20 @@
105
106	@ <tr><th>Fossil Version:</th><td>
107	@ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
108	@ </td></tr>
109	@ <tr><th>SQLite Version:</th><td>
110	sqlite3_snprintf(sizeof(zBuf), zBuf, "%.19s [%.10s] (%s)",
111	SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
112	@ %s(zBuf)
113	@ </td></tr>
114	@ <tr><th>Database Stats:</th><td>
115	@ %d(db_int(0, "PRAGMA %s.page_count", g.zRepoDb)) pages,
116	@ %d(db_int(0, "PRAGMA %s.page_size", g.zRepoDb)) bytes/page,
117	@ %d(db_int(0, "PRAGMA %s.freelist_count", g.zRepoDb)) free pages,
118	@ %s(db_text(0, "PRAGMA %s.encoding", g.zRepoDb)),
119	@ %s(db_text(0, "PRAGMA %s.journal_mode", g.zRepoDb)) mode
120	@ </td></tr>
121
122	@ </table>
123	style_footer();
124	}
125

M src/style.c

+328 -22

		--- src/style.c
		+++ src/style.c
		@@ -83,11 +83,11 @@
83	83	zTitle = vmprintf(zTitleFormat, ap);
84	84	va_end(ap);
85	85
86	86	cgi_destination(CGI_HEADER);
87	87	cgi_printf("%s",
88		- "<!DOCTYPE html PUBLIC \"-//W3C/DTD XHTML 1.0 Strict//EN\""
	88	+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
89	89	" \"http://www.x3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
90	90
91	91	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
92	92
93	93	/* Generate the header up through the main menu */
		@@ -139,20 +139,23 @@
139	139	}
140	140	@ <div class="content">
141	141	cgi_destination(CGI_BODY);
142	142
143	143	/* Put the footer at the bottom of the page.
	144	+ ** the additional clear/both is needed to extend the content
	145	+ ** part to the end of an optional sidebox.
144	146	*/
145		- @ </div><br clear="both"/>
	147	+ @ <div style="clear: both;"></div>
	148	+ @ </div>
146	149	zFooter = db_get("footer", (char*)zDefaultFooter);
147	150	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
148	151	Th_Render(zFooter);
149	152	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
150	153
151	154	/* Render trace log if TH1 tracing is enabled. */
152	155	if( g.thTrace ){
153		- cgi_append_content("<font color=\"red\"><hr>\n", -1);
	156	+ cgi_append_content("<font color=\"red\"><hr />\n", -1);
154	157	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
155	158	cgi_append_content("</font>\n", -1);
156	159	}
157	160	}
158	161
		@@ -160,20 +163,18 @@
160	163	** Begin a side-box on the right-hand side of a page. The title and
161	164	** the width of the box are given as arguments. The width is usually
162	165	** a percentage of total screen width.
163	166	*/
164	167	void style_sidebox_begin(const char zTitle, const char zWidth){
165		- @ <table width="%s(zWidth)" align="right" border="1" cellpadding=5
166		- @ vspace=5 hspace=5>
167		- @ <tr><td>
168		- @ <b>%h(zTitle)</b>
	168	+ @ <div class="sidebox" style="width:%s(zWidth)">
	169	+ @ <div class="sideboxTitle">%h(zTitle)</div>
169	170	}
170	171
171	172	/* End the side-box
172	173	*/
173	174	void style_sidebox_end(void){
174		- @ </td></tr></table>
	175	+ @ </div>
175	176	}
176	177
177	178	/* @-comment: // */
178	179	/*
179	180	** The default page header.
		@@ -181,27 +182,27 @@
181	182	const char zDefaultHeader[] =
182	183	@ <html>
183	184	@ <head>
184	185	@ <title>$<project_name>: $<title></title>
185	186	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
186		-@ href="$baseurl/timeline.rss">
	187	+@ href="$baseurl/timeline.rss" />
187	188	@ <link rel="stylesheet" href="$baseurl/style.css?default" type="text/css"
188		-@ media="screen">
	189	+@ media="screen" />
189	190	@ </head>
190	191	@ <body>
191	192	@ <div class="header">
192	193	@ <div class="logo">
193	194	@ <img src="$baseurl/logo" alt="logo">
194	195	@ </div>
195		-@ <div class="title"><small>$<project_name></small><br>$<title></div>
196		-@ <div class="status"><nobr><th1>
	196	+@ <div class="title"><small>$<project_name></small><br />$<title></div>
	197	+@ <div class="status"><th1>
197	198	@ if {[info exists login]} {
198	199	@ puts "Logged in as $login"
199	200	@ } else {
200	201	@ puts "Not logged in"
201	202	@ }
202		-@ </th1></nobr></div>
	203	+@ </th1></div>
203	204	@ </div>
204	205	@ <div class="mainmenu"><th1>
205	206	@ html "<a href='$baseurl$index_page'>Home</a> "
206	207	@ if {[anycap jor]} {
207	208	@ html "<a href='$baseurl/timeline'>Timeline</a> "
		@@ -243,10 +244,14 @@
243	244	@ </body></html>
244	245	;
245	246
246	247	/*
247	248	** The default Cascading Style Sheet.
	249	+** It's assembled by different strings for each class.
	250	+** The default css conatains all definitions.
	251	+** The style sheet, send to the client only contains the ones,
	252	+** not defined in the user defined css.
248	253	*/
249	254	const char zDefaultCSS[] =
250	255	@ /* General settings for the entire page */
251	256	@ body {
252	257	@ margin: 0ex 1ex;
		@@ -272,11 +277,11 @@
272	277	@ font-weight: bold;
273	278	@ text-align: center;
274	279	@ padding: 0 0 0 1em;
275	280	@ color: #558195;
276	281	@ vertical-align: bottom;
277		-@ width: 100%;
	282	+@ width: 100% ;
278	283	@ }
279	284	@
280	285	@ /* The login status message in the top right-hand corner */
281	286	@ div.status {
282	287	@ display: table-cell;
		@@ -284,16 +289,17 @@
284	289	@ vertical-align: bottom;
285	290	@ color: #558195;
286	291	@ font-size: 0.8em;
287	292	@ font-weight: bold;
288	293	@ min-width: 200px;
	294	+@ white-space: nowrap;
289	295	@ }
290	296	@
291	297	@ /* The header across the top of the page */
292	298	@ div.header {
293	299	@ display: table;
294		-@ width: 100%;
	300	+@ width: 100% ;
295	301	@ }
296	302	@
297	303	@ /* The main menu bar that appears at the top of the page beneath
298	304	@ ** the header */
299	305	@ div.mainmenu {
		@@ -337,10 +343,11 @@
337	343	@ padding: 1px 1px 1px 1px;
338	344	@ font-size: 1.2em;
339	345	@ font-weight: bold;
340	346	@ background-color: #558195;
341	347	@ color: white;
	348	+@ white-space: nowrap;
342	349	@ }
343	350	@
344	351	@ /* The "Date" that occurs on the left hand side of timelines */
345	352	@ div.divider {
346	353	@ background: #a1c4d4;
		@@ -366,11 +373,11 @@
366	373	@ div.footer a { color: white; }
367	374	@ div.footer a:link { color: white; }
368	375	@ div.footer a:visited { color: white; }
369	376	@ div.footer a:hover { background-color: white; color: #558195; }
370	377	@
371		-@ /* <verbatim> blocks */
	378	+@ /* verbatim blocks */
372	379	@ pre.verbatim {
373	380	@ background-color: #f5f5f5;
374	381	@ padding: 0.5em;
375	382	@}
376	383	@
		@@ -378,33 +385,332 @@
378	385	@ table.label-value th {
379	386	@ vertical-align: top;
380	387	@ text-align: right;
381	388	@ padding: 0.2ex 2ex;
382	389	@ }
	390	+@
383	391	;
384	392
	393	+
	394	+/* The following table contains bits of default CSS that must
	395	+** be included if they are not found in the application-defined
	396	+** CSS.
	397	+*/
	398	+const struct strctCssDefaults {
	399	+ char const * const elementClass; /* Name of element needed */
	400	+ char const * const comment; /* Comment text */
	401	+ char const * const value; /* CSS text */
	402	+} cssDefaultList[] = {
	403	+ { "",
	404	+ "",
	405	+ zDefaultCSS
	406	+ },
	407	+ { "div.sidebox",
	408	+ "The nomenclature sidebox for branches,..",
	409	+ @ float: right;
	410	+ @ background-color: white;
	411	+ @ border-width: medium;
	412	+ @ border-style: double;
	413	+ @ margin: 10;
	414	+ },
	415	+ { "div.sideboxTitle",
	416	+ "The nomenclature title in sideboxes for branches,..",
	417	+ @ display: inline;
	418	+ @ font-weight: bold;
	419	+ },
	420	+ { "div.sideboxDescribed",
	421	+ "The defined element in sideboxes for branches,..",
	422	+ @ display: inline;
	423	+ @ font-weight: bold;
	424	+ },
	425	+ { "span.disabled",
	426	+ "The defined element in sideboxes for branches,..",
	427	+ @ color: red;
	428	+ },
	429	+ { "span.timelineDisabled",
	430	+ "The suppressed duplicates lines in timeline, ..",
	431	+ @ font-style: italic;
	432	+ @ font-size: small;
	433	+ },
	434	+ { "table.timelineTable",
	435	+ "the format for the timeline data table",
	436	+ @ cellspacing: 0;
	437	+ @ border: 0;
	438	+ @ cellpadding: 0
	439	+ },
	440	+ { "td.timelineTableCell",
	441	+ "the format for the timeline data cells",
	442	+ @ valign: top;
	443	+ @ align: left;
	444	+ },
	445	+ { "span.timelineLeaf",
	446	+ "the format for the timeline leaf marks",
	447	+ @ font-weight: bold;
	448	+ },
	449	+ { "a.timelineHistLink",
	450	+ "the format for the timeline version links",
	451	+ @
	452	+ },
	453	+ { "span.timelineHistDsp",
	454	+ "the format for the timeline version display(no history permission!)",
	455	+ @ font-weight: bold;
	456	+ },
	457	+ { "td.timelineTime",
	458	+ "the format for the timeline time display",
	459	+ @ vertical-align: top;
	460	+ @ text-align: right;
	461	+ },
	462	+ { "td.timelineGraph",
	463	+ "the format for the grap placeholder cells in timelines",
	464	+ @ width: 20;
	465	+ @ text-align: left;
	466	+ @ vertical-align: top;
	467	+ },
	468	+ { "a.tagLink",
	469	+ "the format for the tag links",
	470	+ @
	471	+ },
	472	+ { "span.tagDsp",
	473	+ "the format for the tag display(no history permission!)",
	474	+ @ font-weight: bold;
	475	+ },
	476	+ { "span.wikiError",
	477	+ "the format for wiki errors",
	478	+ @ font-weight: bold;
	479	+ @ color: red;
	480	+ },
	481	+ { "span.infoTagCancelled",
	482	+ "the format for fixed/canceled tags,..",
	483	+ @ font-weight: bold;
	484	+ @ text-decoration: line-through;
	485	+ },
	486	+ { "span.infoTag",
	487	+ "the format for tags,..",
	488	+ @ font-weight: bold;
	489	+ },
	490	+ { "span.wikiTagCancelled",
	491	+ "the format for fixed/cancelled tags,.. on wiki pages",
	492	+ @ text-decoration: line-through;
	493	+ },
	494	+ { "table.browser",
	495	+ "format for the file display table",
	496	+ @ /* the format for wiki errors */
	497	+ @ width: 100% ;
	498	+ @ border: 0;
	499	+ },
	500	+ { "td.browser",
	501	+ "format for cells in the file browser",
	502	+ @ width: 24% ;
	503	+ @ vertical-align: top;
	504	+ },
	505	+ { "ul.browser",
	506	+ "format for the list in the file browser",
	507	+ @ margin-left: 0.5em;
	508	+ @ padding-left: 0.5em;
	509	+ },
	510	+ { "table.login_out",
	511	+ "table format for login/out label/input table",
	512	+ @ text-align: left;
	513	+ @ margin-right: 10px;
	514	+ @ margin-left: 10px;
	515	+ @ margin-top: 10px;
	516	+ },
	517	+ { "div.captcha",
	518	+ "captcha display options",
	519	+ @ text-align: center;
	520	+ },
	521	+ { "table.captcha",
	522	+ "format for the layout table, used for the captcha display",
	523	+ @ margin: auto;
	524	+ @ padding: 10px;
	525	+ @ outline-width: 1;
	526	+ @ outline-style: double;
	527	+ },
	528	+ { "td.login_out_label",
	529	+ "format for the label cells in the login/out table",
	530	+ @ text-align: center;
	531	+ },
	532	+ { "span.loginError",
	533	+ "format for login error messages",
	534	+ @ color: red;
	535	+ },
	536	+ { "span.note",
	537	+ "format for leading text for notes",
	538	+ @ font-weight: bold;
	539	+ },
	540	+ { "span.textareaLabel",
	541	+ "format for textare labels",
	542	+ @ font-weight: bold;
	543	+ },
	544	+ { "table.usetupLayoutTable",
	545	+ "format for the user setup layout table",
	546	+ @ outline-style: none;
	547	+ @ padding: 0;
	548	+ @ margin: 25px;
	549	+ },
	550	+ { "td.usetupColumnLayout",
	551	+ "format of the columns on the user setup list page",
	552	+ @ vertical-align: top
	553	+ },
	554	+ { "table.usetupUserList",
	555	+ "format for the user list table on the user setup page",
	556	+ @ outline-style: double;
	557	+ @ outline-width: 1;
	558	+ @ padding: 10px;
	559	+ },
	560	+ { "th.usetupListUser",
	561	+ "format for table header user in user list on user setup page",
	562	+ @ text-align: right;
	563	+ @ padding-right: 20px;
	564	+ },
	565	+ { "th.usetupListCap",
	566	+ "format for table header capabilities in user list on user setup page",
	567	+ @ text-align: center;
	568	+ @ padding-right: 15px;
	569	+ },
	570	+ { "th.usetupListCon",
	571	+ "format for table header contact info in user list on user setup page",
	572	+ @ text-align: left;
	573	+ },
	574	+ { "td.usetupListUser",
	575	+ "format for table cell user in user list on user setup page",
	576	+ @ text-align: right;
	577	+ @ padding-right: 20px;
	578	+ @ white-space:nowrap;
	579	+ },
	580	+ { "td.usetupListCap",
	581	+ "format for table cell capabilities in user list on user setup page",
	582	+ @ text-align: center;
	583	+ @ padding-right: 15px;
	584	+ },
	585	+ { "td.usetupListCon",
	586	+ "format for table cell contact info in user list on user setup page",
	587	+ @ text-align: left
	588	+ },
	589	+ { "div.ueditCapBox",
	590	+ "layout definition for the capabilities box on the user edit detail page",
	591	+ @ float: left;
	592	+ @ margin-right: 20px;
	593	+ @ margin-bottom: 20px;
	594	+ },
	595	+ { "td.usetupEditLabel",
	596	+ "format of the label cells in the detailed user edit page",
	597	+ @ text-align: right;
	598	+ @ vertical-align: top;
	599	+ @ white-space: nowrap;
	600	+ },
	601	+ { "span.ueditInheritNobody",
	602	+ "color for capabilities, inherited by nobody",
	603	+ @ color: green;
	604	+ },
	605	+ { "span.ueditInheritDeveloper",
	606	+ "color for capabilities, inherited by developer",
	607	+ @ color: red;
	608	+ },
	609	+ { "span.ueditInheritReader",
	610	+ "color for capabilities, inherited by reader",
	611	+ @ color: black;
	612	+ },
	613	+ { "span.ueditInheritAnonymous",
	614	+ "color for capabilities, inherited by anonymous",
	615	+ @ color: blue;
	616	+ },
	617	+ { "span.capability",
	618	+ "format for capabilites, mentioned on the user edit page",
	619	+ @ font-weight: bold;
	620	+ },
	621	+ { "span.usertype",
	622	+ "format for different user types, mentioned on the user edit page",
	623	+ @ font-weight: bold;
	624	+ },
	625	+ { "span.usertype:before",
	626	+ "leading text for user types, mentioned on the user edit page",
	627	+ @ content:"'";
	628	+ },
	629	+ { "span.usertype:after",
	630	+ "trailing text for user types, mentioned on the user edit page",
	631	+ @ content:"'";
	632	+ },
	633	+ { "span.wikiruleHead",
	634	+ "format for leading text in wikirules definitions",
	635	+ @ font-weight: bold;
	636	+ },
	637	+ { "td.tktDspLabel",
	638	+ "format for labels on ticket display page",
	639	+ @ text-align: right;
	640	+ },
	641	+ { "td.tktDspValue",
	642	+ "format for values on ticket display page",
	643	+ @ text-align: left;
	644	+ @ vertical-align: top;
	645	+ @ background-color: #d0d0d0;
	646	+ },
	647	+ { "span.tktError",
	648	+ "format for ticket error messages",
	649	+ @ color: red;
	650	+ @ font-weight: bold;
	651	+ },
	652	+ { 0,
	653	+ 0,
	654	+ 0
	655	+ }
	656	+};
	657	+
	658	+/*
	659	+** Append all of the default CSS to the CGI output.
	660	+*/
	661	+void cgi_append_default_css(void) {
	662	+ int i;
	663	+
	664	+ for (i=0;cssDefaultList[i].elementClass;i++){
	665	+ if (cssDefaultList[i].elementClass[0]){
	666	+ cgi_printf("/* %s */\n%s {\n%s\n}\n\n",
	667	+ cssDefaultList[i].comment,
	668	+ cssDefaultList[i].elementClass,
	669	+ cssDefaultList[i].value
	670	+ );
	671	+ }else{
	672	+ cgi_printf("%s",
	673	+ cssDefaultList[i].value
	674	+ );
	675	+ }
	676	+ }
	677	+}
	678	+
385	679	/*
386	680	** WEBPAGE: style.css
387	681	*/
388	682	void page_style_css(void){
389		- char *zCSS = 0;
	683	+ const char *zCSS = 0;
	684	+ int i;
390	685
391	686	cgi_set_content_type("text/css");
392	687	zCSS = db_get("css",(char*)zDefaultCSS);
	688	+ /* append user defined css */
393	689	cgi_append_content(zCSS, -1);
	690	+ /* add special missing definitions */
	691	+ for (i=1;cssDefaultList[i].elementClass;i++)
	692	+ if (!strstr(zCSS,cssDefaultList[i].elementClass)) {
	693	+ cgi_append_content("/* ", -1);
	694	+ cgi_append_content(cssDefaultList[i].comment, -1);
	695	+ cgi_append_content(" */\n", -1);
	696	+ cgi_append_content(cssDefaultList[i].elementClass, -1);
	697	+ cgi_append_content(" {\n", -1);
	698	+ cgi_append_content(cssDefaultList[i].value, -1);
	699	+ cgi_append_content("}\n\n", -1);
	700	+ }
394	701	g.isConst = 1;
395	702	}
396	703
397	704	/*
398	705	** WEBPAGE: test_env
399	706	*/
400	707	void page_test_env(void){
401	708	style_header("Environment Test");
402		-#if !defined(__MINGW32__)
403		- @ uid=%d(getuid()), gid=%d(getgid())<br>
	709	+#if !defined(_WIN32)
	710	+ @ uid=%d(getuid()), gid=%d(getgid())<br />
404	711	#endif
405		- @ g.zBaseURL = %h(g.zBaseURL)<br>
406		- @ g.zTop = %h(g.zTop)<br>
407		- @ g.zRepositoryName = %h(g.zRepositoryName)<br>
	712	+ @ g.zBaseURL = %h(g.zBaseURL)<br />
	713	+ @ g.zTop = %h(g.zTop)<br />
408	714	cgi_print_all();
409	715	style_footer();
410	716	}
411	717

	--- src/style.c
	+++ src/style.c
	@@ -83,11 +83,11 @@
83	zTitle = vmprintf(zTitleFormat, ap);
84	va_end(ap);
85
86	cgi_destination(CGI_HEADER);
87	cgi_printf("%s",
88	"<!DOCTYPE html PUBLIC \"-//W3C/DTD XHTML 1.0 Strict//EN\""
89	" \"http://www.x3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
90
91	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
92
93	/* Generate the header up through the main menu */
	@@ -139,20 +139,23 @@
139	}
140	@ <div class="content">
141	cgi_destination(CGI_BODY);
142
143	/* Put the footer at the bottom of the page.


144	*/
145	@ </div><br clear="both"/>

146	zFooter = db_get("footer", (char*)zDefaultFooter);
147	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
148	Th_Render(zFooter);
149	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
150
151	/* Render trace log if TH1 tracing is enabled. */
152	if( g.thTrace ){
153	cgi_append_content("<font color=\"red\"><hr>\n", -1);
154	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
155	cgi_append_content("</font>\n", -1);
156	}
157	}
158
	@@ -160,20 +163,18 @@
160	** Begin a side-box on the right-hand side of a page. The title and
161	** the width of the box are given as arguments. The width is usually
162	** a percentage of total screen width.
163	*/
164	void style_sidebox_begin(const char zTitle, const char zWidth){
165	@ <table width="%s(zWidth)" align="right" border="1" cellpadding=5
166	@ vspace=5 hspace=5>
167	@ <tr><td>
168	@ <b>%h(zTitle)</b>
169	}
170
171	/* End the side-box
172	*/
173	void style_sidebox_end(void){
174	@ </td></tr></table>
175	}
176
177	/* @-comment: // */
178	/*
179	** The default page header.
	@@ -181,27 +182,27 @@
181	const char zDefaultHeader[] =
182	@ <html>
183	@ <head>
184	@ <title>$<project_name>: $<title></title>
185	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
186	@ href="$baseurl/timeline.rss">
187	@ <link rel="stylesheet" href="$baseurl/style.css?default" type="text/css"
188	@ media="screen">
189	@ </head>
190	@ <body>
191	@ <div class="header">
192	@ <div class="logo">
193	@ <img src="$baseurl/logo" alt="logo">
194	@ </div>
195	@ <div class="title"><small>$<project_name></small><br>$<title></div>
196	@ <div class="status"><nobr><th1>
197	@ if {[info exists login]} {
198	@ puts "Logged in as $login"
199	@ } else {
200	@ puts "Not logged in"
201	@ }
202	@ </th1></nobr></div>
203	@ </div>
204	@ <div class="mainmenu"><th1>
205	@ html "<a href='$baseurl$index_page'>Home</a> "
206	@ if {[anycap jor]} {
207	@ html "<a href='$baseurl/timeline'>Timeline</a> "
	@@ -243,10 +244,14 @@
243	@ </body></html>
244	;
245
246	/*
247	** The default Cascading Style Sheet.




248	*/
249	const char zDefaultCSS[] =
250	@ /* General settings for the entire page */
251	@ body {
252	@ margin: 0ex 1ex;
	@@ -272,11 +277,11 @@
272	@ font-weight: bold;
273	@ text-align: center;
274	@ padding: 0 0 0 1em;
275	@ color: #558195;
276	@ vertical-align: bottom;
277	@ width: 100%;
278	@ }
279	@
280	@ /* The login status message in the top right-hand corner */
281	@ div.status {
282	@ display: table-cell;
	@@ -284,16 +289,17 @@
284	@ vertical-align: bottom;
285	@ color: #558195;
286	@ font-size: 0.8em;
287	@ font-weight: bold;
288	@ min-width: 200px;

289	@ }
290	@
291	@ /* The header across the top of the page */
292	@ div.header {
293	@ display: table;
294	@ width: 100%;
295	@ }
296	@
297	@ /* The main menu bar that appears at the top of the page beneath
298	@ ** the header */
299	@ div.mainmenu {
	@@ -337,10 +343,11 @@
337	@ padding: 1px 1px 1px 1px;
338	@ font-size: 1.2em;
339	@ font-weight: bold;
340	@ background-color: #558195;
341	@ color: white;

342	@ }
343	@
344	@ /* The "Date" that occurs on the left hand side of timelines */
345	@ div.divider {
346	@ background: #a1c4d4;
	@@ -366,11 +373,11 @@
366	@ div.footer a { color: white; }
367	@ div.footer a:link { color: white; }
368	@ div.footer a:visited { color: white; }
369	@ div.footer a:hover { background-color: white; color: #558195; }
370	@
371	@ /* <verbatim> blocks */
372	@ pre.verbatim {
373	@ background-color: #f5f5f5;
374	@ padding: 0.5em;
375	@}
376	@
	@@ -378,33 +385,332 @@
378	@ table.label-value th {
379	@ vertical-align: top;
380	@ text-align: right;
381	@ padding: 0.2ex 2ex;
382	@ }

383	;
384






























































































































































































































































































385	/*
386	** WEBPAGE: style.css
387	*/
388	void page_style_css(void){
389	char *zCSS = 0;

390
391	cgi_set_content_type("text/css");
392	zCSS = db_get("css",(char*)zDefaultCSS);

393	cgi_append_content(zCSS, -1);











394	g.isConst = 1;
395	}
396
397	/*
398	** WEBPAGE: test_env
399	*/
400	void page_test_env(void){
401	style_header("Environment Test");
402	#if !defined(__MINGW32__)
403	@ uid=%d(getuid()), gid=%d(getgid())<br>
404	#endif
405	@ g.zBaseURL = %h(g.zBaseURL)<br>
406	@ g.zTop = %h(g.zTop)<br>
407	@ g.zRepositoryName = %h(g.zRepositoryName)<br>
408	cgi_print_all();
409	style_footer();
410	}
411

	--- src/style.c
	+++ src/style.c
	@@ -83,11 +83,11 @@
83	zTitle = vmprintf(zTitleFormat, ap);
84	va_end(ap);
85
86	cgi_destination(CGI_HEADER);
87	cgi_printf("%s",
88	"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
89	" \"http://www.x3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");
90
91	if( g.thTrace ) Th_Trace("BEGIN_HEADER<br />\n", -1);
92
93	/* Generate the header up through the main menu */
	@@ -139,20 +139,23 @@
139	}
140	@ <div class="content">
141	cgi_destination(CGI_BODY);
142
143	/* Put the footer at the bottom of the page.
144	** the additional clear/both is needed to extend the content
145	** part to the end of an optional sidebox.
146	*/
147	@ <div style="clear: both;"></div>
148	@ </div>
149	zFooter = db_get("footer", (char*)zDefaultFooter);
150	if( g.thTrace ) Th_Trace("BEGIN_FOOTER<br />\n", -1);
151	Th_Render(zFooter);
152	if( g.thTrace ) Th_Trace("END_FOOTER<br />\n", -1);
153
154	/* Render trace log if TH1 tracing is enabled. */
155	if( g.thTrace ){
156	cgi_append_content("<font color=\"red\"><hr />\n", -1);
157	cgi_append_content(blob_str(&g.thLog), blob_size(&g.thLog));
158	cgi_append_content("</font>\n", -1);
159	}
160	}
161
	@@ -160,20 +163,18 @@
163	** Begin a side-box on the right-hand side of a page. The title and
164	** the width of the box are given as arguments. The width is usually
165	** a percentage of total screen width.
166	*/
167	void style_sidebox_begin(const char zTitle, const char zWidth){
168	@ <div class="sidebox" style="width:%s(zWidth)">
169	@ <div class="sideboxTitle">%h(zTitle)</div>


170	}
171
172	/* End the side-box
173	*/
174	void style_sidebox_end(void){
175	@ </div>
176	}
177
178	/* @-comment: // */
179	/*
180	** The default page header.
	@@ -181,27 +182,27 @@
182	const char zDefaultHeader[] =
183	@ <html>
184	@ <head>
185	@ <title>$<project_name>: $<title></title>
186	@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
187	@ href="$baseurl/timeline.rss" />
188	@ <link rel="stylesheet" href="$baseurl/style.css?default" type="text/css"
189	@ media="screen" />
190	@ </head>
191	@ <body>
192	@ <div class="header">
193	@ <div class="logo">
194	@ <img src="$baseurl/logo" alt="logo">
195	@ </div>
196	@ <div class="title"><small>$<project_name></small><br />$<title></div>
197	@ <div class="status"><th1>
198	@ if {[info exists login]} {
199	@ puts "Logged in as $login"
200	@ } else {
201	@ puts "Not logged in"
202	@ }
203	@ </th1></div>
204	@ </div>
205	@ <div class="mainmenu"><th1>
206	@ html "<a href='$baseurl$index_page'>Home</a> "
207	@ if {[anycap jor]} {
208	@ html "<a href='$baseurl/timeline'>Timeline</a> "
	@@ -243,10 +244,14 @@
244	@ </body></html>
245	;
246
247	/*
248	** The default Cascading Style Sheet.
249	** It's assembled by different strings for each class.
250	** The default css conatains all definitions.
251	** The style sheet, send to the client only contains the ones,
252	** not defined in the user defined css.
253	*/
254	const char zDefaultCSS[] =
255	@ /* General settings for the entire page */
256	@ body {
257	@ margin: 0ex 1ex;
	@@ -272,11 +277,11 @@
277	@ font-weight: bold;
278	@ text-align: center;
279	@ padding: 0 0 0 1em;
280	@ color: #558195;
281	@ vertical-align: bottom;
282	@ width: 100% ;
283	@ }
284	@
285	@ /* The login status message in the top right-hand corner */
286	@ div.status {
287	@ display: table-cell;
	@@ -284,16 +289,17 @@
289	@ vertical-align: bottom;
290	@ color: #558195;
291	@ font-size: 0.8em;
292	@ font-weight: bold;
293	@ min-width: 200px;
294	@ white-space: nowrap;
295	@ }
296	@
297	@ /* The header across the top of the page */
298	@ div.header {
299	@ display: table;
300	@ width: 100% ;
301	@ }
302	@
303	@ /* The main menu bar that appears at the top of the page beneath
304	@ ** the header */
305	@ div.mainmenu {
	@@ -337,10 +343,11 @@
343	@ padding: 1px 1px 1px 1px;
344	@ font-size: 1.2em;
345	@ font-weight: bold;
346	@ background-color: #558195;
347	@ color: white;
348	@ white-space: nowrap;
349	@ }
350	@
351	@ /* The "Date" that occurs on the left hand side of timelines */
352	@ div.divider {
353	@ background: #a1c4d4;
	@@ -366,11 +373,11 @@
373	@ div.footer a { color: white; }
374	@ div.footer a:link { color: white; }
375	@ div.footer a:visited { color: white; }
376	@ div.footer a:hover { background-color: white; color: #558195; }
377	@
378	@ /* verbatim blocks */
379	@ pre.verbatim {
380	@ background-color: #f5f5f5;
381	@ padding: 0.5em;
382	@}
383	@
	@@ -378,33 +385,332 @@
385	@ table.label-value th {
386	@ vertical-align: top;
387	@ text-align: right;
388	@ padding: 0.2ex 2ex;
389	@ }
390	@
391	;
392
393
394	/* The following table contains bits of default CSS that must
395	** be included if they are not found in the application-defined
396	** CSS.
397	*/
398	const struct strctCssDefaults {
399	char const * const elementClass; /* Name of element needed */
400	char const * const comment; /* Comment text */
401	char const * const value; /* CSS text */
402	} cssDefaultList[] = {
403	{ "",
404	"",
405	zDefaultCSS
406	},
407	{ "div.sidebox",
408	"The nomenclature sidebox for branches,..",
409	@ float: right;
410	@ background-color: white;
411	@ border-width: medium;
412	@ border-style: double;
413	@ margin: 10;
414	},
415	{ "div.sideboxTitle",
416	"The nomenclature title in sideboxes for branches,..",
417	@ display: inline;
418	@ font-weight: bold;
419	},
420	{ "div.sideboxDescribed",
421	"The defined element in sideboxes for branches,..",
422	@ display: inline;
423	@ font-weight: bold;
424	},
425	{ "span.disabled",
426	"The defined element in sideboxes for branches,..",
427	@ color: red;
428	},
429	{ "span.timelineDisabled",
430	"The suppressed duplicates lines in timeline, ..",
431	@ font-style: italic;
432	@ font-size: small;
433	},
434	{ "table.timelineTable",
435	"the format for the timeline data table",
436	@ cellspacing: 0;
437	@ border: 0;
438	@ cellpadding: 0
439	},
440	{ "td.timelineTableCell",
441	"the format for the timeline data cells",
442	@ valign: top;
443	@ align: left;
444	},
445	{ "span.timelineLeaf",
446	"the format for the timeline leaf marks",
447	@ font-weight: bold;
448	},
449	{ "a.timelineHistLink",
450	"the format for the timeline version links",
451	@
452	},
453	{ "span.timelineHistDsp",
454	"the format for the timeline version display(no history permission!)",
455	@ font-weight: bold;
456	},
457	{ "td.timelineTime",
458	"the format for the timeline time display",
459	@ vertical-align: top;
460	@ text-align: right;
461	},
462	{ "td.timelineGraph",
463	"the format for the grap placeholder cells in timelines",
464	@ width: 20;
465	@ text-align: left;
466	@ vertical-align: top;
467	},
468	{ "a.tagLink",
469	"the format for the tag links",
470	@
471	},
472	{ "span.tagDsp",
473	"the format for the tag display(no history permission!)",
474	@ font-weight: bold;
475	},
476	{ "span.wikiError",
477	"the format for wiki errors",
478	@ font-weight: bold;
479	@ color: red;
480	},
481	{ "span.infoTagCancelled",
482	"the format for fixed/canceled tags,..",
483	@ font-weight: bold;
484	@ text-decoration: line-through;
485	},
486	{ "span.infoTag",
487	"the format for tags,..",
488	@ font-weight: bold;
489	},
490	{ "span.wikiTagCancelled",
491	"the format for fixed/cancelled tags,.. on wiki pages",
492	@ text-decoration: line-through;
493	},
494	{ "table.browser",
495	"format for the file display table",
496	@ /* the format for wiki errors */
497	@ width: 100% ;
498	@ border: 0;
499	},
500	{ "td.browser",
501	"format for cells in the file browser",
502	@ width: 24% ;
503	@ vertical-align: top;
504	},
505	{ "ul.browser",
506	"format for the list in the file browser",
507	@ margin-left: 0.5em;
508	@ padding-left: 0.5em;
509	},
510	{ "table.login_out",
511	"table format for login/out label/input table",
512	@ text-align: left;
513	@ margin-right: 10px;
514	@ margin-left: 10px;
515	@ margin-top: 10px;
516	},
517	{ "div.captcha",
518	"captcha display options",
519	@ text-align: center;
520	},
521	{ "table.captcha",
522	"format for the layout table, used for the captcha display",
523	@ margin: auto;
524	@ padding: 10px;
525	@ outline-width: 1;
526	@ outline-style: double;
527	},
528	{ "td.login_out_label",
529	"format for the label cells in the login/out table",
530	@ text-align: center;
531	},
532	{ "span.loginError",
533	"format for login error messages",
534	@ color: red;
535	},
536	{ "span.note",
537	"format for leading text for notes",
538	@ font-weight: bold;
539	},
540	{ "span.textareaLabel",
541	"format for textare labels",
542	@ font-weight: bold;
543	},
544	{ "table.usetupLayoutTable",
545	"format for the user setup layout table",
546	@ outline-style: none;
547	@ padding: 0;
548	@ margin: 25px;
549	},
550	{ "td.usetupColumnLayout",
551	"format of the columns on the user setup list page",
552	@ vertical-align: top
553	},
554	{ "table.usetupUserList",
555	"format for the user list table on the user setup page",
556	@ outline-style: double;
557	@ outline-width: 1;
558	@ padding: 10px;
559	},
560	{ "th.usetupListUser",
561	"format for table header user in user list on user setup page",
562	@ text-align: right;
563	@ padding-right: 20px;
564	},
565	{ "th.usetupListCap",
566	"format for table header capabilities in user list on user setup page",
567	@ text-align: center;
568	@ padding-right: 15px;
569	},
570	{ "th.usetupListCon",
571	"format for table header contact info in user list on user setup page",
572	@ text-align: left;
573	},
574	{ "td.usetupListUser",
575	"format for table cell user in user list on user setup page",
576	@ text-align: right;
577	@ padding-right: 20px;
578	@ white-space:nowrap;
579	},
580	{ "td.usetupListCap",
581	"format for table cell capabilities in user list on user setup page",
582	@ text-align: center;
583	@ padding-right: 15px;
584	},
585	{ "td.usetupListCon",
586	"format for table cell contact info in user list on user setup page",
587	@ text-align: left
588	},
589	{ "div.ueditCapBox",
590	"layout definition for the capabilities box on the user edit detail page",
591	@ float: left;
592	@ margin-right: 20px;
593	@ margin-bottom: 20px;
594	},
595	{ "td.usetupEditLabel",
596	"format of the label cells in the detailed user edit page",
597	@ text-align: right;
598	@ vertical-align: top;
599	@ white-space: nowrap;
600	},
601	{ "span.ueditInheritNobody",
602	"color for capabilities, inherited by nobody",
603	@ color: green;
604	},
605	{ "span.ueditInheritDeveloper",
606	"color for capabilities, inherited by developer",
607	@ color: red;
608	},
609	{ "span.ueditInheritReader",
610	"color for capabilities, inherited by reader",
611	@ color: black;
612	},
613	{ "span.ueditInheritAnonymous",
614	"color for capabilities, inherited by anonymous",
615	@ color: blue;
616	},
617	{ "span.capability",
618	"format for capabilites, mentioned on the user edit page",
619	@ font-weight: bold;
620	},
621	{ "span.usertype",
622	"format for different user types, mentioned on the user edit page",
623	@ font-weight: bold;
624	},
625	{ "span.usertype:before",
626	"leading text for user types, mentioned on the user edit page",
627	@ content:"'";
628	},
629	{ "span.usertype:after",
630	"trailing text for user types, mentioned on the user edit page",
631	@ content:"'";
632	},
633	{ "span.wikiruleHead",
634	"format for leading text in wikirules definitions",
635	@ font-weight: bold;
636	},
637	{ "td.tktDspLabel",
638	"format for labels on ticket display page",
639	@ text-align: right;
640	},
641	{ "td.tktDspValue",
642	"format for values on ticket display page",
643	@ text-align: left;
644	@ vertical-align: top;
645	@ background-color: #d0d0d0;
646	},
647	{ "span.tktError",
648	"format for ticket error messages",
649	@ color: red;
650	@ font-weight: bold;
651	},
652	{ 0,
653	0,
654	0
655	}
656	};
657
658	/*
659	** Append all of the default CSS to the CGI output.
660	*/
661	void cgi_append_default_css(void) {
662	int i;
663
664	for (i=0;cssDefaultList[i].elementClass;i++){
665	if (cssDefaultList[i].elementClass[0]){
666	cgi_printf("/* %s */\n%s {\n%s\n}\n\n",
667	cssDefaultList[i].comment,
668	cssDefaultList[i].elementClass,
669	cssDefaultList[i].value
670	);
671	}else{
672	cgi_printf("%s",
673	cssDefaultList[i].value
674	);
675	}
676	}
677	}
678
679	/*
680	** WEBPAGE: style.css
681	*/
682	void page_style_css(void){
683	const char *zCSS = 0;
684	int i;
685
686	cgi_set_content_type("text/css");
687	zCSS = db_get("css",(char*)zDefaultCSS);
688	/* append user defined css */
689	cgi_append_content(zCSS, -1);
690	/* add special missing definitions */
691	for (i=1;cssDefaultList[i].elementClass;i++)
692	if (!strstr(zCSS,cssDefaultList[i].elementClass)) {
693	cgi_append_content("/* ", -1);
694	cgi_append_content(cssDefaultList[i].comment, -1);
695	cgi_append_content(" */\n", -1);
696	cgi_append_content(cssDefaultList[i].elementClass, -1);
697	cgi_append_content(" {\n", -1);
698	cgi_append_content(cssDefaultList[i].value, -1);
699	cgi_append_content("}\n\n", -1);
700	}
701	g.isConst = 1;
702	}
703
704	/*
705	** WEBPAGE: test_env
706	*/
707	void page_test_env(void){
708	style_header("Environment Test");
709	#if !defined(_WIN32)
710	@ uid=%d(getuid()), gid=%d(getgid())<br />
711	#endif
712	@ g.zBaseURL = %h(g.zBaseURL)<br />
713	@ g.zTop = %h(g.zTop)<br />

714	cgi_print_all();
715	style_footer();
716	}
717

M src/tag.c

+8 -6

		--- src/tag.c
		+++ src/tag.c
		@@ -514,13 +514,14 @@
514	514	);
515	515	@ <ul>
516	516	while( db_step(&q)==SQLITE_ROW ){
517	517	const char *zName = db_column_text(&q, 0);
518	518	if( g.okHistory ){
519		- @ <li><a href=%s(g.zBaseURL)/timeline?t=%T(zName)>%h(zName)</a></li>
	519	+ @ <li><a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zName)">
	520	+ @ %h(zName)</a></li>
520	521	}else{
521		- @ <li><strong>%h(zName)</strong></li>
	522	+ @ <li><span class="tagDsp">%h(zName)</span></li>
522	523	}
523	524	}
524	525	@ </ul>
525	526	db_finalize(&q);
526	527	style_footer();
		@@ -542,13 +543,14 @@
542	543	rid
543	544	);
544	545	while( db_step(&q)==SQLITE_ROW ){
545	546	const char *zTagName = db_column_text(&q, 0);
546	547	if( g.okHistory ){
547		- @ <a href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">[%h(zTagName)]</a>
	548	+ @ <a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">
	549	+ @ [%h(zTagName)]</a>
548	550	}else{
549		- @ <b>[%h(zTagName)]</b>
	551	+ @ <span class="tagDsp">[%h(zTagName)]</span>
550	552	}
551	553	}
552	554	db_finalize(&q);
553	555	}
554	556
		@@ -573,14 +575,14 @@
573	575	" ORDER BY event.mtime DESC",
574	576	timeline_query_for_www()
575	577	);
576	578	www_print_timeline(&q, 0, tagtimeline_extra);
577	579	db_finalize(&q);
578		- @ <br clear="both">
579		- @ <script>
	580	+ @ <br />
	581	+ @ <script type="text/JavaScript">
580	582	@ function xin(id){
581	583	@ }
582	584	@ function xout(id){
583	585	@ }
584	586	@ </script>
585	587	style_footer();
586	588	}
587	589

	--- src/tag.c
	+++ src/tag.c
	@@ -514,13 +514,14 @@
514	);
515	@ <ul>
516	while( db_step(&q)==SQLITE_ROW ){
517	const char *zName = db_column_text(&q, 0);
518	if( g.okHistory ){
519	@ <li><a href=%s(g.zBaseURL)/timeline?t=%T(zName)>%h(zName)</a></li>

520	}else{
521	@ <li><strong>%h(zName)</strong></li>
522	}
523	}
524	@ </ul>
525	db_finalize(&q);
526	style_footer();
	@@ -542,13 +543,14 @@
542	rid
543	);
544	while( db_step(&q)==SQLITE_ROW ){
545	const char *zTagName = db_column_text(&q, 0);
546	if( g.okHistory ){
547	@ <a href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">[%h(zTagName)]</a>

548	}else{
549	@ <b>[%h(zTagName)]</b>
550	}
551	}
552	db_finalize(&q);
553	}
554
	@@ -573,14 +575,14 @@
573	" ORDER BY event.mtime DESC",
574	timeline_query_for_www()
575	);
576	www_print_timeline(&q, 0, tagtimeline_extra);
577	db_finalize(&q);
578	@ <br clear="both">
579	@ <script>
580	@ function xin(id){
581	@ }
582	@ function xout(id){
583	@ }
584	@ </script>
585	style_footer();
586	}
587

	--- src/tag.c
	+++ src/tag.c
	@@ -514,13 +514,14 @@
514	);
515	@ <ul>
516	while( db_step(&q)==SQLITE_ROW ){
517	const char *zName = db_column_text(&q, 0);
518	if( g.okHistory ){
519	@ <li><a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zName)">
520	@ %h(zName)</a></li>
521	}else{
522	@ <li><span class="tagDsp">%h(zName)</span></li>
523	}
524	}
525	@ </ul>
526	db_finalize(&q);
527	style_footer();
	@@ -542,13 +543,14 @@
543	rid
544	);
545	while( db_step(&q)==SQLITE_ROW ){
546	const char *zTagName = db_column_text(&q, 0);
547	if( g.okHistory ){
548	@ <a class="tagLink" href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">
549	@ [%h(zTagName)]</a>
550	}else{
551	@ <span class="tagDsp">[%h(zTagName)]</span>
552	}
553	}
554	db_finalize(&q);
555	}
556
	@@ -573,14 +575,14 @@
575	" ORDER BY event.mtime DESC",
576	timeline_query_for_www()
577	);
578	www_print_timeline(&q, 0, tagtimeline_extra);
579	db_finalize(&q);
580	@ <br />
581	@ <script type="text/JavaScript">
582	@ function xin(id){
583	@ }
584	@ function xout(id){
585	@ }
586	@ </script>
587	style_footer();
588	}
589

M src/th.c

+1 -1

		--- src/th.c
		+++ src/th.c
		@@ -846,11 +846,11 @@
846	846
847	847	/* Gobble up input a word at a time until the end of the command
848	848	** (a semi-colon or end of line).
849	849	*/
850	850	while( rc==TH_OK && *zInput!=';' && !thEndOfLine(zInput, nInput) ){
851		- int nWord;
	851	+ int nWord=0;
852	852	thNextSpace(interp, zInput, nInput, &nSpace);
853	853	rc = thNextWord(interp, &zInput[nSpace], nInput-nSpace, &nWord, 1);
854	854	zInput += (nSpace+nWord);
855	855	nInput -= (nSpace+nWord);
856	856	}
857	857

	--- src/th.c
	+++ src/th.c
	@@ -846,11 +846,11 @@
846
847	/* Gobble up input a word at a time until the end of the command
848	** (a semi-colon or end of line).
849	*/
850	while( rc==TH_OK && *zInput!=';' && !thEndOfLine(zInput, nInput) ){
851	int nWord;
852	thNextSpace(interp, zInput, nInput, &nSpace);
853	rc = thNextWord(interp, &zInput[nSpace], nInput-nSpace, &nWord, 1);
854	zInput += (nSpace+nWord);
855	nInput -= (nSpace+nWord);
856	}
857

	--- src/th.c
	+++ src/th.c
	@@ -846,11 +846,11 @@
846
847	/* Gobble up input a word at a time until the end of the command
848	** (a semi-colon or end of line).
849	*/
850	while( rc==TH_OK && *zInput!=';' && !thEndOfLine(zInput, nInput) ){
851	int nWord=0;
852	thNextSpace(interp, zInput, nInput, &nSpace);
853	rc = thNextWord(interp, &zInput[nSpace], nInput-nSpace, &nWord, 1);
854	zInput += (nSpace+nWord);
855	nInput -= (nSpace+nWord);
856	}
857

M src/th_main.c

+2 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -278,11 +278,12 @@
278	278	blob_reset(&name);
279	279	for(i=0; i<nElem; i++){
280	280	zH = htmlize((char*)azElem[i], aszElem[i]);
281	281	if( zValue && aszElem[i]==nValue
282	282	&& memcmp(zValue, azElem[i], nValue)==0 ){
283		- z = mprintf("<option value=\"%s\" selected>%s</option>", zH, zH);
	283	+ z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>",
	284	+ zH, zH);
284	285	}else{
285	286	z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
286	287	}
287	288	free(zH);
288	289	sendText(z, -1, 0);
289	290

	--- src/th_main.c
	+++ src/th_main.c
	@@ -278,11 +278,12 @@
278	blob_reset(&name);
279	for(i=0; i<nElem; i++){
280	zH = htmlize((char*)azElem[i], aszElem[i]);
281	if( zValue && aszElem[i]==nValue
282	&& memcmp(zValue, azElem[i], nValue)==0 ){
283	z = mprintf("<option value=\"%s\" selected>%s</option>", zH, zH);

284	}else{
285	z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
286	}
287	free(zH);
288	sendText(z, -1, 0);
289

	--- src/th_main.c
	+++ src/th_main.c
	@@ -278,11 +278,12 @@
278	blob_reset(&name);
279	for(i=0; i<nElem; i++){
280	zH = htmlize((char*)azElem[i], aszElem[i]);
281	if( zValue && aszElem[i]==nValue
282	&& memcmp(zValue, azElem[i], nValue)==0 ){
283	z = mprintf("<option value=\"%s\" selected=\"selected\">%s</option>",
284	zH, zH);
285	}else{
286	z = mprintf("<option value=\"%s\">%s</option>", zH, zH);
287	}
288	free(zH);
289	sendText(z, -1, 0);
290

M src/timeline.c

+37 -27

		--- src/timeline.c
		+++ src/timeline.c
		@@ -48,13 +48,14 @@
48	48	*/
49	49	void hyperlink_to_uuid(const char *zUuid){
50	50	char zShortUuid[UUID_SIZE+1];
51	51	shorten_uuid(zShortUuid, zUuid);
52	52	if( g.okHistory ){
53		- @ <a href="%s(g.zBaseURL)/info/%s(zShortUuid)">[%s(zShortUuid)]</a>
	53	+ @ <a class="timelineHistLink" href="%s(g.zBaseURL)/info/%s(zShortUuid)">
	54	+ @ [%s(zShortUuid)]</a>
54	55	}else{
55		- @ <b>[%s(zShortUuid)]</b>
	56	+ @ <span class="timelineHistDsp">[%s(zShortUuid)]</span>
56	57	}
57	58	}
58	59
59	60	/*
60	61	** Generate a hyperlink that invokes javascript to highlight
		@@ -83,11 +84,11 @@
83	84	void hyperlink_to_diff(const char zV1, const char zV2){
84	85	if( g.okHistory ){
85	86	if( zV2==0 ){
86	87	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
87	88	}else{
88		- @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
	89	+ @ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
89	90	}
90	91	}
91	92	}
92	93
93	94	/*
		@@ -109,11 +110,11 @@
109	110	*/
110	111	void hyperlink_to_user(const char zU, const char zD, const char *zSuf){
111	112	if( zSuf==0 ) zSuf = "";
112	113	if( g.okHistory ){
113	114	if( zD && zD[0] ){
114		- @ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf)
	115	+ @ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf)
115	116	}else{
116	117	@ <a href="%s(g.zTop)/timeline?u=%T(zU)">%h(zU)</a>%s(zSuf)
117	118	}
118	119	}else{
119	120	@ %s(zU)
		@@ -189,14 +190,17 @@
189	190	}else{
190	191	wikiFlags = WIKI_INLINE \| WIKI_NOBLOCK;
191	192	}
192	193	if( tmFlags & TIMELINE_GRAPH ){
193	194	pGraph = graph_init();
	195	+ /* style is not moved to css, because this is
	196	+ ** a technical div for the timeline graph
	197	+ */
194	198	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
195	199	}
196	200
197		- @ <table cellspacing=0 border=0 cellpadding=0>
	201	+ @ <table class="timelineTable">
198	202	blob_zero(&comment);
199	203	while( db_step(pQuery)==SQLITE_ROW ){
200	204	int rid = db_column_int(pQuery, 0);
201	205	const char *zUuid = db_column_text(pQuery, 1);
202	206	int isLeaf = db_column_int(pQuery, 5);
		@@ -218,30 +222,30 @@
218	222	}
219	223	}
220	224	}
221	225	prevTagid = tagid;
222	226	if( suppressCnt ){
223		- @ <tr><td><td><td>
224		- @ <small><i>... %d(suppressCnt) similar
225		- @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr>
	227	+ @ <tr><td /><td /><td>
	228	+ @ <span class="timelineDisabled">... %d(suppressCnt) similar
	229	+ @ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
226	230	suppressCnt = 0;
227	231	}
228	232	if( strcmp(zType,"div")==0 ){
229		- @ <tr><td colspan=3><hr></td></tr>
	233	+ @ <tr><td colspan="3"><hr /></td></tr>
230	234	continue;
231	235	}
232	236	if( memcmp(zDate, zPrevDate, 10) ){
233	237	sprintf(zPrevDate, "%.10s", zDate);
234	238	@ <tr><td>
235		- @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
	239	+ @ <div class="divider">%s(zPrevDate)</div>
236	240	@ </td></tr>
237	241	}
238	242	memcpy(zTime, &zDate[11], 5);
239	243	zTime[5] = 0;
240	244	@ <tr>
241		- @ <td valign="top" align="right">%s(zTime)</td>
242		- @ <td width="20" align="left" valign="top">
	245	+ @ <td class="timelineTime">%s(zTime)</td>
	246	+ @ <td class="timelineGraph">
243	247	if( pGraph && zType[0]=='c' ){
244	248	int nParent = 0;
245	249	int aParent[32];
246	250	const char *zBr;
247	251	int gidx;
		@@ -267,24 +271,25 @@
267	271	}
268	272	gidx = graph_add_row(pGraph, rid, nParent, aParent, zBr, zBgClr);
269	273	db_reset(&qbranch);
270	274	@ <div id="m%d(gidx)"></div>
271	275	}
	276	+ @</td>
272	277	if( zBgClr && zBgClr[0] ){
273		- @ <td valign="top" align="left" bgcolor="%h(zBgClr)">
	278	+ @ <td class="timelineTableCell" style="background-color: %h(zBgClr);">
274	279	}else{
275		- @ <td valign="top" align="left">
	280	+ @ <td class="timelineTableCell">
276	281	}
277	282	if( zType[0]=='c' ){
278	283	hyperlink_to_uuid(zUuid);
279	284	if( isLeaf ){
280	285	if( db_exists("SELECT 1 FROM tagxref"
281	286	" WHERE rid=%d AND tagid=%d AND tagtype>0",
282	287	rid, TAG_CLOSED) ){
283		- @ <b>Closed-Leaf:</b>
	288	+ @ <span class="timelineLeaf">Closed-Leaf:</span>
284	289	}else{
285		- @ <b>Leaf:</b>
	290	+ @ <span class="timelineLeaf">Leaf:</span>
286	291	}
287	292	}
288	293	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
289	294	hyperlink_to_uuid(zUuid);
290	295	}
		@@ -309,22 +314,27 @@
309	314	xExtra(rid);
310	315	}
311	316	@ </td></tr>
312	317	}
313	318	if( suppressCnt ){
314		- @ <tr><td><td><td>
315		- @ <small><i>... %d(suppressCnt) similar
316		- @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr>
	319	+ @ <tr><td /><td /><td>
	320	+ @ <span class="timelineDisabled">... %d(suppressCnt) similar
	321	+ @ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
317	322	suppressCnt = 0;
318	323	}
319	324	if( pGraph ){
320	325	graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
321	326	if( pGraph->nErr ){
322	327	graph_free(pGraph);
323	328	pGraph = 0;
324	329	}else{
325		- @ <tr><td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>
	330	+ /* style is not moved to css, because this is
	331	+ ** a technical div for the timeline graph
	332	+ */
	333	+ @ <tr><td /><td>
	334	+ @ <div id="grbtm" style="width:%d(pGraph->mxRail*20+30)px;"></div>
	335	+ @ </td></tr>
326	336	}
327	337	}
328	338	@ </table>
329	339	timeline_output_graph_javascript(pGraph);
330	340	}
		@@ -336,11 +346,11 @@
336	346	void timeline_output_graph_javascript(GraphContext *pGraph){
337	347	if( pGraph && pGraph->nErr==0 ){
338	348	GraphRow *pRow;
339	349	int i;
340	350	char cSep;
341		- @ <script type="text/JavaScript">
	351	+ @ <script type="text/JavaScript">
342	352	cgi_printf("var rowinfo = [\n");
343	353	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
344	354	cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
345	355	pRow->idx,
346	356	pRow->zBgClr,
		@@ -352,20 +362,20 @@
352	362	);
353	363	cSep = '[';
354	364	for(i=0; i<GR_MAX_RAIL; i++){
355	365	if( i==pRow->iRail ) continue;
356	366	if( pRow->aiRaiser[i]>0 ){
357		- cgi_printf("%c%d,%d", cSep, pGraph->railMap[i], pRow->aiRaiser[i]);
	367	+ cgi_printf("%c%d,%d", cSep, i, pRow->aiRaiser[i]);
358	368	cSep = ',';
359	369	}
360	370	}
361	371	if( cSep=='[' ) cgi_printf("[");
362	372	cgi_printf("],mi:");
363	373	cSep = '[';
364	374	for(i=0; i<GR_MAX_RAIL; i++){
365	375	if( pRow->mergeIn & (1<<i) ){
366		- cgi_printf("%c%d", cSep, pGraph->railMap[i]);
	376	+ cgi_printf("%c%d", cSep, i);
367	377	cSep = ',';
368	378	}
369	379	}
370	380	if( cSep=='[' ) cgi_printf("[");
371	381	cgi_printf("]}%s", pRow->pNext ? ",\n" : "];\n");
		@@ -482,11 +492,11 @@
482	492	@ var width = nrail*20;
483	493	@ for(var i in rowinfo){
484	494	@ rowinfo[i].y = absoluteY(rowinfo[i].id) + 10 - canvasY;
485	495	@ rowinfo[i].x = left + rowinfo[i].r*20;
486	496	@ }
487		- @ var btm = rowinfo[rowinfo.length-1].y + 20;
	497	+ @ var btm = absoluteY("grbtm") + 10 - canvasY;
488	498	@ if( btm<32768 ){
489	499	@ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
490	500	@ 'style="position:absolute;left:'+(left-5)+'px;"' +
491	501	@ ' width="'+width+'" height="'+btm+'"></canvas>';
492	502	@ realCanvas = document.getElementById('timeline-canvas');
		@@ -882,15 +892,15 @@
882	892	}else if( zBrName ){
883	893	blob_appendf(&desc, " related to \"%h\"", zBrName);
884	894	tmFlags \|= TIMELINE_DISJOINT;
885	895	}
886	896	if( zAfter ){
887		- blob_appendf(&desc, " occurring on or after %h.<br>", zAfter);
	897	+ blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
888	898	}else if( zBefore ){
889		- blob_appendf(&desc, " occurring on or before %h.<br>", zBefore);
	899	+ blob_appendf(&desc, " occurring on or before %h.<br />", zBefore);
890	900	}else if( zCirca ){
891		- blob_appendf(&desc, " occurring around %h.<br>", zCirca);
	901	+ blob_appendf(&desc, " occurring around %h.<br />", zCirca);
892	902	}
893	903	if( zSearch ){
894	904	blob_appendf(&desc, " matching \"%h\"", zSearch);
895	905	}
896	906	if( g.okHistory ){
897	907

	--- src/timeline.c
	+++ src/timeline.c
	@@ -48,13 +48,14 @@
48	*/
49	void hyperlink_to_uuid(const char *zUuid){
50	char zShortUuid[UUID_SIZE+1];
51	shorten_uuid(zShortUuid, zUuid);
52	if( g.okHistory ){
53	@ <a href="%s(g.zBaseURL)/info/%s(zShortUuid)">[%s(zShortUuid)]</a>

54	}else{
55	@ <b>[%s(zShortUuid)]</b>
56	}
57	}
58
59	/*
60	** Generate a hyperlink that invokes javascript to highlight
	@@ -83,11 +84,11 @@
83	void hyperlink_to_diff(const char zV1, const char zV2){
84	if( g.okHistory ){
85	if( zV2==0 ){
86	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
87	}else{
88	@ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
89	}
90	}
91	}
92
93	/*
	@@ -109,11 +110,11 @@
109	*/
110	void hyperlink_to_user(const char zU, const char zD, const char *zSuf){
111	if( zSuf==0 ) zSuf = "";
112	if( g.okHistory ){
113	if( zD && zD[0] ){
114	@ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf)
115	}else{
116	@ <a href="%s(g.zTop)/timeline?u=%T(zU)">%h(zU)</a>%s(zSuf)
117	}
118	}else{
119	@ %s(zU)
	@@ -189,14 +190,17 @@
189	}else{
190	wikiFlags = WIKI_INLINE \| WIKI_NOBLOCK;
191	}
192	if( tmFlags & TIMELINE_GRAPH ){
193	pGraph = graph_init();



194	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
195	}
196
197	@ <table cellspacing=0 border=0 cellpadding=0>
198	blob_zero(&comment);
199	while( db_step(pQuery)==SQLITE_ROW ){
200	int rid = db_column_int(pQuery, 0);
201	const char *zUuid = db_column_text(pQuery, 1);
202	int isLeaf = db_column_int(pQuery, 5);
	@@ -218,30 +222,30 @@
218	}
219	}
220	}
221	prevTagid = tagid;
222	if( suppressCnt ){
223	@ <tr><td><td><td>
224	@ <small><i>... %d(suppressCnt) similar
225	@ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr>
226	suppressCnt = 0;
227	}
228	if( strcmp(zType,"div")==0 ){
229	@ <tr><td colspan=3><hr></td></tr>
230	continue;
231	}
232	if( memcmp(zDate, zPrevDate, 10) ){
233	sprintf(zPrevDate, "%.10s", zDate);
234	@ <tr><td>
235	@ <div class="divider"><nobr>%s(zPrevDate)</nobr></div>
236	@ </td></tr>
237	}
238	memcpy(zTime, &zDate[11], 5);
239	zTime[5] = 0;
240	@ <tr>
241	@ <td valign="top" align="right">%s(zTime)</td>
242	@ <td width="20" align="left" valign="top">
243	if( pGraph && zType[0]=='c' ){
244	int nParent = 0;
245	int aParent[32];
246	const char *zBr;
247	int gidx;
	@@ -267,24 +271,25 @@
267	}
268	gidx = graph_add_row(pGraph, rid, nParent, aParent, zBr, zBgClr);
269	db_reset(&qbranch);
270	@ <div id="m%d(gidx)"></div>
271	}

272	if( zBgClr && zBgClr[0] ){
273	@ <td valign="top" align="left" bgcolor="%h(zBgClr)">
274	}else{
275	@ <td valign="top" align="left">
276	}
277	if( zType[0]=='c' ){
278	hyperlink_to_uuid(zUuid);
279	if( isLeaf ){
280	if( db_exists("SELECT 1 FROM tagxref"
281	" WHERE rid=%d AND tagid=%d AND tagtype>0",
282	rid, TAG_CLOSED) ){
283	@ <b>Closed-Leaf:</b>
284	}else{
285	@ <b>Leaf:</b>
286	}
287	}
288	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
289	hyperlink_to_uuid(zUuid);
290	}
	@@ -309,22 +314,27 @@
309	xExtra(rid);
310	}
311	@ </td></tr>
312	}
313	if( suppressCnt ){
314	@ <tr><td><td><td>
315	@ <small><i>... %d(suppressCnt) similar
316	@ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr>
317	suppressCnt = 0;
318	}
319	if( pGraph ){
320	graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
321	if( pGraph->nErr ){
322	graph_free(pGraph);
323	pGraph = 0;
324	}else{
325	@ <tr><td><td><div style="width:%d(pGraph->mxRail*20+30)px;"></div>





326	}
327	}
328	@ </table>
329	timeline_output_graph_javascript(pGraph);
330	}
	@@ -336,11 +346,11 @@
336	void timeline_output_graph_javascript(GraphContext *pGraph){
337	if( pGraph && pGraph->nErr==0 ){
338	GraphRow *pRow;
339	int i;
340	char cSep;
341	@ <script type="text/JavaScript">
342	cgi_printf("var rowinfo = [\n");
343	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
344	cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
345	pRow->idx,
346	pRow->zBgClr,
	@@ -352,20 +362,20 @@
352	);
353	cSep = '[';
354	for(i=0; i<GR_MAX_RAIL; i++){
355	if( i==pRow->iRail ) continue;
356	if( pRow->aiRaiser[i]>0 ){
357	cgi_printf("%c%d,%d", cSep, pGraph->railMap[i], pRow->aiRaiser[i]);
358	cSep = ',';
359	}
360	}
361	if( cSep=='[' ) cgi_printf("[");
362	cgi_printf("],mi:");
363	cSep = '[';
364	for(i=0; i<GR_MAX_RAIL; i++){
365	if( pRow->mergeIn & (1<<i) ){
366	cgi_printf("%c%d", cSep, pGraph->railMap[i]);
367	cSep = ',';
368	}
369	}
370	if( cSep=='[' ) cgi_printf("[");
371	cgi_printf("]}%s", pRow->pNext ? ",\n" : "];\n");
	@@ -482,11 +492,11 @@
482	@ var width = nrail*20;
483	@ for(var i in rowinfo){
484	@ rowinfo[i].y = absoluteY(rowinfo[i].id) + 10 - canvasY;
485	@ rowinfo[i].x = left + rowinfo[i].r*20;
486	@ }
487	@ var btm = rowinfo[rowinfo.length-1].y + 20;
488	@ if( btm<32768 ){
489	@ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
490	@ 'style="position:absolute;left:'+(left-5)+'px;"' +
491	@ ' width="'+width+'" height="'+btm+'"></canvas>';
492	@ realCanvas = document.getElementById('timeline-canvas');
	@@ -882,15 +892,15 @@
882	}else if( zBrName ){
883	blob_appendf(&desc, " related to \"%h\"", zBrName);
884	tmFlags \|= TIMELINE_DISJOINT;
885	}
886	if( zAfter ){
887	blob_appendf(&desc, " occurring on or after %h.<br>", zAfter);
888	}else if( zBefore ){
889	blob_appendf(&desc, " occurring on or before %h.<br>", zBefore);
890	}else if( zCirca ){
891	blob_appendf(&desc, " occurring around %h.<br>", zCirca);
892	}
893	if( zSearch ){
894	blob_appendf(&desc, " matching \"%h\"", zSearch);
895	}
896	if( g.okHistory ){
897

	--- src/timeline.c
	+++ src/timeline.c
	@@ -48,13 +48,14 @@
48	*/
49	void hyperlink_to_uuid(const char *zUuid){
50	char zShortUuid[UUID_SIZE+1];
51	shorten_uuid(zShortUuid, zUuid);
52	if( g.okHistory ){
53	@ <a class="timelineHistLink" href="%s(g.zBaseURL)/info/%s(zShortUuid)">
54	@ [%s(zShortUuid)]</a>
55	}else{
56	@ <span class="timelineHistDsp">[%s(zShortUuid)]</span>
57	}
58	}
59
60	/*
61	** Generate a hyperlink that invokes javascript to highlight
	@@ -83,11 +84,11 @@
84	void hyperlink_to_diff(const char zV1, const char zV2){
85	if( g.okHistory ){
86	if( zV2==0 ){
87	@ <a href="%s(g.zBaseURL)/diff?v2=%s(zV1)">[diff]</a>
88	}else{
89	@ <a href="%s(g.zBaseURL)/diff?v1=%s(zV1)&v2=%s(zV2)">[diff]</a>
90	}
91	}
92	}
93
94	/*
	@@ -109,11 +110,11 @@
110	*/
111	void hyperlink_to_user(const char zU, const char zD, const char *zSuf){
112	if( zSuf==0 ) zSuf = "";
113	if( g.okHistory ){
114	if( zD && zD[0] ){
115	@ <a href="%s(g.zTop)/timeline?c=%T(zD)&u=%T(zU)">%h(zU)</a>%s(zSuf)
116	}else{
117	@ <a href="%s(g.zTop)/timeline?u=%T(zU)">%h(zU)</a>%s(zSuf)
118	}
119	}else{
120	@ %s(zU)
	@@ -189,14 +190,17 @@
190	}else{
191	wikiFlags = WIKI_INLINE \| WIKI_NOBLOCK;
192	}
193	if( tmFlags & TIMELINE_GRAPH ){
194	pGraph = graph_init();
195	/* style is not moved to css, because this is
196	** a technical div for the timeline graph
197	*/
198	@ <div id="canvas" style="position:relative;width:1px;height:1px;"></div>
199	}
200
201	@ <table class="timelineTable">
202	blob_zero(&comment);
203	while( db_step(pQuery)==SQLITE_ROW ){
204	int rid = db_column_int(pQuery, 0);
205	const char *zUuid = db_column_text(pQuery, 1);
206	int isLeaf = db_column_int(pQuery, 5);
	@@ -218,30 +222,30 @@
222	}
223	}
224	}
225	prevTagid = tagid;
226	if( suppressCnt ){
227	@ <tr><td /><td /><td>
228	@ <span class="timelineDisabled">... %d(suppressCnt) similar
229	@ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
230	suppressCnt = 0;
231	}
232	if( strcmp(zType,"div")==0 ){
233	@ <tr><td colspan="3"><hr /></td></tr>
234	continue;
235	}
236	if( memcmp(zDate, zPrevDate, 10) ){
237	sprintf(zPrevDate, "%.10s", zDate);
238	@ <tr><td>
239	@ <div class="divider">%s(zPrevDate)</div>
240	@ </td></tr>
241	}
242	memcpy(zTime, &zDate[11], 5);
243	zTime[5] = 0;
244	@ <tr>
245	@ <td class="timelineTime">%s(zTime)</td>
246	@ <td class="timelineGraph">
247	if( pGraph && zType[0]=='c' ){
248	int nParent = 0;
249	int aParent[32];
250	const char *zBr;
251	int gidx;
	@@ -267,24 +271,25 @@
271	}
272	gidx = graph_add_row(pGraph, rid, nParent, aParent, zBr, zBgClr);
273	db_reset(&qbranch);
274	@ <div id="m%d(gidx)"></div>
275	}
276	@</td>
277	if( zBgClr && zBgClr[0] ){
278	@ <td class="timelineTableCell" style="background-color: %h(zBgClr);">
279	}else{
280	@ <td class="timelineTableCell">
281	}
282	if( zType[0]=='c' ){
283	hyperlink_to_uuid(zUuid);
284	if( isLeaf ){
285	if( db_exists("SELECT 1 FROM tagxref"
286	" WHERE rid=%d AND tagid=%d AND tagtype>0",
287	rid, TAG_CLOSED) ){
288	@ <span class="timelineLeaf">Closed-Leaf:</span>
289	}else{
290	@ <span class="timelineLeaf">Leaf:</span>
291	}
292	}
293	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
294	hyperlink_to_uuid(zUuid);
295	}
	@@ -309,22 +314,27 @@
314	xExtra(rid);
315	}
316	@ </td></tr>
317	}
318	if( suppressCnt ){
319	@ <tr><td /><td /><td>
320	@ <span class="timelineDisabled">... %d(suppressCnt) similar
321	@ event%s(suppressCnt>1?"s":"") omitted.</span></td></tr>
322	suppressCnt = 0;
323	}
324	if( pGraph ){
325	graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0);
326	if( pGraph->nErr ){
327	graph_free(pGraph);
328	pGraph = 0;
329	}else{
330	/* style is not moved to css, because this is
331	** a technical div for the timeline graph
332	*/
333	@ <tr><td /><td>
334	@ <div id="grbtm" style="width:%d(pGraph->mxRail*20+30)px;"></div>
335	@ </td></tr>
336	}
337	}
338	@ </table>
339	timeline_output_graph_javascript(pGraph);
340	}
	@@ -336,11 +346,11 @@
346	void timeline_output_graph_javascript(GraphContext *pGraph){
347	if( pGraph && pGraph->nErr==0 ){
348	GraphRow *pRow;
349	int i;
350	char cSep;
351	@ <script type="text/JavaScript">
352	cgi_printf("var rowinfo = [\n");
353	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
354	cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
355	pRow->idx,
356	pRow->zBgClr,
	@@ -352,20 +362,20 @@
362	);
363	cSep = '[';
364	for(i=0; i<GR_MAX_RAIL; i++){
365	if( i==pRow->iRail ) continue;
366	if( pRow->aiRaiser[i]>0 ){
367	cgi_printf("%c%d,%d", cSep, i, pRow->aiRaiser[i]);
368	cSep = ',';
369	}
370	}
371	if( cSep=='[' ) cgi_printf("[");
372	cgi_printf("],mi:");
373	cSep = '[';
374	for(i=0; i<GR_MAX_RAIL; i++){
375	if( pRow->mergeIn & (1<<i) ){
376	cgi_printf("%c%d", cSep, i);
377	cSep = ',';
378	}
379	}
380	if( cSep=='[' ) cgi_printf("[");
381	cgi_printf("]}%s", pRow->pNext ? ",\n" : "];\n");
	@@ -482,11 +492,11 @@
492	@ var width = nrail*20;
493	@ for(var i in rowinfo){
494	@ rowinfo[i].y = absoluteY(rowinfo[i].id) + 10 - canvasY;
495	@ rowinfo[i].x = left + rowinfo[i].r*20;
496	@ }
497	@ var btm = absoluteY("grbtm") + 10 - canvasY;
498	@ if( btm<32768 ){
499	@ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
500	@ 'style="position:absolute;left:'+(left-5)+'px;"' +
501	@ ' width="'+width+'" height="'+btm+'"></canvas>';
502	@ realCanvas = document.getElementById('timeline-canvas');
	@@ -882,15 +892,15 @@
892	}else if( zBrName ){
893	blob_appendf(&desc, " related to \"%h\"", zBrName);
894	tmFlags \|= TIMELINE_DISJOINT;
895	}
896	if( zAfter ){
897	blob_appendf(&desc, " occurring on or after %h.<br />", zAfter);
898	}else if( zBefore ){
899	blob_appendf(&desc, " occurring on or before %h.<br />", zBefore);
900	}else if( zCirca ){
901	blob_appendf(&desc, " occurring around %h.<br />", zCirca);
902	}
903	if( zSearch ){
904	blob_appendf(&desc, " matching \"%h\"", zSearch);
905	}
906	if( g.okHistory ){
907

M src/tkt.c

+22 -14

		--- src/tkt.c
		+++ src/tkt.c
		@@ -313,11 +313,11 @@
313	313	style_submenu_element("New Ticket", "Create a new ticket",
314	314	"%s/tktnew", g.zTop);
315	315	}
316	316	if( g.okApndTkt && g.okAttach ){
317	317	style_submenu_element("Attach", "Add An Attachment",
318		- "%s/attachadd?tkt=%T&from=%s/tktview/%t",
	318	+ "%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	319	g.zTop, zUuid, g.zTop, zUuid);
320	320	}
321	321	style_header("View Ticket");
322	322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	323	ticket_init();
		@@ -342,19 +342,24 @@
342	342	while( db_step(&q)==SQLITE_ROW ){
343	343	const char *zDate = db_column_text(&q, 0);
344	344	const char *zFile = db_column_text(&q, 1);
345	345	const char *zUser = db_column_text(&q, 2);
346	346	if( cnt==0 ){
347		- @ <hr><h2>Attachments:</h2>
	347	+ @ <hr /><h2>Attachments:</h2>
348	348	@ <ul>
349	349	}
350	350	cnt++;
351		- @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
352		- @ %h(zFile)</a> add by %h(zUser) on
	351	+ if( g.okRead && g.okHistory ){
	352	+ @ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
	353	+ @ %h(zFile)</a>
	354	+ }else{
	355	+ @ %h(zFile)
	356	+ }
	357	+ @ added by %h(zUser) on
353	358	hyperlink_to_date(zDate, ".");
354	359	if( g.okWrTkt && g.okAttach ){
355		- @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
	360	+ @ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
356	361	}
357	362	}
358	363	if( cnt ){
359	364	@ </ul>
360	365	}
		@@ -506,12 +511,13 @@
506	511	if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
507	512	ticket_init();
508	513	getAllTicketFields();
509	514	initializeVariablesFromDb();
510	515	initializeVariablesFromCGI();
511		- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
	516	+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
512	517	login_insert_csrf_secret();
	518	+ @ </p>
513	519	zScript = ticket_newpage_code();
514	520	Th_Store("login", g.zLogin);
515	521	Th_Store("date", db_text(0, "SELECT datetime('now')"));
516	522	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
517	523	(void*)&zNewUuid, 0);
		@@ -549,34 +555,36 @@
549	555	cgi_redirectf("tktview?name=%T", zName);
550	556	}
551	557	style_header("Edit Ticket");
552	558	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>UUID_SIZE
553	559	\|\| !validate16(zName,nName) ){
554		- @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
	560	+ @ <span class="tktError">Not a valid ticket id: \"%h(zName)\"</span>
555	561	style_footer();
556	562	return;
557	563	}
558	564	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
559	565	zName);
560	566	if( nRec==0 ){
561		- @ <font color="red"><b>No such ticket: \"%h(zName)\"</b></font>
	567	+ @ <span class="tktError">No such ticket: \"%h(zName)\"</span>
562	568	style_footer();
563	569	return;
564	570	}
565	571	if( nRec>1 ){
566		- @ <font color="red"><b>%d(nRec) tickets begin with: \"%h(zName)\"</b></font>
	572	+ @ <span class="tktError"><b>%d(nRec) tickets begin with:
	573	+ @ \"%h(zName)\"</span>
567	574	style_footer();
568	575	return;
569	576	}
570	577	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
571	578	ticket_init();
572	579	getAllTicketFields();
573	580	initializeVariablesFromCGI();
574	581	initializeVariablesFromDb();
575		- @ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
576		- @ <input type="hidden" name="name" value="%s(zName)">
	582	+ @ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
	583	+ @ <input type="hidden" name="name" value="%s(zName)" />
577	584	login_insert_csrf_secret();
	585	+ @ </p>
578	586	zScript = ticket_editpage_code();
579	587	Th_Store("login", g.zLogin);
580	588	Th_Store("date", db_text(0, "SELECT datetime('now')"));
581	589	Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
582	590	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
		@@ -619,11 +627,11 @@
619	627	return 0;
620	628	}
621	629
622	630	/*
623	631	** WEBPAGE: tkttimeline
624		-** URL: /tkttimeline?name=TICKETUUID&y=TYPE
	632	+** URL: /tkttimeline?name=TICKETUUID&y=TYPE
625	633	**
626	634	** Show the change history for a single ticket in timeline format.
627	635	*/
628	636	void tkttimeline_page(void){
629	637	Stmt q;
		@@ -639,11 +647,11 @@
639	647	if( !g.okHistory \|\| !g.okRdTkt ){ login_needed(); return; }
640	648	zUuid = PD("name","");
641	649	zType = PD("y","a");
642	650	if( zType[0]!='c' ){
643	651	style_submenu_element("Check-ins", "Check-ins",
644		- "%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid);
	652	+ "%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid);
645	653	}else{
646	654	style_submenu_element("Timeline", "Timeline",
647	655	"%s/tkttimeline?name=%T", g.zTop, zUuid);
648	656	}
649	657	style_submenu_element("History", "History",
		@@ -771,12 +779,12 @@
771	779	@ <p>Ticket change
772	780	@ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zShort)</a>]
773	781	@ (rid %d(rid)) by
774	782	hyperlink_to_user(m.zUser,zDate," on");
775	783	hyperlink_to_date(zDate, ":");
776		- ticket_output_change_artifact(&m);
777	784	@ </p>
	785	+ ticket_output_change_artifact(&m);
778	786	}
779	787	manifest_clear(&m);
780	788	}
781	789	}
782	790	db_finalize(&q);
783	791

	--- src/tkt.c
	+++ src/tkt.c
	@@ -313,11 +313,11 @@
313	style_submenu_element("New Ticket", "Create a new ticket",
314	"%s/tktnew", g.zTop);
315	}
316	if( g.okApndTkt && g.okAttach ){
317	style_submenu_element("Attach", "Add An Attachment",
318	"%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	g.zTop, zUuid, g.zTop, zUuid);
320	}
321	style_header("View Ticket");
322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	ticket_init();
	@@ -342,19 +342,24 @@
342	while( db_step(&q)==SQLITE_ROW ){
343	const char *zDate = db_column_text(&q, 0);
344	const char *zFile = db_column_text(&q, 1);
345	const char *zUser = db_column_text(&q, 2);
346	if( cnt==0 ){
347	@ <hr><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
352	@ %h(zFile)</a> add by %h(zUser) on





353	hyperlink_to_date(zDate, ".");
354	if( g.okWrTkt && g.okAttach ){
355	@ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
356	}
357	}
358	if( cnt ){
359	@ </ul>
360	}
	@@ -506,12 +511,13 @@
506	if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
507	ticket_init();
508	getAllTicketFields();
509	initializeVariablesFromDb();
510	initializeVariablesFromCGI();
511	@ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
512	login_insert_csrf_secret();

513	zScript = ticket_newpage_code();
514	Th_Store("login", g.zLogin);
515	Th_Store("date", db_text(0, "SELECT datetime('now')"));
516	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
517	(void*)&zNewUuid, 0);
	@@ -549,34 +555,36 @@
549	cgi_redirectf("tktview?name=%T", zName);
550	}
551	style_header("Edit Ticket");
552	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>UUID_SIZE
553	\|\| !validate16(zName,nName) ){
554	@ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
555	style_footer();
556	return;
557	}
558	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
559	zName);
560	if( nRec==0 ){
561	@ <font color="red"><b>No such ticket: \"%h(zName)\"</b></font>
562	style_footer();
563	return;
564	}
565	if( nRec>1 ){
566	@ <font color="red"><b>%d(nRec) tickets begin with: \"%h(zName)\"</b></font>

567	style_footer();
568	return;
569	}
570	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
571	ticket_init();
572	getAllTicketFields();
573	initializeVariablesFromCGI();
574	initializeVariablesFromDb();
575	@ <form method="POST" action="%s(g.zBaseURL)/%s(g.zPath)">
576	@ <input type="hidden" name="name" value="%s(zName)">
577	login_insert_csrf_secret();

578	zScript = ticket_editpage_code();
579	Th_Store("login", g.zLogin);
580	Th_Store("date", db_text(0, "SELECT datetime('now')"));
581	Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
582	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
	@@ -619,11 +627,11 @@
619	return 0;
620	}
621
622	/*
623	** WEBPAGE: tkttimeline
624	** URL: /tkttimeline?name=TICKETUUID&y=TYPE
625	**
626	** Show the change history for a single ticket in timeline format.
627	*/
628	void tkttimeline_page(void){
629	Stmt q;
	@@ -639,11 +647,11 @@
639	if( !g.okHistory \|\| !g.okRdTkt ){ login_needed(); return; }
640	zUuid = PD("name","");
641	zType = PD("y","a");
642	if( zType[0]!='c' ){
643	style_submenu_element("Check-ins", "Check-ins",
644	"%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid);
645	}else{
646	style_submenu_element("Timeline", "Timeline",
647	"%s/tkttimeline?name=%T", g.zTop, zUuid);
648	}
649	style_submenu_element("History", "History",
	@@ -771,12 +779,12 @@
771	@ <p>Ticket change
772	@ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zShort)</a>]
773	@ (rid %d(rid)) by
774	hyperlink_to_user(m.zUser,zDate," on");
775	hyperlink_to_date(zDate, ":");
776	ticket_output_change_artifact(&m);
777	@ </p>

778	}
779	manifest_clear(&m);
780	}
781	}
782	db_finalize(&q);
783

	--- src/tkt.c
	+++ src/tkt.c
	@@ -313,11 +313,11 @@
313	style_submenu_element("New Ticket", "Create a new ticket",
314	"%s/tktnew", g.zTop);
315	}
316	if( g.okApndTkt && g.okAttach ){
317	style_submenu_element("Attach", "Add An Attachment",
318	"%s/attachadd?tkt=%T&from=%s/tktview/%t",
319	g.zTop, zUuid, g.zTop, zUuid);
320	}
321	style_header("View Ticket");
322	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br />\n", -1);
323	ticket_init();
	@@ -342,19 +342,24 @@
342	while( db_step(&q)==SQLITE_ROW ){
343	const char *zDate = db_column_text(&q, 0);
344	const char *zFile = db_column_text(&q, 1);
345	const char *zUser = db_column_text(&q, 2);
346	if( cnt==0 ){
347	@ <hr /><h2>Attachments:</h2>
348	@ <ul>
349	}
350	cnt++;
351	if( g.okRead && g.okHistory ){
352	@ <li><a href="%s(g.zTop)/attachview?tkt=%s(zFullName)&file=%t(zFile)">
353	@ %h(zFile)</a>
354	}else{
355	@ %h(zFile)
356	}
357	@ added by %h(zUser) on
358	hyperlink_to_date(zDate, ".");
359	if( g.okWrTkt && g.okAttach ){
360	@ [<a href="%s(g.zTop)/attachdelete?tkt=%s(zFullName)&file=%t(zFile)&from=%s(g.zTop)/tktview%%3fname=%s(zFullName)">delete</a>]
361	}
362	}
363	if( cnt ){
364	@ </ul>
365	}
	@@ -506,12 +511,13 @@
511	if( g.thTrace ) Th_Trace("BEGIN_TKTNEW<br />\n", -1);
512	ticket_init();
513	getAllTicketFields();
514	initializeVariablesFromDb();
515	initializeVariablesFromCGI();
516	@ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
517	login_insert_csrf_secret();
518	@ </p>
519	zScript = ticket_newpage_code();
520	Th_Store("login", g.zLogin);
521	Th_Store("date", db_text(0, "SELECT datetime('now')"));
522	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd,
523	(void*)&zNewUuid, 0);
	@@ -549,34 +555,36 @@
555	cgi_redirectf("tktview?name=%T", zName);
556	}
557	style_header("Edit Ticket");
558	if( zName==0 \|\| (nName = strlen(zName))<4 \|\| nName>UUID_SIZE
559	\|\| !validate16(zName,nName) ){
560	@ <span class="tktError">Not a valid ticket id: \"%h(zName)\"</span>
561	style_footer();
562	return;
563	}
564	nRec = db_int(0, "SELECT count() FROM ticket WHERE tkt_uuid GLOB '%q'",
565	zName);
566	if( nRec==0 ){
567	@ <span class="tktError">No such ticket: \"%h(zName)\"</span>
568	style_footer();
569	return;
570	}
571	if( nRec>1 ){
572	@ <span class="tktError"><b>%d(nRec) tickets begin with:
573	@ \"%h(zName)\"</span>
574	style_footer();
575	return;
576	}
577	if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
578	ticket_init();
579	getAllTicketFields();
580	initializeVariablesFromCGI();
581	initializeVariablesFromDb();
582	@ <form method="post" action="%s(g.zBaseURL)/%s(g.zPath)"><p>
583	@ <input type="hidden" name="name" value="%s(zName)" />
584	login_insert_csrf_secret();
585	@ </p>
586	zScript = ticket_editpage_code();
587	Th_Store("login", g.zLogin);
588	Th_Store("date", db_text(0, "SELECT datetime('now')"));
589	Th_CreateCommand(g.interp, "append_field", appendRemarkCmd, 0, 0);
590	Th_CreateCommand(g.interp, "submit_ticket", submitTicketCmd, (void*)&zName,0);
	@@ -619,11 +627,11 @@
627	return 0;
628	}
629
630	/*
631	** WEBPAGE: tkttimeline
632	** URL: /tkttimeline?name=TICKETUUID&y=TYPE
633	**
634	** Show the change history for a single ticket in timeline format.
635	*/
636	void tkttimeline_page(void){
637	Stmt q;
	@@ -639,11 +647,11 @@
647	if( !g.okHistory \|\| !g.okRdTkt ){ login_needed(); return; }
648	zUuid = PD("name","");
649	zType = PD("y","a");
650	if( zType[0]!='c' ){
651	style_submenu_element("Check-ins", "Check-ins",
652	"%s/tkttimeline?name=%T&y=ci", g.zTop, zUuid);
653	}else{
654	style_submenu_element("Timeline", "Timeline",
655	"%s/tkttimeline?name=%T", g.zTop, zUuid);
656	}
657	style_submenu_element("History", "History",
	@@ -771,12 +779,12 @@
779	@ <p>Ticket change
780	@ [<a href="%s(g.zTop)/artifact/%T(zChngUuid)">%s(zShort)</a>]
781	@ (rid %d(rid)) by
782	hyperlink_to_user(m.zUser,zDate," on");
783	hyperlink_to_date(zDate, ":");

784	@ </p>
785	ticket_output_change_artifact(&m);
786	}
787	manifest_clear(&m);
788	}
789	}
790	db_finalize(&q);
791

M src/tktsetup.c

+94 -98

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -130,21 +130,21 @@
130	130	db_set(zDbField, z, 0);
131	131	if( xRebuild ) xRebuild();
132	132	cgi_redirect("tktsetup");
133	133	}
134	134	}
135		- @ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="POST">
	135	+ @ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="post"><div>
136	136	login_insert_csrf_secret();
137	137	@ <p>%s(zDesc)</p>
138	138	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
139		- @ <blockquote>
140		- @ <input type="submit" name="submit" value="Apply Changes">
141		- @ <input type="submit" name="clear" value="Revert To Default">
142		- @ <input type="submit" name="setup" value="Cancel">
143		- @ </blockquote>
144		- @ </form>
145		- @ <hr>
	139	+ @ <blockquote><p>
	140	+ @ <input type="submit" name="submit" value="Apply Changes" />
	141	+ @ <input type="submit" name="clear" value="Revert To Default" />
	142	+ @ <input type="submit" name="setup" value="Cancel" />
	143	+ @ </p></blockquote>
	144	+ @ </div></form>
	145	+ @ <hr />
146	146	@ <h2>Default %s(zTitle)</h2>
147	147	@ <blockquote><pre>
148	148	@ %h(zDfltValue)
149	149	@ </pre></blockquote>
150	150	style_footer();
		@@ -153,13 +153,13 @@
153	153	/*
154	154	** WEBPAGE: tktsetup_tab
155	155	*/
156	156	void tktsetup_tab_page(void){
157	157	static const char zDesc[] =
158		- @ <p>Enter a valid CREATE TABLE statement for the "ticket" table. The
	158	+ @ Enter a valid CREATE TABLE statement for the "ticket" table. The
159	159	@ table must contain columns named "tkt_id", "tkt_uuid", and "tkt_mtime"
160		- @ with an unique index on "tkt_uuid" and "tkt_mtime".</p>
	160	+ @ with an unique index on "tkt_uuid" and "tkt_mtime".
161	161	;
162	162	tktsetup_generic(
163	163	"Ticket Table Schema",
164	164	"ticket-table",
165	165	zDefaultTicketTable,
		@@ -229,12 +229,12 @@
229	229	/*
230	230	** WEBPAGE: tktsetup_com
231	231	*/
232	232	void tktsetup_com_page(void){
233	233	static const char zDesc[] =
234		- @ <p>Enter TH1 script that initializes variables prior to generating
235		- @ any of the ticket view, edit, or creation pages.</p>
	234	+ @ Enter TH1 script that initializes variables prior to generating
	235	+ @ any of the ticket view, edit, or creation pages.
236	236	;
237	237	tktsetup_generic(
238	238	"Ticket Common Script",
239	239	"ticket-common",
240	240	zDefaultTicketCommon,
		@@ -250,80 +250,80 @@
250	250	@ if {[info exists submit]} {
251	251	@ set status Open
252	252	@ submit_ticket
253	253	@ }
254	254	@ </th1>
255		-@ <h1 align="center">Enter A New Ticket</h1>
	255	+@ <h1 style="text-align: center;">Enter A New Ticket</h1>
256	256	@ <table cellpadding="5">
257	257	@ <tr>
258	258	@ <td colspan="2">
259		-@ Enter a one-line summary of the ticket:<br>
260		-@ <input type="text" name="title" size="60" value="$<title>">
	259	+@ Enter a one-line summary of the ticket:<br />
	260	+@ <input type="text" name="title" size="60" value="$<title>" />
261	261	@ </td>
262	262	@ </tr>
263	263	@
264	264	@ <tr>
265		-@ <td align="right">Type:
	265	+@ <td style="text-align: center;">Type:
266	266	@ <th1>combobox type $type_choices 1</th1>
267	267	@ </td>
268	268	@ <td>What type of ticket is this?</td>
269	269	@ </tr>
270	270	@
271	271	@ <tr>
272		-@ <td align="right">Version:
273		-@ <input type="text" name="foundin" size="20" value="$<foundin>">
	272	+@ <td style="text-align: center;">Version:
	273	+@ <input type="text" name="foundin" size="20" value="$<foundin>" />
274	274	@ </td>
275	275	@ <td>In what version or build number do you observe the problem?</td>
276	276	@ </tr>
277	277	@
278	278	@ <tr>
279		-@ <td align="right">Severity:
	279	+@ <td style="text-align: center;">Severity:
280	280	@ <th1>combobox severity $severity_choices 1</th1>
281	281	@ </td>
282	282	@ <td>How debilitating is the problem? How badly does the problem
283	283	@ affect the operation of the product?</td>
284	284	@ </tr>
285	285	@
286	286	@ <tr>
287		-@ <td align="right">EMail:
288		-@ <input type="text" name="private_contact" value="$<private_contact>" size="30">
	287	+@ <td style="text-align: center;">EMail:
	288	+@ <input type="text" name="private_contact" value="$<private_contact>" size="30" />
289	289	@ </td>
290		-@ <td><u>Not publicly visible</u>. Used by developers to contact you with
291		-@ questions.</td>
	290	+@ <td><span style="text-decoration: underline;">Not publicly visible</span>.
	291	+@ Used by developers to contact you with questions.</td>
292	292	@ </tr>
293	293	@
294	294	@ <tr>
295	295	@ <td colspan="2">
296	296	@ Enter a detailed description of the problem.
297	297	@ For code defects, be sure to provide details on exactly how
298	298	@ the problem can be reproduced. Provide as much detail as
299	299	@ possible.
300		-@ <br>
	300	+@ <br />
301	301	@ <th1>set nline [linecount $comment 50 10]</th1>
302	302	@ <textarea name="comment" cols="80" rows="$nline"
303		-@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
304		-@ <input type="submit" name="preview" value="Preview">
	303	+@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
	304	+@ <input type="submit" name="preview" value="Preview" /></td>
305	305	@ </tr>
306	306	@
307	307	@ <th1>enable_output [info exists preview]</th1>
308	308	@ <tr><td colspan="2">
309		-@ Description Preview:<br><hr>
	309	+@ Description Preview:<br /><hr />
310	310	@ <th1>wiki $comment</th1>
311		-@ <hr>
	311	+@ <hr />
312	312	@ </td></tr>
313	313	@ <th1>enable_output 1</th1>
314	314	@
315	315	@ <tr>
316		-@ <td align="right">
317		-@ <input type="submit" name="submit" value="Submit">
	316	+@ <td style="text-align: center;">
	317	+@ <input type="submit" name="submit" value="Submit" />
318	318	@ </td>
319	319	@ <td>After filling in the information above, press this button to create
320	320	@ the new ticket</td>
321	321	@ </tr>
322	322	@ <tr>
323		-@ <td align="right">
324		-@ <input type="submit" name="cancel" value="Cancel">
	323	+@ <td style="text-align: center;">
	324	+@ <input type="submit" name="cancel" value="Cancel" />
325	325	@ </td>
326	326	@ <td>Abandon and forget this ticket</td>
327	327	@ </tr>
328	328	@ </table>
329	329	;
		@@ -338,12 +338,12 @@
338	338	/*
339	339	** WEBPAGE: tktsetup_newpage
340	340	*/
341	341	void tktsetup_newpage_page(void){
342	342	static const char zDesc[] =
343		- @ <p>Enter HTML with embedded TH1 script that will render the "new ticket"
344		- @ page</p>
	343	+ @ Enter HTML with embedded TH1 script that will render the "new ticket"
	344	+ @ page
345	345	;
346	346	tktsetup_generic(
347	347	"HTML For New Tickets",
348	348	"ticket-newpage",
349	349	zDefaultNew,
		@@ -354,51 +354,50 @@
354	354	);
355	355	}
356	356
357	357	static const char zDefaultView[] =
358	358	@ <table cellpadding="5">
359		-@ <tr><td align="right">Ticket UUID:</td><td bgcolor="#d0d0d0" colspan="3">
360		-@ $<tkt_uuid>
361		-@ </td></tr>
362		-@ <tr><td align="right">Title:</td>
363		-@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
	359	+@ <tr><td class="tktDspLabel">Ticket UUID:</td>
	360	+@ <td class="tktDspValue" colspan="3">$<tkt_uuid></td></tr>
	361	+@ <tr><td class="tktDspLabel">Title:</td>
	362	+@ <td class="tktDspValue" colspan="3">
364	363	@ <th1>wiki $title</th1>
365	364	@ </td></tr>
366		-@ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
	365	+@ <tr><td class="tktDspLabel">Status:</td><td class="tktDspValue">
367	366	@ $<status>
368	367	@ </td>
369		-@ <td align="right">Type:</td><td bgcolor="#d0d0d0">
	368	+@ <td class="tktDspLabel">Type:</td><td class="tktDspValue">
370	369	@ $<type>
371	370	@ </td></tr>
372		-@ <tr><td align="right">Severity:</td><td bgcolor="#d0d0d0">
	371	+@ <tr><td class="tktDspLabel">Severity:</td><td class="tktDspValue">
373	372	@ $<severity>
374	373	@ </td>
375		-@ <td align="right">Priority:</td><td bgcolor="#d0d0d0">
	374	+@ <td class="tktDspLabel">Priority:</td><td class="tktDspValue">
376	375	@ $<priority>
377	376	@ </td></tr>
378		-@ <tr><td align="right">Subsystem:</td><td bgcolor="#d0d0d0">
	377	+@ <tr><td class="tktDspLabel">Subsystem:</td><td class="tktDspValue">
379	378	@ $<subsystem>
380	379	@ </td>
381		-@ <td align="right">Resolution:</td><td bgcolor="#d0d0d0">
	380	+@ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue">
382	381	@ $<resolution>
383	382	@ </td></tr>
384		-@ <tr><td align="right">Last Modified:</td><td bgcolor="#d0d0d0">
	383	+@ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue">
385	384	@ $<tkt_datetime>
386	385	@ </td>
387	386	@ <th1>enable_output [hascap e]</th1>
388		-@ <td align="right">Contact:</td><td bgcolor="#d0d0d0">
	387	+@ <td class="tktDspLabel">Contact:</td><td class="tktDspValue">
389	388	@ $<private_contact>
390	389	@ </td>
391	390	@ <th1>enable_output 1</th1>
392	391	@ </tr>
393		-@ <tr><td align="right">Version Found In:</td>
394		-@ <td colspan="3" valign="top" bgcolor="#d0d0d0">
	392	+@ <tr><td class="tktDspLabel">Version Found In:</td>
	393	+@ <td colspan="3" valign="top" class="tktDspValue">
395	394	@ $<foundin>
396	395	@ </td></tr>
397	396	@ <tr><td>Description & Comments:</td></tr>
398		-@ <tr><td colspan="4" bgcolor="#d0d0d0">
399		-@ <span bgcolor="#d0d0d0"><th1>wiki $comment</th1></span>
	397	+@ <tr><td colspan="4" class="tktDspValue">
	398	+@ <th1>wiki $comment</th1>
400	399	@ </td></tr>
401	400	@ </table>
402	401	;
403	402
404	403
		@@ -412,12 +411,11 @@
412	411	/*
413	412	** WEBPAGE: tktsetup_viewpage
414	413	*/
415	414	void tktsetup_viewpage_page(void){
416	415	static const char zDesc[] =
417		- @ <p>Enter HTML with embedded TH1 script that will render the "view ticket"
418		- @ page</p>
	416	+ @ Enter HTML with embedded TH1 script that will render the "view ticket" page
419	417	;
420	418	tktsetup_generic(
421	419	"HTML For Viewing Tickets",
422	420	"ticket-viewpage",
423	421	zDefaultView,
		@@ -432,51 +430,51 @@
432	430	@ <th1>
433	431	@ if {![info exists username]} {set username $login}
434	432	@ if {[info exists submit]} {
435	433	@ if {[info exists cmappnd]} {
436	434	@ if {[string length $cmappnd]>0} {
437		-@ set ctxt "\n\n<hr><i>[htmlize $login]"
	435	+@ set ctxt "\n\n<hr /><i>[htmlize $login]"
438	436	@ if {$username ne $login} {
439	437	@ set ctxt "$ctxt claiming to be [htmlize $username]"
440	438	@ }
441		-@ set ctxt "$ctxt added on [date]:</i><br>\n$cmappnd"
	439	+@ set ctxt "$ctxt added on [date]:</i><br />\n$cmappnd"
442	440	@ append_field comment $ctxt
443	441	@ }
444	442	@ }
445	443	@ submit_ticket
446	444	@ }
447	445	@ </th1>
448	446	@ <table cellpadding="5">
449		-@ <tr><td align="right">Title:</td><td>
450		-@ <input type="text" name="title" value="$<title>" size="60">
	447	+@ <tr><td class="tktDspLabel">Title:</td><td>
	448	+@ <input type="text" name="title" value="$<title>" size="60" />
451	449	@ </td></tr>
452		-@ <tr><td align="right">Status:</td><td>
	450	+@ <tr><td class="tktDspLabel">Status:</td><td>
453	451	@ <th1>combobox status $status_choices 1</th1>
454	452	@ </td></tr>
455		-@ <tr><td align="right">Type:</td><td>
	453	+@ <tr><td class="tktDspLabel">Type:</td><td>
456	454	@ <th1>combobox type $type_choices 1</th1>
457	455	@ </td></tr>
458		-@ <tr><td align="right">Severity:</td><td>
	456	+@ <tr><td class="tktDspLabel">Severity:</td><td>
459	457	@ <th1>combobox severity $severity_choices 1</th1>
460	458	@ </td></tr>
461		-@ <tr><td align="right">Priority:</td><td>
	459	+@ <tr><td class="tktDspLabel">Priority:</td><td>
462	460	@ <th1>combobox priority $priority_choices 1</th1>
463	461	@ </td></tr>
464		-@ <tr><td align="right">Resolution:</td><td>
	462	+@ <tr><td class="tktDspLabel">Resolution:</td><td>
465	463	@ <th1>combobox resolution $resolution_choices 1</th1>
466	464	@ </td></tr>
467		-@ <tr><td align="right">Subsystem:</td><td>
	465	+@ <tr><td class="tktDspLabel">Subsystem:</td><td>
468	466	@ <th1>combobox subsystem $subsystem_choices 1</th1>
469	467	@ </td></tr>
470	468	@ <th1>enable_output [hascap e]</th1>
471		-@ <tr><td align="right">Contact:</td><td>
	469	+@ <tr><td class="tktDspLabel">Contact:</td><td>
472	470	@ <input type="text" name="private_contact" size="40"
473		-@ value="$<private_contact>">
	471	+@ value="$<private_contact>" />
474	472	@ </td></tr>
475	473	@ <th1>enable_output 1</th1>
476		-@ <tr><td align="right">Version Found In:</td><td>
477		-@ <input type="text" name="foundin" size="50" value="$<foundin>">
	474	+@ <tr><td class="tktDspLabel">Version Found In:</td><td>
	475	+@ <input type="text" name="foundin" size="50" value="$<foundin>" />
478	476	@ </td></tr>
479	477	@ <tr><td colspan="2">
480	478	@ <th1>
481	479	@ if {![info exists eall]} {set eall 0}
482	480	@ if {[info exists aonlybtn]} {set eall 0}
		@@ -484,45 +482,45 @@
484	482	@ if {![hascap w]} {set eall 0}
485	483	@ if {![info exists cmappnd]} {set cmappnd {}}
486	484	@ set nline [linecount $comment 15 10]
487	485	@ enable_output $eall
488	486	@ </th1>
489		-@ Description And Comments:<br>
	487	+@ Description And Comments:<br />
490	488	@ <textarea name="comment" cols="80" rows="$nline"
491		-@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
492		-@ <input type="hidden" name="eall" value="1">
493		-@ <input type="submit" name="aonlybtn" value="Append Remark">
494		-@ <input type="submit" name="preview1btn" value="Preview">
	489	+@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
	490	+@ <input type="hidden" name="eall" value="1" />
	491	+@ <input type="submit" name="aonlybtn" value="Append Remark" />
	492	+@ <input type="submit" name="preview1btn" value="Preview" />
495	493	@ <th1>enable_output [expr {!$eall}]</th1>
496	494	@ Append Remark from
497		-@ <input type="text" name="username" value="$<username>" size="30">:<br>
	495	+@ <input type="text" name="username" value="$<username>" size="30" />:<br />
498	496	@ <textarea name="cmappnd" cols="80" rows="15"
499		-@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br>
	497	+@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
500	498	@ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
501		-@ <input type="submit" name="eallbtn" value="Edit All">
	499	+@ <input type="submit" name="eallbtn" value="Edit All" />
502	500	@ <th1>enable_output [expr {!$eall}]</th1>
503		-@ <input type="submit" name="preview2btn" value="Preview">
	501	+@ <input type="submit" name="preview2btn" value="Preview" />
504	502	@ <th1>enable_output 1</th1>
505	503	@ </td></tr>
506	504	@
507	505	@ <th1>enable_output [info exists preview1btn]</th1>
508	506	@ <tr><td colspan="2">
509		-@ Description Preview:<br><hr>
	507	+@ Description Preview:<br /><hr />
510	508	@ <th1>wiki $comment</th1>
511		-@ <hr>
	509	+@ <hr />
512	510	@ </td></tr>
513	511	@ <th1>enable_output [info exists preview2btn]</th1>
514	512	@ <tr><td colspan="2">
515		-@ Description Preview:<br><hr>
	513	+@ Description Preview:<br /><hr />
516	514	@ <th1>wiki $cmappnd</th1>
517		-@ <hr>
	515	+@ <hr />
518	516	@ </td></tr>
519	517	@ <th1>enable_output 1</th1>
520	518	@
521	519	@ <tr><td align="right"></td><td>
522		-@ <input type="submit" name="submit" value="Submit Changes">
523		-@ <input type="submit" name="cancel" value="Cancel">
	520	+@ <input type="submit" name="submit" value="Submit Changes" />
	521	+@ <input type="submit" name="cancel" value="Cancel" />
524	522	@ </td></tr>
525	523	@ </table>
526	524	;
527	525
528	526	/*
		@@ -535,12 +533,11 @@
535	533	/*
536	534	** WEBPAGE: tktsetup_editpage
537	535	*/
538	536	void tktsetup_editpage_page(void){
539	537	static const char zDesc[] =
540		- @ <p>Enter HTML with embedded TH1 script that will render the "edit ticket"
541		- @ page</p>
	538	+ @ Enter HTML with embedded TH1 script that will render the "edit ticket" page
542	539	;
543	540	tktsetup_generic(
544	541	"HTML For Editing Tickets",
545	542	"ticket-editpage",
546	543	zDefaultEdit,
		@@ -585,12 +582,11 @@
585	582	/*
586	583	** WEBPAGE: tktsetup_reportlist
587	584	*/
588	585	void tktsetup_reportlist(void){
589	586	static const char zDesc[] =
590		- @ <p>Enter HTML with embedded TH1 script that will render the "report list"
591		- @ page</p>
	587	+ @ Enter HTML with embedded TH1 script that will render the "report list" page
592	588	;
593	589	tktsetup_generic(
594	590	"HTML For Report List",
595	591	"ticket-reportlist",
596	592	zDefaultReportList,
		@@ -633,13 +629,13 @@
633	629	/*
634	630	** WEBPAGE: tktsetup_rpttplt
635	631	*/
636	632	void tktsetup_rpttplt_page(void){
637	633	static const char zDesc[] =
638		- @ <p>Enter the default ticket report format template. This is the
	634	+ @ Enter the default ticket report format template. This is the
639	635	@ the template report format that initially appears when creating a
640		- @ new ticket summary report.</p>
	636	+ @ new ticket summary report.
641	637	;
642	638	tktsetup_generic(
643	639	"Default Report Template",
644	640	"ticket-report-template",
645	641	zDefaultReport,
		@@ -674,13 +670,13 @@
674	670	/*
675	671	** WEBPAGE: tktsetup_keytplt
676	672	*/
677	673	void tktsetup_keytplt_page(void){
678	674	static const char zDesc[] =
679		- @ <p>Enter the default ticket report color-key template. This is the
	675	+ @ Enter the default ticket report color-key template. This is the
680	676	@ the color-key that initially appears when creating a
681		- @ new ticket summary report.</p>
	677	+ @ new ticket summary report.
682	678	;
683	679	tktsetup_generic(
684	680	"Default Report Color-Key Template",
685	681	"ticket-key-template",
686	682	zDefaultKey,
		@@ -703,34 +699,34 @@
703	699	if( P("setup") ){
704	700	cgi_redirect("tktsetup");
705	701	}
706	702	style_header("Ticket Display On Timelines");
707	703	db_begin_transaction();
708		- @ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="POST">
	704	+ @ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="post"><div>
709	705	login_insert_csrf_secret();
710	706
711		- @ <hr>
	707	+ @ <hr />
712	708	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t", "title");
713	709	@ <p>An SQL expression in a query against the TICKET table that will
714	710	@ return the title of the ticket for display purposes.</p>
715	711
716		- @ <hr>
	712	+ @ <hr />
717	713	entry_attribute("Ticket Status", 40, "ticket-status-column", "s", "status");
718	714	@ <p>The name of the column in the TICKET table that contains the ticket
719	715	@ status in human-readable form. Case sensitive.</p>
720	716
721		- @ <hr>
	717	+ @ <hr />
722	718	entry_attribute("Ticket Closed", 40, "ticket-closed-expr", "c",
723	719	"status='Closed'");
724	720	@ <p>An SQL expression that evaluates to true in a TICKET table query if
725	721	@ the ticket is closed.</p>
726	722
727		- @ <hr>
	723	+ @ <hr />
728	724	@ <p>
729		- @ <input type="submit" name="submit" value="Apply Changes">
730		- @ <input type="submit" name="setup" value="Cancel">
	725	+ @ <input type="submit" name="submit" value="Apply Changes" />
	726	+ @ <input type="submit" name="setup" value="Cancel" />
731	727	@ </p>
732		- @ </form>
	728	+ @ </div></form>
733	729	db_end_transaction(0);
734	730	style_footer();
735	731
736	732	}
737	733

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -130,21 +130,21 @@
130	db_set(zDbField, z, 0);
131	if( xRebuild ) xRebuild();
132	cgi_redirect("tktsetup");
133	}
134	}
135	@ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="POST">
136	login_insert_csrf_secret();
137	@ <p>%s(zDesc)</p>
138	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
139	@ <blockquote>
140	@ <input type="submit" name="submit" value="Apply Changes">
141	@ <input type="submit" name="clear" value="Revert To Default">
142	@ <input type="submit" name="setup" value="Cancel">
143	@ </blockquote>
144	@ </form>
145	@ <hr>
146	@ <h2>Default %s(zTitle)</h2>
147	@ <blockquote><pre>
148	@ %h(zDfltValue)
149	@ </pre></blockquote>
150	style_footer();
	@@ -153,13 +153,13 @@
153	/*
154	** WEBPAGE: tktsetup_tab
155	*/
156	void tktsetup_tab_page(void){
157	static const char zDesc[] =
158	@ <p>Enter a valid CREATE TABLE statement for the "ticket" table. The
159	@ table must contain columns named "tkt_id", "tkt_uuid", and "tkt_mtime"
160	@ with an unique index on "tkt_uuid" and "tkt_mtime".</p>
161	;
162	tktsetup_generic(
163	"Ticket Table Schema",
164	"ticket-table",
165	zDefaultTicketTable,
	@@ -229,12 +229,12 @@
229	/*
230	** WEBPAGE: tktsetup_com
231	*/
232	void tktsetup_com_page(void){
233	static const char zDesc[] =
234	@ <p>Enter TH1 script that initializes variables prior to generating
235	@ any of the ticket view, edit, or creation pages.</p>
236	;
237	tktsetup_generic(
238	"Ticket Common Script",
239	"ticket-common",
240	zDefaultTicketCommon,
	@@ -250,80 +250,80 @@
250	@ if {[info exists submit]} {
251	@ set status Open
252	@ submit_ticket
253	@ }
254	@ </th1>
255	@ <h1 align="center">Enter A New Ticket</h1>
256	@ <table cellpadding="5">
257	@ <tr>
258	@ <td colspan="2">
259	@ Enter a one-line summary of the ticket:<br>
260	@ <input type="text" name="title" size="60" value="$<title>">
261	@ </td>
262	@ </tr>
263	@
264	@ <tr>
265	@ <td align="right">Type:
266	@ <th1>combobox type $type_choices 1</th1>
267	@ </td>
268	@ <td>What type of ticket is this?</td>
269	@ </tr>
270	@
271	@ <tr>
272	@ <td align="right">Version:
273	@ <input type="text" name="foundin" size="20" value="$<foundin>">
274	@ </td>
275	@ <td>In what version or build number do you observe the problem?</td>
276	@ </tr>
277	@
278	@ <tr>
279	@ <td align="right">Severity:
280	@ <th1>combobox severity $severity_choices 1</th1>
281	@ </td>
282	@ <td>How debilitating is the problem? How badly does the problem
283	@ affect the operation of the product?</td>
284	@ </tr>
285	@
286	@ <tr>
287	@ <td align="right">EMail:
288	@ <input type="text" name="private_contact" value="$<private_contact>" size="30">
289	@ </td>
290	@ <td><u>Not publicly visible</u>. Used by developers to contact you with
291	@ questions.</td>
292	@ </tr>
293	@
294	@ <tr>
295	@ <td colspan="2">
296	@ Enter a detailed description of the problem.
297	@ For code defects, be sure to provide details on exactly how
298	@ the problem can be reproduced. Provide as much detail as
299	@ possible.
300	@ <br>
301	@ <th1>set nline [linecount $comment 50 10]</th1>
302	@ <textarea name="comment" cols="80" rows="$nline"
303	@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
304	@ <input type="submit" name="preview" value="Preview">
305	@ </tr>
306	@
307	@ <th1>enable_output [info exists preview]</th1>
308	@ <tr><td colspan="2">
309	@ Description Preview:<br><hr>
310	@ <th1>wiki $comment</th1>
311	@ <hr>
312	@ </td></tr>
313	@ <th1>enable_output 1</th1>
314	@
315	@ <tr>
316	@ <td align="right">
317	@ <input type="submit" name="submit" value="Submit">
318	@ </td>
319	@ <td>After filling in the information above, press this button to create
320	@ the new ticket</td>
321	@ </tr>
322	@ <tr>
323	@ <td align="right">
324	@ <input type="submit" name="cancel" value="Cancel">
325	@ </td>
326	@ <td>Abandon and forget this ticket</td>
327	@ </tr>
328	@ </table>
329	;
	@@ -338,12 +338,12 @@
338	/*
339	** WEBPAGE: tktsetup_newpage
340	*/
341	void tktsetup_newpage_page(void){
342	static const char zDesc[] =
343	@ <p>Enter HTML with embedded TH1 script that will render the "new ticket"
344	@ page</p>
345	;
346	tktsetup_generic(
347	"HTML For New Tickets",
348	"ticket-newpage",
349	zDefaultNew,
	@@ -354,51 +354,50 @@
354	);
355	}
356
357	static const char zDefaultView[] =
358	@ <table cellpadding="5">
359	@ <tr><td align="right">Ticket UUID:</td><td bgcolor="#d0d0d0" colspan="3">
360	@ $<tkt_uuid>
361	@ </td></tr>
362	@ <tr><td align="right">Title:</td>
363	@ <td bgcolor="#d0d0d0" colspan="3" valign="top">
364	@ <th1>wiki $title</th1>
365	@ </td></tr>
366	@ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
367	@ $<status>
368	@ </td>
369	@ <td align="right">Type:</td><td bgcolor="#d0d0d0">
370	@ $<type>
371	@ </td></tr>
372	@ <tr><td align="right">Severity:</td><td bgcolor="#d0d0d0">
373	@ $<severity>
374	@ </td>
375	@ <td align="right">Priority:</td><td bgcolor="#d0d0d0">
376	@ $<priority>
377	@ </td></tr>
378	@ <tr><td align="right">Subsystem:</td><td bgcolor="#d0d0d0">
379	@ $<subsystem>
380	@ </td>
381	@ <td align="right">Resolution:</td><td bgcolor="#d0d0d0">
382	@ $<resolution>
383	@ </td></tr>
384	@ <tr><td align="right">Last Modified:</td><td bgcolor="#d0d0d0">
385	@ $<tkt_datetime>
386	@ </td>
387	@ <th1>enable_output [hascap e]</th1>
388	@ <td align="right">Contact:</td><td bgcolor="#d0d0d0">
389	@ $<private_contact>
390	@ </td>
391	@ <th1>enable_output 1</th1>
392	@ </tr>
393	@ <tr><td align="right">Version Found In:</td>
394	@ <td colspan="3" valign="top" bgcolor="#d0d0d0">
395	@ $<foundin>
396	@ </td></tr>
397	@ <tr><td>Description & Comments:</td></tr>
398	@ <tr><td colspan="4" bgcolor="#d0d0d0">
399	@ <span bgcolor="#d0d0d0"><th1>wiki $comment</th1></span>
400	@ </td></tr>
401	@ </table>
402	;
403
404
	@@ -412,12 +411,11 @@
412	/*
413	** WEBPAGE: tktsetup_viewpage
414	*/
415	void tktsetup_viewpage_page(void){
416	static const char zDesc[] =
417	@ <p>Enter HTML with embedded TH1 script that will render the "view ticket"
418	@ page</p>
419	;
420	tktsetup_generic(
421	"HTML For Viewing Tickets",
422	"ticket-viewpage",
423	zDefaultView,
	@@ -432,51 +430,51 @@
432	@ <th1>
433	@ if {![info exists username]} {set username $login}
434	@ if {[info exists submit]} {
435	@ if {[info exists cmappnd]} {
436	@ if {[string length $cmappnd]>0} {
437	@ set ctxt "\n\n<hr><i>[htmlize $login]"
438	@ if {$username ne $login} {
439	@ set ctxt "$ctxt claiming to be [htmlize $username]"
440	@ }
441	@ set ctxt "$ctxt added on [date]:</i><br>\n$cmappnd"
442	@ append_field comment $ctxt
443	@ }
444	@ }
445	@ submit_ticket
446	@ }
447	@ </th1>
448	@ <table cellpadding="5">
449	@ <tr><td align="right">Title:</td><td>
450	@ <input type="text" name="title" value="$<title>" size="60">
451	@ </td></tr>
452	@ <tr><td align="right">Status:</td><td>
453	@ <th1>combobox status $status_choices 1</th1>
454	@ </td></tr>
455	@ <tr><td align="right">Type:</td><td>
456	@ <th1>combobox type $type_choices 1</th1>
457	@ </td></tr>
458	@ <tr><td align="right">Severity:</td><td>
459	@ <th1>combobox severity $severity_choices 1</th1>
460	@ </td></tr>
461	@ <tr><td align="right">Priority:</td><td>
462	@ <th1>combobox priority $priority_choices 1</th1>
463	@ </td></tr>
464	@ <tr><td align="right">Resolution:</td><td>
465	@ <th1>combobox resolution $resolution_choices 1</th1>
466	@ </td></tr>
467	@ <tr><td align="right">Subsystem:</td><td>
468	@ <th1>combobox subsystem $subsystem_choices 1</th1>
469	@ </td></tr>
470	@ <th1>enable_output [hascap e]</th1>
471	@ <tr><td align="right">Contact:</td><td>
472	@ <input type="text" name="private_contact" size="40"
473	@ value="$<private_contact>">
474	@ </td></tr>
475	@ <th1>enable_output 1</th1>
476	@ <tr><td align="right">Version Found In:</td><td>
477	@ <input type="text" name="foundin" size="50" value="$<foundin>">
478	@ </td></tr>
479	@ <tr><td colspan="2">
480	@ <th1>
481	@ if {![info exists eall]} {set eall 0}
482	@ if {[info exists aonlybtn]} {set eall 0}
	@@ -484,45 +482,45 @@
484	@ if {![hascap w]} {set eall 0}
485	@ if {![info exists cmappnd]} {set cmappnd {}}
486	@ set nline [linecount $comment 15 10]
487	@ enable_output $eall
488	@ </th1>
489	@ Description And Comments:<br>
490	@ <textarea name="comment" cols="80" rows="$nline"
491	@ wrap="virtual" class="wikiedit">$<comment></textarea><br>
492	@ <input type="hidden" name="eall" value="1">
493	@ <input type="submit" name="aonlybtn" value="Append Remark">
494	@ <input type="submit" name="preview1btn" value="Preview">
495	@ <th1>enable_output [expr {!$eall}]</th1>
496	@ Append Remark from
497	@ <input type="text" name="username" value="$<username>" size="30">:<br>
498	@ <textarea name="cmappnd" cols="80" rows="15"
499	@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br>
500	@ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
501	@ <input type="submit" name="eallbtn" value="Edit All">
502	@ <th1>enable_output [expr {!$eall}]</th1>
503	@ <input type="submit" name="preview2btn" value="Preview">
504	@ <th1>enable_output 1</th1>
505	@ </td></tr>
506	@
507	@ <th1>enable_output [info exists preview1btn]</th1>
508	@ <tr><td colspan="2">
509	@ Description Preview:<br><hr>
510	@ <th1>wiki $comment</th1>
511	@ <hr>
512	@ </td></tr>
513	@ <th1>enable_output [info exists preview2btn]</th1>
514	@ <tr><td colspan="2">
515	@ Description Preview:<br><hr>
516	@ <th1>wiki $cmappnd</th1>
517	@ <hr>
518	@ </td></tr>
519	@ <th1>enable_output 1</th1>
520	@
521	@ <tr><td align="right"></td><td>
522	@ <input type="submit" name="submit" value="Submit Changes">
523	@ <input type="submit" name="cancel" value="Cancel">
524	@ </td></tr>
525	@ </table>
526	;
527
528	/*
	@@ -535,12 +533,11 @@
535	/*
536	** WEBPAGE: tktsetup_editpage
537	*/
538	void tktsetup_editpage_page(void){
539	static const char zDesc[] =
540	@ <p>Enter HTML with embedded TH1 script that will render the "edit ticket"
541	@ page</p>
542	;
543	tktsetup_generic(
544	"HTML For Editing Tickets",
545	"ticket-editpage",
546	zDefaultEdit,
	@@ -585,12 +582,11 @@
585	/*
586	** WEBPAGE: tktsetup_reportlist
587	*/
588	void tktsetup_reportlist(void){
589	static const char zDesc[] =
590	@ <p>Enter HTML with embedded TH1 script that will render the "report list"
591	@ page</p>
592	;
593	tktsetup_generic(
594	"HTML For Report List",
595	"ticket-reportlist",
596	zDefaultReportList,
	@@ -633,13 +629,13 @@
633	/*
634	** WEBPAGE: tktsetup_rpttplt
635	*/
636	void tktsetup_rpttplt_page(void){
637	static const char zDesc[] =
638	@ <p>Enter the default ticket report format template. This is the
639	@ the template report format that initially appears when creating a
640	@ new ticket summary report.</p>
641	;
642	tktsetup_generic(
643	"Default Report Template",
644	"ticket-report-template",
645	zDefaultReport,
	@@ -674,13 +670,13 @@
674	/*
675	** WEBPAGE: tktsetup_keytplt
676	*/
677	void tktsetup_keytplt_page(void){
678	static const char zDesc[] =
679	@ <p>Enter the default ticket report color-key template. This is the
680	@ the color-key that initially appears when creating a
681	@ new ticket summary report.</p>
682	;
683	tktsetup_generic(
684	"Default Report Color-Key Template",
685	"ticket-key-template",
686	zDefaultKey,
	@@ -703,34 +699,34 @@
703	if( P("setup") ){
704	cgi_redirect("tktsetup");
705	}
706	style_header("Ticket Display On Timelines");
707	db_begin_transaction();
708	@ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="POST">
709	login_insert_csrf_secret();
710
711	@ <hr>
712	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t", "title");
713	@ <p>An SQL expression in a query against the TICKET table that will
714	@ return the title of the ticket for display purposes.</p>
715
716	@ <hr>
717	entry_attribute("Ticket Status", 40, "ticket-status-column", "s", "status");
718	@ <p>The name of the column in the TICKET table that contains the ticket
719	@ status in human-readable form. Case sensitive.</p>
720
721	@ <hr>
722	entry_attribute("Ticket Closed", 40, "ticket-closed-expr", "c",
723	"status='Closed'");
724	@ <p>An SQL expression that evaluates to true in a TICKET table query if
725	@ the ticket is closed.</p>
726
727	@ <hr>
728	@ <p>
729	@ <input type="submit" name="submit" value="Apply Changes">
730	@ <input type="submit" name="setup" value="Cancel">
731	@ </p>
732	@ </form>
733	db_end_transaction(0);
734	style_footer();
735
736	}
737

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -130,21 +130,21 @@
130	db_set(zDbField, z, 0);
131	if( xRebuild ) xRebuild();
132	cgi_redirect("tktsetup");
133	}
134	}
135	@ <form action="%s(g.zBaseURL)/%s(g.zPath)" method="post"><div>
136	login_insert_csrf_secret();
137	@ <p>%s(zDesc)</p>
138	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
139	@ <blockquote><p>
140	@ <input type="submit" name="submit" value="Apply Changes" />
141	@ <input type="submit" name="clear" value="Revert To Default" />
142	@ <input type="submit" name="setup" value="Cancel" />
143	@ </p></blockquote>
144	@ </div></form>
145	@ <hr />
146	@ <h2>Default %s(zTitle)</h2>
147	@ <blockquote><pre>
148	@ %h(zDfltValue)
149	@ </pre></blockquote>
150	style_footer();
	@@ -153,13 +153,13 @@
153	/*
154	** WEBPAGE: tktsetup_tab
155	*/
156	void tktsetup_tab_page(void){
157	static const char zDesc[] =
158	@ Enter a valid CREATE TABLE statement for the "ticket" table. The
159	@ table must contain columns named "tkt_id", "tkt_uuid", and "tkt_mtime"
160	@ with an unique index on "tkt_uuid" and "tkt_mtime".
161	;
162	tktsetup_generic(
163	"Ticket Table Schema",
164	"ticket-table",
165	zDefaultTicketTable,
	@@ -229,12 +229,12 @@
229	/*
230	** WEBPAGE: tktsetup_com
231	*/
232	void tktsetup_com_page(void){
233	static const char zDesc[] =
234	@ Enter TH1 script that initializes variables prior to generating
235	@ any of the ticket view, edit, or creation pages.
236	;
237	tktsetup_generic(
238	"Ticket Common Script",
239	"ticket-common",
240	zDefaultTicketCommon,
	@@ -250,80 +250,80 @@
250	@ if {[info exists submit]} {
251	@ set status Open
252	@ submit_ticket
253	@ }
254	@ </th1>
255	@ <h1 style="text-align: center;">Enter A New Ticket</h1>
256	@ <table cellpadding="5">
257	@ <tr>
258	@ <td colspan="2">
259	@ Enter a one-line summary of the ticket:<br />
260	@ <input type="text" name="title" size="60" value="$<title>" />
261	@ </td>
262	@ </tr>
263	@
264	@ <tr>
265	@ <td style="text-align: center;">Type:
266	@ <th1>combobox type $type_choices 1</th1>
267	@ </td>
268	@ <td>What type of ticket is this?</td>
269	@ </tr>
270	@
271	@ <tr>
272	@ <td style="text-align: center;">Version:
273	@ <input type="text" name="foundin" size="20" value="$<foundin>" />
274	@ </td>
275	@ <td>In what version or build number do you observe the problem?</td>
276	@ </tr>
277	@
278	@ <tr>
279	@ <td style="text-align: center;">Severity:
280	@ <th1>combobox severity $severity_choices 1</th1>
281	@ </td>
282	@ <td>How debilitating is the problem? How badly does the problem
283	@ affect the operation of the product?</td>
284	@ </tr>
285	@
286	@ <tr>
287	@ <td style="text-align: center;">EMail:
288	@ <input type="text" name="private_contact" value="$<private_contact>" size="30" />
289	@ </td>
290	@ <td><span style="text-decoration: underline;">Not publicly visible</span>.
291	@ Used by developers to contact you with questions.</td>
292	@ </tr>
293	@
294	@ <tr>
295	@ <td colspan="2">
296	@ Enter a detailed description of the problem.
297	@ For code defects, be sure to provide details on exactly how
298	@ the problem can be reproduced. Provide as much detail as
299	@ possible.
300	@ <br />
301	@ <th1>set nline [linecount $comment 50 10]</th1>
302	@ <textarea name="comment" cols="80" rows="$nline"
303	@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
304	@ <input type="submit" name="preview" value="Preview" /></td>
305	@ </tr>
306	@
307	@ <th1>enable_output [info exists preview]</th1>
308	@ <tr><td colspan="2">
309	@ Description Preview:<br /><hr />
310	@ <th1>wiki $comment</th1>
311	@ <hr />
312	@ </td></tr>
313	@ <th1>enable_output 1</th1>
314	@
315	@ <tr>
316	@ <td style="text-align: center;">
317	@ <input type="submit" name="submit" value="Submit" />
318	@ </td>
319	@ <td>After filling in the information above, press this button to create
320	@ the new ticket</td>
321	@ </tr>
322	@ <tr>
323	@ <td style="text-align: center;">
324	@ <input type="submit" name="cancel" value="Cancel" />
325	@ </td>
326	@ <td>Abandon and forget this ticket</td>
327	@ </tr>
328	@ </table>
329	;
	@@ -338,12 +338,12 @@
338	/*
339	** WEBPAGE: tktsetup_newpage
340	*/
341	void tktsetup_newpage_page(void){
342	static const char zDesc[] =
343	@ Enter HTML with embedded TH1 script that will render the "new ticket"
344	@ page
345	;
346	tktsetup_generic(
347	"HTML For New Tickets",
348	"ticket-newpage",
349	zDefaultNew,
	@@ -354,51 +354,50 @@
354	);
355	}
356
357	static const char zDefaultView[] =
358	@ <table cellpadding="5">
359	@ <tr><td class="tktDspLabel">Ticket UUID:</td>
360	@ <td class="tktDspValue" colspan="3">$<tkt_uuid></td></tr>
361	@ <tr><td class="tktDspLabel">Title:</td>
362	@ <td class="tktDspValue" colspan="3">

363	@ <th1>wiki $title</th1>
364	@ </td></tr>
365	@ <tr><td class="tktDspLabel">Status:</td><td class="tktDspValue">
366	@ $<status>
367	@ </td>
368	@ <td class="tktDspLabel">Type:</td><td class="tktDspValue">
369	@ $<type>
370	@ </td></tr>
371	@ <tr><td class="tktDspLabel">Severity:</td><td class="tktDspValue">
372	@ $<severity>
373	@ </td>
374	@ <td class="tktDspLabel">Priority:</td><td class="tktDspValue">
375	@ $<priority>
376	@ </td></tr>
377	@ <tr><td class="tktDspLabel">Subsystem:</td><td class="tktDspValue">
378	@ $<subsystem>
379	@ </td>
380	@ <td class="tktDspLabel">Resolution:</td><td class="tktDspValue">
381	@ $<resolution>
382	@ </td></tr>
383	@ <tr><td class="tktDspLabel">Last Modified:</td><td class="tktDspValue">
384	@ $<tkt_datetime>
385	@ </td>
386	@ <th1>enable_output [hascap e]</th1>
387	@ <td class="tktDspLabel">Contact:</td><td class="tktDspValue">
388	@ $<private_contact>
389	@ </td>
390	@ <th1>enable_output 1</th1>
391	@ </tr>
392	@ <tr><td class="tktDspLabel">Version Found In:</td>
393	@ <td colspan="3" valign="top" class="tktDspValue">
394	@ $<foundin>
395	@ </td></tr>
396	@ <tr><td>Description & Comments:</td></tr>
397	@ <tr><td colspan="4" class="tktDspValue">
398	@ <th1>wiki $comment</th1>
399	@ </td></tr>
400	@ </table>
401	;
402
403
	@@ -412,12 +411,11 @@
411	/*
412	** WEBPAGE: tktsetup_viewpage
413	*/
414	void tktsetup_viewpage_page(void){
415	static const char zDesc[] =
416	@ Enter HTML with embedded TH1 script that will render the "view ticket" page

417	;
418	tktsetup_generic(
419	"HTML For Viewing Tickets",
420	"ticket-viewpage",
421	zDefaultView,
	@@ -432,51 +430,51 @@
430	@ <th1>
431	@ if {![info exists username]} {set username $login}
432	@ if {[info exists submit]} {
433	@ if {[info exists cmappnd]} {
434	@ if {[string length $cmappnd]>0} {
435	@ set ctxt "\n\n<hr /><i>[htmlize $login]"
436	@ if {$username ne $login} {
437	@ set ctxt "$ctxt claiming to be [htmlize $username]"
438	@ }
439	@ set ctxt "$ctxt added on [date]:</i><br />\n$cmappnd"
440	@ append_field comment $ctxt
441	@ }
442	@ }
443	@ submit_ticket
444	@ }
445	@ </th1>
446	@ <table cellpadding="5">
447	@ <tr><td class="tktDspLabel">Title:</td><td>
448	@ <input type="text" name="title" value="$<title>" size="60" />
449	@ </td></tr>
450	@ <tr><td class="tktDspLabel">Status:</td><td>
451	@ <th1>combobox status $status_choices 1</th1>
452	@ </td></tr>
453	@ <tr><td class="tktDspLabel">Type:</td><td>
454	@ <th1>combobox type $type_choices 1</th1>
455	@ </td></tr>
456	@ <tr><td class="tktDspLabel">Severity:</td><td>
457	@ <th1>combobox severity $severity_choices 1</th1>
458	@ </td></tr>
459	@ <tr><td class="tktDspLabel">Priority:</td><td>
460	@ <th1>combobox priority $priority_choices 1</th1>
461	@ </td></tr>
462	@ <tr><td class="tktDspLabel">Resolution:</td><td>
463	@ <th1>combobox resolution $resolution_choices 1</th1>
464	@ </td></tr>
465	@ <tr><td class="tktDspLabel">Subsystem:</td><td>
466	@ <th1>combobox subsystem $subsystem_choices 1</th1>
467	@ </td></tr>
468	@ <th1>enable_output [hascap e]</th1>
469	@ <tr><td class="tktDspLabel">Contact:</td><td>
470	@ <input type="text" name="private_contact" size="40"
471	@ value="$<private_contact>" />
472	@ </td></tr>
473	@ <th1>enable_output 1</th1>
474	@ <tr><td class="tktDspLabel">Version Found In:</td><td>
475	@ <input type="text" name="foundin" size="50" value="$<foundin>" />
476	@ </td></tr>
477	@ <tr><td colspan="2">
478	@ <th1>
479	@ if {![info exists eall]} {set eall 0}
480	@ if {[info exists aonlybtn]} {set eall 0}
	@@ -484,45 +482,45 @@
482	@ if {![hascap w]} {set eall 0}
483	@ if {![info exists cmappnd]} {set cmappnd {}}
484	@ set nline [linecount $comment 15 10]
485	@ enable_output $eall
486	@ </th1>
487	@ Description And Comments:<br />
488	@ <textarea name="comment" cols="80" rows="$nline"
489	@ wrap="virtual" class="wikiedit">$<comment></textarea><br />
490	@ <input type="hidden" name="eall" value="1" />
491	@ <input type="submit" name="aonlybtn" value="Append Remark" />
492	@ <input type="submit" name="preview1btn" value="Preview" />
493	@ <th1>enable_output [expr {!$eall}]</th1>
494	@ Append Remark from
495	@ <input type="text" name="username" value="$<username>" size="30" />:<br />
496	@ <textarea name="cmappnd" cols="80" rows="15"
497	@ wrap="virtual" class="wikiedit">$<cmappnd></textarea><br />
498	@ <th1>enable_output [expr {[hascap w] && !$eall}]</th1>
499	@ <input type="submit" name="eallbtn" value="Edit All" />
500	@ <th1>enable_output [expr {!$eall}]</th1>
501	@ <input type="submit" name="preview2btn" value="Preview" />
502	@ <th1>enable_output 1</th1>
503	@ </td></tr>
504	@
505	@ <th1>enable_output [info exists preview1btn]</th1>
506	@ <tr><td colspan="2">
507	@ Description Preview:<br /><hr />
508	@ <th1>wiki $comment</th1>
509	@ <hr />
510	@ </td></tr>
511	@ <th1>enable_output [info exists preview2btn]</th1>
512	@ <tr><td colspan="2">
513	@ Description Preview:<br /><hr />
514	@ <th1>wiki $cmappnd</th1>
515	@ <hr />
516	@ </td></tr>
517	@ <th1>enable_output 1</th1>
518	@
519	@ <tr><td align="right"></td><td>
520	@ <input type="submit" name="submit" value="Submit Changes" />
521	@ <input type="submit" name="cancel" value="Cancel" />
522	@ </td></tr>
523	@ </table>
524	;
525
526	/*
	@@ -535,12 +533,11 @@
533	/*
534	** WEBPAGE: tktsetup_editpage
535	*/
536	void tktsetup_editpage_page(void){
537	static const char zDesc[] =
538	@ Enter HTML with embedded TH1 script that will render the "edit ticket" page

539	;
540	tktsetup_generic(
541	"HTML For Editing Tickets",
542	"ticket-editpage",
543	zDefaultEdit,
	@@ -585,12 +582,11 @@
582	/*
583	** WEBPAGE: tktsetup_reportlist
584	*/
585	void tktsetup_reportlist(void){
586	static const char zDesc[] =
587	@ Enter HTML with embedded TH1 script that will render the "report list" page

588	;
589	tktsetup_generic(
590	"HTML For Report List",
591	"ticket-reportlist",
592	zDefaultReportList,
	@@ -633,13 +629,13 @@
629	/*
630	** WEBPAGE: tktsetup_rpttplt
631	*/
632	void tktsetup_rpttplt_page(void){
633	static const char zDesc[] =
634	@ Enter the default ticket report format template. This is the
635	@ the template report format that initially appears when creating a
636	@ new ticket summary report.
637	;
638	tktsetup_generic(
639	"Default Report Template",
640	"ticket-report-template",
641	zDefaultReport,
	@@ -674,13 +670,13 @@
670	/*
671	** WEBPAGE: tktsetup_keytplt
672	*/
673	void tktsetup_keytplt_page(void){
674	static const char zDesc[] =
675	@ Enter the default ticket report color-key template. This is the
676	@ the color-key that initially appears when creating a
677	@ new ticket summary report.
678	;
679	tktsetup_generic(
680	"Default Report Color-Key Template",
681	"ticket-key-template",
682	zDefaultKey,
	@@ -703,34 +699,34 @@
699	if( P("setup") ){
700	cgi_redirect("tktsetup");
701	}
702	style_header("Ticket Display On Timelines");
703	db_begin_transaction();
704	@ <form action="%s(g.zBaseURL)/tktsetup_timeline" method="post"><div>
705	login_insert_csrf_secret();
706
707	@ <hr />
708	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t", "title");
709	@ <p>An SQL expression in a query against the TICKET table that will
710	@ return the title of the ticket for display purposes.</p>
711
712	@ <hr />
713	entry_attribute("Ticket Status", 40, "ticket-status-column", "s", "status");
714	@ <p>The name of the column in the TICKET table that contains the ticket
715	@ status in human-readable form. Case sensitive.</p>
716
717	@ <hr />
718	entry_attribute("Ticket Closed", 40, "ticket-closed-expr", "c",
719	"status='Closed'");
720	@ <p>An SQL expression that evaluates to true in a TICKET table query if
721	@ the ticket is closed.</p>
722
723	@ <hr />
724	@ <p>
725	@ <input type="submit" name="submit" value="Apply Changes" />
726	@ <input type="submit" name="setup" value="Cancel" />
727	@ </p>
728	@ </div></form>
729	db_end_transaction(0);
730	style_footer();
731
732	}
733

M src/translate.c

+11 -8

		--- src/translate.c
		+++ src/translate.c
		@@ -66,15 +66,16 @@
66	66
67	67	/*
68	68	** Translate the input stream into the output stream
69	69	*/
70	70	static void trans(FILE in, FILE out){
71		- int i, j, k; /* Loop counters */
72		- char c1, c2; /* Characters used to start a comment */
73		- int lastWasEq = 0; /* True if last non-whitespace character was "=" */
74		- char zLine[2000]; /* A single line of input */
75		- char zOut[4000]; /* The input line translated into appropriate output */
	71	+ int i, j, k; /* Loop counters */
	72	+ char c1, c2; /* Characters used to start a comment */
	73	+ int lastWasEq = 0; /* True if last non-whitespace character was "=" */
	74	+ int lastWasComma = 0; /* True if last non-whitespace character was "," */
	75	+ char zLine[2000]; /* A single line of input */
	76	+ char zOut[4000]; /* The input line translated into appropriate output */
76	77
77	78	c1 = c2 = '-';
78	79	while( fgets(zLine, sizeof(zLine), in) ){
79	80	for(i=0; zLine[i] && isspace(zLine[i]); i++){}
80	81	if( zLine[i]!='@' ){
		@@ -85,14 +86,16 @@
85	86	c1 = zLine[14];
86	87	c2 = zLine[15];
87	88	}
88	89	i += strlen(&zLine[i]);
89	90	while( i>0 && isspace(zLine[i-1]) ){ i--; }
90		- lastWasEq = i>0 && zLine[i-1]=='=';
91		- }else if( lastWasEq ){
	91	+ lastWasEq = i>0 && zLine[i-1]=='=';
	92	+ lastWasComma = i>0 && zLine[i-1]==',';
	93	+ }else if( lastWasEq \|\| lastWasComma){
92	94	/* If the last non-whitespace character before the first @ was
93		- ** an "=" then generate a string literal. But skip comments
	95	+ ** an "="(var init/set) or a ","(const definition in list) then
	96	+ ** generate a string literal. But skip comments
94	97	** consisting of all text between c1 and c2 (default "--")
95	98	** and end of line.
96	99	*/
97	100	int indent, omitline;
98	101	i++;
99	102

	--- src/translate.c
	+++ src/translate.c
	@@ -66,15 +66,16 @@
66
67	/*
68	** Translate the input stream into the output stream
69	*/
70	static void trans(FILE in, FILE out){
71	int i, j, k; /* Loop counters */
72	char c1, c2; /* Characters used to start a comment */
73	int lastWasEq = 0; /* True if last non-whitespace character was "=" */
74	char zLine[2000]; /* A single line of input */
75	char zOut[4000]; /* The input line translated into appropriate output */

76
77	c1 = c2 = '-';
78	while( fgets(zLine, sizeof(zLine), in) ){
79	for(i=0; zLine[i] && isspace(zLine[i]); i++){}
80	if( zLine[i]!='@' ){
	@@ -85,14 +86,16 @@
85	c1 = zLine[14];
86	c2 = zLine[15];
87	}
88	i += strlen(&zLine[i]);
89	while( i>0 && isspace(zLine[i-1]) ){ i--; }
90	lastWasEq = i>0 && zLine[i-1]=='=';
91	}else if( lastWasEq ){

92	/* If the last non-whitespace character before the first @ was
93	** an "=" then generate a string literal. But skip comments

94	** consisting of all text between c1 and c2 (default "--")
95	** and end of line.
96	*/
97	int indent, omitline;
98	i++;
99

	--- src/translate.c
	+++ src/translate.c
	@@ -66,15 +66,16 @@
66
67	/*
68	** Translate the input stream into the output stream
69	*/
70	static void trans(FILE in, FILE out){
71	int i, j, k; /* Loop counters */
72	char c1, c2; /* Characters used to start a comment */
73	int lastWasEq = 0; /* True if last non-whitespace character was "=" */
74	int lastWasComma = 0; /* True if last non-whitespace character was "," */
75	char zLine[2000]; /* A single line of input */
76	char zOut[4000]; /* The input line translated into appropriate output */
77
78	c1 = c2 = '-';
79	while( fgets(zLine, sizeof(zLine), in) ){
80	for(i=0; zLine[i] && isspace(zLine[i]); i++){}
81	if( zLine[i]!='@' ){
	@@ -85,14 +86,16 @@
86	c1 = zLine[14];
87	c2 = zLine[15];
88	}
89	i += strlen(&zLine[i]);
90	while( i>0 && isspace(zLine[i-1]) ){ i--; }
91	lastWasEq = i>0 && zLine[i-1]=='=';
92	lastWasComma = i>0 && zLine[i-1]==',';
93	}else if( lastWasEq \|\| lastWasComma){
94	/* If the last non-whitespace character before the first @ was
95	** an "="(var init/set) or a ","(const definition in list) then
96	** generate a string literal. But skip comments
97	** consisting of all text between c1 and c2 (default "--")
98	** and end of line.
99	*/
100	int indent, omitline;
101	i++;
102

M src/update.c

+2 -1

		--- src/update.c
		+++ src/update.c
		@@ -24,11 +24,11 @@
24	24
25	25	/*
26	26	** Return true if artifact rid is a version
27	27	*/
28	28	int is_a_version(int rid){
29		- return db_exists("SELECT 1 FROM plink WHERE cid=%d", rid);
	29	+ return db_exists("SELECT 1 FROM event WHERE objid=%d AND type='ci'", rid);
30	30	}
31	31
32	32	/*
33	33	** COMMAND: update
34	34	**
		@@ -111,10 +111,11 @@
111	111	tid = db_int(0, "SELECT rid FROM leaves, event"
112	112	" WHERE event.objid=leaves.rid"
113	113	" ORDER BY event.mtime DESC");
114	114	}
115	115
	116	+ if( tid==vid ) return; /* Nothing to update */
116	117	db_begin_transaction();
117	118	vfile_check_signature(vid, 1);
118	119	if( !nochangeFlag ) undo_begin();
119	120	load_vfile_from_rid(tid);
120	121
121	122

	--- src/update.c
	+++ src/update.c
	@@ -24,11 +24,11 @@
24
25	/*
26	** Return true if artifact rid is a version
27	*/
28	int is_a_version(int rid){
29	return db_exists("SELECT 1 FROM plink WHERE cid=%d", rid);
30	}
31
32	/*
33	** COMMAND: update
34	**
	@@ -111,10 +111,11 @@
111	tid = db_int(0, "SELECT rid FROM leaves, event"
112	" WHERE event.objid=leaves.rid"
113	" ORDER BY event.mtime DESC");
114	}
115

116	db_begin_transaction();
117	vfile_check_signature(vid, 1);
118	if( !nochangeFlag ) undo_begin();
119	load_vfile_from_rid(tid);
120
121

	--- src/update.c
	+++ src/update.c
	@@ -24,11 +24,11 @@
24
25	/*
26	** Return true if artifact rid is a version
27	*/
28	int is_a_version(int rid){
29	return db_exists("SELECT 1 FROM event WHERE objid=%d AND type='ci'", rid);
30	}
31
32	/*
33	** COMMAND: update
34	**
	@@ -111,10 +111,11 @@
111	tid = db_int(0, "SELECT rid FROM leaves, event"
112	" WHERE event.objid=leaves.rid"
113	" ORDER BY event.mtime DESC");
114	}
115
116	if( tid==vid ) return; /* Nothing to update */
117	db_begin_transaction();
118	vfile_check_signature(vid, 1);
119	if( !nochangeFlag ) undo_begin();
120	load_vfile_from_rid(tid);
121
122

M src/url.c

+74 -11

		--- src/url.c
		+++ src/url.c
		@@ -17,18 +17,29 @@
17	17	**
18	18	** This file contains code for parsing URLs that appear on the command-line
19	19	*/
20	20	#include "config.h"
21	21	#include "url.h"
	22	+
	23	+/*
	24	+** Convert a string to lower-case.
	25	+*/
	26	+static void url_tolower(char *z){
	27	+ while( *z ){
	28	+ z = tolower(z);
	29	+ z++;
	30	+ }
	31	+}
22	32
23	33	/*
24	34	** Parse the given URL. Populate variables in the global "g" structure.
25	35	**
26	36	** g.urlIsFile True if FILE:
27	37	** g.urlIsHttps True if HTTPS:
	38	+** g.urlIsSsh True if SSH:
28	39	** g.urlProtocol "http" or "https" or "file"
29		-** g.urlName Hostname for HTTP: or HTTPS:. Filename for FILE:
	40	+** g.urlName Hostname for HTTP:, HTTPS:, SSH:. Filename for FILE:
30	41	** g.urlPort TCP port number for HTTP or HTTPS.
31	42	** g.urlDfltPort Default TCP port number (80 or 443).
32	43	** g.urlPath Path name for HTTP or HTTPS.
33	44	** g.urlUser Userid.
34	45	** g.urlPasswd Password.
		@@ -35,50 +46,70 @@
35	46	** g.urlHostname HOST:PORT or just HOST if port is the default.
36	47	** g.urlCanonical The URL in canonical form, omitting the password
37	48	**
38	49	** HTTP url format is:
39	50	**
40		-** http://userid:password@host:port/path?query#fragment
	51	+** http://userid:password@host:port/path
	52	+**
	53	+** SSH url format is:
	54	+**
	55	+** ssh://userid:password@host:port/path?fossil=path/to/fossil.exe
41	56	**
42	57	*/
43	58	void url_parse(const char *zUrl){
44	59	int i, j, c;
45	60	char *zFile = 0;
46		- if( strncmp(zUrl, "http://", 7)==0 \|\| strncmp(zUrl, "https://", 8)==0 ){
	61	+ if( strncmp(zUrl, "http://", 7)==0
	62	+ \|\| strncmp(zUrl, "https://", 8)==0
	63	+ \|\| strncmp(zUrl, "ssh://", 6)==0
	64	+ ){
47	65	int iStart;
48	66	char *zLogin;
	67	+ char *zExe;
	68	+
49	69	g.urlIsFile = 0;
50	70	if( zUrl[4]=='s' ){
51	71	g.urlIsHttps = 1;
52	72	g.urlProtocol = "https";
53	73	g.urlDfltPort = 443;
54	74	iStart = 8;
	75	+ }else if( zUrl[0]=='s' ){
	76	+ g.urlIsSsh = 1;
	77	+ g.urlProtocol = "ssh";
	78	+ g.urlDfltPort = 22;
	79	+ g.urlFossil = "fossil";
	80	+ iStart = 6;
55	81	}else{
56	82	g.urlIsHttps = 0;
57	83	g.urlProtocol = "http";
58	84	g.urlDfltPort = 80;
59	85	iStart = 7;
60	86	}
61	87	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
62	88	if( c=='@' ){
	89	+ /* Parse up the user-id and password */
63	90	for(j=iStart; j<i && zUrl[j]!=':'; j++){}
64	91	g.urlUser = mprintf("%.*s", j-iStart, &zUrl[iStart]);
65	92	dehttpize(g.urlUser);
66	93	if( j<i ){
67	94	g.urlPasswd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
68	95	dehttpize(g.urlPasswd);
69	96	}
	97	+ if( g.urlIsSsh && g.urlPasswd ){
	98	+ zLogin = mprintf("%t:*@", g.urlUser);
	99	+ }else{
	100	+ zLogin = mprintf("%t@", g.urlUser);
	101	+ }
70	102	for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
71	103	g.urlName = mprintf("%.*s", j-i-1, &zUrl[i+1]);
72	104	i = j;
73		- zLogin = mprintf("%t@", g.urlUser);
74	105	}else{
75	106	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
76	107	g.urlName = mprintf("%.*s", i-iStart, &zUrl[iStart]);
77	108	zLogin = mprintf("");
78	109	}
79		- for(j=0; g.urlName[j]; j++){ g.urlName[j] = tolower(g.urlName[j]); }
	110	+ url_tolower(g.urlName);
80	111	if( c==':' ){
81	112	g.urlPort = 0;
82	113	i++;
83	114	while( (c = zUrl[i])!=0 && isdigit(c) ){
84	115	g.urlPort = g.urlPort*10 + c - '0';
		@@ -87,24 +118,53 @@
87	118	g.urlHostname = mprintf("%s:%d", g.urlName, g.urlPort);
88	119	}else{
89	120	g.urlPort = g.urlDfltPort;
90	121	g.urlHostname = g.urlName;
91	122	}
92		- g.urlPath = mprintf(&zUrl[i]);
93	123	dehttpize(g.urlName);
	124	+ g.urlPath = mprintf("%s", &zUrl[i]);
	125	+ for(i=0; g.urlPath[i] && g.urlPath[i]!='?'; i++){}
	126	+ if( g.urlPath[i] ){
	127	+ g.urlPath[i] = 0;
	128	+ i++;
	129	+ }
	130	+ zExe = mprintf("");
	131	+ while( g.urlPath[i]!=0 ){
	132	+ char zName, zValue;
	133	+ zName = &g.urlPath[i];
	134	+ zValue = zName;
	135	+ while( g.urlPath[i] && g.urlPath[i]!='=' ){ i++; }
	136	+ if( g.urlPath[i]=='=' ){
	137	+ g.urlPath[i] = 0;
	138	+ i++;
	139	+ zValue = &g.urlPath[i];
	140	+ while( g.urlPath[i] && g.urlPath[i]!='&' ){ i++; }
	141	+ }
	142	+ if( g.urlPath[i] ){
	143	+ g.urlPath[i] = 0;
	144	+ i++;
	145	+ }
	146	+ if( strcmp(zName,"fossil")==0 ){
	147	+ g.urlFossil = zValue;
	148	+ dehttpize(g.urlFossil);
	149	+ zExe = mprintf("?fossil=%T", g.urlFossil);
	150	+ }
	151	+ }
	152	+
94	153	dehttpize(g.urlPath);
95	154	if( g.urlDfltPort==g.urlPort ){
96	155	g.urlCanonical = mprintf(
97		- "%s://%s%T%T",
98		- g.urlProtocol, zLogin, g.urlName, g.urlPath
	156	+ "%s://%s%T%T%s",
	157	+ g.urlProtocol, zLogin, g.urlName, g.urlPath, zExe
99	158	);
100	159	}else{
101	160	g.urlCanonical = mprintf(
102		- "%s://%s%T:%d%T",
103		- g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath
	161	+ "%s://%s%T:%d%T%s",
	162	+ g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath, zExe
104	163	);
105	164	}
	165	+ if( g.urlIsSsh && g.urlPath[1] ) g.urlPath++;
106	166	free(zLogin);
107	167	}else if( strncmp(zUrl, "file:", 5)==0 ){
108	168	g.urlIsFile = 1;
109	169	if( zUrl[5]=='/' && zUrl[6]=='/' ){
110	170	i = 7;
		@@ -150,19 +210,22 @@
150	210	}
151	211	url_parse(g.argv[2]);
152	212	for(i=0; i<2; i++){
153	213	printf("g.urlIsFile = %d\n", g.urlIsFile);
154	214	printf("g.urlIsHttps = %d\n", g.urlIsHttps);
	215	+ printf("g.urlIsSsh = %d\n", g.urlIsSsh);
155	216	printf("g.urlProtocol = %s\n", g.urlProtocol);
156	217	printf("g.urlName = %s\n", g.urlName);
157	218	printf("g.urlPort = %d\n", g.urlPort);
158	219	printf("g.urlDfltPort = %d\n", g.urlDfltPort);
159	220	printf("g.urlHostname = %s\n", g.urlHostname);
160	221	printf("g.urlPath = %s\n", g.urlPath);
161	222	printf("g.urlUser = %s\n", g.urlUser);
162	223	printf("g.urlPasswd = %s\n", g.urlPasswd);
163	224	printf("g.urlCanonical = %s\n", g.urlCanonical);
	225	+ printf("g.urlFossil = %s\n", g.urlFossil);
	226	+ if( g.urlIsFile \|\| g.urlIsSsh ) break;
164	227	if( i==0 ){
165	228	printf("********\n");
166	229	url_enable_proxy("Using proxy: ");
167	230	}
168	231	}
		@@ -288,11 +351,11 @@
288	351	zName2 = 0;
289	352	z = zValue2;
290	353	if( z==0 ) continue;
291	354	}
292	355	blob_appendf(&p->url, "%s%s=%T", zSep, p->azName[i], z);
293		- zSep = "&";
	356	+ zSep = "&";
294	357	}
295	358	if( zName1 && zValue1 ){
296	359	blob_appendf(&p->url, "%s%s=%T", zSep, zName1, zValue1);
297	360	}
298	361	if( zName2 && zValue2 ){
299	362

	--- src/url.c
	+++ src/url.c
	@@ -17,18 +17,29 @@
17	**
18	** This file contains code for parsing URLs that appear on the command-line
19	*/
20	#include "config.h"
21	#include "url.h"










22
23	/*
24	** Parse the given URL. Populate variables in the global "g" structure.
25	**
26	** g.urlIsFile True if FILE:
27	** g.urlIsHttps True if HTTPS:

28	** g.urlProtocol "http" or "https" or "file"
29	** g.urlName Hostname for HTTP: or HTTPS:. Filename for FILE:
30	** g.urlPort TCP port number for HTTP or HTTPS.
31	** g.urlDfltPort Default TCP port number (80 or 443).
32	** g.urlPath Path name for HTTP or HTTPS.
33	** g.urlUser Userid.
34	** g.urlPasswd Password.
	@@ -35,50 +46,70 @@
35	** g.urlHostname HOST:PORT or just HOST if port is the default.
36	** g.urlCanonical The URL in canonical form, omitting the password
37	**
38	** HTTP url format is:
39	**
40	** http://userid:password@host:port/path?query#fragment




41	**
42	*/
43	void url_parse(const char *zUrl){
44	int i, j, c;
45	char *zFile = 0;
46	if( strncmp(zUrl, "http://", 7)==0 \|\| strncmp(zUrl, "https://", 8)==0 ){



47	int iStart;
48	char *zLogin;


49	g.urlIsFile = 0;
50	if( zUrl[4]=='s' ){
51	g.urlIsHttps = 1;
52	g.urlProtocol = "https";
53	g.urlDfltPort = 443;
54	iStart = 8;






55	}else{
56	g.urlIsHttps = 0;
57	g.urlProtocol = "http";
58	g.urlDfltPort = 80;
59	iStart = 7;
60	}
61	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
62	if( c=='@' ){

63	for(j=iStart; j<i && zUrl[j]!=':'; j++){}
64	g.urlUser = mprintf("%.*s", j-iStart, &zUrl[iStart]);
65	dehttpize(g.urlUser);
66	if( j<i ){
67	g.urlPasswd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
68	dehttpize(g.urlPasswd);
69	}





70	for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
71	g.urlName = mprintf("%.*s", j-i-1, &zUrl[i+1]);
72	i = j;
73	zLogin = mprintf("%t@", g.urlUser);
74	}else{
75	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
76	g.urlName = mprintf("%.*s", i-iStart, &zUrl[iStart]);
77	zLogin = mprintf("");
78	}
79	for(j=0; g.urlName[j]; j++){ g.urlName[j] = tolower(g.urlName[j]); }
80	if( c==':' ){
81	g.urlPort = 0;
82	i++;
83	while( (c = zUrl[i])!=0 && isdigit(c) ){
84	g.urlPort = g.urlPort*10 + c - '0';
	@@ -87,24 +118,53 @@
87	g.urlHostname = mprintf("%s:%d", g.urlName, g.urlPort);
88	}else{
89	g.urlPort = g.urlDfltPort;
90	g.urlHostname = g.urlName;
91	}
92	g.urlPath = mprintf(&zUrl[i]);
93	dehttpize(g.urlName);





























94	dehttpize(g.urlPath);
95	if( g.urlDfltPort==g.urlPort ){
96	g.urlCanonical = mprintf(
97	"%s://%s%T%T",
98	g.urlProtocol, zLogin, g.urlName, g.urlPath
99	);
100	}else{
101	g.urlCanonical = mprintf(
102	"%s://%s%T:%d%T",
103	g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath
104	);
105	}

106	free(zLogin);
107	}else if( strncmp(zUrl, "file:", 5)==0 ){
108	g.urlIsFile = 1;
109	if( zUrl[5]=='/' && zUrl[6]=='/' ){
110	i = 7;
	@@ -150,19 +210,22 @@
150	}
151	url_parse(g.argv[2]);
152	for(i=0; i<2; i++){
153	printf("g.urlIsFile = %d\n", g.urlIsFile);
154	printf("g.urlIsHttps = %d\n", g.urlIsHttps);

155	printf("g.urlProtocol = %s\n", g.urlProtocol);
156	printf("g.urlName = %s\n", g.urlName);
157	printf("g.urlPort = %d\n", g.urlPort);
158	printf("g.urlDfltPort = %d\n", g.urlDfltPort);
159	printf("g.urlHostname = %s\n", g.urlHostname);
160	printf("g.urlPath = %s\n", g.urlPath);
161	printf("g.urlUser = %s\n", g.urlUser);
162	printf("g.urlPasswd = %s\n", g.urlPasswd);
163	printf("g.urlCanonical = %s\n", g.urlCanonical);


164	if( i==0 ){
165	printf("********\n");
166	url_enable_proxy("Using proxy: ");
167	}
168	}
	@@ -288,11 +351,11 @@
288	zName2 = 0;
289	z = zValue2;
290	if( z==0 ) continue;
291	}
292	blob_appendf(&p->url, "%s%s=%T", zSep, p->azName[i], z);
293	zSep = "&";
294	}
295	if( zName1 && zValue1 ){
296	blob_appendf(&p->url, "%s%s=%T", zSep, zName1, zValue1);
297	}
298	if( zName2 && zValue2 ){
299

	--- src/url.c
	+++ src/url.c
	@@ -17,18 +17,29 @@
17	**
18	** This file contains code for parsing URLs that appear on the command-line
19	*/
20	#include "config.h"
21	#include "url.h"
22
23	/*
24	** Convert a string to lower-case.
25	*/
26	static void url_tolower(char *z){
27	while( *z ){
28	z = tolower(z);
29	z++;
30	}
31	}
32
33	/*
34	** Parse the given URL. Populate variables in the global "g" structure.
35	**
36	** g.urlIsFile True if FILE:
37	** g.urlIsHttps True if HTTPS:
38	** g.urlIsSsh True if SSH:
39	** g.urlProtocol "http" or "https" or "file"
40	** g.urlName Hostname for HTTP:, HTTPS:, SSH:. Filename for FILE:
41	** g.urlPort TCP port number for HTTP or HTTPS.
42	** g.urlDfltPort Default TCP port number (80 or 443).
43	** g.urlPath Path name for HTTP or HTTPS.
44	** g.urlUser Userid.
45	** g.urlPasswd Password.
	@@ -35,50 +46,70 @@
46	** g.urlHostname HOST:PORT or just HOST if port is the default.
47	** g.urlCanonical The URL in canonical form, omitting the password
48	**
49	** HTTP url format is:
50	**
51	** http://userid:password@host:port/path
52	**
53	** SSH url format is:
54	**
55	** ssh://userid:password@host:port/path?fossil=path/to/fossil.exe
56	**
57	*/
58	void url_parse(const char *zUrl){
59	int i, j, c;
60	char *zFile = 0;
61	if( strncmp(zUrl, "http://", 7)==0
62	\|\| strncmp(zUrl, "https://", 8)==0
63	\|\| strncmp(zUrl, "ssh://", 6)==0
64	){
65	int iStart;
66	char *zLogin;
67	char *zExe;
68
69	g.urlIsFile = 0;
70	if( zUrl[4]=='s' ){
71	g.urlIsHttps = 1;
72	g.urlProtocol = "https";
73	g.urlDfltPort = 443;
74	iStart = 8;
75	}else if( zUrl[0]=='s' ){
76	g.urlIsSsh = 1;
77	g.urlProtocol = "ssh";
78	g.urlDfltPort = 22;
79	g.urlFossil = "fossil";
80	iStart = 6;
81	}else{
82	g.urlIsHttps = 0;
83	g.urlProtocol = "http";
84	g.urlDfltPort = 80;
85	iStart = 7;
86	}
87	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
88	if( c=='@' ){
89	/* Parse up the user-id and password */
90	for(j=iStart; j<i && zUrl[j]!=':'; j++){}
91	g.urlUser = mprintf("%.*s", j-iStart, &zUrl[iStart]);
92	dehttpize(g.urlUser);
93	if( j<i ){
94	g.urlPasswd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
95	dehttpize(g.urlPasswd);
96	}
97	if( g.urlIsSsh && g.urlPasswd ){
98	zLogin = mprintf("%t:*@", g.urlUser);
99	}else{
100	zLogin = mprintf("%t@", g.urlUser);
101	}
102	for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
103	g.urlName = mprintf("%.*s", j-i-1, &zUrl[i+1]);
104	i = j;

105	}else{
106	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
107	g.urlName = mprintf("%.*s", i-iStart, &zUrl[iStart]);
108	zLogin = mprintf("");
109	}
110	url_tolower(g.urlName);
111	if( c==':' ){
112	g.urlPort = 0;
113	i++;
114	while( (c = zUrl[i])!=0 && isdigit(c) ){
115	g.urlPort = g.urlPort*10 + c - '0';
	@@ -87,24 +118,53 @@
118	g.urlHostname = mprintf("%s:%d", g.urlName, g.urlPort);
119	}else{
120	g.urlPort = g.urlDfltPort;
121	g.urlHostname = g.urlName;
122	}

123	dehttpize(g.urlName);
124	g.urlPath = mprintf("%s", &zUrl[i]);
125	for(i=0; g.urlPath[i] && g.urlPath[i]!='?'; i++){}
126	if( g.urlPath[i] ){
127	g.urlPath[i] = 0;
128	i++;
129	}
130	zExe = mprintf("");
131	while( g.urlPath[i]!=0 ){
132	char zName, zValue;
133	zName = &g.urlPath[i];
134	zValue = zName;
135	while( g.urlPath[i] && g.urlPath[i]!='=' ){ i++; }
136	if( g.urlPath[i]=='=' ){
137	g.urlPath[i] = 0;
138	i++;
139	zValue = &g.urlPath[i];
140	while( g.urlPath[i] && g.urlPath[i]!='&' ){ i++; }
141	}
142	if( g.urlPath[i] ){
143	g.urlPath[i] = 0;
144	i++;
145	}
146	if( strcmp(zName,"fossil")==0 ){
147	g.urlFossil = zValue;
148	dehttpize(g.urlFossil);
149	zExe = mprintf("?fossil=%T", g.urlFossil);
150	}
151	}
152
153	dehttpize(g.urlPath);
154	if( g.urlDfltPort==g.urlPort ){
155	g.urlCanonical = mprintf(
156	"%s://%s%T%T%s",
157	g.urlProtocol, zLogin, g.urlName, g.urlPath, zExe
158	);
159	}else{
160	g.urlCanonical = mprintf(
161	"%s://%s%T:%d%T%s",
162	g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath, zExe
163	);
164	}
165	if( g.urlIsSsh && g.urlPath[1] ) g.urlPath++;
166	free(zLogin);
167	}else if( strncmp(zUrl, "file:", 5)==0 ){
168	g.urlIsFile = 1;
169	if( zUrl[5]=='/' && zUrl[6]=='/' ){
170	i = 7;
	@@ -150,19 +210,22 @@
210	}
211	url_parse(g.argv[2]);
212	for(i=0; i<2; i++){
213	printf("g.urlIsFile = %d\n", g.urlIsFile);
214	printf("g.urlIsHttps = %d\n", g.urlIsHttps);
215	printf("g.urlIsSsh = %d\n", g.urlIsSsh);
216	printf("g.urlProtocol = %s\n", g.urlProtocol);
217	printf("g.urlName = %s\n", g.urlName);
218	printf("g.urlPort = %d\n", g.urlPort);
219	printf("g.urlDfltPort = %d\n", g.urlDfltPort);
220	printf("g.urlHostname = %s\n", g.urlHostname);
221	printf("g.urlPath = %s\n", g.urlPath);
222	printf("g.urlUser = %s\n", g.urlUser);
223	printf("g.urlPasswd = %s\n", g.urlPasswd);
224	printf("g.urlCanonical = %s\n", g.urlCanonical);
225	printf("g.urlFossil = %s\n", g.urlFossil);
226	if( g.urlIsFile \|\| g.urlIsSsh ) break;
227	if( i==0 ){
228	printf("********\n");
229	url_enable_proxy("Using proxy: ");
230	}
231	}
	@@ -288,11 +351,11 @@
351	zName2 = 0;
352	z = zValue2;
353	if( z==0 ) continue;
354	}
355	blob_appendf(&p->url, "%s%s=%T", zSep, p->azName[i], z);
356	zSep = "&";
357	}
358	if( zName1 && zValue1 ){
359	blob_appendf(&p->url, "%s%s=%T", zSep, zName1, zValue1);
360	}
361	if( zName2 && zValue2 ){
362

M src/user.c

		--- src/user.c
		+++ src/user.c
		@@ -39,11 +39,14 @@
39	39	if( z[i]<' ' ) z[i] = ' ';
40	40	}
41	41	blob_append(pBlob, z, -1);
42	42	}
43	43
	44	+#if defined(_WIN32)
44	45	#ifdef __MINGW32__
	46	+#include <conio.h>
	47	+#endif
45	48	/*
46	49	** getpass for Windows
47	50	*/
48	51	static char getpass(const char prompt){
49	52	static char pwd[64];
50	53

	--- src/user.c
	+++ src/user.c
	@@ -39,11 +39,14 @@
39	if( z[i]<' ' ) z[i] = ' ';
40	}
41	blob_append(pBlob, z, -1);
42	}
43

44	#ifdef __MINGW32__


45	/*
46	** getpass for Windows
47	*/
48	static char getpass(const char prompt){
49	static char pwd[64];
50

	--- src/user.c
	+++ src/user.c
	@@ -39,11 +39,14 @@
39	if( z[i]<' ' ) z[i] = ' ';
40	}
41	blob_append(pBlob, z, -1);
42	}
43
44	#if defined(_WIN32)
45	#ifdef __MINGW32__
46	#include <conio.h>
47	#endif
48	/*
49	** getpass for Windows
50	*/
51	static char getpass(const char prompt){
52	static char pwd[64];
53

M src/vfile.c

		--- src/vfile.c
		+++ src/vfile.c
		@@ -19,11 +19,15 @@
19	19	*/
20	20	#include "config.h"
21	21	#include "vfile.h"
22	22	#include <assert.h>
23	23	#include <sys/types.h>
	24	+#if defined(__DMC__)
	25	+#include "dirent.h"
	26	+#else
24	27	#include <dirent.h>
	28	+#endif
25	29
26	30	/*
27	31	** Given a UUID, return the corresponding record ID. If the UUID
28	32	** does not exist, then return 0.
29	33	**
30	34

	--- src/vfile.c
	+++ src/vfile.c
	@@ -19,11 +19,15 @@
19	*/
20	#include "config.h"
21	#include "vfile.h"
22	#include <assert.h>
23	#include <sys/types.h>



24	#include <dirent.h>

25
26	/*
27	** Given a UUID, return the corresponding record ID. If the UUID
28	** does not exist, then return 0.
29	**
30

	--- src/vfile.c
	+++ src/vfile.c
	@@ -19,11 +19,15 @@
19	*/
20	#include "config.h"
21	#include "vfile.h"
22	#include <assert.h>
23	#include <sys/types.h>
24	#if defined(__DMC__)
25	#include "dirent.h"
26	#else
27	#include <dirent.h>
28	#endif
29
30	/*
31	** Given a UUID, return the corresponding record ID. If the UUID
32	** does not exist, then return 0.
33	**
34

M src/wiki.c

+59 -50

		--- src/wiki.c
		+++ src/wiki.c
		@@ -48,15 +48,15 @@
48	48	/*
49	49	** Output rules for well-formed wiki pages
50	50	*/
51	51	static void well_formed_wiki_name_rules(void){
52	52	@ <ul>
53		- @ <li> Must not begin or end with a space.
	53	+ @ <li> Must not begin or end with a space.</li>
54	54	@ <li> Must not contain any control characters, including tab or
55		- @ newline.
56		- @ <li> Must not have two or more spaces in a row internally.
57		- @ <li> Must be between 3 and 100 characters in length.
	55	+ @ newline.</li>
	56	+ @ <li> Must not have two or more spaces in a row internally.</li>
	57	+ @ <li> Must be between 3 and 100 characters in length.</li>
58	58	@ </ul>
59	59	}
60	60
61	61	/*
62	62	** Check a wiki name. If it is not well-formed, then issue an error
		@@ -63,12 +63,12 @@
63	63	** and return true. If it is well-formed, return false.
64	64	*/
65	65	static int check_name(const char *z){
66	66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	67	style_header("Wiki Page Name Error");
68		- @ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for
69		- @ wiki page names:
	68	+ @ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
	69	+ @ Rules for wiki page names:
70	70	well_formed_wiki_name_rules();
71	71	style_footer();
72	72	return 1;
73	73	}
74	74	return 0;
		@@ -79,14 +79,22 @@
79	79	** WEBPAGE: index
80	80	** WEBPAGE: not_found
81	81	*/
82	82	void home_page(void){
83	83	char *zPageName = db_get("project-name",0);
	84	+ char *zIndexPage = db_get("index-page",0);
84	85	login_check_credentials();
85	86	if( !g.okRdWiki ){
86	87	cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL);
87	88	}
	89	+ if( zIndexPage ){
	90	+ while( zIndexPage[0]=='/' ) zIndexPage++;
	91	+ if( strcmp(zIndexPage, P("PATH_INFO"))==0 ) zIndexPage = 0;
	92	+ }
	93	+ if( zIndexPage ){
	94	+ cgi_redirectf("%s/%s", g.zBaseURL, zIndexPage);
	95	+ }
88	96	if( zPageName ){
89	97	login_check_credentials();
90	98	g.zExtra = zPageName;
91	99	cgi_set_parameter_nocopy("name", g.zExtra);
92	100	g.isHome = 1;
		@@ -147,14 +155,14 @@
147	155	if( g.okNewWiki ){
148	156	@ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li>
149	157	}
150	158	@ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a>
151	159	@ available on this server.</li>
152		- @ <li> <form method="GET" action="%s(g.zBaseURL)/wfind">
153		- @ Search wiki titles: <input type="text" name="title"/>
154		- @   <input type="submit" />
155		- @ </li>
	160	+ @ <li> <form method="get" action="%s(g.zBaseURL)/wfind"><div>
	161	+ @ Search wiki titles: <input type="text" name="title"/>
	162	+ @   <input type="submit" /></div></form>
	163	+ @ </li>
156	164	@ </ul>
157	165	style_footer();
158	166	return;
159	167	}
160	168	if( check_name(zPageName) ) return;
		@@ -186,11 +194,11 @@
186	194	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
187	195	g.zTop, zPageName);
188	196	}
189	197	if( rid && g.okApndWiki && g.okAttach ){
190	198	style_submenu_element("Attach", "Add An Attachment",
191		- "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
	199	+ "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
192	200	g.zTop, zPageName, g.zTop, zPageName);
193	201	}
194	202	if( rid && g.okApndWiki ){
195	203	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
196	204	g.zTop, zPageName);
		@@ -218,19 +226,21 @@
218	226	if( cnt==0 ){
219	227	@ <hr><h2>Attachments:</h2>
220	228	@ <ul>
221	229	}
222	230	cnt++;
223		- if( g.okHistory ){
224		- @ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
225		- }else{
	231	+ if( g.okHistory && g.okRead ){
226	232	@ <li>
	233	+ @ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
	234	+ @ %h(zFile)</a>
	235	+ }else{
	236	+ @ <li>%h(zFile)
227	237	}
228		- @ %h(zFile)</a> add by %h(zUser) on
	238	+ @ added by %h(zUser) on
229	239	hyperlink_to_date(zDate, ".");
230	240	if( g.okWrWiki && g.okAttach ){
231		- @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
	241	+ @ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
232	242	}
233	243	}
234	244	if( cnt ){
235	245	@ </ul>
236	246	}
		@@ -342,30 +352,30 @@
342	352	zHtmlPageName = mprintf("Edit: %s", zPageName);
343	353	style_header(zHtmlPageName);
344	354	if( P("preview")!=0 ){
345	355	blob_zero(&wiki);
346	356	blob_append(&wiki, zBody, -1);
347		- @ Preview:<hr>
	357	+ @ Preview:<hr />
348	358	wiki_convert(&wiki, 0, 0);
349		- @ <hr>
	359	+ @ <hr />
350	360	blob_reset(&wiki);
351	361	}
352	362	for(n=2, z=zBody; z[0]; z++){
353	363	if( z[0]=='\n' ) n++;
354	364	}
355	365	if( n<20 ) n = 20;
356	366	if( n>40 ) n = 40;
357		- @ <form method="POST" action="%s(g.zBaseURL)/wikiedit">
	367	+ @ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div>
358	368	login_insert_csrf_secret();
359		- @ <input type="hidden" name="name" value="%h(zPageName)">
	369	+ @ <input type="hidden" name="name" value="%h(zPageName)" />
360	370	@ <textarea name="w" class="wikiedit" cols="80"
361	371	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
362		- @ <br>
363		- @ <input type="submit" name="preview" value="Preview Your Changes">
364		- @ <input type="submit" name="submit" value="Apply These Changes">
365		- @ <input type="submit" name="cancel" value="Cancel">
366		- @ </form>
	372	+ @ <br />
	373	+ @ <input type="submit" name="preview" value="Preview Your Changes" />
	374	+ @ <input type="submit" name="submit" value="Apply These Changes" />
	375	+ @ <input type="submit" name="cancel" value="Cancel" />
	376	+ @ </div></form>
367	377	if( !isSandbox ){
368	378	manifest_clear(&m);
369	379	}
370	380	style_footer();
371	381	}
		@@ -387,21 +397,20 @@
387	397	zName = PD("name","");
388	398	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
389	399	cgi_redirectf("wikiedit?name=%T", zName);
390	400	}
391	401	style_header("Create A New Wiki Page");
392		- @ <p>Rules for wiki page names:
	402	+ @ <p>Rules for wiki page names:</p>
393	403	well_formed_wiki_name_rules();
394		- @ </p>
395		- @ <form method="POST" action="%s(g.zBaseURL)/wikinew">
	404	+ @ <form method="post" action="%s(g.zBaseURL)/wikinew">
396	405	@ <p>Name of new wiki page:
397		- @ <input type="text" width="35" name="name" value="%h(zName)">
398		- @ <input type="submit" value="Create">
	406	+ @ <input style="width: 35;" type="text" name="name" value="%h(zName)" />
	407	+ @ <input type="submit" value="Create" />
399	408	@ </p></form>
400	409	if( zName[0] ){
401		- @ <p><b><font color="red">
402		- @ "%h(zName)" is not a valid wiki page name!</font></b></p>
	410	+ @ <p><span class="wikiError">
	411	+ @ "%h(zName)" is not a valid wiki page name!</span></p>
403	412	}
404	413	style_footer();
405	414	}
406	415
407	416
		@@ -528,15 +537,15 @@
528	537	zUser = PD("u", g.zLogin);
529	538	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
530	539	login_insert_csrf_secret();
531	540	@ <input type="hidden" name="name" value="%h(zPageName)">
532	541	@ Your Name:
533		- @ <input type="text" name="u" size="20" value="%h(zUser)"><br>
534		- @ Comment to append:<br>
	542	+ @ <input type="text" name="u" size="20" value="%h(zUser)"><br />
	543	+ @ Comment to append:<br />
535	544	@ <textarea name="r" class="wikiedit" cols="80"
536	545	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
537		- @ <br>
	546	+ @ <br />
538	547	@ <input type="submit" name="preview" value="Preview Your Comment">
539	548	@ <input type="submit" name="submit" value="Append Your Changes">
540	549	@ <input type="submit" name="cancel" value="Cancel">
541	550	@ </form>
542	551	style_footer();
		@@ -551,11 +560,11 @@
551	560	** Function called to output extra text at the end of each line in
552	561	** a wiki history listing.
553	562	*/
554	563	static void wiki_history_extra(int rid){
555	564	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
556		- @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
	565	+ @ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
557	566	}
558	567	}
559	568
560	569	/*
561	570	** WEBPAGE: whistory
		@@ -634,11 +643,11 @@
634	643	if( m2.type==CFTYPE_WIKI ){
635	644	blob_init(&w2, m2.zWiki, -1);
636	645	}
637	646	}
638	647	blob_zero(&d);
639		- text_diff(&w2, &w1, &d, 5);
	648	+ text_diff(&w2, &w1, &d, 5, 1);
640	649	@ <pre>
641	650	@ %h(blob_str(&d))
642	651	@ </pre>
643	652	style_footer();
644	653	}
		@@ -731,39 +740,39 @@
731	740	@ </ol>
732	741	@ <p>We call the first five rules above "wiki" formatting rules. The
733	742	@ last two rules are the HTML formatting rule.</p>
734	743	@ <h2>Formatting Rule Details</h2>
735	744	@ <ol>
736		- @ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms
	745	+ @ <li> <p><span class="wikiruleHead">Paragraphs</span>. Any sequence of one or more blank lines forms
737	746	@ a paragraph break. Centered or right-justified paragraphs are not
738	747	@ supported by wiki markup, but you can do these things if you need them
739		- @ using HTML.</p>
740		- @ <li> <p><b>Bullet Lists</b>.
	748	+ @ using HTML.</p></li>
	749	+ @ <li> <p><span class="wikiruleHead">Bullet Lists</span>.
741	750	@ A bullet list item is a line that begins with a single "*" character
742	751	@ surrounded on
743	752	@ both sides by two or more spaces or by a tab. Only a single level
744		- @ of bullet list is supported by wiki. For nested lists, use HTML.</p>
745		- @ <li> <p><b>Enumeration Lists</b>.
	753	+ @ of bullet list is supported by wiki. For nested lists, use HTML.</p></li>
	754	+ @ <li> <p><span class="wikiruleHead">Enumeration Lists</span>.
746	755	@ An enumeration list item is a line that begins with a single "#" character
747	756	@ surrounded on both sides by two or more spaces or by a tab. Only a single
748	757	@ level of enumeration list is supported by wiki. For nested lists or for
749		- @ enumerations that count using letters or roman numerials, use HTML.</p>
750		- @ <li> <p><b>Indented Paragraphs</b>.
	758	+ @ enumerations that count using letters or roman numerials, use HTML.</p></li>
	759	+ @ <li> <p><span class="wikiruleHead">Indented Paragraphs</span>.
751	760	@ Any paragraph that begins with two or more spaces or a tab and
752	761	@ which is not a bullet or enumeration list item is rendered
753	762	@ indented. Only a single level of indentation is supported by wiki; use
754		- @ HTML for deeper indentation.</p>
755		- @ <li> <p><b>Hyperlinks</b>.
	763	+ @ HTML for deeper indentation.</p></li>
	764	+ @ <li> <p><span class="wikiruleHead">Hyperlinks</span>.
756	765	@ Text within square brackets ("[...]") becomes a hyperlink. The
757	766	@ target can be a wiki page name, the artifact ID of a check-in or ticket,
758	767	@ the name of an image, or a URL. By default, the target is displayed
759	768	@ as the text of the hyperlink. But you can specify alternative text
760	769	@ after the target name separated by a "\|" character.</p>
761	770	@ <p>You can also link to internal anchor names using [#anchor-name], providing
762	771	@ you have added the necessary "<a name="anchor-name"></a>"
763		- @ tag to your wiki page.</p>
764		- @ <li> <p><b>HTML</b>.
	772	+ @ tag to your wiki page.</p></li>
	773	+ @ <li> <p><span class="wikiruleHead">HTML</span>.
765	774	@ The following standard HTML elements may be used:
766	775	@ <a>
767	776	@ <address>
768	777	@ <b>
769	778	@ <big>
		@@ -813,16 +822,16 @@
813	822	@ <verbatim> and <nowiki>.
814	823	@ No other elements are allowed. All attributes are checked and
815	824	@ only a few benign attributes are allowed on each element.
816	825	@ In particular, any attributes that specify javascript or CSS
817	826	@ are elided.</p></li>
818		- @ <li><p><b>Special Markup.</b>
	827	+ @ <li><p><span class="wikiruleHead">Special Markup.</span>
819	828	@ The <nowiki> tag disables all wiki formatting rules
820	829	@ through the matching </nowiki> element.
821	830	@ The <verbatim> tag works like <pre> with the addition
822	831	@ that it also disables all wiki and HTML markup
823		- @ through the matching </verbatim>.
	832	+ @ through the matching </verbatim>.</p></li>
824	833	@ </ol>
825	834	style_footer();
826	835	}
827	836
828	837	/*
829	838

	--- src/wiki.c
	+++ src/wiki.c
	@@ -48,15 +48,15 @@
48	/*
49	** Output rules for well-formed wiki pages
50	*/
51	static void well_formed_wiki_name_rules(void){
52	@ <ul>
53	@ <li> Must not begin or end with a space.
54	@ <li> Must not contain any control characters, including tab or
55	@ newline.
56	@ <li> Must not have two or more spaces in a row internally.
57	@ <li> Must be between 3 and 100 characters in length.
58	@ </ul>
59	}
60
61	/*
62	** Check a wiki name. If it is not well-formed, then issue an error
	@@ -63,12 +63,12 @@
63	** and return true. If it is well-formed, return false.
64	*/
65	static int check_name(const char *z){
66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	style_header("Wiki Page Name Error");
68	@ The wiki name "<b>%h(z)</b>" is not well-formed. Rules for
69	@ wiki page names:
70	well_formed_wiki_name_rules();
71	style_footer();
72	return 1;
73	}
74	return 0;
	@@ -79,14 +79,22 @@
79	** WEBPAGE: index
80	** WEBPAGE: not_found
81	*/
82	void home_page(void){
83	char *zPageName = db_get("project-name",0);

84	login_check_credentials();
85	if( !g.okRdWiki ){
86	cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL);
87	}







88	if( zPageName ){
89	login_check_credentials();
90	g.zExtra = zPageName;
91	cgi_set_parameter_nocopy("name", g.zExtra);
92	g.isHome = 1;
	@@ -147,14 +155,14 @@
147	if( g.okNewWiki ){
148	@ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li>
149	}
150	@ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a>
151	@ available on this server.</li>
152	@ <li> <form method="GET" action="%s(g.zBaseURL)/wfind">
153	@ Search wiki titles: <input type="text" name="title"/>
154	@   <input type="submit" />
155	@ </li>
156	@ </ul>
157	style_footer();
158	return;
159	}
160	if( check_name(zPageName) ) return;
	@@ -186,11 +194,11 @@
186	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
187	g.zTop, zPageName);
188	}
189	if( rid && g.okApndWiki && g.okAttach ){
190	style_submenu_element("Attach", "Add An Attachment",
191	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
192	g.zTop, zPageName, g.zTop, zPageName);
193	}
194	if( rid && g.okApndWiki ){
195	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
196	g.zTop, zPageName);
	@@ -218,19 +226,21 @@
218	if( cnt==0 ){
219	@ <hr><h2>Attachments:</h2>
220	@ <ul>
221	}
222	cnt++;
223	if( g.okHistory ){
224	@ <li><a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
225	}else{
226	@ <li>




227	}
228	@ %h(zFile)</a> add by %h(zUser) on
229	hyperlink_to_date(zDate, ".");
230	if( g.okWrWiki && g.okAttach ){
231	@ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
232	}
233	}
234	if( cnt ){
235	@ </ul>
236	}
	@@ -342,30 +352,30 @@
342	zHtmlPageName = mprintf("Edit: %s", zPageName);
343	style_header(zHtmlPageName);
344	if( P("preview")!=0 ){
345	blob_zero(&wiki);
346	blob_append(&wiki, zBody, -1);
347	@ Preview:<hr>
348	wiki_convert(&wiki, 0, 0);
349	@ <hr>
350	blob_reset(&wiki);
351	}
352	for(n=2, z=zBody; z[0]; z++){
353	if( z[0]=='\n' ) n++;
354	}
355	if( n<20 ) n = 20;
356	if( n>40 ) n = 40;
357	@ <form method="POST" action="%s(g.zBaseURL)/wikiedit">
358	login_insert_csrf_secret();
359	@ <input type="hidden" name="name" value="%h(zPageName)">
360	@ <textarea name="w" class="wikiedit" cols="80"
361	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
362	@ <br>
363	@ <input type="submit" name="preview" value="Preview Your Changes">
364	@ <input type="submit" name="submit" value="Apply These Changes">
365	@ <input type="submit" name="cancel" value="Cancel">
366	@ </form>
367	if( !isSandbox ){
368	manifest_clear(&m);
369	}
370	style_footer();
371	}
	@@ -387,21 +397,20 @@
387	zName = PD("name","");
388	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
389	cgi_redirectf("wikiedit?name=%T", zName);
390	}
391	style_header("Create A New Wiki Page");
392	@ <p>Rules for wiki page names:
393	well_formed_wiki_name_rules();
394	@ </p>
395	@ <form method="POST" action="%s(g.zBaseURL)/wikinew">
396	@ <p>Name of new wiki page:
397	@ <input type="text" width="35" name="name" value="%h(zName)">
398	@ <input type="submit" value="Create">
399	@ </p></form>
400	if( zName[0] ){
401	@ <p><b><font color="red">
402	@ "%h(zName)" is not a valid wiki page name!</font></b></p>
403	}
404	style_footer();
405	}
406
407
	@@ -528,15 +537,15 @@
528	zUser = PD("u", g.zLogin);
529	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
530	login_insert_csrf_secret();
531	@ <input type="hidden" name="name" value="%h(zPageName)">
532	@ Your Name:
533	@ <input type="text" name="u" size="20" value="%h(zUser)"><br>
534	@ Comment to append:<br>
535	@ <textarea name="r" class="wikiedit" cols="80"
536	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
537	@ <br>
538	@ <input type="submit" name="preview" value="Preview Your Comment">
539	@ <input type="submit" name="submit" value="Append Your Changes">
540	@ <input type="submit" name="cancel" value="Cancel">
541	@ </form>
542	style_footer();
	@@ -551,11 +560,11 @@
551	** Function called to output extra text at the end of each line in
552	** a wiki history listing.
553	*/
554	static void wiki_history_extra(int rid){
555	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
556	@ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
557	}
558	}
559
560	/*
561	** WEBPAGE: whistory
	@@ -634,11 +643,11 @@
634	if( m2.type==CFTYPE_WIKI ){
635	blob_init(&w2, m2.zWiki, -1);
636	}
637	}
638	blob_zero(&d);
639	text_diff(&w2, &w1, &d, 5);
640	@ <pre>
641	@ %h(blob_str(&d))
642	@ </pre>
643	style_footer();
644	}
	@@ -731,39 +740,39 @@
731	@ </ol>
732	@ <p>We call the first five rules above "wiki" formatting rules. The
733	@ last two rules are the HTML formatting rule.</p>
734	@ <h2>Formatting Rule Details</h2>
735	@ <ol>
736	@ <li> <p><b>Paragraphs</b>. Any sequence of one or more blank lines forms
737	@ a paragraph break. Centered or right-justified paragraphs are not
738	@ supported by wiki markup, but you can do these things if you need them
739	@ using HTML.</p>
740	@ <li> <p><b>Bullet Lists</b>.
741	@ A bullet list item is a line that begins with a single "*" character
742	@ surrounded on
743	@ both sides by two or more spaces or by a tab. Only a single level
744	@ of bullet list is supported by wiki. For nested lists, use HTML.</p>
745	@ <li> <p><b>Enumeration Lists</b>.
746	@ An enumeration list item is a line that begins with a single "#" character
747	@ surrounded on both sides by two or more spaces or by a tab. Only a single
748	@ level of enumeration list is supported by wiki. For nested lists or for
749	@ enumerations that count using letters or roman numerials, use HTML.</p>
750	@ <li> <p><b>Indented Paragraphs</b>.
751	@ Any paragraph that begins with two or more spaces or a tab and
752	@ which is not a bullet or enumeration list item is rendered
753	@ indented. Only a single level of indentation is supported by wiki; use
754	@ HTML for deeper indentation.</p>
755	@ <li> <p><b>Hyperlinks</b>.
756	@ Text within square brackets ("[...]") becomes a hyperlink. The
757	@ target can be a wiki page name, the artifact ID of a check-in or ticket,
758	@ the name of an image, or a URL. By default, the target is displayed
759	@ as the text of the hyperlink. But you can specify alternative text
760	@ after the target name separated by a "\|" character.</p>
761	@ <p>You can also link to internal anchor names using [#anchor-name], providing
762	@ you have added the necessary "<a name="anchor-name"></a>"
763	@ tag to your wiki page.</p>
764	@ <li> <p><b>HTML</b>.
765	@ The following standard HTML elements may be used:
766	@ <a>
767	@ <address>
768	@ <b>
769	@ <big>
	@@ -813,16 +822,16 @@
813	@ <verbatim> and <nowiki>.
814	@ No other elements are allowed. All attributes are checked and
815	@ only a few benign attributes are allowed on each element.
816	@ In particular, any attributes that specify javascript or CSS
817	@ are elided.</p></li>
818	@ <li><p><b>Special Markup.</b>
819	@ The <nowiki> tag disables all wiki formatting rules
820	@ through the matching </nowiki> element.
821	@ The <verbatim> tag works like <pre> with the addition
822	@ that it also disables all wiki and HTML markup
823	@ through the matching </verbatim>.
824	@ </ol>
825	style_footer();
826	}
827
828	/*
829

	--- src/wiki.c
	+++ src/wiki.c
	@@ -48,15 +48,15 @@
48	/*
49	** Output rules for well-formed wiki pages
50	*/
51	static void well_formed_wiki_name_rules(void){
52	@ <ul>
53	@ <li> Must not begin or end with a space.</li>
54	@ <li> Must not contain any control characters, including tab or
55	@ newline.</li>
56	@ <li> Must not have two or more spaces in a row internally.</li>
57	@ <li> Must be between 3 and 100 characters in length.</li>
58	@ </ul>
59	}
60
61	/*
62	** Check a wiki name. If it is not well-formed, then issue an error
	@@ -63,12 +63,12 @@
63	** and return true. If it is well-formed, return false.
64	*/
65	static int check_name(const char *z){
66	if( !wiki_name_is_wellformed((const unsigned char *)z) ){
67	style_header("Wiki Page Name Error");
68	@ The wiki name "<span class="wikiError">%h(z)</span>" is not well-formed.
69	@ Rules for wiki page names:
70	well_formed_wiki_name_rules();
71	style_footer();
72	return 1;
73	}
74	return 0;
	@@ -79,14 +79,22 @@
79	** WEBPAGE: index
80	** WEBPAGE: not_found
81	*/
82	void home_page(void){
83	char *zPageName = db_get("project-name",0);
84	char *zIndexPage = db_get("index-page",0);
85	login_check_credentials();
86	if( !g.okRdWiki ){
87	cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL);
88	}
89	if( zIndexPage ){
90	while( zIndexPage[0]=='/' ) zIndexPage++;
91	if( strcmp(zIndexPage, P("PATH_INFO"))==0 ) zIndexPage = 0;
92	}
93	if( zIndexPage ){
94	cgi_redirectf("%s/%s", g.zBaseURL, zIndexPage);
95	}
96	if( zPageName ){
97	login_check_credentials();
98	g.zExtra = zPageName;
99	cgi_set_parameter_nocopy("name", g.zExtra);
100	g.isHome = 1;
	@@ -147,14 +155,14 @@
155	if( g.okNewWiki ){
156	@ <li> Create a <a href="%s(g.zBaseURL)/wikinew">new wiki page</a>.</li>
157	}
158	@ <li> <a href="%s(g.zBaseURL)/wcontent">List of All Wiki Pages</a>
159	@ available on this server.</li>
160	@ <li> <form method="get" action="%s(g.zBaseURL)/wfind"><div>
161	@ Search wiki titles: <input type="text" name="title"/>
162	@   <input type="submit" /></div></form>
163	@ </li>
164	@ </ul>
165	style_footer();
166	return;
167	}
168	if( check_name(zPageName) ) return;
	@@ -186,11 +194,11 @@
194	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
195	g.zTop, zPageName);
196	}
197	if( rid && g.okApndWiki && g.okAttach ){
198	style_submenu_element("Attach", "Add An Attachment",
199	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
200	g.zTop, zPageName, g.zTop, zPageName);
201	}
202	if( rid && g.okApndWiki ){
203	style_submenu_element("Append", "Add A Comment", "%s/wikiappend?name=%T",
204	g.zTop, zPageName);
	@@ -218,19 +226,21 @@
226	if( cnt==0 ){
227	@ <hr><h2>Attachments:</h2>
228	@ <ul>
229	}
230	cnt++;
231	if( g.okHistory && g.okRead ){


232	@ <li>
233	@ <a href="%s(g.zTop)/attachview?page=%s(zPageName)&file=%t(zFile)">
234	@ %h(zFile)</a>
235	}else{
236	@ <li>%h(zFile)
237	}
238	@ added by %h(zUser) on
239	hyperlink_to_date(zDate, ".");
240	if( g.okWrWiki && g.okAttach ){
241	@ [<a href="%s(g.zTop)/attachdelete?page=%s(zPageName)&file=%t(zFile)&from=%s(g.zTop)/wiki%%3fname=%s(zPageName)">delete</a>]
242	}
243	}
244	if( cnt ){
245	@ </ul>
246	}
	@@ -342,30 +352,30 @@
352	zHtmlPageName = mprintf("Edit: %s", zPageName);
353	style_header(zHtmlPageName);
354	if( P("preview")!=0 ){
355	blob_zero(&wiki);
356	blob_append(&wiki, zBody, -1);
357	@ Preview:<hr />
358	wiki_convert(&wiki, 0, 0);
359	@ <hr />
360	blob_reset(&wiki);
361	}
362	for(n=2, z=zBody; z[0]; z++){
363	if( z[0]=='\n' ) n++;
364	}
365	if( n<20 ) n = 20;
366	if( n>40 ) n = 40;
367	@ <form method="post" action="%s(g.zBaseURL)/wikiedit"><div>
368	login_insert_csrf_secret();
369	@ <input type="hidden" name="name" value="%h(zPageName)" />
370	@ <textarea name="w" class="wikiedit" cols="80"
371	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
372	@ <br />
373	@ <input type="submit" name="preview" value="Preview Your Changes" />
374	@ <input type="submit" name="submit" value="Apply These Changes" />
375	@ <input type="submit" name="cancel" value="Cancel" />
376	@ </div></form>
377	if( !isSandbox ){
378	manifest_clear(&m);
379	}
380	style_footer();
381	}
	@@ -387,21 +397,20 @@
397	zName = PD("name","");
398	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
399	cgi_redirectf("wikiedit?name=%T", zName);
400	}
401	style_header("Create A New Wiki Page");
402	@ <p>Rules for wiki page names:</p>
403	well_formed_wiki_name_rules();
404	@ <form method="post" action="%s(g.zBaseURL)/wikinew">

405	@ <p>Name of new wiki page:
406	@ <input style="width: 35;" type="text" name="name" value="%h(zName)" />
407	@ <input type="submit" value="Create" />
408	@ </p></form>
409	if( zName[0] ){
410	@ <p><span class="wikiError">
411	@ "%h(zName)" is not a valid wiki page name!</span></p>
412	}
413	style_footer();
414	}
415
416
	@@ -528,15 +537,15 @@
537	zUser = PD("u", g.zLogin);
538	@ <form method="POST" action="%s(g.zBaseURL)/wikiappend">
539	login_insert_csrf_secret();
540	@ <input type="hidden" name="name" value="%h(zPageName)">
541	@ Your Name:
542	@ <input type="text" name="u" size="20" value="%h(zUser)"><br />
543	@ Comment to append:<br />
544	@ <textarea name="r" class="wikiedit" cols="80"
545	@ rows="10" wrap="virtual">%h(PD("r",""))</textarea>
546	@ <br />
547	@ <input type="submit" name="preview" value="Preview Your Comment">
548	@ <input type="submit" name="submit" value="Append Your Changes">
549	@ <input type="submit" name="cancel" value="Cancel">
550	@ </form>
551	style_footer();
	@@ -551,11 +560,11 @@
560	** Function called to output extra text at the end of each line in
561	** a wiki history listing.
562	*/
563	static void wiki_history_extra(int rid){
564	if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
565	@ <a href="%s(g.zTop)/wdiff?name=%t(zWikiPageName)&a=%d(rid)">[diff]</a>
566	}
567	}
568
569	/*
570	** WEBPAGE: whistory
	@@ -634,11 +643,11 @@
643	if( m2.type==CFTYPE_WIKI ){
644	blob_init(&w2, m2.zWiki, -1);
645	}
646	}
647	blob_zero(&d);
648	text_diff(&w2, &w1, &d, 5, 1);
649	@ <pre>
650	@ %h(blob_str(&d))
651	@ </pre>
652	style_footer();
653	}
	@@ -731,39 +740,39 @@
740	@ </ol>
741	@ <p>We call the first five rules above "wiki" formatting rules. The
742	@ last two rules are the HTML formatting rule.</p>
743	@ <h2>Formatting Rule Details</h2>
744	@ <ol>
745	@ <li> <p><span class="wikiruleHead">Paragraphs</span>. Any sequence of one or more blank lines forms
746	@ a paragraph break. Centered or right-justified paragraphs are not
747	@ supported by wiki markup, but you can do these things if you need them
748	@ using HTML.</p></li>
749	@ <li> <p><span class="wikiruleHead">Bullet Lists</span>.
750	@ A bullet list item is a line that begins with a single "*" character
751	@ surrounded on
752	@ both sides by two or more spaces or by a tab. Only a single level
753	@ of bullet list is supported by wiki. For nested lists, use HTML.</p></li>
754	@ <li> <p><span class="wikiruleHead">Enumeration Lists</span>.
755	@ An enumeration list item is a line that begins with a single "#" character
756	@ surrounded on both sides by two or more spaces or by a tab. Only a single
757	@ level of enumeration list is supported by wiki. For nested lists or for
758	@ enumerations that count using letters or roman numerials, use HTML.</p></li>
759	@ <li> <p><span class="wikiruleHead">Indented Paragraphs</span>.
760	@ Any paragraph that begins with two or more spaces or a tab and
761	@ which is not a bullet or enumeration list item is rendered
762	@ indented. Only a single level of indentation is supported by wiki; use
763	@ HTML for deeper indentation.</p></li>
764	@ <li> <p><span class="wikiruleHead">Hyperlinks</span>.
765	@ Text within square brackets ("[...]") becomes a hyperlink. The
766	@ target can be a wiki page name, the artifact ID of a check-in or ticket,
767	@ the name of an image, or a URL. By default, the target is displayed
768	@ as the text of the hyperlink. But you can specify alternative text
769	@ after the target name separated by a "\|" character.</p>
770	@ <p>You can also link to internal anchor names using [#anchor-name], providing
771	@ you have added the necessary "<a name="anchor-name"></a>"
772	@ tag to your wiki page.</p></li>
773	@ <li> <p><span class="wikiruleHead">HTML</span>.
774	@ The following standard HTML elements may be used:
775	@ <a>
776	@ <address>
777	@ <b>
778	@ <big>
	@@ -813,16 +822,16 @@
822	@ <verbatim> and <nowiki>.
823	@ No other elements are allowed. All attributes are checked and
824	@ only a few benign attributes are allowed on each element.
825	@ In particular, any attributes that specify javascript or CSS
826	@ are elided.</p></li>
827	@ <li><p><span class="wikiruleHead">Special Markup.</span>
828	@ The <nowiki> tag disables all wiki formatting rules
829	@ through the matching </nowiki> element.
830	@ The <verbatim> tag works like <pre> with the addition
831	@ that it also disables all wiki and HTML markup
832	@ through the matching </verbatim>.</p></li>
833	@ </ol>
834	style_footer();
835	}
836
837	/*
838

M src/wikiformat.c

+47 -21

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -321,21 +321,21 @@
321	321	}
322	322
323	323	/*
324	324	** Token types
325	325	*/
326		-#define TOKEN_MARKUP 1 /* <...> */
327		-#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */
328		-#define TOKEN_LINK 3 /* [...] */
329		-#define TOKEN_PARAGRAPH 4 /* blank lines */
330		-#define TOKEN_NEWLINE 5 /* A single "\n" */
331		-#define TOKEN_BUL_LI 6 /* " * " */
332		-#define TOKEN_NUM_LI 7 /* " # " */
333		-#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */
334		-#define TOKEN_INDENT 9 /* " " */
335		-#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */
336		-#define TOKEN_TEXT 11 /* None of the above */
	326	+#define TOKEN_MARKUP 1 /* <...> */
	327	+#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */
	328	+#define TOKEN_LINK 3 /* [...] */
	329	+#define TOKEN_PARAGRAPH 4 /* blank lines */
	330	+#define TOKEN_NEWLINE 5 /* A single "\n" */
	331	+#define TOKEN_BUL_LI 6 /* " * " */
	332	+#define TOKEN_NUM_LI 7 /* " # " */
	333	+#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */
	334	+#define TOKEN_INDENT 9 /* " " */
	335	+#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */
	336	+#define TOKEN_TEXT 11 /* None of the above */
337	337
338	338	/*
339	339	** State flags
340	340	*/
341	341	#define AT_NEWLINE 0x001 /* At start of a line */
		@@ -745,10 +745,13 @@
745	745	static void renderMarkup(Blob pOut, ParsedMarkup p){
746	746	int i;
747	747	if( p->endTag ){
748	748	blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749	749	}else{
	750	+ /* Close active paragraph for several elements, which are not allowed
	751	+ ** in paragraphs in XHTML.
	752	+ */
750	753	blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
751	754	for(i=0; i<p->nAttr; i++){
752	755	blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
753	756	if( p->aAttr[i].zValue ){
754	757	const char *zVal = p->aAttr[i].zValue;
		@@ -756,10 +759,13 @@
756	759	blob_appendf(pOut, "=\"%s%s\"", g.zBaseURL, zVal);
757	760	}else{
758	761	blob_appendf(pOut, "=\"%s\"", zVal);
759	762	}
760	763	}
	764	+ }
	765	+ if (p->iType & MUTYPE_SINGLE){
	766	+ blob_append(pOut, " /", 2);
761	767	}
762	768	blob_append(pOut, ">", 1);
763	769	}
764	770	}
765	771
		@@ -885,12 +891,13 @@
885	891
886	892	/*
887	893	** Begin a new paragraph if that something that is needed.
888	894	*/
889	895	static void startAutoParagraph(Renderer *p){
890		- if( p->wantAutoParagraph==0 \|\| p->wikiList==MARKUP_OL \|\| p->wikiList==MARKUP_UL ) return;
891		- blob_appendf(p->pOut, "<p>", -1);
	896	+ if( p->wantAutoParagraph==0 ) return;
	897	+ if( p->wikiList==MARKUP_OL \|\| p->wikiList==MARKUP_UL ) return;
	898	+ blob_appendf(p->pOut, "<p type=\"auto\">", -1);
892	899	pushStack(p, MARKUP_P);
893	900	p->wantAutoParagraph = 0;
894	901	p->inAutoParagraph = 1;
895	902	}
896	903
		@@ -1019,17 +1026,18 @@
1019	1026	/* Special display processing for tickets. Display the hyperlink
1020	1027	** as crossed out if the ticket is closed.
1021	1028	*/
1022	1029	if( isClosed ){
1023	1030	if( g.okHistory ){
1024		- blob_appendf(p->pOut,"<a href=\"%s/info/%s\"><s>",
1025		- g.zBaseURL, zTarget
	1031	+ blob_appendf(p->pOut,
	1032	+ "<a href=\"%s/info/%s\"><span class=\"wikiTagCancelled\">",
	1033	+ g.zBaseURL, zTarget
1026	1034	);
1027		- zTerm = "</s></a>";
	1035	+ zTerm = "</span></a>";
1028	1036	}else{
1029		- blob_appendf(p->pOut,"<s>");
1030		- zTerm = "</s>";
	1037	+ blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">");
	1038	+ zTerm = "</span>";
1031	1039	}
1032	1040	}else{
1033	1041	if( g.okHistory ){
1034	1042	blob_appendf(p->pOut,"<a href=\"%s/info/%s\">",
1035	1043	g.zBaseURL, zTarget
		@@ -1133,10 +1141,11 @@
1133	1141	}else{
1134	1142	if( p->wikiList!=MARKUP_UL ){
1135	1143	if( p->wikiList ){
1136	1144	popStackToTag(p, p->wikiList);
1137	1145	}
	1146	+ endAutoParagraph(p);
1138	1147	pushStack(p, MARKUP_UL);
1139	1148	blob_append(p->pOut, "<ul>", 4);
1140	1149	p->wikiList = MARKUP_UL;
1141	1150	}
1142	1151	popStackToTag(p, MARKUP_LI);
		@@ -1152,10 +1161,11 @@
1152	1161	}else{
1153	1162	if( p->wikiList!=MARKUP_OL ){
1154	1163	if( p->wikiList ){
1155	1164	popStackToTag(p, p->wikiList);
1156	1165	}
	1166	+ endAutoParagraph(p);
1157	1167	pushStack(p, MARKUP_OL);
1158	1168	blob_append(p->pOut, "<ol>", 4);
1159	1169	p->wikiList = MARKUP_OL;
1160	1170	}
1161	1171	popStackToTag(p, MARKUP_LI);
		@@ -1171,10 +1181,11 @@
1171	1181	}else{
1172	1182	if( p->wikiList!=MARKUP_OL ){
1173	1183	if( p->wikiList ){
1174	1184	popStackToTag(p, p->wikiList);
1175	1185	}
	1186	+ endAutoParagraph(p);
1176	1187	pushStack(p, MARKUP_OL);
1177	1188	blob_append(p->pOut, "<ol>", 4);
1178	1189	p->wikiList = MARKUP_OL;
1179	1190	}
1180	1191	popStackToTag(p, MARKUP_LI);
		@@ -1233,11 +1244,13 @@
1233	1244	p->state = savedState;
1234	1245	blob_append(p->pOut, zClose, -1);
1235	1246	break;
1236	1247	}
1237	1248	case TOKEN_TEXT: {
1238		- startAutoParagraph(p);
	1249	+ int i;
	1250	+ for(i=0; i<n && isspace(z[i]); i++){}
	1251	+ if( i<n ) startAutoParagraph(p);
1239	1252	blob_append(p->pOut, z, n);
1240	1253	break;
1241	1254	}
1242	1255	case TOKEN_RAW: {
1243	1256	blob_append(p->pOut, z, n);
		@@ -1347,16 +1360,19 @@
1347	1360	blob_appendf(p->pOut, "<pre name='code' class='%s'>",
1348	1361	markup.aAttr[vAttrIdx].zValue);
1349	1362	vAttrDidAppend=1;
1350	1363	}
1351	1364	}
1352		- if( !vAttrDidAppend )
	1365	+ if( !vAttrDidAppend ) {
	1366	+ endAutoParagraph(p);
1353	1367	blob_append(p->pOut, "<pre class='verbatim'>",-1);
	1368	+ }
1354	1369	p->wantAutoParagraph = 0;
1355	1370	}else
1356	1371	if( markup.iType==MUTYPE_LI ){
1357	1372	if( backupToType(p, MUTYPE_LIST)==0 ){
	1373	+ endAutoParagraph(p);
1358	1374	pushStack(p, MARKUP_UL);
1359	1375	blob_append(p->pOut, "<ul>", 4);
1360	1376	}
1361	1377	pushStack(p, MARKUP_LI);
1362	1378	renderMarkup(p->pOut, &markup);
		@@ -1384,12 +1400,22 @@
1384	1400	pushStack(p, markup.iCode);
1385	1401	}else
1386	1402	{
1387	1403	if( markup.iType==MUTYPE_FONT ){
1388	1404	startAutoParagraph(p);
1389		- }else if( markup.iType==MUTYPE_BLOCK ){
	1405	+ }else if( markup.iType==MUTYPE_BLOCK \|\| markup.iType==MUTYPE_LIST ){
1390	1406	p->wantAutoParagraph = 0;
	1407	+ }
	1408	+ if( markup.iCode==MARKUP_HR
	1409	+ \|\| markup.iCode==MARKUP_H1
	1410	+ \|\| markup.iCode==MARKUP_H2
	1411	+ \|\| markup.iCode==MARKUP_H3
	1412	+ \|\| markup.iCode==MARKUP_H4
	1413	+ \|\| markup.iCode==MARKUP_H5
	1414	+ \|\| markup.iCode==MARKUP_P
	1415	+ ){
	1416	+ endAutoParagraph(p);
1391	1417	}
1392	1418	if( (markup.iType & MUTYPE_STACK )!=0 ){
1393	1419	pushStack(p, markup.iCode);
1394	1420	}
1395	1421	renderMarkup(p->pOut, &markup);
1396	1422

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -321,21 +321,21 @@
321	}
322
323	/*
324	** Token types
325	*/
326	#define TOKEN_MARKUP 1 /* <...> */
327	#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */
328	#define TOKEN_LINK 3 /* [...] */
329	#define TOKEN_PARAGRAPH 4 /* blank lines */
330	#define TOKEN_NEWLINE 5 /* A single "\n" */
331	#define TOKEN_BUL_LI 6 /* " * " */
332	#define TOKEN_NUM_LI 7 /* " # " */
333	#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */
334	#define TOKEN_INDENT 9 /* " " */
335	#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */
336	#define TOKEN_TEXT 11 /* None of the above */
337
338	/*
339	** State flags
340	*/
341	#define AT_NEWLINE 0x001 /* At start of a line */
	@@ -745,10 +745,13 @@
745	static void renderMarkup(Blob pOut, ParsedMarkup p){
746	int i;
747	if( p->endTag ){
748	blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749	}else{



750	blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
751	for(i=0; i<p->nAttr; i++){
752	blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
753	if( p->aAttr[i].zValue ){
754	const char *zVal = p->aAttr[i].zValue;
	@@ -756,10 +759,13 @@
756	blob_appendf(pOut, "=\"%s%s\"", g.zBaseURL, zVal);
757	}else{
758	blob_appendf(pOut, "=\"%s\"", zVal);
759	}
760	}



761	}
762	blob_append(pOut, ">", 1);
763	}
764	}
765
	@@ -885,12 +891,13 @@
885
886	/*
887	** Begin a new paragraph if that something that is needed.
888	*/
889	static void startAutoParagraph(Renderer *p){
890	if( p->wantAutoParagraph==0 \|\| p->wikiList==MARKUP_OL \|\| p->wikiList==MARKUP_UL ) return;
891	blob_appendf(p->pOut, "<p>", -1);

892	pushStack(p, MARKUP_P);
893	p->wantAutoParagraph = 0;
894	p->inAutoParagraph = 1;
895	}
896
	@@ -1019,17 +1026,18 @@
1019	/* Special display processing for tickets. Display the hyperlink
1020	** as crossed out if the ticket is closed.
1021	*/
1022	if( isClosed ){
1023	if( g.okHistory ){
1024	blob_appendf(p->pOut,"<a href=\"%s/info/%s\"><s>",
1025	g.zBaseURL, zTarget

1026	);
1027	zTerm = "</s></a>";
1028	}else{
1029	blob_appendf(p->pOut,"<s>");
1030	zTerm = "</s>";
1031	}
1032	}else{
1033	if( g.okHistory ){
1034	blob_appendf(p->pOut,"<a href=\"%s/info/%s\">",
1035	g.zBaseURL, zTarget
	@@ -1133,10 +1141,11 @@
1133	}else{
1134	if( p->wikiList!=MARKUP_UL ){
1135	if( p->wikiList ){
1136	popStackToTag(p, p->wikiList);
1137	}

1138	pushStack(p, MARKUP_UL);
1139	blob_append(p->pOut, "<ul>", 4);
1140	p->wikiList = MARKUP_UL;
1141	}
1142	popStackToTag(p, MARKUP_LI);
	@@ -1152,10 +1161,11 @@
1152	}else{
1153	if( p->wikiList!=MARKUP_OL ){
1154	if( p->wikiList ){
1155	popStackToTag(p, p->wikiList);
1156	}

1157	pushStack(p, MARKUP_OL);
1158	blob_append(p->pOut, "<ol>", 4);
1159	p->wikiList = MARKUP_OL;
1160	}
1161	popStackToTag(p, MARKUP_LI);
	@@ -1171,10 +1181,11 @@
1171	}else{
1172	if( p->wikiList!=MARKUP_OL ){
1173	if( p->wikiList ){
1174	popStackToTag(p, p->wikiList);
1175	}

1176	pushStack(p, MARKUP_OL);
1177	blob_append(p->pOut, "<ol>", 4);
1178	p->wikiList = MARKUP_OL;
1179	}
1180	popStackToTag(p, MARKUP_LI);
	@@ -1233,11 +1244,13 @@
1233	p->state = savedState;
1234	blob_append(p->pOut, zClose, -1);
1235	break;
1236	}
1237	case TOKEN_TEXT: {
1238	startAutoParagraph(p);


1239	blob_append(p->pOut, z, n);
1240	break;
1241	}
1242	case TOKEN_RAW: {
1243	blob_append(p->pOut, z, n);
	@@ -1347,16 +1360,19 @@
1347	blob_appendf(p->pOut, "<pre name='code' class='%s'>",
1348	markup.aAttr[vAttrIdx].zValue);
1349	vAttrDidAppend=1;
1350	}
1351	}
1352	if( !vAttrDidAppend )

1353	blob_append(p->pOut, "<pre class='verbatim'>",-1);

1354	p->wantAutoParagraph = 0;
1355	}else
1356	if( markup.iType==MUTYPE_LI ){
1357	if( backupToType(p, MUTYPE_LIST)==0 ){

1358	pushStack(p, MARKUP_UL);
1359	blob_append(p->pOut, "<ul>", 4);
1360	}
1361	pushStack(p, MARKUP_LI);
1362	renderMarkup(p->pOut, &markup);
	@@ -1384,12 +1400,22 @@
1384	pushStack(p, markup.iCode);
1385	}else
1386	{
1387	if( markup.iType==MUTYPE_FONT ){
1388	startAutoParagraph(p);
1389	}else if( markup.iType==MUTYPE_BLOCK ){
1390	p->wantAutoParagraph = 0;










1391	}
1392	if( (markup.iType & MUTYPE_STACK )!=0 ){
1393	pushStack(p, markup.iCode);
1394	}
1395	renderMarkup(p->pOut, &markup);
1396

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -321,21 +321,21 @@
321	}
322
323	/*
324	** Token types
325	*/
326	#define TOKEN_MARKUP 1 /* <...> */
327	#define TOKEN_CHARACTER 2 /* "&" or "<" not part of markup */
328	#define TOKEN_LINK 3 /* [...] */
329	#define TOKEN_PARAGRAPH 4 /* blank lines */
330	#define TOKEN_NEWLINE 5 /* A single "\n" */
331	#define TOKEN_BUL_LI 6 /* " * " */
332	#define TOKEN_NUM_LI 7 /* " # " */
333	#define TOKEN_ENUM 8 /* " \(?\d+[.)]? " */
334	#define TOKEN_INDENT 9 /* " " */
335	#define TOKEN_RAW 10 /* Output exactly (used when wiki-use-html==1) */
336	#define TOKEN_TEXT 11 /* None of the above */
337
338	/*
339	** State flags
340	*/
341	#define AT_NEWLINE 0x001 /* At start of a line */
	@@ -745,10 +745,13 @@
745	static void renderMarkup(Blob pOut, ParsedMarkup p){
746	int i;
747	if( p->endTag ){
748	blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749	}else{
750	/* Close active paragraph for several elements, which are not allowed
751	** in paragraphs in XHTML.
752	*/
753	blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
754	for(i=0; i<p->nAttr; i++){
755	blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
756	if( p->aAttr[i].zValue ){
757	const char *zVal = p->aAttr[i].zValue;
	@@ -756,10 +759,13 @@
759	blob_appendf(pOut, "=\"%s%s\"", g.zBaseURL, zVal);
760	}else{
761	blob_appendf(pOut, "=\"%s\"", zVal);
762	}
763	}
764	}
765	if (p->iType & MUTYPE_SINGLE){
766	blob_append(pOut, " /", 2);
767	}
768	blob_append(pOut, ">", 1);
769	}
770	}
771
	@@ -885,12 +891,13 @@
891
892	/*
893	** Begin a new paragraph if that something that is needed.
894	*/
895	static void startAutoParagraph(Renderer *p){
896	if( p->wantAutoParagraph==0 ) return;
897	if( p->wikiList==MARKUP_OL \|\| p->wikiList==MARKUP_UL ) return;
898	blob_appendf(p->pOut, "<p type=\"auto\">", -1);
899	pushStack(p, MARKUP_P);
900	p->wantAutoParagraph = 0;
901	p->inAutoParagraph = 1;
902	}
903
	@@ -1019,17 +1026,18 @@
1026	/* Special display processing for tickets. Display the hyperlink
1027	** as crossed out if the ticket is closed.
1028	*/
1029	if( isClosed ){
1030	if( g.okHistory ){
1031	blob_appendf(p->pOut,
1032	"<a href=\"%s/info/%s\"><span class=\"wikiTagCancelled\">",
1033	g.zBaseURL, zTarget
1034	);
1035	zTerm = "</span></a>";
1036	}else{
1037	blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">");
1038	zTerm = "</span>";
1039	}
1040	}else{
1041	if( g.okHistory ){
1042	blob_appendf(p->pOut,"<a href=\"%s/info/%s\">",
1043	g.zBaseURL, zTarget
	@@ -1133,10 +1141,11 @@
1141	}else{
1142	if( p->wikiList!=MARKUP_UL ){
1143	if( p->wikiList ){
1144	popStackToTag(p, p->wikiList);
1145	}
1146	endAutoParagraph(p);
1147	pushStack(p, MARKUP_UL);
1148	blob_append(p->pOut, "<ul>", 4);
1149	p->wikiList = MARKUP_UL;
1150	}
1151	popStackToTag(p, MARKUP_LI);
	@@ -1152,10 +1161,11 @@
1161	}else{
1162	if( p->wikiList!=MARKUP_OL ){
1163	if( p->wikiList ){
1164	popStackToTag(p, p->wikiList);
1165	}
1166	endAutoParagraph(p);
1167	pushStack(p, MARKUP_OL);
1168	blob_append(p->pOut, "<ol>", 4);
1169	p->wikiList = MARKUP_OL;
1170	}
1171	popStackToTag(p, MARKUP_LI);
	@@ -1171,10 +1181,11 @@
1181	}else{
1182	if( p->wikiList!=MARKUP_OL ){
1183	if( p->wikiList ){
1184	popStackToTag(p, p->wikiList);
1185	}
1186	endAutoParagraph(p);
1187	pushStack(p, MARKUP_OL);
1188	blob_append(p->pOut, "<ol>", 4);
1189	p->wikiList = MARKUP_OL;
1190	}
1191	popStackToTag(p, MARKUP_LI);
	@@ -1233,11 +1244,13 @@
1244	p->state = savedState;
1245	blob_append(p->pOut, zClose, -1);
1246	break;
1247	}
1248	case TOKEN_TEXT: {
1249	int i;
1250	for(i=0; i<n && isspace(z[i]); i++){}
1251	if( i<n ) startAutoParagraph(p);
1252	blob_append(p->pOut, z, n);
1253	break;
1254	}
1255	case TOKEN_RAW: {
1256	blob_append(p->pOut, z, n);
	@@ -1347,16 +1360,19 @@
1360	blob_appendf(p->pOut, "<pre name='code' class='%s'>",
1361	markup.aAttr[vAttrIdx].zValue);
1362	vAttrDidAppend=1;
1363	}
1364	}
1365	if( !vAttrDidAppend ) {
1366	endAutoParagraph(p);
1367	blob_append(p->pOut, "<pre class='verbatim'>",-1);
1368	}
1369	p->wantAutoParagraph = 0;
1370	}else
1371	if( markup.iType==MUTYPE_LI ){
1372	if( backupToType(p, MUTYPE_LIST)==0 ){
1373	endAutoParagraph(p);
1374	pushStack(p, MARKUP_UL);
1375	blob_append(p->pOut, "<ul>", 4);
1376	}
1377	pushStack(p, MARKUP_LI);
1378	renderMarkup(p->pOut, &markup);
	@@ -1384,12 +1400,22 @@
1400	pushStack(p, markup.iCode);
1401	}else
1402	{
1403	if( markup.iType==MUTYPE_FONT ){
1404	startAutoParagraph(p);
1405	}else if( markup.iType==MUTYPE_BLOCK \|\| markup.iType==MUTYPE_LIST ){
1406	p->wantAutoParagraph = 0;
1407	}
1408	if( markup.iCode==MARKUP_HR
1409	\|\| markup.iCode==MARKUP_H1
1410	\|\| markup.iCode==MARKUP_H2
1411	\|\| markup.iCode==MARKUP_H3
1412	\|\| markup.iCode==MARKUP_H4
1413	\|\| markup.iCode==MARKUP_H5
1414	\|\| markup.iCode==MARKUP_P
1415	){
1416	endAutoParagraph(p);
1417	}
1418	if( (markup.iType & MUTYPE_STACK )!=0 ){
1419	pushStack(p, markup.iCode);
1420	}
1421	renderMarkup(p->pOut, &markup);
1422

M src/winhttp.c

+10 -4

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -16,12 +16,13 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file implements a very simple (and low-performance) HTTP server
19	19	** for windows.
20	20	*/
21		-#ifdef __MINGW32__ /* This code is for win32 only */
22	21	#include "config.h"
	22	+#ifdef _WIN32
	23	+/* This code is for win32 only */
23	24	#include "winhttp.h"
24	25	#include <windows.h>
25	26
26	27	/*
27	28	** The HttpRequest structure holds information about each incoming
		@@ -133,11 +134,12 @@
133	134	*/
134	135	void win32_http_server(
135	136	int mnPort, int mxPort, /* Range of allowed TCP port numbers */
136	137	const char zBrowser, / Command to launch browser. (Or NULL) */
137	138	const char zStopper, / Stop server when this file is exists (Or NULL) */
138		- const char zNotFound / The --notfound option, or NULL */
	139	+ const char zNotFound, / The --notfound option, or NULL */
	140	+ int flags /* One or more HTTP_SERVER_ flags */
139	141	){
140	142	WSADATA wd;
141	143	SOCKET s = INVALID_SOCKET;
142	144	SOCKADDR_IN addr;
143	145	int idCnt = 0;
		@@ -158,11 +160,15 @@
158	160	if( s==INVALID_SOCKET ){
159	161	fossil_fatal("unable to create a socket");
160	162	}
161	163	addr.sin_family = AF_INET;
162	164	addr.sin_port = htons(iPort);
163		- addr.sin_addr.s_addr = htonl(INADDR_ANY);
	165	+ if( flags & HTTP_SERVER_LOCALHOST ){
	166	+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
	167	+ }else{
	168	+ addr.sin_addr.s_addr = htonl(INADDR_ANY);
	169	+ }
164	170	if( bind(s, (struct sockaddr*)&addr, sizeof(addr))==SOCKET_ERROR ){
165	171	closesocket(s);
166	172	iPort++;
167	173	continue;
168	174	}
		@@ -215,6 +221,6 @@
215	221	}
216	222	closesocket(s);
217	223	WSACleanup();
218	224	}
219	225
220		-#endif /* __MINGW32__ -- This code is for win32 only */
	226	+#endif /* _WIN32 -- This code is for win32 only */
221	227

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -16,12 +16,13 @@
16	*******************************************************************************
17	**
18	** This file implements a very simple (and low-performance) HTTP server
19	** for windows.
20	*/
21	#ifdef __MINGW32__ /* This code is for win32 only */
22	#include "config.h"


23	#include "winhttp.h"
24	#include <windows.h>
25
26	/*
27	** The HttpRequest structure holds information about each incoming
	@@ -133,11 +134,12 @@
133	*/
134	void win32_http_server(
135	int mnPort, int mxPort, /* Range of allowed TCP port numbers */
136	const char zBrowser, / Command to launch browser. (Or NULL) */
137	const char zStopper, / Stop server when this file is exists (Or NULL) */
138	const char zNotFound / The --notfound option, or NULL */

139	){
140	WSADATA wd;
141	SOCKET s = INVALID_SOCKET;
142	SOCKADDR_IN addr;
143	int idCnt = 0;
	@@ -158,11 +160,15 @@
158	if( s==INVALID_SOCKET ){
159	fossil_fatal("unable to create a socket");
160	}
161	addr.sin_family = AF_INET;
162	addr.sin_port = htons(iPort);
163	addr.sin_addr.s_addr = htonl(INADDR_ANY);




164	if( bind(s, (struct sockaddr*)&addr, sizeof(addr))==SOCKET_ERROR ){
165	closesocket(s);
166	iPort++;
167	continue;
168	}
	@@ -215,6 +221,6 @@
215	}
216	closesocket(s);
217	WSACleanup();
218	}
219
220	#endif /* __MINGW32__ -- This code is for win32 only */
221

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -16,12 +16,13 @@
16	*******************************************************************************
17	**
18	** This file implements a very simple (and low-performance) HTTP server
19	** for windows.
20	*/

21	#include "config.h"
22	#ifdef _WIN32
23	/* This code is for win32 only */
24	#include "winhttp.h"
25	#include <windows.h>
26
27	/*
28	** The HttpRequest structure holds information about each incoming
	@@ -133,11 +134,12 @@
134	*/
135	void win32_http_server(
136	int mnPort, int mxPort, /* Range of allowed TCP port numbers */
137	const char zBrowser, / Command to launch browser. (Or NULL) */
138	const char zStopper, / Stop server when this file is exists (Or NULL) */
139	const char zNotFound, / The --notfound option, or NULL */
140	int flags /* One or more HTTP_SERVER_ flags */
141	){
142	WSADATA wd;
143	SOCKET s = INVALID_SOCKET;
144	SOCKADDR_IN addr;
145	int idCnt = 0;
	@@ -158,11 +160,15 @@
160	if( s==INVALID_SOCKET ){
161	fossil_fatal("unable to create a socket");
162	}
163	addr.sin_family = AF_INET;
164	addr.sin_port = htons(iPort);
165	if( flags & HTTP_SERVER_LOCALHOST ){
166	addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
167	}else{
168	addr.sin_addr.s_addr = htonl(INADDR_ANY);
169	}
170	if( bind(s, (struct sockaddr*)&addr, sizeof(addr))==SOCKET_ERROR ){
171	closesocket(s);
172	iPort++;
173	continue;
174	}
	@@ -215,6 +221,6 @@
221	}
222	closesocket(s);
223	WSACleanup();
224	}
225
226	#endif /* _WIN32 -- This code is for win32 only */
227

M src/xfer.c

		--- src/xfer.c
		+++ src/xfer.c
		@@ -986,10 +986,11 @@
986	986	if( pushFlag ){
987	987	blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
988	988	nCardSent++;
989	989	}
990	990	manifest_crosslink_begin();
	991	+ transport_global_startup();
991	992	fossil_print(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas");
992	993
993	994	while( go ){
994	995	int newPhantom = 0;
995	996	char *zRandomness;
996	997
997	998	ADDED win/Makefile.dmc
998	999	ADDED win/Makefile.msc
999	1000	ADDED win/include/dirent.h
1000	1001	ADDED win/include/unistd.h
1001	1002	ADDED win/version.c

	--- src/xfer.c
	+++ src/xfer.c
	@@ -986,10 +986,11 @@
986	if( pushFlag ){
987	blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
988	nCardSent++;
989	}
990	manifest_crosslink_begin();

991	fossil_print(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas");
992
993	while( go ){
994	int newPhantom = 0;
995	char *zRandomness;
996
997	DDED win/Makefile.dmc
998	DDED win/Makefile.msc
999	DDED win/include/dirent.h
1000	DDED win/include/unistd.h
1001	DDED win/version.c

	--- src/xfer.c
	+++ src/xfer.c
	@@ -986,10 +986,11 @@
986	if( pushFlag ){
987	blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
988	nCardSent++;
989	}
990	manifest_crosslink_begin();
991	transport_global_startup();
992	fossil_print(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas");
993
994	while( go ){
995	int newPhantom = 0;
996	char *zRandomness;
997
998	DDED win/Makefile.dmc
999	DDED win/Makefile.msc
1000	DDED win/include/dirent.h
1001	DDED win/include/unistd.h
1002	DDED win/version.c

M win/Makefile.dmc

+550

		--- a/win/Makefile.dmc
		+++ b/win/Makefile.dmc
		@@ -0,0 +1,550 @@
	1	+# DO NOT EDITrver_.c:server#
	2	+### $(SQLITE_OPTIONS) $**
	3	+
	4	+**
	5	+
	6	+ENABLE_STAT3rverrverrverrver$O
	7	+# "tclsh src/makemakeserverserver_.c
	8	+
	9	+serverservrver_.c:server**
	10	+
	11	+**
	12	+
	13	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	14	+
	15	+serverservrver_.c:servertag_.tag$O S) $**
	16	+
	17	+**
	18	+
	19	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	20	+### $(SQLITE_OPTIONS) $**
	21	+
	22	+**
	23	+
	24	+ENABLE_STAT3rverrverrverrver$O : serv#
	25	+### $(SQLITE_OPTIONS) $**
	26	+
	27	+**
	28	+
	29	+ENABLE_STAT3rverrver
	30	+
	31	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	32	+
	33	+4_.tag$O S) $**
	34	+
	35	+**
	36	+
	37	+EN4ertaserver_.c serverserver_.c
	38	+
	39	+serverservrver_.c:server#
	40	+### $(SQLITE_OPTIONS) $**
	41	+
	42	+**
	43	+
	44	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	45	+
	46	+serverservrver_.c:server#
	47	+### $(SQLITE_OPTIONS) $**
	48	+
	49	+**
	50	+
	51	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	52	+
	53	+serverservrver_.c:serververify$O : server_.c serve#
	54	+### $(SQLITE_OPTIONS) $**
	55	+
	56	+**
	57	+
	58	+ENABLE_STAT3rverrverrverrvever_.c:server#
	59	+### $(SQLITE_OPTIONS) $**
	60	+
	61	+**
	62	+
	63	+ENABLE_STAT3rverrverrverrver$O
	64	+# "tclsh src/makemakeserverser_.c:server#
	65	+### $(SQLITE_OPTIONS) $**
	66	+
	67	+**
	68	+
	69	+ENABLE_STAT3rverrverrverrver$O
	70	+# "tclsh src/makemaserver**
	71	+
	72	+**
	73	+
	74	+ENABLE_STAT3rverrverrverrver$O : server_.c serversNABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	75	+### $(SQLITE_OPTIONS) $**
	76	+
	77	+**
	78	+
	79	+ENABLE_STAT3rverrverrverrver$O : serv#
	80	+### $(SQLITE_OPTIONS) $**
	81	+
	82	+**
	83	+
	84	+ENABLE_STAT3rverrver
	85	+
	86	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	87	+
	88	+4_.tag$O S) $**
	89	+
	90	+**
	91	+
	92	+EN4ertaserver_.c serverserver_.c
	93	+
	94	+serverservrver_.c:server#
	95	+### $(SQLITE_OPTIONS) $**
	96	+
	97	+**
	98	+
	99	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	100	+
	101	+serverservrver_.c:server#
	102	+### $(SQLITE_OPTIONS) $**
	103	+
	104	+**
	105	+
	106	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	107	+
	108	+serverservrver_.c:serververify$O : server_.c serve#
	109	+### STAT3rverrverrverrvever_.c:server#
	110	+### $(SQLITE_OPTIONS) $**
	111	+
	112	+**
	113	+
	114	+ENABLE_STAT3rverrverrverrver$O
	115	+# "tclsh src/makemakeserverserver_.c
	116	+
	117	+serverservrver_.c:server**
	118	+
	119	+**
	120	+
	121	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	122	+
	123	+serverservrver_.c:servertag_.tag$O S) $**
	124	+
	125	+**
	126	+
	127	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	128	+### $(SQLITE_OPTIONS) $**
	129	+
	130	+**
	131	+
	132	+ENABLE_STAT3rverrverrverrver$O : serv#
	133	+### $(SQLITE_OPTIONS) $**
	134	+
	135	+**
	136	+
	137	+ENABLE_STAT3rverrver
	138	+
	139	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	140	+
	141	+4_.tag$O S) $**
	142	+
	143	+**
	144	+
	145	+EN4ertaserver_.c serverserver_.c
	146	+
	147	+serverservrver_.c:server#
	148	+### $(SQLITE_OPTIONS) $**
	149	+
	150	+**
	151	+
	152	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	153	+
	154	+serverservrver_.c:server#
	155	+### $(SQLITE_OPTIONS) $**
	156	+
	157	+**
	158	+
	159	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	160	+
	161	+serverservrver_.c:serververify$O : server_.c serve#
	162	+### $(SQLITE_OPTIONS) $**
	163	+
	164	+**
	165	+
	166	+ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
	167	+### $(SQLITE_OPTIONS) $**
	168	+
	169	+**
	170	+
	171	+ENABLE_STAT3rverrverrverrver$O
	172	+# "tclsh src/makemakeserverserver_.c
	173	+
	174	+serverservrver_.c:server**
	175	+
	176	+**
	177	+
	178	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	179	+
	180	+serverservrver_.c:servertag_.tag$O S) $**
	181	+
	182	+**
	183	+
	184	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	185	+### $(SQLITE_OPTIONS) $**
	186	+
	187	+**
	188	+
	189	+ENABLE_STAT3rverrverrverrver$O : serv#
	190	+### $(SQLITE_OPTIONS) $**
	191	+
	192	+**
	193	+
	194	+ENABLE_STAT3rverrver
	195	+
	196	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	197	+
	198	+4_.tag$O S) $**
	199	+
	200	+**
	201	+
	202	+EN4ertaserver_.c serverserver_.c
	203	+
	204	+serverservrver_.c:server#
	205	+### $(SQLITE_OPTIONS) $**
	206	+
	207	+**
	208	+
	209	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	210	+
	211	+serverservrver_.c:server#
	212	+### $(SQLITE_OPTIONS) $**
	213	+
	214	+**
	215	+
	216	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	217	+
	218	+serverservrver_.c:serververify$O : server_.c serve#
	219	+### $(SQLITE_OPTIONS) $**
	220	+
	221	+**
	222	+
	223	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	224	+
	225	+serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
	226	+
	227	+**th
	228	+### $(th
	229	+### $(SQLITE_OPfserver#
	230	+##:server#
	231	+### $(SQLITE_I18N serv#
	232	+### $(SQLITE_OPTIONS) $**
	233	+
	234	+*
	235	+
	236	+**
	237	+
	238	+ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
	239	+
	240	+serverservrver_$(SQLITE_OPTIONS) $
	241	+
	242	+**
	243	+
	244	+raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
	245	+### $(SQLITE_OP.c serverserver_.c
	246	+
	247	+serverservrvererervrver_.c:server#
	248	+### $(SQLITE_OPTIONS) $**
	249	+
	250	+**
	251	+
	252	+ENABLE_Sc serverserver_.c
	253	+
	254	+serverservrver_.c:server#
	255	+### $(AT3rverrverrverrver$O : server_.c serverserver_.c
	256	+
	257	+serverservrver_.c:servertag_.tag$O S) $**
	258	+
	259	+**
	260	+
	261	+ENABLE_STAT3rverrverrverrver*
	262	+
	263	+ENABLerrverrver$O : server_.c serverserver_.c
	264	+
	265	+serverservrver_.c:servertag_.tag$O S) $**
	266	+
	267	+**
	268	+
	269	+ENABLE_STAT3rverrverrverrver$Over_.c serverserver_.c
	270	+
	271	+serverservrver_.c:server#
	272	+### $(SQLITE_OPTIONS) $**
	273	+
	274	+**
	275	+
	276	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	277	+
	278	+serverservrver_.c:server#
	279	+### $(SQLITE_OPTIONS) $**
	280	+
	281	+**
	282	+
	283	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	284	+
	285	+serverservrver_.c:server**
	286	+
	287	+**
	288	+
	289	+ENABLE_STAT3rverrverrverrver$O : server_.c serv# DO NOT EDITrver_.c:server#
	290	+### $(SQLITE_OPTIONS) $**
	291	+
	292	+**
	293	+
	294	+ENABLE_STAT3rverrverrverrver$O
	295	+# "tclsh src/makemakeserverserver_.c
	296	+
	297	+serverservrver_.c:server**
	298	+
	299	+**
	300	+
	301	+ENABLE_STAT3rverrverrverrver$O : server_.c serthSTAT3rverrverrver# er$# DO NOT EDITrver_.c:server#
	302	+### $(SQLITE_OPTIONS) $**
	303	+
	304	+**
	305	+
	306	+ENABLE_STAT3rverrverrverrver$O
	307	+# "tclsh src/makemakeserverserver_.c
	308	+
	309	+serverservrver_.c:server**
	310	+
	311	+**
	312	+
	313	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	314	+
	315	+serverservrver_.c:servertag_.tag$O S) $**
	316	+
	317	+**
	318	+
	319	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	320	+### $(SQLITE_OPTIONS) $**
	321	+
	322	+**
	323	+
	324	+ENABLE_STAT3rverrverrverrver$O : serv#
	325	+### $(SQLITE_OPTIONS) $**
	326	+
	327	+**
	328	+
	329	+ENABLE_STAT3rverrver
	330	+
	331	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	332	+
	333	+4_.tag$O S) $**
	334	+
	335	+**
	336	+
	337	+EN4ertaserver_.c serverserver_.c
	338	+
	339	+serverservrver_.c:server#
	340	+### $(SQLITE_OPTIONS) $**
	341	+
	342	+**
	343	+
	344	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	345	+
	346	+serverservrver_.c:server#
	347	+### $(SQLITE_OPTIONS) $**
	348	+
	349	+**
	350	+
	351	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	352	+
	353	+serverservrver_.c:serververify$O : server_.c serve#
	354	+### $(SQLITE_OPTIONS) $**
	355	+
	356	+**
	357	+
	358	+ENABLE_STAT3rverrverrverrvever_.c:server#
	359	+### $(SQLITE_OPTIONS) $**
	360	+
	361	+**
	362	+
	363	+ENABLE_STAT3rverrverrverrver$O
	364	+# "tclsh src/makemakeserverserver_.c
	365	+
	366	+serverservrver_.c:server**
	367	+
	368	+**
	369	+
	370	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	371	+
	372	+serverservrver_.c:servertag_.tag$O S) $**
	373	+
	374	+**
	375	+
	376	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	377	+### $(SQLITE_OPTIONS) $**
	378	+
	379	+**
	380	+
	381	+ENABLE_STAT3rverrverrverrver$O : serv#
	382	+### $(SQLITE_OPTIONS) $**
	383	+
	384	+**
	385	+
	386	+ENABLE_STAT3rverrver
	387	+
	388	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	389	+
	390	+4_.tag$O S) $**
	391	+
	392	+**
	393	+
	394	+EN4ertaserver_.c serverserver_.c
	395	+
	396	+serverservrver_.c:server#
	397	+### $(SQLITE_OPTIONS) $**
	398	+
	399	+**
	400	+
	401	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	402	+
	403	+serverservrver_.c:server#
	404	+### $(SQLITE_OPTIONS) $**
	405	+
	406	+**
	407	+
	408	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	409	+
	410	+serverservrver_.c:serververify$O : server_.c serve#
	411	+### $(SQLITE_OPTIONS) $**
	412	+
	413	+**
	414	+
	415	+ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
	416	+### $(SQLITE_OPTIONS) $**
	417	+
	418	+**
	419	+
	420	+ENABLE_STAT3rverrverrverrver$O
	421	+# "tclsh src/makemakeserverserver_.c
	422	+
	423	+serverservrver_.c:server**
	424	+
	425	+**
	426	+
	427	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	428	+
	429	+serverservrver_.c:servertag_.tag$O S) $**
	430	+
	431	+**
	432	+
	433	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	434	+### $(SQLITE_OPTIONS) $**
	435	+
	436	+**
	437	+
	438	+ENABLE_STAT3rverrverrverrver$O : serv#
	439	+### $(SQLITE_OPTIONS) $**
	440	+
	441	+**
	442	+
	443	+ENABLE_STAT3rverrver
	444	+
	445	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	446	+
	447	+4_.tag$O S) $**
	448	+
	449	+**
	450	+
	451	+EN4ertaserver_.c serverserver_.c
	452	+
	453	+serverservrver_.c:server#
	454	+### $(SQLITE_OPTIONS) $**
	455	+
	456	+**
	457	+
	458	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	459	+
	460	+serverservrver_.c:server#
	461	+### $(SQLITE_OPTIONS) $**
	462	+
	463	+**
	464	+
	465	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	466	+
	467	+serverservrver_.c:serververify$O : server_.c serve#
	468	+### $(SQLITE_OPTIONS) $**
	469	+
	470	+**
	471	+
	472	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	473	+
	474	+serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
	475	+
	476	+**th
	477	+### $(th
	478	+### $(SQLITE_OPfserver#
	479	+##:server#
	480	+### $(SQLITE_I18N serv#
	481	+### $(SQLITE_OPTIONS) $**
	482	+
	483	+*
	484	+
	485	+**
	486	+
	487	+ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
	488	+
	489	+serverservrver_$(SQLITE_OPTIONS) $
	490	+
	491	+**
	492	+
	493	+raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
	494	+### $(SQLITE_OP.c serverserver_.c
	495	+
	496	+serverservrvererervrver_.c:server#
	497	+### $(SQLITE_OPTIONS) $**
	498	+
	499	+**
	500	+
	501	+ENABLE_Sc serverserver_.c
	502	+
	503	+serverservrver_.c:server#
	504	+### $(AT3rverrverrverrver$O : server_.c serverserver_.c
	505	+
	506	+serverservrver_.c:servertag_.tag$O S) $**
	507	+
	508	+**
	509	+
	510	+ENABLE_STAT3rverrverrverrver*
	511	+
	512	+ENABLerrverrver$O : server_.c serverserver_.c
	513	+
	514	+serverservrver_.c:servertag_.tag$O S) $**
	515	+
	516	+**
	517	+
	518	+ENABLE_STAT3rverrverrverrver$Over_.c serverserver_.c
	519	+
	520	+serverservrver_.c:server#
	521	+### $(SQLITE_OPTIONS) $**
	522	+
	523	+**
	524	+
	525	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	526	+
	527	+serverservrver_.c:server#
	528	+### $(SQLITE_OPTIONS) $**
	529	+
	530	+**
	531	+
	532	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	533	+
	534	+serverservrver_.c:server**
	535	+
	536	+**
	537	+
	538	+ENABLE_STAT3rverrverrverrver$O : server_.c serv# DO NOT EDITrver_.c:server#
	539	+### $(SQLITE_OPTIONS) $**
	540	+
	541	+**
	542	+
	543	+ENABLE_STAT3rverrverrverrver$O
	544	+# "tclsh src/makemakeserverserver_.c
	545	+
	546	+serverservrver_.c:server**
	547	+
	548	+**
	549	+
	550	+ENABLE_STAT3rverrverrverrver$O : server_.c serthSTAT3rverrverrver# er$

	--- a/win/Makefile.dmc
	+++ b/win/Makefile.dmc
	@@ -0,0 +1,550 @@

	--- a/win/Makefile.dmc
	+++ b/win/Makefile.dmc
	@@ -0,0 +1,550 @@
1	# DO NOT EDITrver_.c:server#
2	### $(SQLITE_OPTIONS) $**
3
4	**
5
6	ENABLE_STAT3rverrverrverrver$O
7	# "tclsh src/makemakeserverserver_.c
8
9	serverservrver_.c:server**
10
11	**
12
13	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
14
15	serverservrver_.c:servertag_.tag$O S) $**
16
17	**
18
19	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
20	### $(SQLITE_OPTIONS) $**
21
22	**
23
24	ENABLE_STAT3rverrverrverrver$O : serv#
25	### $(SQLITE_OPTIONS) $**
26
27	**
28
29	ENABLE_STAT3rverrver
30
31	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
32
33	4_.tag$O S) $**
34
35	**
36
37	EN4ertaserver_.c serverserver_.c
38
39	serverservrver_.c:server#
40	### $(SQLITE_OPTIONS) $**
41
42	**
43
44	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
45
46	serverservrver_.c:server#
47	### $(SQLITE_OPTIONS) $**
48
49	**
50
51	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
52
53	serverservrver_.c:serververify$O : server_.c serve#
54	### $(SQLITE_OPTIONS) $**
55
56	**
57
58	ENABLE_STAT3rverrverrverrvever_.c:server#
59	### $(SQLITE_OPTIONS) $**
60
61	**
62
63	ENABLE_STAT3rverrverrverrver$O
64	# "tclsh src/makemakeserverser_.c:server#
65	### $(SQLITE_OPTIONS) $**
66
67	**
68
69	ENABLE_STAT3rverrverrverrver$O
70	# "tclsh src/makemaserver**
71
72	**
73
74	ENABLE_STAT3rverrverrverrver$O : server_.c serversNABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
75	### $(SQLITE_OPTIONS) $**
76
77	**
78
79	ENABLE_STAT3rverrverrverrver$O : serv#
80	### $(SQLITE_OPTIONS) $**
81
82	**
83
84	ENABLE_STAT3rverrver
85
86	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
87
88	4_.tag$O S) $**
89
90	**
91
92	EN4ertaserver_.c serverserver_.c
93
94	serverservrver_.c:server#
95	### $(SQLITE_OPTIONS) $**
96
97	**
98
99	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
100
101	serverservrver_.c:server#
102	### $(SQLITE_OPTIONS) $**
103
104	**
105
106	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
107
108	serverservrver_.c:serververify$O : server_.c serve#
109	### STAT3rverrverrverrvever_.c:server#
110	### $(SQLITE_OPTIONS) $**
111
112	**
113
114	ENABLE_STAT3rverrverrverrver$O
115	# "tclsh src/makemakeserverserver_.c
116
117	serverservrver_.c:server**
118
119	**
120
121	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
122
123	serverservrver_.c:servertag_.tag$O S) $**
124
125	**
126
127	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
128	### $(SQLITE_OPTIONS) $**
129
130	**
131
132	ENABLE_STAT3rverrverrverrver$O : serv#
133	### $(SQLITE_OPTIONS) $**
134
135	**
136
137	ENABLE_STAT3rverrver
138
139	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
140
141	4_.tag$O S) $**
142
143	**
144
145	EN4ertaserver_.c serverserver_.c
146
147	serverservrver_.c:server#
148	### $(SQLITE_OPTIONS) $**
149
150	**
151
152	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
153
154	serverservrver_.c:server#
155	### $(SQLITE_OPTIONS) $**
156
157	**
158
159	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
160
161	serverservrver_.c:serververify$O : server_.c serve#
162	### $(SQLITE_OPTIONS) $**
163
164	**
165
166	ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
167	### $(SQLITE_OPTIONS) $**
168
169	**
170
171	ENABLE_STAT3rverrverrverrver$O
172	# "tclsh src/makemakeserverserver_.c
173
174	serverservrver_.c:server**
175
176	**
177
178	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
179
180	serverservrver_.c:servertag_.tag$O S) $**
181
182	**
183
184	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
185	### $(SQLITE_OPTIONS) $**
186
187	**
188
189	ENABLE_STAT3rverrverrverrver$O : serv#
190	### $(SQLITE_OPTIONS) $**
191
192	**
193
194	ENABLE_STAT3rverrver
195
196	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
197
198	4_.tag$O S) $**
199
200	**
201
202	EN4ertaserver_.c serverserver_.c
203
204	serverservrver_.c:server#
205	### $(SQLITE_OPTIONS) $**
206
207	**
208
209	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
210
211	serverservrver_.c:server#
212	### $(SQLITE_OPTIONS) $**
213
214	**
215
216	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
217
218	serverservrver_.c:serververify$O : server_.c serve#
219	### $(SQLITE_OPTIONS) $**
220
221	**
222
223	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
224
225	serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
226
227	**th
228	### $(th
229	### $(SQLITE_OPfserver#
230	##:server#
231	### $(SQLITE_I18N serv#
232	### $(SQLITE_OPTIONS) $**
233
234	*
235
236	**
237
238	ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
239
240	serverservrver_$(SQLITE_OPTIONS) $
241
242	**
243
244	raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
245	### $(SQLITE_OP.c serverserver_.c
246
247	serverservrvererervrver_.c:server#
248	### $(SQLITE_OPTIONS) $**
249
250	**
251
252	ENABLE_Sc serverserver_.c
253
254	serverservrver_.c:server#
255	### $(AT3rverrverrverrver$O : server_.c serverserver_.c
256
257	serverservrver_.c:servertag_.tag$O S) $**
258
259	**
260
261	ENABLE_STAT3rverrverrverrver*
262
263	ENABLerrverrver$O : server_.c serverserver_.c
264
265	serverservrver_.c:servertag_.tag$O S) $**
266
267	**
268
269	ENABLE_STAT3rverrverrverrver$Over_.c serverserver_.c
270
271	serverservrver_.c:server#
272	### $(SQLITE_OPTIONS) $**
273
274	**
275
276	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
277
278	serverservrver_.c:server#
279	### $(SQLITE_OPTIONS) $**
280
281	**
282
283	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
284
285	serverservrver_.c:server**
286
287	**
288
289	ENABLE_STAT3rverrverrverrver$O : server_.c serv# DO NOT EDITrver_.c:server#
290	### $(SQLITE_OPTIONS) $**
291
292	**
293
294	ENABLE_STAT3rverrverrverrver$O
295	# "tclsh src/makemakeserverserver_.c
296
297	serverservrver_.c:server**
298
299	**
300
301	ENABLE_STAT3rverrverrverrver$O : server_.c serthSTAT3rverrverrver# er$# DO NOT EDITrver_.c:server#
302	### $(SQLITE_OPTIONS) $**
303
304	**
305
306	ENABLE_STAT3rverrverrverrver$O
307	# "tclsh src/makemakeserverserver_.c
308
309	serverservrver_.c:server**
310
311	**
312
313	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
314
315	serverservrver_.c:servertag_.tag$O S) $**
316
317	**
318
319	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
320	### $(SQLITE_OPTIONS) $**
321
322	**
323
324	ENABLE_STAT3rverrverrverrver$O : serv#
325	### $(SQLITE_OPTIONS) $**
326
327	**
328
329	ENABLE_STAT3rverrver
330
331	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
332
333	4_.tag$O S) $**
334
335	**
336
337	EN4ertaserver_.c serverserver_.c
338
339	serverservrver_.c:server#
340	### $(SQLITE_OPTIONS) $**
341
342	**
343
344	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
345
346	serverservrver_.c:server#
347	### $(SQLITE_OPTIONS) $**
348
349	**
350
351	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
352
353	serverservrver_.c:serververify$O : server_.c serve#
354	### $(SQLITE_OPTIONS) $**
355
356	**
357
358	ENABLE_STAT3rverrverrverrvever_.c:server#
359	### $(SQLITE_OPTIONS) $**
360
361	**
362
363	ENABLE_STAT3rverrverrverrver$O
364	# "tclsh src/makemakeserverserver_.c
365
366	serverservrver_.c:server**
367
368	**
369
370	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
371
372	serverservrver_.c:servertag_.tag$O S) $**
373
374	**
375
376	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
377	### $(SQLITE_OPTIONS) $**
378
379	**
380
381	ENABLE_STAT3rverrverrverrver$O : serv#
382	### $(SQLITE_OPTIONS) $**
383
384	**
385
386	ENABLE_STAT3rverrver
387
388	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
389
390	4_.tag$O S) $**
391
392	**
393
394	EN4ertaserver_.c serverserver_.c
395
396	serverservrver_.c:server#
397	### $(SQLITE_OPTIONS) $**
398
399	**
400
401	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
402
403	serverservrver_.c:server#
404	### $(SQLITE_OPTIONS) $**
405
406	**
407
408	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
409
410	serverservrver_.c:serververify$O : server_.c serve#
411	### $(SQLITE_OPTIONS) $**
412
413	**
414
415	ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
416	### $(SQLITE_OPTIONS) $**
417
418	**
419
420	ENABLE_STAT3rverrverrverrver$O
421	# "tclsh src/makemakeserverserver_.c
422
423	serverservrver_.c:server**
424
425	**
426
427	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
428
429	serverservrver_.c:servertag_.tag$O S) $**
430
431	**
432
433	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
434	### $(SQLITE_OPTIONS) $**
435
436	**
437
438	ENABLE_STAT3rverrverrverrver$O : serv#
439	### $(SQLITE_OPTIONS) $**
440
441	**
442
443	ENABLE_STAT3rverrver
444
445	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
446
447	4_.tag$O S) $**
448
449	**
450
451	EN4ertaserver_.c serverserver_.c
452
453	serverservrver_.c:server#
454	### $(SQLITE_OPTIONS) $**
455
456	**
457
458	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
459
460	serverservrver_.c:server#
461	### $(SQLITE_OPTIONS) $**
462
463	**
464
465	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
466
467	serverservrver_.c:serververify$O : server_.c serve#
468	### $(SQLITE_OPTIONS) $**
469
470	**
471
472	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
473
474	serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
475
476	**th
477	### $(th
478	### $(SQLITE_OPfserver#
479	##:server#
480	### $(SQLITE_I18N serv#
481	### $(SQLITE_OPTIONS) $**
482
483	*
484
485	**
486
487	ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
488
489	serverservrver_$(SQLITE_OPTIONS) $
490
491	**
492
493	raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
494	### $(SQLITE_OP.c serverserver_.c
495
496	serverservrvererervrver_.c:server#
497	### $(SQLITE_OPTIONS) $**
498
499	**
500
501	ENABLE_Sc serverserver_.c
502
503	serverservrver_.c:server#
504	### $(AT3rverrverrverrver$O : server_.c serverserver_.c
505
506	serverservrver_.c:servertag_.tag$O S) $**
507
508	**
509
510	ENABLE_STAT3rverrverrverrver*
511
512	ENABLerrverrver$O : server_.c serverserver_.c
513
514	serverservrver_.c:servertag_.tag$O S) $**
515
516	**
517
518	ENABLE_STAT3rverrverrverrver$Over_.c serverserver_.c
519
520	serverservrver_.c:server#
521	### $(SQLITE_OPTIONS) $**
522
523	**
524
525	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
526
527	serverservrver_.c:server#
528	### $(SQLITE_OPTIONS) $**
529
530	**
531
532	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
533
534	serverservrver_.c:server**
535
536	**
537
538	ENABLE_STAT3rverrverrverrver$O : server_.c serv# DO NOT EDITrver_.c:server#
539	### $(SQLITE_OPTIONS) $**
540
541	**
542
543	ENABLE_STAT3rverrverrverrver$O
544	# "tclsh src/makemakeserverserver_.c
545
546	serverservrver_.c:server**
547
548	**
549
550	ENABLE_STAT3rverrverrverrver$O : server_.c serthSTAT3rverrverrver# er$

M win/Makefile.msc

+46

		--- a/win/Makefile.msc
		+++ b/win/Makefile.msc
		@@ -0,0 +1,46 @@
	1	+# DO NOT EDITrssrssgamation.h :
	2	+
	3	+_
	4	+
	5	+_
	6	+
	7	+_.c"
	8	+
	9	+_.c"duskinstashsta_matimelin
	10	+
	11	+_.sqlite3thth_
	12	+# "tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
	13	+#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
	14	+
	15	+_
	16	+
	17	+_.c"
	18	+
	19	+_.c"duskinstashsta_matimelin
	20	+
	21	+_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
	22	+MSCDIR = c:\msc# When using precompiled from http://zli# DO N DO NOT EDITrssrssgamation.h :
	23	+
	24	+_
	25	+
	26	+_
	27	+
	28	+_.c"
	29	+
	30	+_.c"duskinstashsta_matimelin
	31	+
	32	+_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
	33	+MSCDIR = c:\msc# When using precompiled from http://zlib.net/zlib125-dll.zip
	34	+#ZINCDIR =-dll\incluDITrssrssgamation.h :
	35	+
	36	+_
	37	+
	38	+_
	39	+
	40	+_.c"
	41	+
	42	+_.c"duskinstashsta_matimelin
	43	+
	44	+_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
	45	+MSCDIR = c:\msc# When using precompiled from http://zlib.net/zlib125-dll.zip
	46	+#ZINCDIR =-dll\inclu

	--- a/win/Makefile.msc
	+++ b/win/Makefile.msc
	@@ -0,0 +1,46 @@

	--- a/win/Makefile.msc
	+++ b/win/Makefile.msc
	@@ -0,0 +1,46 @@
1	# DO NOT EDITrssrssgamation.h :
2
3	_
4
5	_
6
7	_.c"
8
9	_.c"duskinstashsta_matimelin
10
11	_.sqlite3thth_
12	# "tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
13	#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
14
15	_
16
17	_.c"
18
19	_.c"duskinstashsta_matimelin
20
21	_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
22	MSCDIR = c:\msc# When using precompiled from http://zli# DO N DO NOT EDITrssrssgamation.h :
23
24	_
25
26	_
27
28	_.c"
29
30	_.c"duskinstashsta_matimelin
31
32	_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
33	MSCDIR = c:\msc# When using precompiled from http://zlib.net/zlib125-dll.zip
34	#ZINCDIR =-dll\incluDITrssrssgamation.h :
35
36	_
37
38	_
39
40	_.c"
41
42	_.c"duskinstashsta_matimelin
43
44	_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR, stment
45	MSCDIR = c:\msc# When using precompiled from http://zlib.net/zlib125-dll.zip
46	#ZINCDIR =-dll\inclu

M win/include/dirent.h

+67

		--- a/win/include/dirent.h
		+++ b/win/include/dirent.h
		@@ -0,0 +1,67 @@
	1	+/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
	2	+ if (n > 0) le n****
	3	+ * dirent.h - dirent API for Microsoft Visual Studio
	4	+ *
	5	+ * Copyright d
	6	+ * Peron is hereby granted, free of charge, to any person obtaining
	7	+ * a copy of this software and associated documentation files (the
	8	+ * ``Software''), to deal in the Software without restriction, including
	9	+ * without limitation the rights to use, copy, modify, merge, publish,
	10	+ * distribute, sublicense, and/or sell copies of the Software, and to
	11	+ * permit persons to whom the Software is furnished to do so, subject to
	12	+ * the following conditions:
	13	+ *
	14	+ * The above copyright notice and this permission notice shall be included
	15	+ * in all copies or substantial portions of the Software.
	16	+ *
	17	+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
	18	+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	19	+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	20	+ * IN NO EVENT SHALL TONI RONKKO BE LIABLEdirent
	21	+{
	22	+ charLIABLE FOR ANY CLAmulti-bytAdirent;
	23	+
	24	+
	25	+typedef struct DIR
	26	+{
	27	+ LINGS IN THE SOFTWARE.
	28	+ *
	29	+ * Sept 23, 2012, Joe MistachkRonkko
	30	+ * Define PATH_MAX and NAME_MAX. Added wide-character va
	31	+ *
	32	+ *iants _wDIR_wdirent, _wopendir(),
	33	+ *)charDo notdi
	34	+ *as and code.
	35	+ *
	36	+ * Do notding windows.h make This allows dows.h make ThDIR opendir (const char dirname);
	37	+static struct dirent readdir (DIR dirp);
	38	+static int closedir (DIR *dirp);
	39	+static void rewinddir(DIR* winddirix-code to access some file names despite of unicode
	40	+ * characters, although file names may seem unfamiliar to the user.
	41	+ *
	42	+ strer.
	43	+ *
	44	+ * Be ware that the code below cannot come up with a strrt file
	45	+ * name unless the file system provides o attributes */
	46	+ attr = datap->dwFileAttributes;
	47	+ if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
	48	+ entry->d_type
	49	+typedef struct _w /* Compute number of entries in the enlarged pointer tabDIR *opendir
	50	+ numstrtries = init_size;
	51	+ _w
	52	+ * dirent.h - dirent / FFIFO _S_IFFIFOdle != INVAL_IFFstrAdirent *readdir(Aclosedir(
	53	+/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
	54	+ if (n > 0) le n****
	55	+ * Resets the position of thto which dirp refers to the
	56	+ * beginning of the directory. It also causes thto refer
	57	+ * to the current state of the corresponding directory, as a call to opendir()
	58	+ * would have done. If dirp does not refer to a directory stream, the effect
	59	+ * is undefined.
	60	+ */
	61	+static void rewinddir(DIR* dirp)
	62	+{open new search handle FindFirstFileAfree (dirp);
	63	+ return;
	64	+ }
	65	+
	66	+dirp->cached = 1;
	67	+}

	--- a/win/include/dirent.h
	+++ b/win/include/dirent.h
	@@ -0,0 +1,67 @@

	--- a/win/include/dirent.h
	+++ b/win/include/dirent.h
	@@ -0,0 +1,67 @@
1	/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
2	if (n > 0) le n****
3	* dirent.h - dirent API for Microsoft Visual Studio
4	*
5	* Copyright d
6	* Peron is hereby granted, free of charge, to any person obtaining
7	* a copy of this software and associated documentation files (the
8	* ``Software''), to deal in the Software without restriction, including
9	* without limitation the rights to use, copy, modify, merge, publish,
10	* distribute, sublicense, and/or sell copies of the Software, and to
11	* permit persons to whom the Software is furnished to do so, subject to
12	* the following conditions:
13	*
14	* The above copyright notice and this permission notice shall be included
15	* in all copies or substantial portions of the Software.
16	*
17	* THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
18	* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20	* IN NO EVENT SHALL TONI RONKKO BE LIABLEdirent
21	{
22	charLIABLE FOR ANY CLAmulti-bytAdirent;
23
24
25	typedef struct DIR
26	{
27	LINGS IN THE SOFTWARE.
28	*
29	* Sept 23, 2012, Joe MistachkRonkko
30	* Define PATH_MAX and NAME_MAX. Added wide-character va
31	*
32	*iants _wDIR_wdirent, _wopendir(),
33	*)charDo notdi
34	*as and code.
35	*
36	* Do notding windows.h make This allows dows.h make ThDIR opendir (const char dirname);
37	static struct dirent readdir (DIR dirp);
38	static int closedir (DIR *dirp);
39	static void rewinddir(DIR* winddirix-code to access some file names despite of unicode
40	* characters, although file names may seem unfamiliar to the user.
41	*
42	strer.
43	*
44	* Be ware that the code below cannot come up with a strrt file
45	* name unless the file system provides o attributes */
46	attr = datap->dwFileAttributes;
47	if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
48	entry->d_type
49	typedef struct _w /* Compute number of entries in the enlarged pointer tabDIR *opendir
50	numstrtries = init_size;
51	_w
52	* dirent.h - dirent / FFIFO _S_IFFIFOdle != INVAL_IFFstrAdirent *readdir(Aclosedir(
53	/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
54	if (n > 0) le n****
55	* Resets the position of thto which dirp refers to the
56	* beginning of the directory. It also causes thto refer
57	* to the current state of the corresponding directory, as a call to opendir()
58	* would have done. If dirp does not refer to a directory stream, the effect
59	* is undefined.
60	*/
61	static void rewinddir(DIR* dirp)
62	{open new search handle FindFirstFileAfree (dirp);
63	return;
64	}
65
66	dirp->cached = 1;
67	}

M win/include/unistd.h

+43

		--- a/win/include/unistd.h
		+++ b/win/include/unistd.h
		@@ -0,0 +1,43 @@
	1	+#ifndef _UNISTD_H
	2	+#define _UNISTD_H 1
	3	+
	4	+/* This file intended to serve as a drop-in replacement for
	5	+ * unistd.h on Windows
	6	+ * Please add functionality as neeeded
	7	+ */
	8	+
	9	+#include <stdlib.h>
	10	+#include <io.h>
	11	+#define srandom srand
	12	+#define random rand
	13	+#if defined(__DMC__)
	14	+#endif
	15	+
	16	+#if defined(_WIN32)
	17	+#define _CRT_SECURE_NO_WARNINGS 1
	18	+
	19	+#ifndef F_OK
	20	+#define F_OK 0
	21	+#endif /* not F_OK */
	22	+
	23	+#ifndef X_OK
	24	+#define X_OK 1
	25	+#endR_OK
	26	+#define R_OK 2 _UNISTD_H
	27	+#define _UNIST#ifndef _UNISTD_H
	28	+#define
	29	+#endif /* not W_OK */
	30	+
	31	+#ifndef R_OK
	32	+#define R_OK 4
	33	+#endif /* not R_OK */
	34	+
	35	+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
	36	+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
	37	+
	38	+
	39	+
	40	+#endif
	41	+
	42	+#define access _access
	43	+#define ftruncate _c

	--- a/win/include/unistd.h
	+++ b/win/include/unistd.h
	@@ -0,0 +1,43 @@

	--- a/win/include/unistd.h
	+++ b/win/include/unistd.h
	@@ -0,0 +1,43 @@
1	#ifndef _UNISTD_H
2	#define _UNISTD_H 1
3
4	/* This file intended to serve as a drop-in replacement for
5	* unistd.h on Windows
6	* Please add functionality as neeeded
7	*/
8
9	#include <stdlib.h>
10	#include <io.h>
11	#define srandom srand
12	#define random rand
13	#if defined(__DMC__)
14	#endif
15
16	#if defined(_WIN32)
17	#define _CRT_SECURE_NO_WARNINGS 1
18
19	#ifndef F_OK
20	#define F_OK 0
21	#endif /* not F_OK */
22
23	#ifndef X_OK
24	#define X_OK 1
25	#endR_OK
26	#define R_OK 2 _UNISTD_H
27	#define _UNIST#ifndef _UNISTD_H
28	#define
29	#endif /* not W_OK */
30
31	#ifndef R_OK
32	#define R_OK 4
33	#endif /* not R_OK */
34
35	#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
36	#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
37
38
39
40	#endif
41
42	#define access _access
43	#define ftruncate _c

M win/version.c

		--- a/win/version.c
		+++ b/win/version.c
		@@ -0,0 +1,4 @@
	1	+0;
	2	+}
	3	+b2b2,0,sizeof(b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
	4	+ fopen(argv[1

	--- a/win/version.c
	+++ b/win/version.c
	@@ -0,0 +1,4 @@

	--- a/win/version.c
	+++ b/win/version.c
	@@ -0,0 +1,4 @@
1	0;
2	}
3	b2b2,0,sizeof(b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
4	fopen(argv[1

M www/index.wiki

+1 -1

		--- www/index.wiki
		+++ www/index.wiki
		@@ -88,11 +88,11 @@
88	88	7. <b>Robust & Reliable</b> -
89	89	Fossil stores content using an [./fileformat.wiki \| enduring file format]
90	90	in an SQLite database so that transactions are
91	91	atomic even if interrupted by a power loss or system crash. Furthermore,
92	92	automatic [./selfcheck.wiki \| self-checks] verify that all aspects of
93		- the repository are consistent prior to each commit. In nearly three years
	93	+ the repository are consistent prior to each commit. In over three years
94	94	of operation, no work has ever been lost after having been committed to
95	95	a Fossil repository.
96	96
97	97	<hr>
98	98	<h3>Links For Fossil Users:</h3>
99	99

	--- www/index.wiki
	+++ www/index.wiki
	@@ -88,11 +88,11 @@
88	7. <b>Robust & Reliable</b> -
89	Fossil stores content using an [./fileformat.wiki \| enduring file format]
90	in an SQLite database so that transactions are
91	atomic even if interrupted by a power loss or system crash. Furthermore,
92	automatic [./selfcheck.wiki \| self-checks] verify that all aspects of
93	the repository are consistent prior to each commit. In nearly three years
94	of operation, no work has ever been lost after having been committed to
95	a Fossil repository.
96
97	<hr>
98	<h3>Links For Fossil Users:</h3>
99

	--- www/index.wiki
	+++ www/index.wiki
	@@ -88,11 +88,11 @@
88	7. <b>Robust & Reliable</b> -
89	Fossil stores content using an [./fileformat.wiki \| enduring file format]
90	in an SQLite database so that transactions are
91	atomic even if interrupted by a power loss or system crash. Furthermore,
92	automatic [./selfcheck.wiki \| self-checks] verify that all aspects of
93	the repository are consistent prior to each commit. In over three years
94	of operation, no work has ever been lost after having been committed to
95	a Fossil repository.
96
97	<hr>
98	<h3>Links For Fossil Users:</h3>
99

M www/password.wiki

+2 -2

		--- www/password.wiki
		+++ www/password.wiki
		@@ -60,20 +60,20 @@
60	60	the web interface or direct SQL manipulation of the USER table.
61	61	Note also that the password field is
62	62	essentially ignored for the special users named "anonymous", "developer",
63	63	"reader", and "nobody". It is not possible to authenticate as users
64	64	"developer", "reader", or "nobody" and the authentication protocol
65		-for "anonymous" use one-time captchas not persistent passwords.
	65	+for "anonymous" uses one-time captchas not persistent passwords.
66	66
67	67	<h2>Web Interface Authentication</h2>
68	68
69	69	When a user logs into Fossil using the web interface, the login name
70	70	and password are sent in the clear to the server. The server then
71	71	hashes the password and compares it against the value stored in USER.PW.
72	72	If they match, the server sets a cookie on the client to record the
73	73	login. This cookie contains a large amount of high-quality randomness
74		-and is thus impossible to guess. The value of the cookie and the IP
	74	+and is thus intractable to guess. The value of the cookie and the IP
75	75	address of the client is stored in the USER.COOKIE and USER.IPADDR fields
76	76	of the USER table on the server.
77	77	The USER.CEXPIRE field holds an expiration date
78	78	for the cookie, encoded as a julian day number. On all subsequent
79	79	HTTP requests, the cookie value is matched against the USER table to
80	80

	--- www/password.wiki
	+++ www/password.wiki
	@@ -60,20 +60,20 @@
60	the web interface or direct SQL manipulation of the USER table.
61	Note also that the password field is
62	essentially ignored for the special users named "anonymous", "developer",
63	"reader", and "nobody". It is not possible to authenticate as users
64	"developer", "reader", or "nobody" and the authentication protocol
65	for "anonymous" use one-time captchas not persistent passwords.
66
67	<h2>Web Interface Authentication</h2>
68
69	When a user logs into Fossil using the web interface, the login name
70	and password are sent in the clear to the server. The server then
71	hashes the password and compares it against the value stored in USER.PW.
72	If they match, the server sets a cookie on the client to record the
73	login. This cookie contains a large amount of high-quality randomness
74	and is thus impossible to guess. The value of the cookie and the IP
75	address of the client is stored in the USER.COOKIE and USER.IPADDR fields
76	of the USER table on the server.
77	The USER.CEXPIRE field holds an expiration date
78	for the cookie, encoded as a julian day number. On all subsequent
79	HTTP requests, the cookie value is matched against the USER table to
80

	--- www/password.wiki
	+++ www/password.wiki
	@@ -60,20 +60,20 @@
60	the web interface or direct SQL manipulation of the USER table.
61	Note also that the password field is
62	essentially ignored for the special users named "anonymous", "developer",
63	"reader", and "nobody". It is not possible to authenticate as users
64	"developer", "reader", or "nobody" and the authentication protocol
65	for "anonymous" uses one-time captchas not persistent passwords.
66
67	<h2>Web Interface Authentication</h2>
68
69	When a user logs into Fossil using the web interface, the login name
70	and password are sent in the clear to the server. The server then
71	hashes the password and compares it against the value stored in USER.PW.
72	If they match, the server sets a cookie on the client to record the
73	login. This cookie contains a large amount of high-quality randomness
74	and is thus intractable to guess. The value of the cookie and the IP
75	address of the client is stored in the USER.COOKIE and USER.IPADDR fields
76	of the USER table on the server.
77	The USER.CEXPIRE field holds an expiration date
78	for the cookie, encoded as a julian day number. On all subsequent
79	HTTP requests, the cookie value is matched against the USER table to
80

M www/quickstart.wiki

+8 -5

		--- www/quickstart.wiki
		+++ www/quickstart.wiki
		@@ -232,16 +232,19 @@
232	232
233	233	<blockquote>
234	234	<b>fossil ui</b> <i>repository-filename</i>
235	235	</blockquote>
236	236
237		- <p>The difference between these two command is that <b>ui</b>
238		- attempts to automatically start your web browser pointing at the
239		- server whereas <b>server</b> does not.
	237	+ <p>The <b>ui</b> command is intended for accessing the web interface
	238	+ from a local desktop. The <b>ui</b> command binds to the loopback IP
	239	+ address only (and is thus makes the web interface visible only on the
	240	+ local machine) and it automatically start your web browser pointing at the
	241	+ server. For cross-machine collaboration, use the <b>server</b> command,
	242	+ which binds on all IP addresses and does not try to start a web browser.
240	243	You can omit the <i>repository-filename</i> if you are within
241		- a checked-out local tree. This server uses port 8080 by default
242		- but you can specify a different port using the <b>-port</b> command.</p>
	244	+ a checked-out local tree. The <b>server</b> uses port 8080 by default
	245	+ but you can specify a different port using the <b>-port</b> option.</p>
243	246
244	247	<p>Command-line servers like this are useful when two people want
245	248	to share a repository on temporary or ad-hoc basis. For a more
246	249	permanent installation, you should use either the CGI server or the
247	250	inetd server.
248	251

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -232,16 +232,19 @@
232
233	<blockquote>
234	<b>fossil ui</b> <i>repository-filename</i>
235	</blockquote>
236
237	<p>The difference between these two command is that <b>ui</b>
238	attempts to automatically start your web browser pointing at the
239	server whereas <b>server</b> does not.



240	You can omit the <i>repository-filename</i> if you are within
241	a checked-out local tree. This server uses port 8080 by default
242	but you can specify a different port using the <b>-port</b> command.</p>
243
244	<p>Command-line servers like this are useful when two people want
245	to share a repository on temporary or ad-hoc basis. For a more
246	permanent installation, you should use either the CGI server or the
247	inetd server.
248

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -232,16 +232,19 @@
232
233	<blockquote>
234	<b>fossil ui</b> <i>repository-filename</i>
235	</blockquote>
236
237	<p>The <b>ui</b> command is intended for accessing the web interface
238	from a local desktop. The <b>ui</b> command binds to the loopback IP
239	address only (and is thus makes the web interface visible only on the
240	local machine) and it automatically start your web browser pointing at the
241	server. For cross-machine collaboration, use the <b>server</b> command,
242	which binds on all IP addresses and does not try to start a web browser.
243	You can omit the <i>repository-filename</i> if you are within
244	a checked-out local tree. The <b>server</b> uses port 8080 by default
245	but you can specify a different port using the <b>-port</b> option.</p>
246
247	<p>Command-line servers like this are useful when two people want
248	to share a repository on temporary or ad-hoc basis. For a more
249	permanent installation, you should use either the CGI server or the
250	inetd server.
251

Fossil SCM

Keyboard Shortcuts