7db0a2d910d… — Fossil SCM

M src/alerts.c

+3 -3

		--- src/alerts.c
		+++ src/alerts.c
		@@ -1460,11 +1460,11 @@
1460	1460	}
1461	1461
1462	1462	/*
1463	1463	** Text of email message sent in order to confirm a subscription.
1464	1464	*/
1465		-static const char zConfirmMsg[] =
	1465	+static const char zConfirmMsg[] =
1466	1466	@ Someone has signed you up for email alerts on the Fossil repository
1467	1467	@ at %s.
1468	1468	@
1469	1469	@ To confirm your subscription and begin receiving alerts, click on
1470	1470	@ the following hyperlink:
		@@ -2563,11 +2563,11 @@
2563	2563	/*
2564	2564	** Compute a string that is appropriate for the EmailEvent.zPriors field
2565	2565	** for a particular forum post.
2566	2566	**
2567	2567	** This string is an encode list of sender names and rids for all ancestors
2568		-** of the fpdi post - the post that fpid answer, the post that that parent
	2568	+** of the fpdi post - the post that fpid answer, the post that that parent
2569	2569	** post answers, and so forth back up to the root post. Duplicates sender
2570	2570	** names are omitted.
2571	2571	**
2572	2572	** The EmailEvent.zPriors field is used to screen events for people who
2573	2573	** only want to see replies to their own posts or to specific posts.
		@@ -3223,11 +3223,11 @@
3223	3223	db_multi_exec("DELETE FROM pending_alert WHERE sentDigest AND sentSep;");
3224	3224
3225	3225	/* Send renewal messages to subscribers whose subscriptions are about
3226	3226	** to expire. Only do this if:
3227	3227	**
3228		- ** (1) email-renew-interval is 14 or greater (or in other words if
	3228	+ ** (1) email-renew-interval is 14 or greater (or in other words if
3229	3229	** subscription expiration is enabled).
3230	3230	**
3231	3231	** (2) The SENDALERT_RENEWAL flag is set
3232	3232	*/
3233	3233	send_alert_expiration_warnings:
3234	3234

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1460,11 +1460,11 @@
1460	}
1461
1462	/*
1463	** Text of email message sent in order to confirm a subscription.
1464	*/
1465	static const char zConfirmMsg[] =
1466	@ Someone has signed you up for email alerts on the Fossil repository
1467	@ at %s.
1468	@
1469	@ To confirm your subscription and begin receiving alerts, click on
1470	@ the following hyperlink:
	@@ -2563,11 +2563,11 @@
2563	/*
2564	** Compute a string that is appropriate for the EmailEvent.zPriors field
2565	** for a particular forum post.
2566	**
2567	** This string is an encode list of sender names and rids for all ancestors
2568	** of the fpdi post - the post that fpid answer, the post that that parent
2569	** post answers, and so forth back up to the root post. Duplicates sender
2570	** names are omitted.
2571	**
2572	** The EmailEvent.zPriors field is used to screen events for people who
2573	** only want to see replies to their own posts or to specific posts.
	@@ -3223,11 +3223,11 @@
3223	db_multi_exec("DELETE FROM pending_alert WHERE sentDigest AND sentSep;");
3224
3225	/* Send renewal messages to subscribers whose subscriptions are about
3226	** to expire. Only do this if:
3227	**
3228	** (1) email-renew-interval is 14 or greater (or in other words if
3229	** subscription expiration is enabled).
3230	**
3231	** (2) The SENDALERT_RENEWAL flag is set
3232	*/
3233	send_alert_expiration_warnings:
3234

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1460,11 +1460,11 @@
1460	}
1461
1462	/*
1463	** Text of email message sent in order to confirm a subscription.
1464	*/
1465	static const char zConfirmMsg[] =
1466	@ Someone has signed you up for email alerts on the Fossil repository
1467	@ at %s.
1468	@
1469	@ To confirm your subscription and begin receiving alerts, click on
1470	@ the following hyperlink:
	@@ -2563,11 +2563,11 @@
2563	/*
2564	** Compute a string that is appropriate for the EmailEvent.zPriors field
2565	** for a particular forum post.
2566	**
2567	** This string is an encode list of sender names and rids for all ancestors
2568	** of the fpdi post - the post that fpid answer, the post that that parent
2569	** post answers, and so forth back up to the root post. Duplicates sender
2570	** names are omitted.
2571	**
2572	** The EmailEvent.zPriors field is used to screen events for people who
2573	** only want to see replies to their own posts or to specific posts.
	@@ -3223,11 +3223,11 @@
3223	db_multi_exec("DELETE FROM pending_alert WHERE sentDigest AND sentSep;");
3224
3225	/* Send renewal messages to subscribers whose subscriptions are about
3226	** to expire. Only do this if:
3227	**
3228	** (1) email-renew-interval is 14 or greater (or in other words if
3229	** subscription expiration is enabled).
3230	**
3231	** (2) The SENDALERT_RENEWAL flag is set
3232	*/
3233	send_alert_expiration_warnings:
3234

M src/allrepo.c

+1 -1

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -134,11 +134,11 @@
134	134	** but bind to the loopback TCP address only, enable
135	135	** the --localauth option and automatically launch a
136	136	** web-browser
137	137	**
138	138	** whatis Run the "whatis" command on all repositories. Only
139		-** show output for repositories that have a match.
	139	+** show output for repositories that have a match.
140	140	**
141	141	**
142	142	** In addition, the following maintenance operations are supported:
143	143	**
144	144	** add Add all the repositories named to the set of repositories
145	145

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -134,11 +134,11 @@
134	** but bind to the loopback TCP address only, enable
135	** the --localauth option and automatically launch a
136	** web-browser
137	**
138	** whatis Run the "whatis" command on all repositories. Only
139	** show output for repositories that have a match.
140	**
141	**
142	** In addition, the following maintenance operations are supported:
143	**
144	** add Add all the repositories named to the set of repositories
145

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -134,11 +134,11 @@
134	** but bind to the loopback TCP address only, enable
135	** the --localauth option and automatically launch a
136	** web-browser
137	**
138	** whatis Run the "whatis" command on all repositories. Only
139	** show output for repositories that have a match.
140	**
141	**
142	** In addition, the following maintenance operations are supported:
143	**
144	** add Add all the repositories named to the set of repositories
145

M src/backlink.c

+1 -1

		--- src/backlink.c
		+++ src/backlink.c
		@@ -249,11 +249,11 @@
249	249	Backlink p = (Backlink)opaque;
250	250	char *zTarget = blob_buffer(target);
251	251	int nTarget = blob_size(target);
252	252
253	253	backlink_create(p, zTarget, nTarget);
254		- return 1;
	254	+ return 1;
255	255	}
256	256
257	257	/* No-op routines for the rendering callbacks that we do not need */
258	258	static void mkdn_noop_prolog(Blob b, void v){ return; }
259	259	static void (mkdn_noop_epilog)(Blob, void*) = mkdn_noop_prolog;
260	260

	--- src/backlink.c
	+++ src/backlink.c
	@@ -249,11 +249,11 @@
249	Backlink p = (Backlink)opaque;
250	char *zTarget = blob_buffer(target);
251	int nTarget = blob_size(target);
252
253	backlink_create(p, zTarget, nTarget);
254	return 1;
255	}
256
257	/* No-op routines for the rendering callbacks that we do not need */
258	static void mkdn_noop_prolog(Blob b, void v){ return; }
259	static void (mkdn_noop_epilog)(Blob, void*) = mkdn_noop_prolog;
260

	--- src/backlink.c
	+++ src/backlink.c
	@@ -249,11 +249,11 @@
249	Backlink p = (Backlink)opaque;
250	char *zTarget = blob_buffer(target);
251	int nTarget = blob_size(target);
252
253	backlink_create(p, zTarget, nTarget);
254	return 1;
255	}
256
257	/* No-op routines for the rendering callbacks that we do not need */
258	static void mkdn_noop_prolog(Blob b, void v){ return; }
259	static void (mkdn_noop_epilog)(Blob, void*) = mkdn_noop_prolog;
260

M src/backoffice.c

+3 -3

		--- src/backoffice.c
		+++ src/backoffice.c
		@@ -315,11 +315,11 @@
315	315	static int backofficeProcessExists(sqlite3_uint64 pid){
316	316	#if defined(_WIN32)
317	317	return pid>0 && backofficeWin32ProcessExists((DWORD)pid)!=0;
318	318	#else
319	319	return pid>0 && kill((pid_t)pid, 0)==0;
320		-#endif
	320	+#endif
321	321	}
322	322
323	323	/*
324	324	** Check to see if the process identified by pid has finished. If
325	325	** we cannot prove that the process is still running, return true.
		@@ -327,11 +327,11 @@
327	327	static int backofficeProcessDone(sqlite3_uint64 pid){
328	328	#if defined(_WIN32)
329	329	return pid<=0 \|\| backofficeWin32ProcessExists((DWORD)pid)==0;
330	330	#else
331	331	return pid<=0 \|\| kill((pid_t)pid, 0)!=0;
332		-#endif
	332	+#endif
333	333	}
334	334
335	335	/*
336	336	** Return a process id number for the current process
337	337	*/
		@@ -675,11 +675,11 @@
675	675	** to run this command as a daemon that will periodically invoke backoffice
676	676	** on a collection of repositories.
677	677	**
678	678	** If only a single repository is named and --poll is omitted, then the
679	679	** backoffice work is done in-process. But if there are multiple repositories
680		-** or if --poll is used, a separate sub-process is started for each poll of
	680	+** or if --poll is used, a separate sub-process is started for each poll of
681	681	** each repository.
682	682	**
683	683	** Standard options:
684	684	**
685	685	** --debug Show what this command is doing
686	686

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -315,11 +315,11 @@
315	static int backofficeProcessExists(sqlite3_uint64 pid){
316	#if defined(_WIN32)
317	return pid>0 && backofficeWin32ProcessExists((DWORD)pid)!=0;
318	#else
319	return pid>0 && kill((pid_t)pid, 0)==0;
320	#endif
321	}
322
323	/*
324	** Check to see if the process identified by pid has finished. If
325	** we cannot prove that the process is still running, return true.
	@@ -327,11 +327,11 @@
327	static int backofficeProcessDone(sqlite3_uint64 pid){
328	#if defined(_WIN32)
329	return pid<=0 \|\| backofficeWin32ProcessExists((DWORD)pid)==0;
330	#else
331	return pid<=0 \|\| kill((pid_t)pid, 0)!=0;
332	#endif
333	}
334
335	/*
336	** Return a process id number for the current process
337	*/
	@@ -675,11 +675,11 @@
675	** to run this command as a daemon that will periodically invoke backoffice
676	** on a collection of repositories.
677	**
678	** If only a single repository is named and --poll is omitted, then the
679	** backoffice work is done in-process. But if there are multiple repositories
680	** or if --poll is used, a separate sub-process is started for each poll of
681	** each repository.
682	**
683	** Standard options:
684	**
685	** --debug Show what this command is doing
686

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -315,11 +315,11 @@
315	static int backofficeProcessExists(sqlite3_uint64 pid){
316	#if defined(_WIN32)
317	return pid>0 && backofficeWin32ProcessExists((DWORD)pid)!=0;
318	#else
319	return pid>0 && kill((pid_t)pid, 0)==0;
320	#endif
321	}
322
323	/*
324	** Check to see if the process identified by pid has finished. If
325	** we cannot prove that the process is still running, return true.
	@@ -327,11 +327,11 @@
327	static int backofficeProcessDone(sqlite3_uint64 pid){
328	#if defined(_WIN32)
329	return pid<=0 \|\| backofficeWin32ProcessExists((DWORD)pid)==0;
330	#else
331	return pid<=0 \|\| kill((pid_t)pid, 0)!=0;
332	#endif
333	}
334
335	/*
336	** Return a process id number for the current process
337	*/
	@@ -675,11 +675,11 @@
675	** to run this command as a daemon that will periodically invoke backoffice
676	** on a collection of repositories.
677	**
678	** If only a single repository is named and --poll is omitted, then the
679	** backoffice work is done in-process. But if there are multiple repositories
680	** or if --poll is used, a separate sub-process is started for each poll of
681	** each repository.
682	**
683	** Standard options:
684	**
685	** --debug Show what this command is doing
686

M src/blob.c

+11 -11

		--- src/blob.c
		+++ src/blob.c
		@@ -1551,19 +1551,19 @@
1551	1551	}
1552	1552	}
1553	1553
1554	1554	/*
1555	1555	** ASCII (for reference):
1556		-** x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf
1557		-** 0x ^` ^a ^b ^c ^d ^e ^f ^g \b \t \n () \f \r ^n ^o
1558		-** 1x ^p ^q ^r ^s ^t ^u ^v ^w ^x ^y ^z ^{ ^\| ^} ^~ ^
1559		-** 2x () ! " # $ % & ' ( ) * + , - . /
1560		-** 3x 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
1561		-** 4x @ A B C D E F G H I J K L M N O
1562		-** 5x P Q R S T U V W X Y Z [ \ ] ^ _
1563		-** 6x ` a b c d e f g h i j k l m n o
1564		-** 7x p q r s t u v w x y z { \| } ~ ^_
	1556	+** x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf
	1557	+** 0x ^` ^a ^b ^c ^d ^e ^f ^g \b \t \n () \f \r ^n ^o
	1558	+** 1x ^p ^q ^r ^s ^t ^u ^v ^w ^x ^y ^z ^{ ^\| ^} ^~ ^
	1559	+** 2x () ! " # $ % & ' ( ) * + , - . /
	1560	+** 3x 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
	1561	+** 4x @ A B C D E F G H I J K L M N O
	1562	+** 5x P Q R S T U V W X Y Z [ \ ] ^ _
	1563	+** 6x ` a b c d e f g h i j k l m n o
	1564	+** 7x p q r s t u v w x y z { \| } ~ ^_
1565	1565	*/
1566	1566
1567	1567	/*
1568	1568	** Meanings for bytes in a filename:
1569	1569	**
		@@ -1665,11 +1665,11 @@
1665	1665	"an illegal UTF-8 character",
1666	1666	zIn, blob_str(&bad));
1667	1667	}
1668	1668	i += x-2;
1669	1669	}
1670		- }
	1670	+ }
1671	1671	}
1672	1672
1673	1673	/* Separate from the previous argument by a space */
1674	1674	if( n>0 && !fossil_isspace(z[n-1]) ){
1675	1675	blob_append_char(pBlob, ' ');
		@@ -1795,11 +1795,11 @@
1795	1795	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='\\' ) zArg += 2;
1796	1796	#else
1797	1797	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='/' ) zArg += 2;
1798	1798	#endif
1799	1799	if( strcmp(zBuf, zArg)!=0 ){
1800		- fossil_fatal("argument disagree: \"%s\" (%s) versus \"%s\"",
	1800	+ fossil_fatal("argument disagree: \"%s\" (%s) versus \"%s\"",
1801	1801	zBuf, g.argv[i-1], zArg);
1802	1802	}
1803	1803	continue;
1804	1804	}else if( fossil_strcmp(zArg, "--fuzz")==0 && i+1<g.argc ){
1805	1805	int n = atoi(g.argv[++i]);
1806	1806

	--- src/blob.c
	+++ src/blob.c
	@@ -1551,19 +1551,19 @@
1551	}
1552	}
1553
1554	/*
1555	** ASCII (for reference):
1556	** x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf
1557	** 0x ^` ^a ^b ^c ^d ^e ^f ^g \b \t \n () \f \r ^n ^o
1558	** 1x ^p ^q ^r ^s ^t ^u ^v ^w ^x ^y ^z ^{ ^\| ^} ^~ ^
1559	** 2x () ! " # $ % & ' ( ) * + , - . /
1560	** 3x 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
1561	** 4x @ A B C D E F G H I J K L M N O
1562	** 5x P Q R S T U V W X Y Z [ \ ] ^ _
1563	** 6x ` a b c d e f g h i j k l m n o
1564	** 7x p q r s t u v w x y z { \| } ~ ^_
1565	*/
1566
1567	/*
1568	** Meanings for bytes in a filename:
1569	**
	@@ -1665,11 +1665,11 @@
1665	"an illegal UTF-8 character",
1666	zIn, blob_str(&bad));
1667	}
1668	i += x-2;
1669	}
1670	}
1671	}
1672
1673	/* Separate from the previous argument by a space */
1674	if( n>0 && !fossil_isspace(z[n-1]) ){
1675	blob_append_char(pBlob, ' ');
	@@ -1795,11 +1795,11 @@
1795	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='\\' ) zArg += 2;
1796	#else
1797	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='/' ) zArg += 2;
1798	#endif
1799	if( strcmp(zBuf, zArg)!=0 ){
1800	fossil_fatal("argument disagree: \"%s\" (%s) versus \"%s\"",
1801	zBuf, g.argv[i-1], zArg);
1802	}
1803	continue;
1804	}else if( fossil_strcmp(zArg, "--fuzz")==0 && i+1<g.argc ){
1805	int n = atoi(g.argv[++i]);
1806

	--- src/blob.c
	+++ src/blob.c
	@@ -1551,19 +1551,19 @@
1551	}
1552	}
1553
1554	/*
1555	** ASCII (for reference):
1556	** x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf
1557	** 0x ^` ^a ^b ^c ^d ^e ^f ^g \b \t \n () \f \r ^n ^o
1558	** 1x ^p ^q ^r ^s ^t ^u ^v ^w ^x ^y ^z ^{ ^\| ^} ^~ ^
1559	** 2x () ! " # $ % & ' ( ) * + , - . /
1560	** 3x 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
1561	** 4x @ A B C D E F G H I J K L M N O
1562	** 5x P Q R S T U V W X Y Z [ \ ] ^ _
1563	** 6x ` a b c d e f g h i j k l m n o
1564	** 7x p q r s t u v w x y z { \| } ~ ^_
1565	*/
1566
1567	/*
1568	** Meanings for bytes in a filename:
1569	**
	@@ -1665,11 +1665,11 @@
1665	"an illegal UTF-8 character",
1666	zIn, blob_str(&bad));
1667	}
1668	i += x-2;
1669	}
1670	}
1671	}
1672
1673	/* Separate from the previous argument by a space */
1674	if( n>0 && !fossil_isspace(z[n-1]) ){
1675	blob_append_char(pBlob, ' ');
	@@ -1795,11 +1795,11 @@
1795	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='\\' ) zArg += 2;
1796	#else
1797	if( zBuf[0]=='-' && zArg[0]=='.' && zArg[1]=='/' ) zArg += 2;
1798	#endif
1799	if( strcmp(zBuf, zArg)!=0 ){
1800	fossil_fatal("argument disagree: \"%s\" (%s) versus \"%s\"",
1801	zBuf, g.argv[i-1], zArg);
1802	}
1803	continue;
1804	}else if( fossil_strcmp(zArg, "--fuzz")==0 && i+1<g.argc ){
1805	int n = atoi(g.argv[++i]);
1806

M src/branch.c

+2 -2

		--- src/branch.c
		+++ src/branch.c
		@@ -773,11 +773,11 @@
773	773	int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
774	774	const char *zUsers = db_column_text(&q, 3);
775	775	if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){
776	776	continue;
777	777	}
778		- if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0
	778	+ if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0
779	779	\|\| isCur) ){
780	780	continue;
781	781	}
782	782	blob_appendf(&txt, "%s%s%s",
783	783	( (brFlags & BRL_PRIVATE) ? " " : ( isPriv ? "#" : " ") ),
		@@ -887,11 +887,11 @@
887	887	if( zBgClr && zBgClr[0] && show_colors ){
888	888	@ <tr style="background-color:%s(zBgClr)">
889	889	}else{
890	890	@ <tr>
891	891	}
892		- @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input
	892	+ @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input
893	893	@ type="checkbox" disabled="disabled"/></td>
894	894	@ <td data-sortkey="%016llx(iMtime)">%s(zAge)</td>
895	895	@ <td>%d(nCkin)</td>
896	896	fossil_free(zAge);
897	897	@ <td>%s(isClosed?"closed":"")</td>
898	898

	--- src/branch.c
	+++ src/branch.c
	@@ -773,11 +773,11 @@
773	int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
774	const char *zUsers = db_column_text(&q, 3);
775	if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){
776	continue;
777	}
778	if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0
779	\|\| isCur) ){
780	continue;
781	}
782	blob_appendf(&txt, "%s%s%s",
783	( (brFlags & BRL_PRIVATE) ? " " : ( isPriv ? "#" : " ") ),
	@@ -887,11 +887,11 @@
887	if( zBgClr && zBgClr[0] && show_colors ){
888	@ <tr style="background-color:%s(zBgClr)">
889	}else{
890	@ <tr>
891	}
892	@ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input
893	@ type="checkbox" disabled="disabled"/></td>
894	@ <td data-sortkey="%016llx(iMtime)">%s(zAge)</td>
895	@ <td>%d(nCkin)</td>
896	fossil_free(zAge);
897	@ <td>%s(isClosed?"closed":"")</td>
898

	--- src/branch.c
	+++ src/branch.c
	@@ -773,11 +773,11 @@
773	int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
774	const char *zUsers = db_column_text(&q, 3);
775	if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){
776	continue;
777	}
778	if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0
779	\|\| isCur) ){
780	continue;
781	}
782	blob_appendf(&txt, "%s%s%s",
783	( (brFlags & BRL_PRIVATE) ? " " : ( isPriv ? "#" : " ") ),
	@@ -887,11 +887,11 @@
887	if( zBgClr && zBgClr[0] && show_colors ){
888	@ <tr style="background-color:%s(zBgClr)">
889	}else{
890	@ <tr>
891	}
892	@ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input
893	@ type="checkbox" disabled="disabled"/></td>
894	@ <td data-sortkey="%016llx(iMtime)">%s(zAge)</td>
895	@ <td>%d(nCkin)</td>
896	fossil_free(zAge);
897	@ <td>%s(isClosed?"closed":"")</td>
898

M src/browse.c

+2 -2

		--- src/browse.c
		+++ src/browse.c
		@@ -358,11 +358,11 @@
358	358	** directory.
359	359	*/
360	360	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
361	361	if( mxLen<12 ) mxLen = 12;
362	362	mxLen += (mxLen+9)/10;
363		- db_prepare(&q,
	363	+ db_prepare(&q,
364	364	"SELECT x, u FROM localfiles ORDER BY x COLLATE uintnocase /scan/");
365	365	@ <div class="columns files" style="columns: %d(mxLen)ex auto">
366	366	@ <ul class="browser">
367	367	while( db_step(&q)==SQLITE_ROW ){
368	368	const char *zFN;
		@@ -509,11 +509,11 @@
509	509	int size, /* Size for this entry */
510	510	int sortOrder /* 0: filename, 1: mtime, 2: size */
511	511	){
512	512	int i;
513	513	FileTreeNode pParent; / Parent (directory) of the next node to insert */
514		-
	514	+
515	515	/* Make pParent point to the most recent ancestor of zPath, or
516	516	** NULL if there are no prior entires that are a container for zPath.
517	517	*/
518	518	pParent = pTree->pLast;
519	519	while( pParent!=0 &&
520	520

	--- src/browse.c
	+++ src/browse.c
	@@ -358,11 +358,11 @@
358	** directory.
359	*/
360	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
361	if( mxLen<12 ) mxLen = 12;
362	mxLen += (mxLen+9)/10;
363	db_prepare(&q,
364	"SELECT x, u FROM localfiles ORDER BY x COLLATE uintnocase /scan/");
365	@ <div class="columns files" style="columns: %d(mxLen)ex auto">
366	@ <ul class="browser">
367	while( db_step(&q)==SQLITE_ROW ){
368	const char *zFN;
	@@ -509,11 +509,11 @@
509	int size, /* Size for this entry */
510	int sortOrder /* 0: filename, 1: mtime, 2: size */
511	){
512	int i;
513	FileTreeNode pParent; / Parent (directory) of the next node to insert */
514
515	/* Make pParent point to the most recent ancestor of zPath, or
516	** NULL if there are no prior entires that are a container for zPath.
517	*/
518	pParent = pTree->pLast;
519	while( pParent!=0 &&
520

	--- src/browse.c
	+++ src/browse.c
	@@ -358,11 +358,11 @@
358	** directory.
359	*/
360	mxLen = db_int(12, "SELECT max(length(x)) FROM localfiles /scan/");
361	if( mxLen<12 ) mxLen = 12;
362	mxLen += (mxLen+9)/10;
363	db_prepare(&q,
364	"SELECT x, u FROM localfiles ORDER BY x COLLATE uintnocase /scan/");
365	@ <div class="columns files" style="columns: %d(mxLen)ex auto">
366	@ <ul class="browser">
367	while( db_step(&q)==SQLITE_ROW ){
368	const char *zFN;
	@@ -509,11 +509,11 @@
509	int size, /* Size for this entry */
510	int sortOrder /* 0: filename, 1: mtime, 2: size */
511	){
512	int i;
513	FileTreeNode pParent; / Parent (directory) of the next node to insert */
514
515	/* Make pParent point to the most recent ancestor of zPath, or
516	** NULL if there are no prior entires that are a container for zPath.
517	*/
518	pParent = pTree->pLast;
519	while( pParent!=0 &&
520

M src/builtin.c

+4 -4

		--- src/builtin.c
		+++ src/builtin.c
		@@ -521,15 +521,15 @@
521	521	}
522	522
523	523	/*
524	524	** This method is called to "rewind" the builtinVtab_cursor object back
525	525	** to the first row of output. This method is always called at least
526		-** once prior to any call to builtinVtabColumn() or builtinVtabRowid() or
	526	+** once prior to any call to builtinVtabColumn() or builtinVtabRowid() or
527	527	** builtinVtabEof().
528	528	*/
529	529	static int builtinVtabFilter(
530		- sqlite3_vtab_cursor *pVtabCursor,
	530	+ sqlite3_vtab_cursor *pVtabCursor,
531	531	int idxNum, const char *idxStr,
532	532	int argc, sqlite3_value **argv
533	533	){
534	534	builtinVtab_cursor pCur = (builtinVtab_cursor )pVtabCursor;
535	535	pCur->iRowid = 1;
		@@ -550,11 +550,11 @@
550	550	pIdxInfo->estimatedRows = count(aBuiltinFiles);
551	551	return SQLITE_OK;
552	552	}
553	553
554	554	/*
555		-** This following structure defines all the methods for the
	555	+** This following structure defines all the methods for the
556	556	** virtual table.
557	557	*/
558	558	static sqlite3_module builtinVtabModule = {
559	559	/* iVersion */ 0,
560	560	/* xCreate / 0, / The builtin vtab is eponymous and read-only */
		@@ -816,11 +816,11 @@
816	816	** This function has an internal mapping of the dependencies for each
817	817	** of the known fossil.XYZ.js modules and ensures that the
818	818	** dependencies also get queued (recursively) and that each module is
819	819	** queued only once.
820	820	**
821		-** If passed a name which is not a base fossil module name then it
	821	+** If passed a name which is not a base fossil module name then it
822	822	** will fail fatally!
823	823	**
824	824	** DO NOT use this for loading fossil.page.*.js: use
825	825	** builtin_request_js() for those.
826	826	**
827	827

	--- src/builtin.c
	+++ src/builtin.c
	@@ -521,15 +521,15 @@
521	}
522
523	/*
524	** This method is called to "rewind" the builtinVtab_cursor object back
525	** to the first row of output. This method is always called at least
526	** once prior to any call to builtinVtabColumn() or builtinVtabRowid() or
527	** builtinVtabEof().
528	*/
529	static int builtinVtabFilter(
530	sqlite3_vtab_cursor *pVtabCursor,
531	int idxNum, const char *idxStr,
532	int argc, sqlite3_value **argv
533	){
534	builtinVtab_cursor pCur = (builtinVtab_cursor )pVtabCursor;
535	pCur->iRowid = 1;
	@@ -550,11 +550,11 @@
550	pIdxInfo->estimatedRows = count(aBuiltinFiles);
551	return SQLITE_OK;
552	}
553
554	/*
555	** This following structure defines all the methods for the
556	** virtual table.
557	*/
558	static sqlite3_module builtinVtabModule = {
559	/* iVersion */ 0,
560	/* xCreate / 0, / The builtin vtab is eponymous and read-only */
	@@ -816,11 +816,11 @@
816	** This function has an internal mapping of the dependencies for each
817	** of the known fossil.XYZ.js modules and ensures that the
818	** dependencies also get queued (recursively) and that each module is
819	** queued only once.
820	**
821	** If passed a name which is not a base fossil module name then it
822	** will fail fatally!
823	**
824	** DO NOT use this for loading fossil.page.*.js: use
825	** builtin_request_js() for those.
826	**
827

	--- src/builtin.c
	+++ src/builtin.c
	@@ -521,15 +521,15 @@
521	}
522
523	/*
524	** This method is called to "rewind" the builtinVtab_cursor object back
525	** to the first row of output. This method is always called at least
526	** once prior to any call to builtinVtabColumn() or builtinVtabRowid() or
527	** builtinVtabEof().
528	*/
529	static int builtinVtabFilter(
530	sqlite3_vtab_cursor *pVtabCursor,
531	int idxNum, const char *idxStr,
532	int argc, sqlite3_value **argv
533	){
534	builtinVtab_cursor pCur = (builtinVtab_cursor )pVtabCursor;
535	pCur->iRowid = 1;
	@@ -550,11 +550,11 @@
550	pIdxInfo->estimatedRows = count(aBuiltinFiles);
551	return SQLITE_OK;
552	}
553
554	/*
555	** This following structure defines all the methods for the
556	** virtual table.
557	*/
558	static sqlite3_module builtinVtabModule = {
559	/* iVersion */ 0,
560	/* xCreate / 0, / The builtin vtab is eponymous and read-only */
	@@ -816,11 +816,11 @@
816	** This function has an internal mapping of the dependencies for each
817	** of the known fossil.XYZ.js modules and ensures that the
818	** dependencies also get queued (recursively) and that each module is
819	** queued only once.
820	**
821	** If passed a name which is not a base fossil module name then it
822	** will fail fatally!
823	**
824	** DO NOT use this for loading fossil.page.*.js: use
825	** builtin_request_js() for those.
826	**
827

M src/cache.c

+2 -2

		--- src/cache.c
		+++ src/cache.c
		@@ -313,11 +313,11 @@
313	313	fossil_print("cache cleared\n");
314	314	}else{
315	315	fossil_print("nothing to clear; cache does not exist\n");
316	316	}
317	317	}else if( strncmp(zCmd, "list", nCmd)==0
318		- \|\| strncmp(zCmd, "ls", nCmd)==0
	318	+ \|\| strncmp(zCmd, "ls", nCmd)==0
319	319	\|\| strncmp(zCmd, "status", nCmd)==0
320	320	){
321	321	db = cacheOpen(0);
322	322	if( db==0 ){
323	323	fossil_print("cache does not exist\n");
		@@ -432,11 +432,11 @@
432	432	if( zHash ){
433	433	@ %z(href("%R/timeline?c=%S",zHash))check-in</a>\
434	434	fossil_free(zHash);
435	435	}
436	436	@ </p></li>
437		-
	437	+
438	438	}
439	439	sqlite3_finalize(pStmt);
440	440	@ </ol>
441	441	}
442	442	zDbName = cacheName();
443	443

	--- src/cache.c
	+++ src/cache.c
	@@ -313,11 +313,11 @@
313	fossil_print("cache cleared\n");
314	}else{
315	fossil_print("nothing to clear; cache does not exist\n");
316	}
317	}else if( strncmp(zCmd, "list", nCmd)==0
318	\|\| strncmp(zCmd, "ls", nCmd)==0
319	\|\| strncmp(zCmd, "status", nCmd)==0
320	){
321	db = cacheOpen(0);
322	if( db==0 ){
323	fossil_print("cache does not exist\n");
	@@ -432,11 +432,11 @@
432	if( zHash ){
433	@ %z(href("%R/timeline?c=%S",zHash))check-in</a>\
434	fossil_free(zHash);
435	}
436	@ </p></li>
437
438	}
439	sqlite3_finalize(pStmt);
440	@ </ol>
441	}
442	zDbName = cacheName();
443

	--- src/cache.c
	+++ src/cache.c
	@@ -313,11 +313,11 @@
313	fossil_print("cache cleared\n");
314	}else{
315	fossil_print("nothing to clear; cache does not exist\n");
316	}
317	}else if( strncmp(zCmd, "list", nCmd)==0
318	\|\| strncmp(zCmd, "ls", nCmd)==0
319	\|\| strncmp(zCmd, "status", nCmd)==0
320	){
321	db = cacheOpen(0);
322	if( db==0 ){
323	fossil_print("cache does not exist\n");
	@@ -432,11 +432,11 @@
432	if( zHash ){
433	@ %z(href("%R/timeline?c=%S",zHash))check-in</a>\
434	fossil_free(zHash);
435	}
436	@ </p></li>
437
438	}
439	sqlite3_finalize(pStmt);
440	@ </ol>
441	}
442	zDbName = cacheName();
443

M src/capabilities.c

+1 -1

		--- src/capabilities.c
		+++ src/capabilities.c
		@@ -401,11 +401,11 @@
401	401	const char *zId = db_column_text(&q, 0);
402	402	const char *zCap = db_column_text(&q, 1);
403	403	int n = db_column_int(&q, 3);
404	404	int eType;
405	405	static const char *const azType[] = { "off", "read", "write" };
406		- static const char *const azClass[] =
	406	+ static const char *const azClass[] =
407	407	{ "capsumOff", "capsumRead", "capsumWrite" };
408	408
409	409	if( n==0 ) continue;
410	410
411	411	/* Code */
412	412

	--- src/capabilities.c
	+++ src/capabilities.c
	@@ -401,11 +401,11 @@
401	const char *zId = db_column_text(&q, 0);
402	const char *zCap = db_column_text(&q, 1);
403	int n = db_column_int(&q, 3);
404	int eType;
405	static const char *const azType[] = { "off", "read", "write" };
406	static const char *const azClass[] =
407	{ "capsumOff", "capsumRead", "capsumWrite" };
408
409	if( n==0 ) continue;
410
411	/* Code */
412

	--- src/capabilities.c
	+++ src/capabilities.c
	@@ -401,11 +401,11 @@
401	const char *zId = db_column_text(&q, 0);
402	const char *zCap = db_column_text(&q, 1);
403	int n = db_column_int(&q, 3);
404	int eType;
405	static const char *const azType[] = { "off", "read", "write" };
406	static const char *const azClass[] =
407	{ "capsumOff", "capsumRead", "capsumWrite" };
408
409	if( n==0 ) continue;
410
411	/* Code */
412

M src/cgi.c

+5 -5

		--- src/cgi.c
		+++ src/cgi.c
		@@ -37,11 +37,11 @@
37	37	** received by a variety of means, and to generate well-formatted replies
38	38	** to those requests.
39	39	**
40	40	** The code in this file abstracts the web-request so that downstream
41	41	** modules that generate the body of the reply (based on the requested page)
42		-** do not need to know if the request is coming from CGI, direct HTTP,
	42	+** do not need to know if the request is coming from CGI, direct HTTP,
43	43	** SCGI, or some other means.
44	44	**
45	45	** This module gathers information about web page request into a key/value
46	46	** store. Keys and values come from:
47	47	**
		@@ -481,11 +481,11 @@
481	481	zReplyStatus = "OK";
482	482	}
483	483
484	484	if( g.fullHttpReply ){
485	485	if( rangeEnd>0
486		- && iReplyStatus==200
	486	+ && iReplyStatus==200
487	487	&& fossil_strcmp(P("REQUEST_METHOD"),"GET")==0
488	488	){
489	489	iReplyStatus = 206;
490	490	zReplyStatus = "Partial Content";
491	491	}
		@@ -562,11 +562,11 @@
562	562	}
563	563	total_size = blob_size(&cgiContent[0]) + blob_size(&cgiContent[1]);
564	564	if( iReplyStatus==206 ){
565	565	blob_appendf(&hdr, "Content-Range: bytes %d-%d/%d\r\n",
566	566	rangeStart, rangeEnd-1, total_size);
567		- total_size = rangeEnd - rangeStart;
	567	+ total_size = rangeEnd - rangeStart;
568	568	}
569	569	blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
570	570	}else{
571	571	total_size = 0;
572	572	}
		@@ -1311,11 +1311,11 @@
1311	1311	** \___/ \____________/\____/\____________________/ \_/
1312	1312	** \| \| \| \| \|
1313	1313	** \| HTTP_HOST \| PATH_INFO QUERY_STRING
1314	1314	** \| \|
1315	1315	** REQUEST_SCHEMA SCRIPT_NAME
1316		-**
	1316	+**
1317	1317	*/
1318	1318	void cgi_init(void){
1319	1319	char *z;
1320	1320	const char *zType;
1321	1321	char *zSemi;
		@@ -1348,11 +1348,11 @@
1348	1348	}
1349	1349
1350	1350	#ifdef _WIN32
1351	1351	/* The Microsoft IIS web server does not define REQUEST_URI, instead it uses
1352	1352	** PATH_INFO for virtually the same purpose. Define REQUEST_URI the same as
1353		- ** PATH_INFO and redefine PATH_INFO with SCRIPT_NAME removed from the
	1353	+ ** PATH_INFO and redefine PATH_INFO with SCRIPT_NAME removed from the
1354	1354	** beginning. */
1355	1355	if( zServerSoftware && strstr(zServerSoftware, "Microsoft-IIS") ){
1356	1356	int i, j;
1357	1357	cgi_set_parameter("REQUEST_URI", zPathInfo);
1358	1358	for(i=0; zPathInfo[i]==zScriptName[i] && zPathInfo[i]; i++){}
1359	1359

	--- src/cgi.c
	+++ src/cgi.c
	@@ -37,11 +37,11 @@
37	** received by a variety of means, and to generate well-formatted replies
38	** to those requests.
39	**
40	** The code in this file abstracts the web-request so that downstream
41	** modules that generate the body of the reply (based on the requested page)
42	** do not need to know if the request is coming from CGI, direct HTTP,
43	** SCGI, or some other means.
44	**
45	** This module gathers information about web page request into a key/value
46	** store. Keys and values come from:
47	**
	@@ -481,11 +481,11 @@
481	zReplyStatus = "OK";
482	}
483
484	if( g.fullHttpReply ){
485	if( rangeEnd>0
486	&& iReplyStatus==200
487	&& fossil_strcmp(P("REQUEST_METHOD"),"GET")==0
488	){
489	iReplyStatus = 206;
490	zReplyStatus = "Partial Content";
491	}
	@@ -562,11 +562,11 @@
562	}
563	total_size = blob_size(&cgiContent[0]) + blob_size(&cgiContent[1]);
564	if( iReplyStatus==206 ){
565	blob_appendf(&hdr, "Content-Range: bytes %d-%d/%d\r\n",
566	rangeStart, rangeEnd-1, total_size);
567	total_size = rangeEnd - rangeStart;
568	}
569	blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
570	}else{
571	total_size = 0;
572	}
	@@ -1311,11 +1311,11 @@
1311	** \___/ \____________/\____/\____________________/ \_/
1312	** \| \| \| \| \|
1313	** \| HTTP_HOST \| PATH_INFO QUERY_STRING
1314	** \| \|
1315	** REQUEST_SCHEMA SCRIPT_NAME
1316	**
1317	*/
1318	void cgi_init(void){
1319	char *z;
1320	const char *zType;
1321	char *zSemi;
	@@ -1348,11 +1348,11 @@
1348	}
1349
1350	#ifdef _WIN32
1351	/* The Microsoft IIS web server does not define REQUEST_URI, instead it uses
1352	** PATH_INFO for virtually the same purpose. Define REQUEST_URI the same as
1353	** PATH_INFO and redefine PATH_INFO with SCRIPT_NAME removed from the
1354	** beginning. */
1355	if( zServerSoftware && strstr(zServerSoftware, "Microsoft-IIS") ){
1356	int i, j;
1357	cgi_set_parameter("REQUEST_URI", zPathInfo);
1358	for(i=0; zPathInfo[i]==zScriptName[i] && zPathInfo[i]; i++){}
1359

	--- src/cgi.c
	+++ src/cgi.c
	@@ -37,11 +37,11 @@
37	** received by a variety of means, and to generate well-formatted replies
38	** to those requests.
39	**
40	** The code in this file abstracts the web-request so that downstream
41	** modules that generate the body of the reply (based on the requested page)
42	** do not need to know if the request is coming from CGI, direct HTTP,
43	** SCGI, or some other means.
44	**
45	** This module gathers information about web page request into a key/value
46	** store. Keys and values come from:
47	**
	@@ -481,11 +481,11 @@
481	zReplyStatus = "OK";
482	}
483
484	if( g.fullHttpReply ){
485	if( rangeEnd>0
486	&& iReplyStatus==200
487	&& fossil_strcmp(P("REQUEST_METHOD"),"GET")==0
488	){
489	iReplyStatus = 206;
490	zReplyStatus = "Partial Content";
491	}
	@@ -562,11 +562,11 @@
562	}
563	total_size = blob_size(&cgiContent[0]) + blob_size(&cgiContent[1]);
564	if( iReplyStatus==206 ){
565	blob_appendf(&hdr, "Content-Range: bytes %d-%d/%d\r\n",
566	rangeStart, rangeEnd-1, total_size);
567	total_size = rangeEnd - rangeStart;
568	}
569	blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
570	}else{
571	total_size = 0;
572	}
	@@ -1311,11 +1311,11 @@
1311	** \___/ \____________/\____/\____________________/ \_/
1312	** \| \| \| \| \|
1313	** \| HTTP_HOST \| PATH_INFO QUERY_STRING
1314	** \| \|
1315	** REQUEST_SCHEMA SCRIPT_NAME
1316	**
1317	*/
1318	void cgi_init(void){
1319	char *z;
1320	const char *zType;
1321	char *zSemi;
	@@ -1348,11 +1348,11 @@
1348	}
1349
1350	#ifdef _WIN32
1351	/* The Microsoft IIS web server does not define REQUEST_URI, instead it uses
1352	** PATH_INFO for virtually the same purpose. Define REQUEST_URI the same as
1353	** PATH_INFO and redefine PATH_INFO with SCRIPT_NAME removed from the
1354	** beginning. */
1355	if( zServerSoftware && strstr(zServerSoftware, "Microsoft-IIS") ){
1356	int i, j;
1357	cgi_set_parameter("REQUEST_URI", zPathInfo);
1358	for(i=0; zPathInfo[i]==zScriptName[i] && zPathInfo[i]; i++){}
1359

M src/chat.c

+6 -6

		--- src/chat.c
		+++ src/chat.c
		@@ -34,11 +34,11 @@
34	34	**
35	35	** Notification is accomplished using the "hanging GET" or "long poll" design
36	36	** in which a GET request is issued but the server does not send a reply until
37	37	** new content arrives. Newer Web Sockets and Server Sent Event protocols are
38	38	** more elegant, but are not compatible with CGI, and would thus complicate
39		-** configuration.
	39	+** configuration.
40	40	*/
41	41	#include "config.h"
42	42	#include <assert.h>
43	43	#include "chat.h"
44	44
		@@ -319,11 +319,11 @@
319	319	msgid = db_int(0, "SELECT msgid FROM chat"
320	320	" ORDER BY msgid DESC LIMIT 1 OFFSET %d", mxCnt);
321	321	if( msgid>0 ){
322	322	Stmt s;
323	323	db_multi_exec("PRAGMA secure_delete=ON;");
324		- db_prepare(&s,
	324	+ db_prepare(&s,
325	325	"DELETE FROM chat WHERE mtime<julianday('now')-:mxage"
326	326	" AND msgid<%d", msgid);
327	327	db_bind_double(&s, ":mxage", mxDays);
328	328	db_step(&s);
329	329	db_finalize(&s);
		@@ -693,11 +693,11 @@
693	693	}
694	694	} /* Exit by "break" */
695	695	db_finalize(&q1);
696	696	blob_append(&json, "\n]}", 3);
697	697	cgi_set_content(&json);
698		- return;
	698	+ return;
699	699	}
700	700
701	701	/*
702	702	** WEBPAGE: chat-fetch-one hidden loadavg-exempt
703	703	**
		@@ -726,11 +726,11 @@
726	726	return;
727	727	}
728	728	zChatUser = db_get("chat-timeline-user",0);
729	729	chat_create_tables();
730	730	cgi_set_content_type("application/json");
731		- db_prepare(&q,
	731	+ db_prepare(&q,
732	732	"SELECT datetime(mtime), xfrom, xmsg, octet_length(file),"
733	733	" fname, fmime, lmtime"
734	734	" FROM chat WHERE msgid=%d AND mdel IS NULL",
735	735	msgid);
736	736	if(SQLITE_ROW==db_step(&q)){
		@@ -769,11 +769,11 @@
769	769	if( nByte==0 ){
770	770	blob_appendf(&json, "\"fsize\":0");
771	771	}else{
772	772	blob_appendf(&json, "\"fsize\":%d,\"fname\":%!j,\"fmime\":%!j",
773	773	nByte, zFName, zFMime);
774		- }
	774	+ }
775	775	blob_append(&json,"}",1);
776	776	cgi_set_content(&json);
777	777	}else{
778	778	ajax_route_error(404,"Chat message #%d not found.", msgid);
779	779	}
		@@ -957,11 +957,11 @@
957	957	const char zType = (const char)sqlite3_value_text(argv[0]);
958	958	int rid = sqlite3_value_int(argv[1]);
959	959	const char zUser = (const char)sqlite3_value_text(argv[2]);
960	960	const char zMsg = (const char)sqlite3_value_text(argv[3]);
961	961	char *zRes = 0;
962		-
	962	+
963	963	if( zType==0 \|\| zUser==0 \|\| zMsg==0 ) return;
964	964	if( zType[0]=='c' ){
965	965	/* Check-ins */
966	966	char *zBranch;
967	967	char *zUuid;
968	968

	--- src/chat.c
	+++ src/chat.c
	@@ -34,11 +34,11 @@
34	**
35	** Notification is accomplished using the "hanging GET" or "long poll" design
36	** in which a GET request is issued but the server does not send a reply until
37	** new content arrives. Newer Web Sockets and Server Sent Event protocols are
38	** more elegant, but are not compatible with CGI, and would thus complicate
39	** configuration.
40	*/
41	#include "config.h"
42	#include <assert.h>
43	#include "chat.h"
44
	@@ -319,11 +319,11 @@
319	msgid = db_int(0, "SELECT msgid FROM chat"
320	" ORDER BY msgid DESC LIMIT 1 OFFSET %d", mxCnt);
321	if( msgid>0 ){
322	Stmt s;
323	db_multi_exec("PRAGMA secure_delete=ON;");
324	db_prepare(&s,
325	"DELETE FROM chat WHERE mtime<julianday('now')-:mxage"
326	" AND msgid<%d", msgid);
327	db_bind_double(&s, ":mxage", mxDays);
328	db_step(&s);
329	db_finalize(&s);
	@@ -693,11 +693,11 @@
693	}
694	} /* Exit by "break" */
695	db_finalize(&q1);
696	blob_append(&json, "\n]}", 3);
697	cgi_set_content(&json);
698	return;
699	}
700
701	/*
702	** WEBPAGE: chat-fetch-one hidden loadavg-exempt
703	**
	@@ -726,11 +726,11 @@
726	return;
727	}
728	zChatUser = db_get("chat-timeline-user",0);
729	chat_create_tables();
730	cgi_set_content_type("application/json");
731	db_prepare(&q,
732	"SELECT datetime(mtime), xfrom, xmsg, octet_length(file),"
733	" fname, fmime, lmtime"
734	" FROM chat WHERE msgid=%d AND mdel IS NULL",
735	msgid);
736	if(SQLITE_ROW==db_step(&q)){
	@@ -769,11 +769,11 @@
769	if( nByte==0 ){
770	blob_appendf(&json, "\"fsize\":0");
771	}else{
772	blob_appendf(&json, "\"fsize\":%d,\"fname\":%!j,\"fmime\":%!j",
773	nByte, zFName, zFMime);
774	}
775	blob_append(&json,"}",1);
776	cgi_set_content(&json);
777	}else{
778	ajax_route_error(404,"Chat message #%d not found.", msgid);
779	}
	@@ -957,11 +957,11 @@
957	const char zType = (const char)sqlite3_value_text(argv[0]);
958	int rid = sqlite3_value_int(argv[1]);
959	const char zUser = (const char)sqlite3_value_text(argv[2]);
960	const char zMsg = (const char)sqlite3_value_text(argv[3]);
961	char *zRes = 0;
962
963	if( zType==0 \|\| zUser==0 \|\| zMsg==0 ) return;
964	if( zType[0]=='c' ){
965	/* Check-ins */
966	char *zBranch;
967	char *zUuid;
968

	--- src/chat.c
	+++ src/chat.c
	@@ -34,11 +34,11 @@
34	**
35	** Notification is accomplished using the "hanging GET" or "long poll" design
36	** in which a GET request is issued but the server does not send a reply until
37	** new content arrives. Newer Web Sockets and Server Sent Event protocols are
38	** more elegant, but are not compatible with CGI, and would thus complicate
39	** configuration.
40	*/
41	#include "config.h"
42	#include <assert.h>
43	#include "chat.h"
44
	@@ -319,11 +319,11 @@
319	msgid = db_int(0, "SELECT msgid FROM chat"
320	" ORDER BY msgid DESC LIMIT 1 OFFSET %d", mxCnt);
321	if( msgid>0 ){
322	Stmt s;
323	db_multi_exec("PRAGMA secure_delete=ON;");
324	db_prepare(&s,
325	"DELETE FROM chat WHERE mtime<julianday('now')-:mxage"
326	" AND msgid<%d", msgid);
327	db_bind_double(&s, ":mxage", mxDays);
328	db_step(&s);
329	db_finalize(&s);
	@@ -693,11 +693,11 @@
693	}
694	} /* Exit by "break" */
695	db_finalize(&q1);
696	blob_append(&json, "\n]}", 3);
697	cgi_set_content(&json);
698	return;
699	}
700
701	/*
702	** WEBPAGE: chat-fetch-one hidden loadavg-exempt
703	**
	@@ -726,11 +726,11 @@
726	return;
727	}
728	zChatUser = db_get("chat-timeline-user",0);
729	chat_create_tables();
730	cgi_set_content_type("application/json");
731	db_prepare(&q,
732	"SELECT datetime(mtime), xfrom, xmsg, octet_length(file),"
733	" fname, fmime, lmtime"
734	" FROM chat WHERE msgid=%d AND mdel IS NULL",
735	msgid);
736	if(SQLITE_ROW==db_step(&q)){
	@@ -769,11 +769,11 @@
769	if( nByte==0 ){
770	blob_appendf(&json, "\"fsize\":0");
771	}else{
772	blob_appendf(&json, "\"fsize\":%d,\"fname\":%!j,\"fmime\":%!j",
773	nByte, zFName, zFMime);
774	}
775	blob_append(&json,"}",1);
776	cgi_set_content(&json);
777	}else{
778	ajax_route_error(404,"Chat message #%d not found.", msgid);
779	}
	@@ -957,11 +957,11 @@
957	const char zType = (const char)sqlite3_value_text(argv[0]);
958	int rid = sqlite3_value_int(argv[1]);
959	const char zUser = (const char)sqlite3_value_text(argv[2]);
960	const char zMsg = (const char)sqlite3_value_text(argv[3]);
961	char *zRes = 0;
962
963	if( zType==0 \|\| zUser==0 \|\| zMsg==0 ) return;
964	if( zType[0]=='c' ){
965	/* Check-ins */
966	char *zBranch;
967	char *zUuid;
968

M src/checkin.c

+2 -2

		--- src/checkin.c
		+++ src/checkin.c
		@@ -2535,11 +2535,11 @@
2535	2535	}else{
2536	2536	fossil_fatal("Would fork. \"update\" first or use --branch or "
2537	2537	"--allow-fork.");
2538	2538	}
2539	2539	}
2540		-
	2540	+
2541	2541	/*
2542	2542	** Do not allow a commit against a closed leaf unless the commit
2543	2543	** ends up on a different branch.
2544	2544	*/
2545	2545	if(
		@@ -2556,11 +2556,11 @@
2556	2556	}
2557	2557
2558	2558	/* Always exit the loop on the second pass */
2559	2559	if( bRecheck ) break;
2560	2560
2561		-
	2561	+
2562	2562	/* Get the check-in comment. This might involve prompting the
2563	2563	** user for the check-in comment, in which case we should resync
2564	2564	** to renew the check-in lock and repeat the checks for conflicts.
2565	2565	*/
2566	2566	if( zComment ){
2567	2567

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2535,11 +2535,11 @@
2535	}else{
2536	fossil_fatal("Would fork. \"update\" first or use --branch or "
2537	"--allow-fork.");
2538	}
2539	}
2540
2541	/*
2542	** Do not allow a commit against a closed leaf unless the commit
2543	** ends up on a different branch.
2544	*/
2545	if(
	@@ -2556,11 +2556,11 @@
2556	}
2557
2558	/* Always exit the loop on the second pass */
2559	if( bRecheck ) break;
2560
2561
2562	/* Get the check-in comment. This might involve prompting the
2563	** user for the check-in comment, in which case we should resync
2564	** to renew the check-in lock and repeat the checks for conflicts.
2565	*/
2566	if( zComment ){
2567

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2535,11 +2535,11 @@
2535	}else{
2536	fossil_fatal("Would fork. \"update\" first or use --branch or "
2537	"--allow-fork.");
2538	}
2539	}
2540
2541	/*
2542	** Do not allow a commit against a closed leaf unless the commit
2543	** ends up on a different branch.
2544	*/
2545	if(
	@@ -2556,11 +2556,11 @@
2556	}
2557
2558	/* Always exit the loop on the second pass */
2559	if( bRecheck ) break;
2560
2561
2562	/* Get the check-in comment. This might involve prompting the
2563	** user for the check-in comment, in which case we should resync
2564	** to renew the check-in lock and repeat the checks for conflicts.
2565	*/
2566	if( zComment ){
2567

M src/clone.c

+1 -1

		--- src/clone.c
		+++ src/clone.c
		@@ -196,11 +196,11 @@
196	196	zRepo = mprintf("./%s.fossil", zBase);
197	197	if( zWorkDir==0 ){
198	198	zWorkDir = mprintf("./%s", zBase);
199	199	}
200	200	fossil_free(zBase);
201		- }
	201	+ }
202	202	if( -1 != file_size(zRepo, ExtFILE) ){
203	203	fossil_fatal("file already exists: %s", zRepo);
204	204	}
205	205	/* Fail before clone if open will fail because inside an open check-out */
206	206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207	207

	--- src/clone.c
	+++ src/clone.c
	@@ -196,11 +196,11 @@
196	zRepo = mprintf("./%s.fossil", zBase);
197	if( zWorkDir==0 ){
198	zWorkDir = mprintf("./%s", zBase);
199	}
200	fossil_free(zBase);
201	}
202	if( -1 != file_size(zRepo, ExtFILE) ){
203	fossil_fatal("file already exists: %s", zRepo);
204	}
205	/* Fail before clone if open will fail because inside an open check-out */
206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207

	--- src/clone.c
	+++ src/clone.c
	@@ -196,11 +196,11 @@
196	zRepo = mprintf("./%s.fossil", zBase);
197	if( zWorkDir==0 ){
198	zWorkDir = mprintf("./%s", zBase);
199	}
200	fossil_free(zBase);
201	}
202	if( -1 != file_size(zRepo, ExtFILE) ){
203	fossil_fatal("file already exists: %s", zRepo);
204	}
205	/* Fail before clone if open will fail because inside an open check-out */
206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207

M src/cookies.c

+1 -1

		--- src/cookies.c
		+++ src/cookies.c
		@@ -239,11 +239,11 @@
239	239	cgi_set_cookie(zName, "", 0, -1);
240	240	cgi_redirect("cookies");
241	241	}
242	242	nCookie++;
243	243	@ <li><p><b>%h(zName)</b>: %h(zValue)
244		- @ <input type="submit" name="%h(zDel)" value="Delete">
	244	+ @ <input type="submit" name="%h(zDel)" value="Delete">
245	245	if( fossil_strcmp(zName, DISPLAY_SETTINGS_COOKIE)==0 && cookies.nParam>0 ){
246	246	int j;
247	247	@ <ul>
248	248	for(j=0; j<cookies.nParam; j++){
249	249	@ <li>%h(cookies.aParam[j].zPName): "%h(cookies.aParam[j].zPValue)"
250	250

	--- src/cookies.c
	+++ src/cookies.c
	@@ -239,11 +239,11 @@
239	cgi_set_cookie(zName, "", 0, -1);
240	cgi_redirect("cookies");
241	}
242	nCookie++;
243	@ <li><p><b>%h(zName)</b>: %h(zValue)
244	@ <input type="submit" name="%h(zDel)" value="Delete">
245	if( fossil_strcmp(zName, DISPLAY_SETTINGS_COOKIE)==0 && cookies.nParam>0 ){
246	int j;
247	@ <ul>
248	for(j=0; j<cookies.nParam; j++){
249	@ <li>%h(cookies.aParam[j].zPName): "%h(cookies.aParam[j].zPValue)"
250

	--- src/cookies.c
	+++ src/cookies.c
	@@ -239,11 +239,11 @@
239	cgi_set_cookie(zName, "", 0, -1);
240	cgi_redirect("cookies");
241	}
242	nCookie++;
243	@ <li><p><b>%h(zName)</b>: %h(zValue)
244	@ <input type="submit" name="%h(zDel)" value="Delete">
245	if( fossil_strcmp(zName, DISPLAY_SETTINGS_COOKIE)==0 && cookies.nParam>0 ){
246	int j;
247	@ <ul>
248	for(j=0; j<cookies.nParam; j++){
249	@ <li>%h(cookies.aParam[j].zPName): "%h(cookies.aParam[j].zPValue)"
250

M src/db.c

+10 -10

		--- src/db.c
		+++ src/db.c
		@@ -457,11 +457,11 @@
457	457	void db_protect_only(unsigned flags){
458	458	if( db.nProtect>=count(db.aProtect)-2 ){
459	459	fossil_panic("too many db_protect() calls");
460	460	}
461	461	db.aProtect[db.nProtect++] = db.protectMask;
462		- if( (flags & PROTECT_SENSITIVE)!=0
	462	+ if( (flags & PROTECT_SENSITIVE)!=0
463	463	&& db.bProtectTriggers==0
464	464	&& g.repositoryOpen
465	465	){
466	466	/* Create the triggers needed to protect sensitive settings from
467	467	** being created or modified the first time that PROTECT_SENSITIVE
		@@ -1557,13 +1557,13 @@
1557	1557	sqlite3_create_function(db, "win_reserved", 1, SQLITE_UTF8, 0,
1558	1558	db_win_reserved_func,0,0);
1559	1559	sqlite3_create_function(db, "url_nouser", 1, SQLITE_UTF8, 0,
1560	1560	url_nouser_func,0,0);
1561	1561	sqlite3_create_function(db, "chat_msg_from_event", 4,
1562		- SQLITE_UTF8 \| SQLITE_INNOCUOUS, 0,
	1562	+ SQLITE_UTF8 \| SQLITE_INNOCUOUS, 0,
1563	1563	chat_msg_from_event, 0, 0);
1564		-
	1564	+
1565	1565	}
1566	1566
1567	1567	#if USE_SEE
1568	1568	/*
1569	1569	** This is a pointer to the saved database encryption key string.
		@@ -2606,11 +2606,11 @@
2606	2606	sz = file_size(zDbName, ExtFILE);
2607	2607	if( sz<16834 ) return 0;
2608	2608	db = db_open(zDbName);
2609	2609	if( !db ) return 0;
2610	2610	if( !g.zVfsName && sz%512 ) return 0;
2611		- rc = sqlite3_prepare_v2(db,
	2611	+ rc = sqlite3_prepare_v2(db,
2612	2612	"SELECT count(*) FROM sqlite_schema"
2613	2613	" WHERE name COLLATE nocase IN"
2614	2614	"('blob','delta','rcvfrom','user','config','mlink','plink');",
2615	2615	-1, &pStmt, 0);
2616	2616	if( rc ) goto is_repo_end;
		@@ -4022,11 +4022,11 @@
4022	4022	}
4023	4023	file_canonical_name(zName, &full, 0);
4024	4024	(void)filename_collation(); /* Initialize before connection swap */
4025	4025	db_swap_connections();
4026	4026	zRepoSetting = mprintf("repo:%q", blob_str(&full));
4027		-
	4027	+
4028	4028	db_unprotect(PROTECT_CONFIG);
4029	4029	db_multi_exec(
4030	4030	"DELETE FROM global_config WHERE name %s = %Q;",
4031	4031	filename_collation(), zRepoSetting
4032	4032	);
		@@ -4186,11 +4186,11 @@
4186	4186	&& (nLocal = file_directory_size(".", 0, 1))>0
4187	4187	&& (nLocal>1 \|\| isUri \|\| !file_in_cwd(zRepo))
4188	4188	){
4189	4189	fossil_fatal("directory %s is not empty\n"
4190	4190	"use the -f (--force) option to override\n"
4191		- "or the -k (--keep) option to keep local files unchanged",
	4191	+ "or the -k (--keep) option to keep local files unchanged",
4192	4192	file_getcwd(0,0));
4193	4193	}
4194	4194
4195	4195	if( db_open_local_v2(0, allowNested) ){
4196	4196	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
		@@ -4392,11 +4392,11 @@
4392	4392	** in the "admin_log" table of the repository.
4393	4393	*/
4394	4394	/*
4395	4395	** SETTING: allow-symlinks boolean default=off sensitive
4396	4396	**
4397		-** When allow-symlinks is OFF, Fossil does not see symbolic links
	4397	+** When allow-symlinks is OFF, Fossil does not see symbolic links
4398	4398	** (a.k.a "symlinks") on disk as a separate class of object. Instead Fossil
4399	4399	** sees the object that the symlink points to. Fossil will only manage files
4400	4400	** and directories, not symlinks. When a symlink is added to a repository,
4401	4401	** the object that the symlink points to is added, not the symlink itself.
4402	4402	**
		@@ -4450,11 +4450,11 @@
4450	4450	** after the page load. Suggested values: 50 to 200.
4451	4451	*/
4452	4452	/*
4453	4453	** SETTING: auto-hyperlink-mouseover boolean default=off
4454	4454	**
4455		-** When the auto-hyperlink setting is 1 and this setting is on, the
	4455	+** When the auto-hyperlink setting is 1 and this setting is on, the
4456	4456	** javascript that runs to set the href= attributes of hyperlinks waits
4457	4457	** until either a mousedown or mousemove event is seen. This helps
4458	4458	** to distinguish real users from robots. For maximum robot defense,
4459	4459	** the recommended setting is ON.
4460	4460	*/
		@@ -4674,11 +4674,11 @@
4674	4674	*/
4675	4675	/*
4676	4676	** SETTING: forbid-delta-manifests boolean default=off
4677	4677	** If enabled on a client, new delta manifests are prohibited on
4678	4678	** commits. If enabled on a server, whenever a client attempts
4679		-** to obtain a check-in lock during auto-sync, the server will
	4679	+** to obtain a check-in lock during auto-sync, the server will
4680	4680	** send the "pragma avoid-delta-manifests" statement in its reply,
4681	4681	** which will cause the client to avoid generating a delta
4682	4682	** manifest.
4683	4683	*/
4684	4684	/*
		@@ -5015,11 +5015,11 @@
5015	5015	*/
5016	5016	/*
5017	5017	** SETTING: large-file-size width=10 default=200000000
5018	5018	** Fossil considers any file whose size is greater than this value
5019	5019	** to be a "large file". Fossil might issue warnings if you try to
5020		-** "add" or "commit" a "large file". Set this value to 0 or less
	5020	+** "add" or "commit" a "large file". Set this value to 0 or less
5021	5021	** to disable all such warnings.
5022	5022	*/
5023	5023
5024	5024	/*
5025	5025	** Look up a control setting by its name. Return a pointer to the Setting
5026	5026

	--- src/db.c
	+++ src/db.c
	@@ -457,11 +457,11 @@
457	void db_protect_only(unsigned flags){
458	if( db.nProtect>=count(db.aProtect)-2 ){
459	fossil_panic("too many db_protect() calls");
460	}
461	db.aProtect[db.nProtect++] = db.protectMask;
462	if( (flags & PROTECT_SENSITIVE)!=0
463	&& db.bProtectTriggers==0
464	&& g.repositoryOpen
465	){
466	/* Create the triggers needed to protect sensitive settings from
467	** being created or modified the first time that PROTECT_SENSITIVE
	@@ -1557,13 +1557,13 @@
1557	sqlite3_create_function(db, "win_reserved", 1, SQLITE_UTF8, 0,
1558	db_win_reserved_func,0,0);
1559	sqlite3_create_function(db, "url_nouser", 1, SQLITE_UTF8, 0,
1560	url_nouser_func,0,0);
1561	sqlite3_create_function(db, "chat_msg_from_event", 4,
1562	SQLITE_UTF8 \| SQLITE_INNOCUOUS, 0,
1563	chat_msg_from_event, 0, 0);
1564
1565	}
1566
1567	#if USE_SEE
1568	/*
1569	** This is a pointer to the saved database encryption key string.
	@@ -2606,11 +2606,11 @@
2606	sz = file_size(zDbName, ExtFILE);
2607	if( sz<16834 ) return 0;
2608	db = db_open(zDbName);
2609	if( !db ) return 0;
2610	if( !g.zVfsName && sz%512 ) return 0;
2611	rc = sqlite3_prepare_v2(db,
2612	"SELECT count(*) FROM sqlite_schema"
2613	" WHERE name COLLATE nocase IN"
2614	"('blob','delta','rcvfrom','user','config','mlink','plink');",
2615	-1, &pStmt, 0);
2616	if( rc ) goto is_repo_end;
	@@ -4022,11 +4022,11 @@
4022	}
4023	file_canonical_name(zName, &full, 0);
4024	(void)filename_collation(); /* Initialize before connection swap */
4025	db_swap_connections();
4026	zRepoSetting = mprintf("repo:%q", blob_str(&full));
4027
4028	db_unprotect(PROTECT_CONFIG);
4029	db_multi_exec(
4030	"DELETE FROM global_config WHERE name %s = %Q;",
4031	filename_collation(), zRepoSetting
4032	);
	@@ -4186,11 +4186,11 @@
4186	&& (nLocal = file_directory_size(".", 0, 1))>0
4187	&& (nLocal>1 \|\| isUri \|\| !file_in_cwd(zRepo))
4188	){
4189	fossil_fatal("directory %s is not empty\n"
4190	"use the -f (--force) option to override\n"
4191	"or the -k (--keep) option to keep local files unchanged",
4192	file_getcwd(0,0));
4193	}
4194
4195	if( db_open_local_v2(0, allowNested) ){
4196	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
	@@ -4392,11 +4392,11 @@
4392	** in the "admin_log" table of the repository.
4393	*/
4394	/*
4395	** SETTING: allow-symlinks boolean default=off sensitive
4396	**
4397	** When allow-symlinks is OFF, Fossil does not see symbolic links
4398	** (a.k.a "symlinks") on disk as a separate class of object. Instead Fossil
4399	** sees the object that the symlink points to. Fossil will only manage files
4400	** and directories, not symlinks. When a symlink is added to a repository,
4401	** the object that the symlink points to is added, not the symlink itself.
4402	**
	@@ -4450,11 +4450,11 @@
4450	** after the page load. Suggested values: 50 to 200.
4451	*/
4452	/*
4453	** SETTING: auto-hyperlink-mouseover boolean default=off
4454	**
4455	** When the auto-hyperlink setting is 1 and this setting is on, the
4456	** javascript that runs to set the href= attributes of hyperlinks waits
4457	** until either a mousedown or mousemove event is seen. This helps
4458	** to distinguish real users from robots. For maximum robot defense,
4459	** the recommended setting is ON.
4460	*/
	@@ -4674,11 +4674,11 @@
4674	*/
4675	/*
4676	** SETTING: forbid-delta-manifests boolean default=off
4677	** If enabled on a client, new delta manifests are prohibited on
4678	** commits. If enabled on a server, whenever a client attempts
4679	** to obtain a check-in lock during auto-sync, the server will
4680	** send the "pragma avoid-delta-manifests" statement in its reply,
4681	** which will cause the client to avoid generating a delta
4682	** manifest.
4683	*/
4684	/*
	@@ -5015,11 +5015,11 @@
5015	*/
5016	/*
5017	** SETTING: large-file-size width=10 default=200000000
5018	** Fossil considers any file whose size is greater than this value
5019	** to be a "large file". Fossil might issue warnings if you try to
5020	** "add" or "commit" a "large file". Set this value to 0 or less
5021	** to disable all such warnings.
5022	*/
5023
5024	/*
5025	** Look up a control setting by its name. Return a pointer to the Setting
5026

	--- src/db.c
	+++ src/db.c
	@@ -457,11 +457,11 @@
457	void db_protect_only(unsigned flags){
458	if( db.nProtect>=count(db.aProtect)-2 ){
459	fossil_panic("too many db_protect() calls");
460	}
461	db.aProtect[db.nProtect++] = db.protectMask;
462	if( (flags & PROTECT_SENSITIVE)!=0
463	&& db.bProtectTriggers==0
464	&& g.repositoryOpen
465	){
466	/* Create the triggers needed to protect sensitive settings from
467	** being created or modified the first time that PROTECT_SENSITIVE
	@@ -1557,13 +1557,13 @@
1557	sqlite3_create_function(db, "win_reserved", 1, SQLITE_UTF8, 0,
1558	db_win_reserved_func,0,0);
1559	sqlite3_create_function(db, "url_nouser", 1, SQLITE_UTF8, 0,
1560	url_nouser_func,0,0);
1561	sqlite3_create_function(db, "chat_msg_from_event", 4,
1562	SQLITE_UTF8 \| SQLITE_INNOCUOUS, 0,
1563	chat_msg_from_event, 0, 0);
1564
1565	}
1566
1567	#if USE_SEE
1568	/*
1569	** This is a pointer to the saved database encryption key string.
	@@ -2606,11 +2606,11 @@
2606	sz = file_size(zDbName, ExtFILE);
2607	if( sz<16834 ) return 0;
2608	db = db_open(zDbName);
2609	if( !db ) return 0;
2610	if( !g.zVfsName && sz%512 ) return 0;
2611	rc = sqlite3_prepare_v2(db,
2612	"SELECT count(*) FROM sqlite_schema"
2613	" WHERE name COLLATE nocase IN"
2614	"('blob','delta','rcvfrom','user','config','mlink','plink');",
2615	-1, &pStmt, 0);
2616	if( rc ) goto is_repo_end;
	@@ -4022,11 +4022,11 @@
4022	}
4023	file_canonical_name(zName, &full, 0);
4024	(void)filename_collation(); /* Initialize before connection swap */
4025	db_swap_connections();
4026	zRepoSetting = mprintf("repo:%q", blob_str(&full));
4027
4028	db_unprotect(PROTECT_CONFIG);
4029	db_multi_exec(
4030	"DELETE FROM global_config WHERE name %s = %Q;",
4031	filename_collation(), zRepoSetting
4032	);
	@@ -4186,11 +4186,11 @@
4186	&& (nLocal = file_directory_size(".", 0, 1))>0
4187	&& (nLocal>1 \|\| isUri \|\| !file_in_cwd(zRepo))
4188	){
4189	fossil_fatal("directory %s is not empty\n"
4190	"use the -f (--force) option to override\n"
4191	"or the -k (--keep) option to keep local files unchanged",
4192	file_getcwd(0,0));
4193	}
4194
4195	if( db_open_local_v2(0, allowNested) ){
4196	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
	@@ -4392,11 +4392,11 @@
4392	** in the "admin_log" table of the repository.
4393	*/
4394	/*
4395	** SETTING: allow-symlinks boolean default=off sensitive
4396	**
4397	** When allow-symlinks is OFF, Fossil does not see symbolic links
4398	** (a.k.a "symlinks") on disk as a separate class of object. Instead Fossil
4399	** sees the object that the symlink points to. Fossil will only manage files
4400	** and directories, not symlinks. When a symlink is added to a repository,
4401	** the object that the symlink points to is added, not the symlink itself.
4402	**
	@@ -4450,11 +4450,11 @@
4450	** after the page load. Suggested values: 50 to 200.
4451	*/
4452	/*
4453	** SETTING: auto-hyperlink-mouseover boolean default=off
4454	**
4455	** When the auto-hyperlink setting is 1 and this setting is on, the
4456	** javascript that runs to set the href= attributes of hyperlinks waits
4457	** until either a mousedown or mousemove event is seen. This helps
4458	** to distinguish real users from robots. For maximum robot defense,
4459	** the recommended setting is ON.
4460	*/
	@@ -4674,11 +4674,11 @@
4674	*/
4675	/*
4676	** SETTING: forbid-delta-manifests boolean default=off
4677	** If enabled on a client, new delta manifests are prohibited on
4678	** commits. If enabled on a server, whenever a client attempts
4679	** to obtain a check-in lock during auto-sync, the server will
4680	** send the "pragma avoid-delta-manifests" statement in its reply,
4681	** which will cause the client to avoid generating a delta
4682	** manifest.
4683	*/
4684	/*
	@@ -5015,11 +5015,11 @@
5015	*/
5016	/*
5017	** SETTING: large-file-size width=10 default=200000000
5018	** Fossil considers any file whose size is greater than this value
5019	** to be a "large file". Fossil might issue warnings if you try to
5020	** "add" or "commit" a "large file". Set this value to 0 or less
5021	** to disable all such warnings.
5022	*/
5023
5024	/*
5025	** Look up a control setting by its name. Return a pointer to the Setting
5026

M src/diff.c

+7 -7

		--- src/diff.c
		+++ src/diff.c
		@@ -90,16 +90,16 @@
90	90	** because not all diff operations are started from the command-line. But
91	91	** the idea is sound.
92	92	**
93	93	** Information encoded by this object includes but is not limited to:
94	94	**
95		-** * The desired output format (unified vs. side-by-side,
	95	+** * The desired output format (unified vs. side-by-side,
96	96	** TCL, JSON, HTML vs. plain-text).
97	97	**
98	98	** * Number of lines of context surrounding each difference block
99	99	**
100		-** * Width of output columns for text side-by-side diffop
	100	+** * Width of output columns for text side-by-side diffop
101	101	*/
102	102	struct DiffConfig {
103	103	u64 diffFlags; /* Diff flags */
104	104	int nContext; /* Number of lines of context */
105	105	int wColumn; /* Column width in -y mode */
		@@ -915,11 +915,11 @@
915	915	** lines and formats them for display. Subclasses of this object format
916	916	** the diff output in different ways.
917	917	**
918	918	** To subclass, create an instance of the DiffBuilder object and fill
919	919	** in appropriate method implementations.
920		-*/
	920	+*/
921	921	typedef struct DiffBuilder DiffBuilder;
922	922	struct DiffBuilder {
923	923	void (xSkip)(DiffBuilder, unsigned int, int);
924	924	void (xCommon)(DiffBuilder,const DLine*);
925	925	void (xInsert)(DiffBuilder,const DLine*);
		@@ -1100,11 +1100,11 @@
1100	1100	x = chng.a[i].iStart1;
1101	1101	blob_append_char(p->pOut, ' ');
1102	1102	blob_append_tcl_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1103	1103	x += chng.a[i].iLen1;
1104	1104	blob_append_char(p->pOut, ' ');
1105		- blob_append_tcl_literal(p->pOut,
	1105	+ blob_append_tcl_literal(p->pOut,
1106	1106	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1107	1107	}
1108	1108	if( x<pX->n ){
1109	1109	blob_append_char(p->pOut, ' ');
1110	1110	blob_append_tcl_literal(p->pOut, pX->z + x, pX->n - x);
		@@ -1186,11 +1186,11 @@
1186	1186	x = chng.a[i].iStart1;
1187	1187	blob_append_char(p->pOut, ',');
1188	1188	blob_append_json_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1189	1189	x += chng.a[i].iLen1;
1190	1190	blob_append_char(p->pOut, ',');
1191		- blob_append_json_literal(p->pOut,
	1191	+ blob_append_json_literal(p->pOut,
1192	1192	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1193	1193	}
1194	1194	blob_append_char(p->pOut, ',');
1195	1195	blob_append_json_literal(p->pOut, pX->z + x, pX->n - x);
1196	1196	blob_append(p->pOut, "],\n",3);
		@@ -1268,11 +1268,11 @@
1268	1268
1269	1269	/* Text of the inserted lines */
1270	1270	blob_append(&p->aCol[2], "<ins>", 5);
1271	1271	blob_append_xfer(&p->aCol[2], &p->aCol[4]);
1272	1272	blob_append(&p->aCol[2], "</ins>", 6);
1273		-
	1273	+
1274	1274	p->nPending = 0;
1275	1275	}
1276	1276	static void dfunifiedFinishRow(DiffBuilder *p){
1277	1277	dfunifiedFinishDelete(p);
1278	1278	dfunifiedFinishInsert(p);
		@@ -2005,11 +2005,11 @@
2005	2005	}
2006	2006	iDivBig = nBig/2;
2007	2007	iDivSmall = nSmall/2;
2008	2008
2009	2009	if( pCfg->diffFlags & DIFF_DEBUG ){
2010		- fossil_print(" Divide at [%.*s]\n",
	2010	+ fossil_print(" Divide at [%.*s]\n",
2011	2011	aBig[iDivBig].n, aBig[iDivBig].z);
2012	2012	}
2013	2013
2014	2014	bestScore = 10000;
2015	2015	for(i=0; i<nSmall; i++){
2016	2016

	--- src/diff.c
	+++ src/diff.c
	@@ -90,16 +90,16 @@
90	** because not all diff operations are started from the command-line. But
91	** the idea is sound.
92	**
93	** Information encoded by this object includes but is not limited to:
94	**
95	** * The desired output format (unified vs. side-by-side,
96	** TCL, JSON, HTML vs. plain-text).
97	**
98	** * Number of lines of context surrounding each difference block
99	**
100	** * Width of output columns for text side-by-side diffop
101	*/
102	struct DiffConfig {
103	u64 diffFlags; /* Diff flags */
104	int nContext; /* Number of lines of context */
105	int wColumn; /* Column width in -y mode */
	@@ -915,11 +915,11 @@
915	** lines and formats them for display. Subclasses of this object format
916	** the diff output in different ways.
917	**
918	** To subclass, create an instance of the DiffBuilder object and fill
919	** in appropriate method implementations.
920	*/
921	typedef struct DiffBuilder DiffBuilder;
922	struct DiffBuilder {
923	void (xSkip)(DiffBuilder, unsigned int, int);
924	void (xCommon)(DiffBuilder,const DLine*);
925	void (xInsert)(DiffBuilder,const DLine*);
	@@ -1100,11 +1100,11 @@
1100	x = chng.a[i].iStart1;
1101	blob_append_char(p->pOut, ' ');
1102	blob_append_tcl_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1103	x += chng.a[i].iLen1;
1104	blob_append_char(p->pOut, ' ');
1105	blob_append_tcl_literal(p->pOut,
1106	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1107	}
1108	if( x<pX->n ){
1109	blob_append_char(p->pOut, ' ');
1110	blob_append_tcl_literal(p->pOut, pX->z + x, pX->n - x);
	@@ -1186,11 +1186,11 @@
1186	x = chng.a[i].iStart1;
1187	blob_append_char(p->pOut, ',');
1188	blob_append_json_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1189	x += chng.a[i].iLen1;
1190	blob_append_char(p->pOut, ',');
1191	blob_append_json_literal(p->pOut,
1192	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1193	}
1194	blob_append_char(p->pOut, ',');
1195	blob_append_json_literal(p->pOut, pX->z + x, pX->n - x);
1196	blob_append(p->pOut, "],\n",3);
	@@ -1268,11 +1268,11 @@
1268
1269	/* Text of the inserted lines */
1270	blob_append(&p->aCol[2], "<ins>", 5);
1271	blob_append_xfer(&p->aCol[2], &p->aCol[4]);
1272	blob_append(&p->aCol[2], "</ins>", 6);
1273
1274	p->nPending = 0;
1275	}
1276	static void dfunifiedFinishRow(DiffBuilder *p){
1277	dfunifiedFinishDelete(p);
1278	dfunifiedFinishInsert(p);
	@@ -2005,11 +2005,11 @@
2005	}
2006	iDivBig = nBig/2;
2007	iDivSmall = nSmall/2;
2008
2009	if( pCfg->diffFlags & DIFF_DEBUG ){
2010	fossil_print(" Divide at [%.*s]\n",
2011	aBig[iDivBig].n, aBig[iDivBig].z);
2012	}
2013
2014	bestScore = 10000;
2015	for(i=0; i<nSmall; i++){
2016

	--- src/diff.c
	+++ src/diff.c
	@@ -90,16 +90,16 @@
90	** because not all diff operations are started from the command-line. But
91	** the idea is sound.
92	**
93	** Information encoded by this object includes but is not limited to:
94	**
95	** * The desired output format (unified vs. side-by-side,
96	** TCL, JSON, HTML vs. plain-text).
97	**
98	** * Number of lines of context surrounding each difference block
99	**
100	** * Width of output columns for text side-by-side diffop
101	*/
102	struct DiffConfig {
103	u64 diffFlags; /* Diff flags */
104	int nContext; /* Number of lines of context */
105	int wColumn; /* Column width in -y mode */
	@@ -915,11 +915,11 @@
915	** lines and formats them for display. Subclasses of this object format
916	** the diff output in different ways.
917	**
918	** To subclass, create an instance of the DiffBuilder object and fill
919	** in appropriate method implementations.
920	*/
921	typedef struct DiffBuilder DiffBuilder;
922	struct DiffBuilder {
923	void (xSkip)(DiffBuilder, unsigned int, int);
924	void (xCommon)(DiffBuilder,const DLine*);
925	void (xInsert)(DiffBuilder,const DLine*);
	@@ -1100,11 +1100,11 @@
1100	x = chng.a[i].iStart1;
1101	blob_append_char(p->pOut, ' ');
1102	blob_append_tcl_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1103	x += chng.a[i].iLen1;
1104	blob_append_char(p->pOut, ' ');
1105	blob_append_tcl_literal(p->pOut,
1106	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1107	}
1108	if( x<pX->n ){
1109	blob_append_char(p->pOut, ' ');
1110	blob_append_tcl_literal(p->pOut, pX->z + x, pX->n - x);
	@@ -1186,11 +1186,11 @@
1186	x = chng.a[i].iStart1;
1187	blob_append_char(p->pOut, ',');
1188	blob_append_json_literal(p->pOut, pX->z + x, chng.a[i].iLen1);
1189	x += chng.a[i].iLen1;
1190	blob_append_char(p->pOut, ',');
1191	blob_append_json_literal(p->pOut,
1192	pY->z + chng.a[i].iStart2, chng.a[i].iLen2);
1193	}
1194	blob_append_char(p->pOut, ',');
1195	blob_append_json_literal(p->pOut, pX->z + x, pX->n - x);
1196	blob_append(p->pOut, "],\n",3);
	@@ -1268,11 +1268,11 @@
1268
1269	/* Text of the inserted lines */
1270	blob_append(&p->aCol[2], "<ins>", 5);
1271	blob_append_xfer(&p->aCol[2], &p->aCol[4]);
1272	blob_append(&p->aCol[2], "</ins>", 6);
1273
1274	p->nPending = 0;
1275	}
1276	static void dfunifiedFinishRow(DiffBuilder *p){
1277	dfunifiedFinishDelete(p);
1278	dfunifiedFinishInsert(p);
	@@ -2005,11 +2005,11 @@
2005	}
2006	iDivBig = nBig/2;
2007	iDivSmall = nSmall/2;
2008
2009	if( pCfg->diffFlags & DIFF_DEBUG ){
2010	fossil_print(" Divide at [%.*s]\n",
2011	aBig[iDivBig].n, aBig[iDivBig].z);
2012	}
2013
2014	bestScore = 10000;
2015	for(i=0; i<nSmall; i++){
2016

M src/diffcmd.c

+12 -12

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -113,11 +113,11 @@
113	113	}
114	114
115	115	/*
116	116	** Print details about the compared versions - possibly the working directory
117	117	** or the undo buffer. For check-ins, show hash and commit time.
118		-**
	118	+**
119	119	** This is intended primarily to go into the "header garbage" that is ignored
120	120	** by patch(1).
121	121	**
122	122	** zFrom and zTo are interpreted as symbolic version names, unless they
123	123	** start with '(', in which case they are printed directly.
		@@ -218,11 +218,11 @@
218	218
219	219
220	220	/*
221	221	** Default header texts for diff with --webpage
222	222	*/
223		-static const char zWebpageHdr[] =
	223	+static const char zWebpageHdr[] =
224	224	@ <!DOCTYPE html>
225	225	@ <html>
226	226	@ <head>
227	227	@ <meta charset="UTF-8">
228	228	@ <style>
		@@ -342,16 +342,16 @@
342	342	@ }
343	343	@ td.difftxt ins > ins {
344	344	@ background-color: #559855;
345	345	@ }
346	346	@ }
347		-@
	347	+@
348	348	@ </style>
349	349	@ </head>
350	350	@ <body>
351	351	;
352		-static const char zWebpageHdrDark[] =
	352	+static const char zWebpageHdrDark[] =
353	353	@ <!DOCTYPE html>
354	354	@ <html>
355	355	@ <head>
356	356	@ <meta charset="UTF-8">
357	357	@ <style>
		@@ -360,11 +360,11 @@
360	360	@ color: #ffffff;
361	361	@ }
362	362	@ h1 {
363	363	@ font-size: 150%;
364	364	@ }
365		-@
	365	+@
366	366	@ table.diff {
367	367	@ width: 100%;
368	368	@ border-spacing: 0;
369	369	@ border: 1px solid black;
370	370	@ line-height: inherit;
		@@ -448,16 +448,16 @@
448	448	@ td.difftxt ins > ins.edit {
449	449	@ background-color: #c0c0ff;
450	450	@ text-decoration: none;
451	451	@ font-weight: bold;
452	452	@ }
453		-@
	453	+@
454	454	@ </style>
455	455	@ </head>
456	456	@ <body>
457	457	;
458		-const char zWebpageEnd[] =
	458	+const char zWebpageEnd[] =
459	459	@ </body>
460	460	@ </html>
461	461	;
462	462
463	463	/*
		@@ -516,20 +516,20 @@
516	516	#else
517	517	SetConsoleCtrlHandler(diff_console_ctrl_handler, TRUE);
518	518	#endif
519	519	}
520	520	if( (pCfg->diffFlags & DIFF_WEBPAGE)!=0 ){
521		- fossil_print("%s",(pCfg->diffFlags & DIFF_DARKMODE)!=0 ? zWebpageHdrDark :
	521	+ fossil_print("%s",(pCfg->diffFlags & DIFF_DARKMODE)!=0 ? zWebpageHdrDark :
522	522	zWebpageHdr);
523	523	fflush(stdout);
524	524	}
525	525	}
526	526
527	527	/* Do any final output required by a diff and complete the diff
528	528	** process.
529	529	**
530		-** For --browser and --webpage, output any javascript required by
	530	+** For --browser and --webpage, output any javascript required by
531	531	** the diff. (Currently JS is only needed for side-by-side diffs).
532	532	**
533	533	** For --browser, close the connection to the temporary file, then
534	534	** launch a web browser to view the file. After a delay
535	535	** of FOSSIL_BROWSER_DIFF_DELAY milliseconds, delete the temp file.
		@@ -947,11 +947,11 @@
947	947	Blob content;
948	948	db_prepare(&q, "SELECT pathname, content FROM undo");
949	949	blob_init(&content, 0, 0);
950	950	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
951	951	diff_print_versions("(undo)", "(workdir)", pCfg);
952		- }
	952	+ }
953	953	while( db_step(&q)==SQLITE_ROW ){
954	954	char *zFullName;
955	955	const char zFile = (const char)db_column_text(&q, 0);
956	956	if( !file_dir_match(pFileDir, zFile) ) continue;
957	957	zFullName = mprintf("%s%s", g.zLocalRoot, zFile);
		@@ -1034,11 +1034,11 @@
1034	1034	pTo = manifest_get_by_name(zTo, 0);
1035	1035	manifest_file_rewind(pTo);
1036	1036	pToFile = manifest_file_next(pTo,0);
1037	1037	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
1038	1038	diff_print_versions(zFrom, zTo, pCfg);
1039		- }
	1039	+ }
1040	1040	while( pFromFile \|\| pToFile ){
1041	1041	int cmp;
1042	1042	if( pFromFile==0 ){
1043	1043	cmp = +1;
1044	1044	}else if( pToFile==0 ){
		@@ -1383,11 +1383,11 @@
1383	1383	}
1384	1384	fossil_free(pFileDir);
1385	1385	}
1386	1386	diff_end(&DCfg, 0);
1387	1387	if ( DCfg.diffFlags & DIFF_NUMSTAT ){
1388		- fossil_print("%10d %10d TOTAL over %d changed files\n",
	1388	+ fossil_print("%10d %10d TOTAL over %d changed files\n",
1389	1389	g.diffCnt[1], g.diffCnt[2], g.diffCnt[0]);
1390	1390	}
1391	1391	}
1392	1392
1393	1393	/*
1394	1394

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -113,11 +113,11 @@
113	}
114
115	/*
116	** Print details about the compared versions - possibly the working directory
117	** or the undo buffer. For check-ins, show hash and commit time.
118	**
119	** This is intended primarily to go into the "header garbage" that is ignored
120	** by patch(1).
121	**
122	** zFrom and zTo are interpreted as symbolic version names, unless they
123	** start with '(', in which case they are printed directly.
	@@ -218,11 +218,11 @@
218
219
220	/*
221	** Default header texts for diff with --webpage
222	*/
223	static const char zWebpageHdr[] =
224	@ <!DOCTYPE html>
225	@ <html>
226	@ <head>
227	@ <meta charset="UTF-8">
228	@ <style>
	@@ -342,16 +342,16 @@
342	@ }
343	@ td.difftxt ins > ins {
344	@ background-color: #559855;
345	@ }
346	@ }
347	@
348	@ </style>
349	@ </head>
350	@ <body>
351	;
352	static const char zWebpageHdrDark[] =
353	@ <!DOCTYPE html>
354	@ <html>
355	@ <head>
356	@ <meta charset="UTF-8">
357	@ <style>
	@@ -360,11 +360,11 @@
360	@ color: #ffffff;
361	@ }
362	@ h1 {
363	@ font-size: 150%;
364	@ }
365	@
366	@ table.diff {
367	@ width: 100%;
368	@ border-spacing: 0;
369	@ border: 1px solid black;
370	@ line-height: inherit;
	@@ -448,16 +448,16 @@
448	@ td.difftxt ins > ins.edit {
449	@ background-color: #c0c0ff;
450	@ text-decoration: none;
451	@ font-weight: bold;
452	@ }
453	@
454	@ </style>
455	@ </head>
456	@ <body>
457	;
458	const char zWebpageEnd[] =
459	@ </body>
460	@ </html>
461	;
462
463	/*
	@@ -516,20 +516,20 @@
516	#else
517	SetConsoleCtrlHandler(diff_console_ctrl_handler, TRUE);
518	#endif
519	}
520	if( (pCfg->diffFlags & DIFF_WEBPAGE)!=0 ){
521	fossil_print("%s",(pCfg->diffFlags & DIFF_DARKMODE)!=0 ? zWebpageHdrDark :
522	zWebpageHdr);
523	fflush(stdout);
524	}
525	}
526
527	/* Do any final output required by a diff and complete the diff
528	** process.
529	**
530	** For --browser and --webpage, output any javascript required by
531	** the diff. (Currently JS is only needed for side-by-side diffs).
532	**
533	** For --browser, close the connection to the temporary file, then
534	** launch a web browser to view the file. After a delay
535	** of FOSSIL_BROWSER_DIFF_DELAY milliseconds, delete the temp file.
	@@ -947,11 +947,11 @@
947	Blob content;
948	db_prepare(&q, "SELECT pathname, content FROM undo");
949	blob_init(&content, 0, 0);
950	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
951	diff_print_versions("(undo)", "(workdir)", pCfg);
952	}
953	while( db_step(&q)==SQLITE_ROW ){
954	char *zFullName;
955	const char zFile = (const char)db_column_text(&q, 0);
956	if( !file_dir_match(pFileDir, zFile) ) continue;
957	zFullName = mprintf("%s%s", g.zLocalRoot, zFile);
	@@ -1034,11 +1034,11 @@
1034	pTo = manifest_get_by_name(zTo, 0);
1035	manifest_file_rewind(pTo);
1036	pToFile = manifest_file_next(pTo,0);
1037	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
1038	diff_print_versions(zFrom, zTo, pCfg);
1039	}
1040	while( pFromFile \|\| pToFile ){
1041	int cmp;
1042	if( pFromFile==0 ){
1043	cmp = +1;
1044	}else if( pToFile==0 ){
	@@ -1383,11 +1383,11 @@
1383	}
1384	fossil_free(pFileDir);
1385	}
1386	diff_end(&DCfg, 0);
1387	if ( DCfg.diffFlags & DIFF_NUMSTAT ){
1388	fossil_print("%10d %10d TOTAL over %d changed files\n",
1389	g.diffCnt[1], g.diffCnt[2], g.diffCnt[0]);
1390	}
1391	}
1392
1393	/*
1394

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -113,11 +113,11 @@
113	}
114
115	/*
116	** Print details about the compared versions - possibly the working directory
117	** or the undo buffer. For check-ins, show hash and commit time.
118	**
119	** This is intended primarily to go into the "header garbage" that is ignored
120	** by patch(1).
121	**
122	** zFrom and zTo are interpreted as symbolic version names, unless they
123	** start with '(', in which case they are printed directly.
	@@ -218,11 +218,11 @@
218
219
220	/*
221	** Default header texts for diff with --webpage
222	*/
223	static const char zWebpageHdr[] =
224	@ <!DOCTYPE html>
225	@ <html>
226	@ <head>
227	@ <meta charset="UTF-8">
228	@ <style>
	@@ -342,16 +342,16 @@
342	@ }
343	@ td.difftxt ins > ins {
344	@ background-color: #559855;
345	@ }
346	@ }
347	@
348	@ </style>
349	@ </head>
350	@ <body>
351	;
352	static const char zWebpageHdrDark[] =
353	@ <!DOCTYPE html>
354	@ <html>
355	@ <head>
356	@ <meta charset="UTF-8">
357	@ <style>
	@@ -360,11 +360,11 @@
360	@ color: #ffffff;
361	@ }
362	@ h1 {
363	@ font-size: 150%;
364	@ }
365	@
366	@ table.diff {
367	@ width: 100%;
368	@ border-spacing: 0;
369	@ border: 1px solid black;
370	@ line-height: inherit;
	@@ -448,16 +448,16 @@
448	@ td.difftxt ins > ins.edit {
449	@ background-color: #c0c0ff;
450	@ text-decoration: none;
451	@ font-weight: bold;
452	@ }
453	@
454	@ </style>
455	@ </head>
456	@ <body>
457	;
458	const char zWebpageEnd[] =
459	@ </body>
460	@ </html>
461	;
462
463	/*
	@@ -516,20 +516,20 @@
516	#else
517	SetConsoleCtrlHandler(diff_console_ctrl_handler, TRUE);
518	#endif
519	}
520	if( (pCfg->diffFlags & DIFF_WEBPAGE)!=0 ){
521	fossil_print("%s",(pCfg->diffFlags & DIFF_DARKMODE)!=0 ? zWebpageHdrDark :
522	zWebpageHdr);
523	fflush(stdout);
524	}
525	}
526
527	/* Do any final output required by a diff and complete the diff
528	** process.
529	**
530	** For --browser and --webpage, output any javascript required by
531	** the diff. (Currently JS is only needed for side-by-side diffs).
532	**
533	** For --browser, close the connection to the temporary file, then
534	** launch a web browser to view the file. After a delay
535	** of FOSSIL_BROWSER_DIFF_DELAY milliseconds, delete the temp file.
	@@ -947,11 +947,11 @@
947	Blob content;
948	db_prepare(&q, "SELECT pathname, content FROM undo");
949	blob_init(&content, 0, 0);
950	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
951	diff_print_versions("(undo)", "(workdir)", pCfg);
952	}
953	while( db_step(&q)==SQLITE_ROW ){
954	char *zFullName;
955	const char zFile = (const char)db_column_text(&q, 0);
956	if( !file_dir_match(pFileDir, zFile) ) continue;
957	zFullName = mprintf("%s%s", g.zLocalRoot, zFile);
	@@ -1034,11 +1034,11 @@
1034	pTo = manifest_get_by_name(zTo, 0);
1035	manifest_file_rewind(pTo);
1036	pToFile = manifest_file_next(pTo,0);
1037	if( (pCfg->diffFlags & DIFF_SHOW_VERS)!=0 ){
1038	diff_print_versions(zFrom, zTo, pCfg);
1039	}
1040	while( pFromFile \|\| pToFile ){
1041	int cmp;
1042	if( pFromFile==0 ){
1043	cmp = +1;
1044	}else if( pToFile==0 ){
	@@ -1383,11 +1383,11 @@
1383	}
1384	fossil_free(pFileDir);
1385	}
1386	diff_end(&DCfg, 0);
1387	if ( DCfg.diffFlags & DIFF_NUMSTAT ){
1388	fossil_print("%10d %10d TOTAL over %d changed files\n",
1389	g.diffCnt[1], g.diffCnt[2], g.diffCnt[0]);
1390	}
1391	}
1392
1393	/*
1394

M src/dispatch.c

+14 -14

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -453,11 +453,11 @@
453	453	if( wantP ){
454	454	blob_append(pHtml,"<p>", 3);
455	455	wantP = 0;
456	456	}
457	457	blob_append(pHtml, "<ul>\n", 5);
458		- }else if( isDT
	458	+ }else if( isDT
459	459	\|\| zHelp[nIndent]=='-'
460	460	\|\| hasGap(zHelp+nIndent,i-nIndent) ){
461	461	iLevel++;
462	462	aIndent[iLevel] = nIndent;
463	463	azEnd[iLevel] = zEndDL;
		@@ -547,15 +547,15 @@
547	547	zHelp += i+2;
548	548	blob_append(pText, zHelp, x-3);
549	549	zHelp += x-1;
550	550	i = -1;
551	551	continue;
552		- }
	552	+ }
553	553	}
554	554	if( i>0 ){
555	555	blob_append(pText, zHelp, i);
556		- }
	556	+ }
557	557	}
558	558
559	559	/*
560	560	** Display help for all commands based on provided flags.
561	561	*/
		@@ -635,11 +635,11 @@
635	635	** Defaults to just the CLI commands. Specify --www to see only the
636	636	** web pages, or --everything to see both commands and pages.
637	637	**
638	638	** Options:
639	639	** -a\|--aliases Show aliases
640		-** -e\|--everything Show all commands and pages. Omit aliases to
	640	+** -e\|--everything Show all commands and pages. Omit aliases to
641	641	** avoid duplicates.
642	642	** -h\|--html Transform output to HTML
643	643	** -o\|--options Show global options
644	644	** -r\|--raw No output formatting
645	645	** -s\|--settings Show settings
		@@ -661,11 +661,11 @@
661	661	if( find_option("settings","s",0) ){
662	662	mask = CMDFLAG_SETTING;
663	663	}
664	664	if( find_option("aliases","a",0) ){
665	665	mask = CMDFLAG_ALIAS;
666		- }
	666	+ }
667	667	if( find_option("test","t",0) ){
668	668	mask \|= CMDFLAG_TEST;
669	669	}
670	670	display_all_help(mask, useHtml, rawOut);
671	671	}
		@@ -768,11 +768,11 @@
768	768	iFirst = FOSSIL_FIRST_CMD;
769	769	iLast = MX_COMMAND-1;
770	770	}
771	771
772	772	while( n<nArray ){
773		- bestScore = mxScore;
	773	+ bestScore = mxScore;
774	774	for(i=iFirst; i<=iLast; i++){
775	775	m = edit_distance(zIn, aCommand[i].zName);
776	776	if( m<mnScore ) continue;
777	777	if( m==mnScore ){
778	778	azArray[n++] = aCommand[i].zName;
		@@ -988,11 +988,11 @@
988	988	@ <dl>
989	989	/* Fill in help string buckets */
990	990	for(i=0; i<MX_COMMAND; i++){
991	991	if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
992	992	bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
993		- }
	993	+ }
994	994	for(i=0; i<MX_COMMAND; i++){
995	995	const char *zDesc;
996	996	unsigned int e = aCommand[i].eCmdFlags;
997	997	if( e & CMDFLAG_1ST_TIER ){
998	998	zDesc = "1st tier command";
		@@ -1040,11 +1040,11 @@
1040	1040	zDesc = "raw-content web page";
1041	1041	}else{
1042	1042	zDesc = "web page";
1043	1043	}
1044	1044	}
1045		-
	1045	+
1046	1046	@ <dt><big><b>%s(aCommand[bktHelp[aCommand[i].iHelp][j]].zName)</b>
1047	1047	@</big> (%s(zDesc))</dt>
1048	1048	}
1049	1049	@ <p><dd>
1050	1050	help_to_html(aCommand[i].zHelp, cgi_output_blob());
		@@ -1119,18 +1119,18 @@
1119	1119	** Documentation on universal command-line options.
1120	1120	*/
1121	1121	/* @-comment: # */
1122	1122	static const char zOptions[] =
1123	1123	@ Command-line options common to all commands:
1124		-@
	1124	+@
1125	1125	@ --args FILENAME Read additional arguments and options from FILENAME
1126	1126	@ --case-sensitive BOOL Set case sensitivity for file names
1127	1127	@ --cgitrace Active CGI tracing
1128		-@ --chdir PATH Change to PATH before performing any operations
	1128	+@ --chdir PATH Change to PATH before performing any operations
1129	1129	@ --comfmtflags VALUE Set comment formatting flags to VALUE
1130	1130	@ --comment-format VALUE Alias for --comfmtflags
1131		-@ --errorlog FILENAME Log errors to FILENAME
	1131	+@ --errorlog FILENAME Log errors to FILENAME
1132	1132	@ --help Show help on the command rather than running it
1133	1133	@ --httptrace Trace outbound HTTP requests
1134	1134	@ --localtime Display times using the local timezone
1135	1135	@ --nocgi Do not act as CGI
1136	1136	@ --no-th-hook Do not run TH1 hooks
		@@ -1488,15 +1488,15 @@
1488	1488	}
1489	1489
1490	1490	/*
1491	1491	** This method is called to "rewind" the helptextVtab_cursor object back
1492	1492	** to the first row of output. This method is always called at least
1493		-** once prior to any call to helptextVtabColumn() or helptextVtabRowid() or
	1493	+** once prior to any call to helptextVtabColumn() or helptextVtabRowid() or
1494	1494	** helptextVtabEof().
1495	1495	*/
1496	1496	static int helptextVtabFilter(
1497		- sqlite3_vtab_cursor *pVtabCursor,
	1497	+ sqlite3_vtab_cursor *pVtabCursor,
1498	1498	int idxNum, const char *idxStr,
1499	1499	int argc, sqlite3_value **argv
1500	1500	){
1501	1501	helptextVtab_cursor pCur = (helptextVtab_cursor )pVtabCursor;
1502	1502	pCur->iRowid = 1;
		@@ -1517,11 +1517,11 @@
1517	1517	pIdxInfo->estimatedRows = MX_COMMAND;
1518	1518	return SQLITE_OK;
1519	1519	}
1520	1520
1521	1521	/*
1522		-** This following structure defines all the methods for the
	1522	+** This following structure defines all the methods for the
1523	1523	** virtual table.
1524	1524	*/
1525	1525	static sqlite3_module helptextVtabModule = {
1526	1526	/* iVersion */ 0,
1527	1527	/* xCreate / 0, / Helptext is eponymous and read-only */
1528	1528

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -453,11 +453,11 @@
453	if( wantP ){
454	blob_append(pHtml,"<p>", 3);
455	wantP = 0;
456	}
457	blob_append(pHtml, "<ul>\n", 5);
458	}else if( isDT
459	\|\| zHelp[nIndent]=='-'
460	\|\| hasGap(zHelp+nIndent,i-nIndent) ){
461	iLevel++;
462	aIndent[iLevel] = nIndent;
463	azEnd[iLevel] = zEndDL;
	@@ -547,15 +547,15 @@
547	zHelp += i+2;
548	blob_append(pText, zHelp, x-3);
549	zHelp += x-1;
550	i = -1;
551	continue;
552	}
553	}
554	if( i>0 ){
555	blob_append(pText, zHelp, i);
556	}
557	}
558
559	/*
560	** Display help for all commands based on provided flags.
561	*/
	@@ -635,11 +635,11 @@
635	** Defaults to just the CLI commands. Specify --www to see only the
636	** web pages, or --everything to see both commands and pages.
637	**
638	** Options:
639	** -a\|--aliases Show aliases
640	** -e\|--everything Show all commands and pages. Omit aliases to
641	** avoid duplicates.
642	** -h\|--html Transform output to HTML
643	** -o\|--options Show global options
644	** -r\|--raw No output formatting
645	** -s\|--settings Show settings
	@@ -661,11 +661,11 @@
661	if( find_option("settings","s",0) ){
662	mask = CMDFLAG_SETTING;
663	}
664	if( find_option("aliases","a",0) ){
665	mask = CMDFLAG_ALIAS;
666	}
667	if( find_option("test","t",0) ){
668	mask \|= CMDFLAG_TEST;
669	}
670	display_all_help(mask, useHtml, rawOut);
671	}
	@@ -768,11 +768,11 @@
768	iFirst = FOSSIL_FIRST_CMD;
769	iLast = MX_COMMAND-1;
770	}
771
772	while( n<nArray ){
773	bestScore = mxScore;
774	for(i=iFirst; i<=iLast; i++){
775	m = edit_distance(zIn, aCommand[i].zName);
776	if( m<mnScore ) continue;
777	if( m==mnScore ){
778	azArray[n++] = aCommand[i].zName;
	@@ -988,11 +988,11 @@
988	@ <dl>
989	/* Fill in help string buckets */
990	for(i=0; i<MX_COMMAND; i++){
991	if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
992	bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
993	}
994	for(i=0; i<MX_COMMAND; i++){
995	const char *zDesc;
996	unsigned int e = aCommand[i].eCmdFlags;
997	if( e & CMDFLAG_1ST_TIER ){
998	zDesc = "1st tier command";
	@@ -1040,11 +1040,11 @@
1040	zDesc = "raw-content web page";
1041	}else{
1042	zDesc = "web page";
1043	}
1044	}
1045
1046	@ <dt><big><b>%s(aCommand[bktHelp[aCommand[i].iHelp][j]].zName)</b>
1047	@</big> (%s(zDesc))</dt>
1048	}
1049	@ <p><dd>
1050	help_to_html(aCommand[i].zHelp, cgi_output_blob());
	@@ -1119,18 +1119,18 @@
1119	** Documentation on universal command-line options.
1120	*/
1121	/* @-comment: # */
1122	static const char zOptions[] =
1123	@ Command-line options common to all commands:
1124	@
1125	@ --args FILENAME Read additional arguments and options from FILENAME
1126	@ --case-sensitive BOOL Set case sensitivity for file names
1127	@ --cgitrace Active CGI tracing
1128	@ --chdir PATH Change to PATH before performing any operations
1129	@ --comfmtflags VALUE Set comment formatting flags to VALUE
1130	@ --comment-format VALUE Alias for --comfmtflags
1131	@ --errorlog FILENAME Log errors to FILENAME
1132	@ --help Show help on the command rather than running it
1133	@ --httptrace Trace outbound HTTP requests
1134	@ --localtime Display times using the local timezone
1135	@ --nocgi Do not act as CGI
1136	@ --no-th-hook Do not run TH1 hooks
	@@ -1488,15 +1488,15 @@
1488	}
1489
1490	/*
1491	** This method is called to "rewind" the helptextVtab_cursor object back
1492	** to the first row of output. This method is always called at least
1493	** once prior to any call to helptextVtabColumn() or helptextVtabRowid() or
1494	** helptextVtabEof().
1495	*/
1496	static int helptextVtabFilter(
1497	sqlite3_vtab_cursor *pVtabCursor,
1498	int idxNum, const char *idxStr,
1499	int argc, sqlite3_value **argv
1500	){
1501	helptextVtab_cursor pCur = (helptextVtab_cursor )pVtabCursor;
1502	pCur->iRowid = 1;
	@@ -1517,11 +1517,11 @@
1517	pIdxInfo->estimatedRows = MX_COMMAND;
1518	return SQLITE_OK;
1519	}
1520
1521	/*
1522	** This following structure defines all the methods for the
1523	** virtual table.
1524	*/
1525	static sqlite3_module helptextVtabModule = {
1526	/* iVersion */ 0,
1527	/* xCreate / 0, / Helptext is eponymous and read-only */
1528

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -453,11 +453,11 @@
453	if( wantP ){
454	blob_append(pHtml,"<p>", 3);
455	wantP = 0;
456	}
457	blob_append(pHtml, "<ul>\n", 5);
458	}else if( isDT
459	\|\| zHelp[nIndent]=='-'
460	\|\| hasGap(zHelp+nIndent,i-nIndent) ){
461	iLevel++;
462	aIndent[iLevel] = nIndent;
463	azEnd[iLevel] = zEndDL;
	@@ -547,15 +547,15 @@
547	zHelp += i+2;
548	blob_append(pText, zHelp, x-3);
549	zHelp += x-1;
550	i = -1;
551	continue;
552	}
553	}
554	if( i>0 ){
555	blob_append(pText, zHelp, i);
556	}
557	}
558
559	/*
560	** Display help for all commands based on provided flags.
561	*/
	@@ -635,11 +635,11 @@
635	** Defaults to just the CLI commands. Specify --www to see only the
636	** web pages, or --everything to see both commands and pages.
637	**
638	** Options:
639	** -a\|--aliases Show aliases
640	** -e\|--everything Show all commands and pages. Omit aliases to
641	** avoid duplicates.
642	** -h\|--html Transform output to HTML
643	** -o\|--options Show global options
644	** -r\|--raw No output formatting
645	** -s\|--settings Show settings
	@@ -661,11 +661,11 @@
661	if( find_option("settings","s",0) ){
662	mask = CMDFLAG_SETTING;
663	}
664	if( find_option("aliases","a",0) ){
665	mask = CMDFLAG_ALIAS;
666	}
667	if( find_option("test","t",0) ){
668	mask \|= CMDFLAG_TEST;
669	}
670	display_all_help(mask, useHtml, rawOut);
671	}
	@@ -768,11 +768,11 @@
768	iFirst = FOSSIL_FIRST_CMD;
769	iLast = MX_COMMAND-1;
770	}
771
772	while( n<nArray ){
773	bestScore = mxScore;
774	for(i=iFirst; i<=iLast; i++){
775	m = edit_distance(zIn, aCommand[i].zName);
776	if( m<mnScore ) continue;
777	if( m==mnScore ){
778	azArray[n++] = aCommand[i].zName;
	@@ -988,11 +988,11 @@
988	@ <dl>
989	/* Fill in help string buckets */
990	for(i=0; i<MX_COMMAND; i++){
991	if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
992	bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
993	}
994	for(i=0; i<MX_COMMAND; i++){
995	const char *zDesc;
996	unsigned int e = aCommand[i].eCmdFlags;
997	if( e & CMDFLAG_1ST_TIER ){
998	zDesc = "1st tier command";
	@@ -1040,11 +1040,11 @@
1040	zDesc = "raw-content web page";
1041	}else{
1042	zDesc = "web page";
1043	}
1044	}
1045
1046	@ <dt><big><b>%s(aCommand[bktHelp[aCommand[i].iHelp][j]].zName)</b>
1047	@</big> (%s(zDesc))</dt>
1048	}
1049	@ <p><dd>
1050	help_to_html(aCommand[i].zHelp, cgi_output_blob());
	@@ -1119,18 +1119,18 @@
1119	** Documentation on universal command-line options.
1120	*/
1121	/* @-comment: # */
1122	static const char zOptions[] =
1123	@ Command-line options common to all commands:
1124	@
1125	@ --args FILENAME Read additional arguments and options from FILENAME
1126	@ --case-sensitive BOOL Set case sensitivity for file names
1127	@ --cgitrace Active CGI tracing
1128	@ --chdir PATH Change to PATH before performing any operations
1129	@ --comfmtflags VALUE Set comment formatting flags to VALUE
1130	@ --comment-format VALUE Alias for --comfmtflags
1131	@ --errorlog FILENAME Log errors to FILENAME
1132	@ --help Show help on the command rather than running it
1133	@ --httptrace Trace outbound HTTP requests
1134	@ --localtime Display times using the local timezone
1135	@ --nocgi Do not act as CGI
1136	@ --no-th-hook Do not run TH1 hooks
	@@ -1488,15 +1488,15 @@
1488	}
1489
1490	/*
1491	** This method is called to "rewind" the helptextVtab_cursor object back
1492	** to the first row of output. This method is always called at least
1493	** once prior to any call to helptextVtabColumn() or helptextVtabRowid() or
1494	** helptextVtabEof().
1495	*/
1496	static int helptextVtabFilter(
1497	sqlite3_vtab_cursor *pVtabCursor,
1498	int idxNum, const char *idxStr,
1499	int argc, sqlite3_value **argv
1500	){
1501	helptextVtab_cursor pCur = (helptextVtab_cursor )pVtabCursor;
1502	pCur->iRowid = 1;
	@@ -1517,11 +1517,11 @@
1517	pIdxInfo->estimatedRows = MX_COMMAND;
1518	return SQLITE_OK;
1519	}
1520
1521	/*
1522	** This following structure defines all the methods for the
1523	** virtual table.
1524	*/
1525	static sqlite3_module helptextVtabModule = {
1526	/* iVersion */ 0,
1527	/* xCreate / 0, / Helptext is eponymous and read-only */
1528

M src/doc.c

+4 -4

		--- src/doc.c
		+++ src/doc.c
		@@ -341,11 +341,11 @@
341	341	static int once = 0;
342	342	char * z;
343	343	int tokenizerState /* 0=expecting a key, 1=skip next token,
344	344	** 2=accept next token */;
345	345	if(once==0){
346		- once = 1;
	346	+ once = 1;
347	347	zList = db_get("mimetypes",0);
348	348	if(zList==0){
349	349	return 0;
350	350	}
351	351	/* Transform zList to simplify the main loop:
		@@ -729,13 +729,13 @@
729	729	**
730	730	** href="$ROOT/..."
731	731	** action="$ROOT/..."
732	732	** href=".../doc/$CURRENT/..."
733	733	**
734		-** Convert $ROOT to the root URI of the repository, and $CURRENT to the
	734	+** Convert $ROOT to the root URI of the repository, and $CURRENT to the
735	735	** version number of the /doc/ document currently being displayed (if any).
736		-** Allow ' in place of " and any case for href or action.
	736	+** Allow ' in place of " and any case for href or action.
737	737	**
738	738	** Efforts are made to limit this translation to cases where the text is
739	739	** fully contained with an HTML markup element.
740	740	*/
741	741	void convert_href_and_output(Blob *pIn){
		@@ -1211,11 +1211,11 @@
1211	1211	** command. For a permanent website, the recommended process is for
1212	1212	** the admin to set up a project-specific icon and reference that icon
1213	1213	** in the HTML header using a line like:
1214	1214	**
1215	1215	** <link rel="icon" href="URL-FOR-YOUR-ICON" type="MIMETYPE"/>
1216		-**
	1216	+**
1217	1217	*/
1218	1218	void favicon_page(void){
1219	1219	Blob icon;
1220	1220	char *zMime;
1221	1221
1222	1222

	--- src/doc.c
	+++ src/doc.c
	@@ -341,11 +341,11 @@
341	static int once = 0;
342	char * z;
343	int tokenizerState /* 0=expecting a key, 1=skip next token,
344	** 2=accept next token */;
345	if(once==0){
346	once = 1;
347	zList = db_get("mimetypes",0);
348	if(zList==0){
349	return 0;
350	}
351	/* Transform zList to simplify the main loop:
	@@ -729,13 +729,13 @@
729	**
730	** href="$ROOT/..."
731	** action="$ROOT/..."
732	** href=".../doc/$CURRENT/..."
733	**
734	** Convert $ROOT to the root URI of the repository, and $CURRENT to the
735	** version number of the /doc/ document currently being displayed (if any).
736	** Allow ' in place of " and any case for href or action.
737	**
738	** Efforts are made to limit this translation to cases where the text is
739	** fully contained with an HTML markup element.
740	*/
741	void convert_href_and_output(Blob *pIn){
	@@ -1211,11 +1211,11 @@
1211	** command. For a permanent website, the recommended process is for
1212	** the admin to set up a project-specific icon and reference that icon
1213	** in the HTML header using a line like:
1214	**
1215	** <link rel="icon" href="URL-FOR-YOUR-ICON" type="MIMETYPE"/>
1216	**
1217	*/
1218	void favicon_page(void){
1219	Blob icon;
1220	char *zMime;
1221
1222

	--- src/doc.c
	+++ src/doc.c
	@@ -341,11 +341,11 @@
341	static int once = 0;
342	char * z;
343	int tokenizerState /* 0=expecting a key, 1=skip next token,
344	** 2=accept next token */;
345	if(once==0){
346	once = 1;
347	zList = db_get("mimetypes",0);
348	if(zList==0){
349	return 0;
350	}
351	/* Transform zList to simplify the main loop:
	@@ -729,13 +729,13 @@
729	**
730	** href="$ROOT/..."
731	** action="$ROOT/..."
732	** href=".../doc/$CURRENT/..."
733	**
734	** Convert $ROOT to the root URI of the repository, and $CURRENT to the
735	** version number of the /doc/ document currently being displayed (if any).
736	** Allow ' in place of " and any case for href or action.
737	**
738	** Efforts are made to limit this translation to cases where the text is
739	** fully contained with an HTML markup element.
740	*/
741	void convert_href_and_output(Blob *pIn){
	@@ -1211,11 +1211,11 @@
1211	** command. For a permanent website, the recommended process is for
1212	** the admin to set up a project-specific icon and reference that icon
1213	** in the HTML header using a line like:
1214	**
1215	** <link rel="icon" href="URL-FOR-YOUR-ICON" type="MIMETYPE"/>
1216	**
1217	*/
1218	void favicon_page(void){
1219	Blob icon;
1220	char *zMime;
1221
1222

M src/etag.c

+4 -4

		--- src/etag.c
		+++ src/etag.c
		@@ -100,18 +100,18 @@
100	100
101	101	if( etagCancelled ) return;
102	102
103	103	/* By default, ETagged URLs never expire since the ETag will change
104	104	* when the content changes. Approximate this policy as 10 years. */
105		- iMaxAge = 10 * 365 * 24 * 60 * 60;
	105	+ iMaxAge = 10 * 365 * 24 * 60 * 60;
106	106	md5sum_init();
107	107
108	108	/* Always include the executable ID as part of the hash */
109	109	md5sum_step_text("exe-id: ", -1);
110	110	md5sum_step_text(fossil_exe_id(), -1);
111	111	md5sum_step_text("\n", 1);
112		-
	112	+
113	113	if( (eFlags & ETAG_HASH)!=0 && zHash ){
114	114	md5sum_step_text("hash: ", -1);
115	115	md5sum_step_text(zHash, -1);
116	116	md5sum_step_text("\n", 1);
117	117	iMaxAge = 0;
		@@ -210,11 +210,11 @@
210	210	zIfModifiedSince = P("HTTP_IF_MODIFIED_SINCE");
211	211	if( zIfModifiedSince==0 ) return;
212	212	x = cgi_rfc822_parsedate(zIfModifiedSince);
213	213	if( x<mtime ) return;
214	214
215		-#if 0
	215	+#if 0
216	216	/* If the Fossil executable is more recent than If-Modified-Since,
217	217	** go ahead and regenerate the resource. */
218	218	if( file_mtime(g.nameOfExe, ExtFILE)>x ) return;
219	219	#endif
220	220
		@@ -244,11 +244,11 @@
244	244	*/
245	245	sqlite3_int64 etag_mtime(void){
246	246	return iEtagMtime;
247	247	}
248	248
249		-/*
	249	+/*
250	250	** COMMAND: test-etag
251	251	**
252	252	** Usage: fossil test-etag -key KEY-NUMBER -hash HASH
253	253	**
254	254	** Generate an etag given a KEY-NUMBER and/or a HASH.
255	255

	--- src/etag.c
	+++ src/etag.c
	@@ -100,18 +100,18 @@
100
101	if( etagCancelled ) return;
102
103	/* By default, ETagged URLs never expire since the ETag will change
104	* when the content changes. Approximate this policy as 10 years. */
105	iMaxAge = 10 * 365 * 24 * 60 * 60;
106	md5sum_init();
107
108	/* Always include the executable ID as part of the hash */
109	md5sum_step_text("exe-id: ", -1);
110	md5sum_step_text(fossil_exe_id(), -1);
111	md5sum_step_text("\n", 1);
112
113	if( (eFlags & ETAG_HASH)!=0 && zHash ){
114	md5sum_step_text("hash: ", -1);
115	md5sum_step_text(zHash, -1);
116	md5sum_step_text("\n", 1);
117	iMaxAge = 0;
	@@ -210,11 +210,11 @@
210	zIfModifiedSince = P("HTTP_IF_MODIFIED_SINCE");
211	if( zIfModifiedSince==0 ) return;
212	x = cgi_rfc822_parsedate(zIfModifiedSince);
213	if( x<mtime ) return;
214
215	#if 0
216	/* If the Fossil executable is more recent than If-Modified-Since,
217	** go ahead and regenerate the resource. */
218	if( file_mtime(g.nameOfExe, ExtFILE)>x ) return;
219	#endif
220
	@@ -244,11 +244,11 @@
244	*/
245	sqlite3_int64 etag_mtime(void){
246	return iEtagMtime;
247	}
248
249	/*
250	** COMMAND: test-etag
251	**
252	** Usage: fossil test-etag -key KEY-NUMBER -hash HASH
253	**
254	** Generate an etag given a KEY-NUMBER and/or a HASH.
255

	--- src/etag.c
	+++ src/etag.c
	@@ -100,18 +100,18 @@
100
101	if( etagCancelled ) return;
102
103	/* By default, ETagged URLs never expire since the ETag will change
104	* when the content changes. Approximate this policy as 10 years. */
105	iMaxAge = 10 * 365 * 24 * 60 * 60;
106	md5sum_init();
107
108	/* Always include the executable ID as part of the hash */
109	md5sum_step_text("exe-id: ", -1);
110	md5sum_step_text(fossil_exe_id(), -1);
111	md5sum_step_text("\n", 1);
112
113	if( (eFlags & ETAG_HASH)!=0 && zHash ){
114	md5sum_step_text("hash: ", -1);
115	md5sum_step_text(zHash, -1);
116	md5sum_step_text("\n", 1);
117	iMaxAge = 0;
	@@ -210,11 +210,11 @@
210	zIfModifiedSince = P("HTTP_IF_MODIFIED_SINCE");
211	if( zIfModifiedSince==0 ) return;
212	x = cgi_rfc822_parsedate(zIfModifiedSince);
213	if( x<mtime ) return;
214
215	#if 0
216	/* If the Fossil executable is more recent than If-Modified-Since,
217	** go ahead and regenerate the resource. */
218	if( file_mtime(g.nameOfExe, ExtFILE)>x ) return;
219	#endif
220
	@@ -244,11 +244,11 @@
244	*/
245	sqlite3_int64 etag_mtime(void){
246	return iEtagMtime;
247	}
248
249	/*
250	** COMMAND: test-etag
251	**
252	** Usage: fossil test-etag -key KEY-NUMBER -hash HASH
253	**
254	** Generate an etag given a KEY-NUMBER and/or a HASH.
255

M src/export.c

+8 -8

		--- src/export.c
		+++ src/export.c
		@@ -449,11 +449,11 @@
449	449	}
450	450	}
451	451
452	452	/* This is the original header command (and hence documentation) for
453	453	** the "fossil export" command:
454		-**
	454	+**
455	455	** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
456	456	**
457	457	** Write an export of all check-ins to standard output. The export is
458	458	** written in the git-fast-export file format assuming the --git option is
459	459	** provided. The git-fast-export format is currently the only VCS
		@@ -1004,11 +1004,11 @@
1004	1004	db_reset(&sIns);
1005	1005	return mprintf(":%d", db_last_insert_rowid());
1006	1006	}
1007	1007
1008	1008	/* This is the SHA3-256 hash of an empty file */
1009		-static const char zEmptySha3[] =
	1009	+static const char zEmptySha3[] =
1010	1010	"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a";
1011	1011
1012	1012	/*
1013	1013	** Export a single file named by zUuid.
1014	1014	**
		@@ -1037,11 +1037,11 @@
1037	1037	if( rc==0 ){
1038	1038	if( bPhantomOk ){
1039	1039	blob_init(&data, 0, 0);
1040	1040	gitmirror_message(VERB_EXTRA, "missing file: %s\n", zUuid);
1041	1041	zUuid = zEmptySha3;
1042		- }else{
	1042	+ }else{
1043	1043	return 1;
1044	1044	}
1045	1045	}
1046	1046	}
1047	1047	zMark = gitmirror_find_mark(zUuid, 1, 1);
		@@ -1350,11 +1350,11 @@
1350	1350	gitmirror_message(VERB_NORMAL, "%s\n", zCmd);
1351	1351	xCmd = popen(zCmd, "r");
1352	1352	if( xCmd==0 ){
1353	1353	fossil_fatal("git command failed: %s", zCmd);
1354	1354	}
1355		-
	1355	+
1356	1356	z = fgets(zLine, sizeof(zLine), xCmd);
1357	1357	pclose(xCmd);
1358	1358	if( z==0 ){
1359	1359	fossil_fatal("no output from \"%s\"", zCmd);
1360	1360	}
		@@ -1361,11 +1361,11 @@
1361	1361	for(i=0; z[i] && !fossil_isspace(z[i]); i++){}
1362	1362	z[i] = 0;
1363	1363	zMainBr = fossil_strdup(z);
1364	1364	}
1365	1365	return zMainBr;
1366		-}
	1366	+}
1367	1367
1368	1368	/*
1369	1369	** Implementation of the "fossil git export" command.
1370	1370	*/
1371	1371	void gitmirror_export_command(void){
		@@ -1436,11 +1436,11 @@
1436	1436	if( !file_isdir(z, ExtFILE) ){
1437	1437	zMainBr = gitmirror_init(zMirror, zMainBr);
1438	1438	bNeedRepack = 1;
1439	1439	}
1440	1440	fossil_free(z);
1441		-
	1441	+
1442	1442	/* Make sure the .mirror_state subdirectory exists */
1443	1443	z = mprintf("%s/.mirror_state", zMirror);
1444	1444	rc = file_mkdir(z, ExtFILE, 0);
1445	1445	if( rc ) fossil_fatal("cannot create directory \"%s\"", z);
1446	1446	fossil_free(z);
		@@ -1743,11 +1743,11 @@
1743	1743	int bByAll = 0; /* Undocumented option meaning this command was invoked
1744	1744	** from "fossil all" and should modify output accordingly */
1745	1745
1746	1746	db_find_and_open_repository(0, 0);
1747	1747	bQuiet = find_option("quiet","q",0)!=0;
1748		- bByAll = find_option("by-all",0,0)!=0;
	1748	+ bByAll = find_option("by-all",0,0)!=0;
1749	1749	verify_all_options();
1750	1750	zMirror = db_get("last-git-export-repo", 0);
1751	1751	if( zMirror==0 ){
1752	1752	if( bQuiet ) return;
1753	1753	if( bByAll ) return;
		@@ -1856,11 +1856,11 @@
1856	1856	** -q\|--quiet Reduce output. Repeat for even less output.
1857	1857	** -v\|--verbose More output
1858	1858	**
1859	1859	** > fossil git import MIRROR
1860	1860	**
1861		-** TBD...
	1861	+** TBD...
1862	1862	**
1863	1863	** > fossil git status
1864	1864	**
1865	1865	** Show the status of the current Git mirror, if there is one.
1866	1866	**
1867	1867

	--- src/export.c
	+++ src/export.c
	@@ -449,11 +449,11 @@
449	}
450	}
451
452	/* This is the original header command (and hence documentation) for
453	** the "fossil export" command:
454	**
455	** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
456	**
457	** Write an export of all check-ins to standard output. The export is
458	** written in the git-fast-export file format assuming the --git option is
459	** provided. The git-fast-export format is currently the only VCS
	@@ -1004,11 +1004,11 @@
1004	db_reset(&sIns);
1005	return mprintf(":%d", db_last_insert_rowid());
1006	}
1007
1008	/* This is the SHA3-256 hash of an empty file */
1009	static const char zEmptySha3[] =
1010	"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a";
1011
1012	/*
1013	** Export a single file named by zUuid.
1014	**
	@@ -1037,11 +1037,11 @@
1037	if( rc==0 ){
1038	if( bPhantomOk ){
1039	blob_init(&data, 0, 0);
1040	gitmirror_message(VERB_EXTRA, "missing file: %s\n", zUuid);
1041	zUuid = zEmptySha3;
1042	}else{
1043	return 1;
1044	}
1045	}
1046	}
1047	zMark = gitmirror_find_mark(zUuid, 1, 1);
	@@ -1350,11 +1350,11 @@
1350	gitmirror_message(VERB_NORMAL, "%s\n", zCmd);
1351	xCmd = popen(zCmd, "r");
1352	if( xCmd==0 ){
1353	fossil_fatal("git command failed: %s", zCmd);
1354	}
1355
1356	z = fgets(zLine, sizeof(zLine), xCmd);
1357	pclose(xCmd);
1358	if( z==0 ){
1359	fossil_fatal("no output from \"%s\"", zCmd);
1360	}
	@@ -1361,11 +1361,11 @@
1361	for(i=0; z[i] && !fossil_isspace(z[i]); i++){}
1362	z[i] = 0;
1363	zMainBr = fossil_strdup(z);
1364	}
1365	return zMainBr;
1366	}
1367
1368	/*
1369	** Implementation of the "fossil git export" command.
1370	*/
1371	void gitmirror_export_command(void){
	@@ -1436,11 +1436,11 @@
1436	if( !file_isdir(z, ExtFILE) ){
1437	zMainBr = gitmirror_init(zMirror, zMainBr);
1438	bNeedRepack = 1;
1439	}
1440	fossil_free(z);
1441
1442	/* Make sure the .mirror_state subdirectory exists */
1443	z = mprintf("%s/.mirror_state", zMirror);
1444	rc = file_mkdir(z, ExtFILE, 0);
1445	if( rc ) fossil_fatal("cannot create directory \"%s\"", z);
1446	fossil_free(z);
	@@ -1743,11 +1743,11 @@
1743	int bByAll = 0; /* Undocumented option meaning this command was invoked
1744	** from "fossil all" and should modify output accordingly */
1745
1746	db_find_and_open_repository(0, 0);
1747	bQuiet = find_option("quiet","q",0)!=0;
1748	bByAll = find_option("by-all",0,0)!=0;
1749	verify_all_options();
1750	zMirror = db_get("last-git-export-repo", 0);
1751	if( zMirror==0 ){
1752	if( bQuiet ) return;
1753	if( bByAll ) return;
	@@ -1856,11 +1856,11 @@
1856	** -q\|--quiet Reduce output. Repeat for even less output.
1857	** -v\|--verbose More output
1858	**
1859	** > fossil git import MIRROR
1860	**
1861	** TBD...
1862	**
1863	** > fossil git status
1864	**
1865	** Show the status of the current Git mirror, if there is one.
1866	**
1867

	--- src/export.c
	+++ src/export.c
	@@ -449,11 +449,11 @@
449	}
450	}
451
452	/* This is the original header command (and hence documentation) for
453	** the "fossil export" command:
454	**
455	** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
456	**
457	** Write an export of all check-ins to standard output. The export is
458	** written in the git-fast-export file format assuming the --git option is
459	** provided. The git-fast-export format is currently the only VCS
	@@ -1004,11 +1004,11 @@
1004	db_reset(&sIns);
1005	return mprintf(":%d", db_last_insert_rowid());
1006	}
1007
1008	/* This is the SHA3-256 hash of an empty file */
1009	static const char zEmptySha3[] =
1010	"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a";
1011
1012	/*
1013	** Export a single file named by zUuid.
1014	**
	@@ -1037,11 +1037,11 @@
1037	if( rc==0 ){
1038	if( bPhantomOk ){
1039	blob_init(&data, 0, 0);
1040	gitmirror_message(VERB_EXTRA, "missing file: %s\n", zUuid);
1041	zUuid = zEmptySha3;
1042	}else{
1043	return 1;
1044	}
1045	}
1046	}
1047	zMark = gitmirror_find_mark(zUuid, 1, 1);
	@@ -1350,11 +1350,11 @@
1350	gitmirror_message(VERB_NORMAL, "%s\n", zCmd);
1351	xCmd = popen(zCmd, "r");
1352	if( xCmd==0 ){
1353	fossil_fatal("git command failed: %s", zCmd);
1354	}
1355
1356	z = fgets(zLine, sizeof(zLine), xCmd);
1357	pclose(xCmd);
1358	if( z==0 ){
1359	fossil_fatal("no output from \"%s\"", zCmd);
1360	}
	@@ -1361,11 +1361,11 @@
1361	for(i=0; z[i] && !fossil_isspace(z[i]); i++){}
1362	z[i] = 0;
1363	zMainBr = fossil_strdup(z);
1364	}
1365	return zMainBr;
1366	}
1367
1368	/*
1369	** Implementation of the "fossil git export" command.
1370	*/
1371	void gitmirror_export_command(void){
	@@ -1436,11 +1436,11 @@
1436	if( !file_isdir(z, ExtFILE) ){
1437	zMainBr = gitmirror_init(zMirror, zMainBr);
1438	bNeedRepack = 1;
1439	}
1440	fossil_free(z);
1441
1442	/* Make sure the .mirror_state subdirectory exists */
1443	z = mprintf("%s/.mirror_state", zMirror);
1444	rc = file_mkdir(z, ExtFILE, 0);
1445	if( rc ) fossil_fatal("cannot create directory \"%s\"", z);
1446	fossil_free(z);
	@@ -1743,11 +1743,11 @@
1743	int bByAll = 0; /* Undocumented option meaning this command was invoked
1744	** from "fossil all" and should modify output accordingly */
1745
1746	db_find_and_open_repository(0, 0);
1747	bQuiet = find_option("quiet","q",0)!=0;
1748	bByAll = find_option("by-all",0,0)!=0;
1749	verify_all_options();
1750	zMirror = db_get("last-git-export-repo", 0);
1751	if( zMirror==0 ){
1752	if( bQuiet ) return;
1753	if( bByAll ) return;
	@@ -1856,11 +1856,11 @@
1856	** -q\|--quiet Reduce output. Repeat for even less output.
1857	** -v\|--verbose More output
1858	**
1859	** > fossil git import MIRROR
1860	**
1861	** TBD...
1862	**
1863	** > fossil git status
1864	**
1865	** Show the status of the current Git mirror, if there is one.
1866	**
1867

M src/fileedit.c

+9 -9

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -436,11 +436,11 @@
436	436	** This function validates pCI's state and fails if any validation
437	437	** fails.
438	438	**
439	439	** On error, returns false (0) and, if pErr is not NULL, writes a
440	440	** diagnostic message there.
441		-**
	441	+**
442	442	** Returns true on success. If pRid is not NULL, the RID of the
443	443	** resulting manifest is written to *pRid.
444	444	**
445	445	** The check-in process is largely influenced by pCI->flags, and that
446	446	** must be populated before calling this. See the fossil_cimini_flags
		@@ -981,11 +981,11 @@
981	981	const char * zFilename,
982	982	int * frid){
983	983	char * zFileUuid = 0; /* file content UUID */
984	984	const int checkFile = zFilename!=0 \|\| frid!=0;
985	985	int vid = 0;
986		-
	986	+
987	987	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
988	988	return 0;
989	989	}
990	990	vid = symbolic_name_to_rid(zRev, "ci");
991	991	if(0==vid){
		@@ -1176,11 +1176,11 @@
1176	1176	*/
1177	1177	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1178	1178	int * bIsMissingArg){
1179	1179	char * zFileUuid = 0; /* UUID of file content */
1180	1180	const char * zFlag; /* generic flag */
1181		- int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
	1181	+ int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
1182	1182
1183	1183	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1184	1184	zFlag = PD("filename",P("fn"));
1185	1185	if(zFlag==0 \|\| !*zFlag){
1186	1186	rc = 400;
		@@ -1371,11 +1371,11 @@
1371	1371	}
1372	1372	CX("%!j", zFilename);
1373	1373	}
1374	1374	}
1375	1375	db_finalize(&q);
1376		- CX("]}");
	1376	+ CX("]}");
1377	1377	}
1378	1378
1379	1379	/*
1380	1380	** AJAX route /fileedit?ajax=filelist
1381	1381	**
		@@ -1427,11 +1427,11 @@
1427	1427
1428	1428	/*
1429	1429	** AJAX route /fileedit?ajax=commit
1430	1430	**
1431	1431	** Required query parameters:
1432		-**
	1432	+**
1433	1433	** filename=FILENAME
1434	1434	** checkin=Parent check-in UUID
1435	1435	** content=text
1436	1436	** comment=non-empty text
1437	1437	**
		@@ -1441,11 +1441,11 @@
1441	1441	**
1442	1442	** dry_run=int (1 or 0)
1443	1443	**
1444	1444	** include_manifest=int (1 or 0), whether to include
1445	1445	** the generated manifest in the response.
1446		-**
	1446	+**
1447	1447	**
1448	1448	** User must have Write permissions to use this page.
1449	1449	**
1450	1450	** Responds with JSON (with some state repeated
1451	1451	** from the input in order to avoid certain race conditions
		@@ -1577,11 +1577,11 @@
1577	1577	** Which additional parameters are used by each distinct ajax route
1578	1578	** is an internal implementation detail and may change with any
1579	1579	** given build of this code. An unknown "name" value triggers an
1580	1580	** error, as documented for ajax_route_error().
1581	1581	*/
1582		-
	1582	+
1583	1583	/* Allow no access to this page without check-in privilege */
1584	1584	login_check_credentials();
1585	1585	if( !g.perm.Write ){
1586	1586	if(zAjax!=0){
1587	1587	ajax_route_error(403, "Write permissions required.");
		@@ -1670,11 +1670,11 @@
1670	1670	** whatever CSS we wish...
1671	1671	*/
1672	1672	style_script_begin(__FILE__,__LINE__);
1673	1673	CX("document.body.classList.add('fileedit');\n");
1674	1674	style_script_end();
1675		-
	1675	+
1676	1676	/* Status bar */
1677	1677	CX("<div id='fossil-status-bar' "
1678	1678	"title='Status message area. Double-click to clear them.'>"
1679	1679	"Status messages will go here.</div>\n"
1680	1680	/* will be moved into the tab container via JS */);
		@@ -1939,11 +1939,11 @@
1939	1939	"Comment style:",
1940	1940	"Specify how fossil will interpret the "
1941	1941	"comment string.",
1942	1942	NULL,
1943	1943	"Fossil", "text/x-fossil-wiki",
1944		- "Markdown", "text/x-markdown",
	1944	+ "Markdown", "text/x-markdown",
1945	1945	"Plain text", "text/plain",
1946	1946	NULL);
1947	1947	CX("</div>\n");
1948	1948	}
1949	1949	CX("<div class='fileedit-hint flex-container flex-row'>"
1950	1950

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -436,11 +436,11 @@
436	** This function validates pCI's state and fails if any validation
437	** fails.
438	**
439	** On error, returns false (0) and, if pErr is not NULL, writes a
440	** diagnostic message there.
441	**
442	** Returns true on success. If pRid is not NULL, the RID of the
443	** resulting manifest is written to *pRid.
444	**
445	** The check-in process is largely influenced by pCI->flags, and that
446	** must be populated before calling this. See the fossil_cimini_flags
	@@ -981,11 +981,11 @@
981	const char * zFilename,
982	int * frid){
983	char * zFileUuid = 0; /* file content UUID */
984	const int checkFile = zFilename!=0 \|\| frid!=0;
985	int vid = 0;
986
987	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
988	return 0;
989	}
990	vid = symbolic_name_to_rid(zRev, "ci");
991	if(0==vid){
	@@ -1176,11 +1176,11 @@
1176	*/
1177	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1178	int * bIsMissingArg){
1179	char * zFileUuid = 0; /* UUID of file content */
1180	const char * zFlag; /* generic flag */
1181	int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
1182
1183	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1184	zFlag = PD("filename",P("fn"));
1185	if(zFlag==0 \|\| !*zFlag){
1186	rc = 400;
	@@ -1371,11 +1371,11 @@
1371	}
1372	CX("%!j", zFilename);
1373	}
1374	}
1375	db_finalize(&q);
1376	CX("]}");
1377	}
1378
1379	/*
1380	** AJAX route /fileedit?ajax=filelist
1381	**
	@@ -1427,11 +1427,11 @@
1427
1428	/*
1429	** AJAX route /fileedit?ajax=commit
1430	**
1431	** Required query parameters:
1432	**
1433	** filename=FILENAME
1434	** checkin=Parent check-in UUID
1435	** content=text
1436	** comment=non-empty text
1437	**
	@@ -1441,11 +1441,11 @@
1441	**
1442	** dry_run=int (1 or 0)
1443	**
1444	** include_manifest=int (1 or 0), whether to include
1445	** the generated manifest in the response.
1446	**
1447	**
1448	** User must have Write permissions to use this page.
1449	**
1450	** Responds with JSON (with some state repeated
1451	** from the input in order to avoid certain race conditions
	@@ -1577,11 +1577,11 @@
1577	** Which additional parameters are used by each distinct ajax route
1578	** is an internal implementation detail and may change with any
1579	** given build of this code. An unknown "name" value triggers an
1580	** error, as documented for ajax_route_error().
1581	*/
1582
1583	/* Allow no access to this page without check-in privilege */
1584	login_check_credentials();
1585	if( !g.perm.Write ){
1586	if(zAjax!=0){
1587	ajax_route_error(403, "Write permissions required.");
	@@ -1670,11 +1670,11 @@
1670	** whatever CSS we wish...
1671	*/
1672	style_script_begin(__FILE__,__LINE__);
1673	CX("document.body.classList.add('fileedit');\n");
1674	style_script_end();
1675
1676	/* Status bar */
1677	CX("<div id='fossil-status-bar' "
1678	"title='Status message area. Double-click to clear them.'>"
1679	"Status messages will go here.</div>\n"
1680	/* will be moved into the tab container via JS */);
	@@ -1939,11 +1939,11 @@
1939	"Comment style:",
1940	"Specify how fossil will interpret the "
1941	"comment string.",
1942	NULL,
1943	"Fossil", "text/x-fossil-wiki",
1944	"Markdown", "text/x-markdown",
1945	"Plain text", "text/plain",
1946	NULL);
1947	CX("</div>\n");
1948	}
1949	CX("<div class='fileedit-hint flex-container flex-row'>"
1950

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -436,11 +436,11 @@
436	** This function validates pCI's state and fails if any validation
437	** fails.
438	**
439	** On error, returns false (0) and, if pErr is not NULL, writes a
440	** diagnostic message there.
441	**
442	** Returns true on success. If pRid is not NULL, the RID of the
443	** resulting manifest is written to *pRid.
444	**
445	** The check-in process is largely influenced by pCI->flags, and that
446	** must be populated before calling this. See the fossil_cimini_flags
	@@ -981,11 +981,11 @@
981	const char * zFilename,
982	int * frid){
983	char * zFileUuid = 0; /* file content UUID */
984	const int checkFile = zFilename!=0 \|\| frid!=0;
985	int vid = 0;
986
987	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
988	return 0;
989	}
990	vid = symbolic_name_to_rid(zRev, "ci");
991	if(0==vid){
	@@ -1176,11 +1176,11 @@
1176	*/
1177	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1178	int * bIsMissingArg){
1179	char * zFileUuid = 0; /* UUID of file content */
1180	const char * zFlag; /* generic flag */
1181	int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
1182
1183	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1184	zFlag = PD("filename",P("fn"));
1185	if(zFlag==0 \|\| !*zFlag){
1186	rc = 400;
	@@ -1371,11 +1371,11 @@
1371	}
1372	CX("%!j", zFilename);
1373	}
1374	}
1375	db_finalize(&q);
1376	CX("]}");
1377	}
1378
1379	/*
1380	** AJAX route /fileedit?ajax=filelist
1381	**
	@@ -1427,11 +1427,11 @@
1427
1428	/*
1429	** AJAX route /fileedit?ajax=commit
1430	**
1431	** Required query parameters:
1432	**
1433	** filename=FILENAME
1434	** checkin=Parent check-in UUID
1435	** content=text
1436	** comment=non-empty text
1437	**
	@@ -1441,11 +1441,11 @@
1441	**
1442	** dry_run=int (1 or 0)
1443	**
1444	** include_manifest=int (1 or 0), whether to include
1445	** the generated manifest in the response.
1446	**
1447	**
1448	** User must have Write permissions to use this page.
1449	**
1450	** Responds with JSON (with some state repeated
1451	** from the input in order to avoid certain race conditions
	@@ -1577,11 +1577,11 @@
1577	** Which additional parameters are used by each distinct ajax route
1578	** is an internal implementation detail and may change with any
1579	** given build of this code. An unknown "name" value triggers an
1580	** error, as documented for ajax_route_error().
1581	*/
1582
1583	/* Allow no access to this page without check-in privilege */
1584	login_check_credentials();
1585	if( !g.perm.Write ){
1586	if(zAjax!=0){
1587	ajax_route_error(403, "Write permissions required.");
	@@ -1670,11 +1670,11 @@
1670	** whatever CSS we wish...
1671	*/
1672	style_script_begin(__FILE__,__LINE__);
1673	CX("document.body.classList.add('fileedit');\n");
1674	style_script_end();
1675
1676	/* Status bar */
1677	CX("<div id='fossil-status-bar' "
1678	"title='Status message area. Double-click to clear them.'>"
1679	"Status messages will go here.</div>\n"
1680	/* will be moved into the tab container via JS */);
	@@ -1939,11 +1939,11 @@
1939	"Comment style:",
1940	"Specify how fossil will interpret the "
1941	"comment string.",
1942	NULL,
1943	"Fossil", "text/x-fossil-wiki",
1944	"Markdown", "text/x-markdown",
1945	"Plain text", "text/plain",
1946	NULL);
1947	CX("</div>\n");
1948	}
1949	CX("<div class='fileedit-hint flex-container flex-row'>"
1950

M src/graph.c

+4 -4

		--- src/graph.c
		+++ src/graph.c
		@@ -311,11 +311,11 @@
311	311	if( dist<iBestDist ){
312	312	iBestDist = dist;
313	313	iBest = i;
314	314	}
315	315	}
316		-
	316	+
317	317	/* If no match, consider all possible rails */
318	318	if( iBestDist>1000 ){
319	319	for(i=0; i<=p->mxRail+1; i++){
320	320	int dist;
321	321	if( inUseMask & BIT(i) ) continue;
		@@ -539,11 +539,11 @@
539	539	if( (tmFlags & (TIMELINE_DISJOINT\|TIMELINE_XMERGE))!=0 ){
540	540	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
541	541	for(i=1; i<pRow->nParent; i++){
542	542	GraphRow *pParent = hashFind(p, pRow->aParent[i]);
543	543	if( pParent==0 ){
544		- memmove(pRow->aParent+i, pRow->aParent+i+1,
	544	+ memmove(pRow->aParent+i, pRow->aParent+i+1,
545	545	sizeof(pRow->aParent[0])*(pRow->nParent-i-1));
546	546	pRow->nParent--;
547	547	if( i<pRow->nNonCherrypick ){
548	548	pRow->nNonCherrypick--;
549	549	}else{
		@@ -552,11 +552,11 @@
552	552	i--;
553	553	}
554	554	}
555	555	}
556	556	}
557		-
	557	+
558	558	/* Put the deepest (earliest) merge parent first in the list.
559	559	** An off-screen merge parent is considered deepest.
560	560	*/
561	561	for(pRow=p->pFirst; pRow; pRow=pRow->pNext ){
562	562	if( pRow->nParent<=1 ) continue;
		@@ -940,11 +940,11 @@
940	940	** branch directly above its parent. */
941	941	continue;
942	942	}
943	943
944	944	/* All clear. Make the translation
945		- */
	945	+ */
946	946	for(pLoop=pRow; pLoop && pLoop->idx<=pBottom->idx; pLoop=pLoop->pNext){
947	947	if( pLoop->iRail==iFrom ){
948	948	pLoop->iRail = iTo;
949	949	pLoop->aiRiser[iTo] = pLoop->aiRiser[iFrom];
950	950	pLoop->aiRiser[iFrom] = -1;
951	951

	--- src/graph.c
	+++ src/graph.c
	@@ -311,11 +311,11 @@
311	if( dist<iBestDist ){
312	iBestDist = dist;
313	iBest = i;
314	}
315	}
316
317	/* If no match, consider all possible rails */
318	if( iBestDist>1000 ){
319	for(i=0; i<=p->mxRail+1; i++){
320	int dist;
321	if( inUseMask & BIT(i) ) continue;
	@@ -539,11 +539,11 @@
539	if( (tmFlags & (TIMELINE_DISJOINT\|TIMELINE_XMERGE))!=0 ){
540	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
541	for(i=1; i<pRow->nParent; i++){
542	GraphRow *pParent = hashFind(p, pRow->aParent[i]);
543	if( pParent==0 ){
544	memmove(pRow->aParent+i, pRow->aParent+i+1,
545	sizeof(pRow->aParent[0])*(pRow->nParent-i-1));
546	pRow->nParent--;
547	if( i<pRow->nNonCherrypick ){
548	pRow->nNonCherrypick--;
549	}else{
	@@ -552,11 +552,11 @@
552	i--;
553	}
554	}
555	}
556	}
557
558	/* Put the deepest (earliest) merge parent first in the list.
559	** An off-screen merge parent is considered deepest.
560	*/
561	for(pRow=p->pFirst; pRow; pRow=pRow->pNext ){
562	if( pRow->nParent<=1 ) continue;
	@@ -940,11 +940,11 @@
940	** branch directly above its parent. */
941	continue;
942	}
943
944	/* All clear. Make the translation
945	*/
946	for(pLoop=pRow; pLoop && pLoop->idx<=pBottom->idx; pLoop=pLoop->pNext){
947	if( pLoop->iRail==iFrom ){
948	pLoop->iRail = iTo;
949	pLoop->aiRiser[iTo] = pLoop->aiRiser[iFrom];
950	pLoop->aiRiser[iFrom] = -1;
951

	--- src/graph.c
	+++ src/graph.c
	@@ -311,11 +311,11 @@
311	if( dist<iBestDist ){
312	iBestDist = dist;
313	iBest = i;
314	}
315	}
316
317	/* If no match, consider all possible rails */
318	if( iBestDist>1000 ){
319	for(i=0; i<=p->mxRail+1; i++){
320	int dist;
321	if( inUseMask & BIT(i) ) continue;
	@@ -539,11 +539,11 @@
539	if( (tmFlags & (TIMELINE_DISJOINT\|TIMELINE_XMERGE))!=0 ){
540	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
541	for(i=1; i<pRow->nParent; i++){
542	GraphRow *pParent = hashFind(p, pRow->aParent[i]);
543	if( pParent==0 ){
544	memmove(pRow->aParent+i, pRow->aParent+i+1,
545	sizeof(pRow->aParent[0])*(pRow->nParent-i-1));
546	pRow->nParent--;
547	if( i<pRow->nNonCherrypick ){
548	pRow->nNonCherrypick--;
549	}else{
	@@ -552,11 +552,11 @@
552	i--;
553	}
554	}
555	}
556	}
557
558	/* Put the deepest (earliest) merge parent first in the list.
559	** An off-screen merge parent is considered deepest.
560	*/
561	for(pRow=p->pFirst; pRow; pRow=pRow->pNext ){
562	if( pRow->nParent<=1 ) continue;
	@@ -940,11 +940,11 @@
940	** branch directly above its parent. */
941	continue;
942	}
943
944	/* All clear. Make the translation
945	*/
946	for(pLoop=pRow; pLoop && pLoop->idx<=pBottom->idx; pLoop=pLoop->pNext){
947	if( pLoop->iRail==iFrom ){
948	pLoop->iRail = iTo;
949	pLoop->aiRiser[iTo] = pLoop->aiRiser[iFrom];
950	pLoop->aiRiser[iFrom] = -1;
951

M src/http.c

+3 -3

		--- src/http.c
		+++ src/http.c
		@@ -98,11 +98,11 @@
98	98	**
99	99	** We assume that a hexadecimal string of exactly 40 characters is a
100	100	** SHA1 hash, not an original password. If a user has a password which
101	101	** just happens to be a 40-character hex string, then this routine won't
102	102	** be able to distinguish it from a hash, the translation will not be
103		- ** performed, and the sync won't work.
	103	+ ** performed, and the sync won't work.
104	104	*/
105	105	if( zPw && zPw[0] && (strlen(zPw)!=40 \|\| !validate16(zPw,40)) ){
106	106	const char *zProjectCode = 0;
107	107	if( g.url.flags & URL_USE_PARENT ){
108	108	zProjectCode = db_get("parent-project-code", 0);
		@@ -258,20 +258,20 @@
258	258	fossil_print("RUN %s\n", zCmd);
259	259	}
260	260	rc = fossil_system(zCmd);
261	261	if( rc ){
262	262	fossil_warning("Transport command failed: %s\n", zCmd);
263		- }
	263	+ }
264	264	fossil_free(zCmd);
265	265	file_delete(zUplink);
266	266	if( file_size(zDownlink, ExtFILE)<0 ){
267	267	blob_zero(pReply);
268	268	}else{
269	269	blob_read_from_file(pReply, zDownlink, ExtFILE);
270	270	file_delete(zDownlink);
271	271	}
272		- return rc;
	272	+ return rc;
273	273	}
274	274
275	275	/*
276	276	** Sign the content in pSend, compress it, and send it to the server
277	277	** via HTTP or HTTPS. Get a reply, uncompress the reply, and store the reply
278	278

	--- src/http.c
	+++ src/http.c
	@@ -98,11 +98,11 @@
98	**
99	** We assume that a hexadecimal string of exactly 40 characters is a
100	** SHA1 hash, not an original password. If a user has a password which
101	** just happens to be a 40-character hex string, then this routine won't
102	** be able to distinguish it from a hash, the translation will not be
103	** performed, and the sync won't work.
104	*/
105	if( zPw && zPw[0] && (strlen(zPw)!=40 \|\| !validate16(zPw,40)) ){
106	const char *zProjectCode = 0;
107	if( g.url.flags & URL_USE_PARENT ){
108	zProjectCode = db_get("parent-project-code", 0);
	@@ -258,20 +258,20 @@
258	fossil_print("RUN %s\n", zCmd);
259	}
260	rc = fossil_system(zCmd);
261	if( rc ){
262	fossil_warning("Transport command failed: %s\n", zCmd);
263	}
264	fossil_free(zCmd);
265	file_delete(zUplink);
266	if( file_size(zDownlink, ExtFILE)<0 ){
267	blob_zero(pReply);
268	}else{
269	blob_read_from_file(pReply, zDownlink, ExtFILE);
270	file_delete(zDownlink);
271	}
272	return rc;
273	}
274
275	/*
276	** Sign the content in pSend, compress it, and send it to the server
277	** via HTTP or HTTPS. Get a reply, uncompress the reply, and store the reply
278

	--- src/http.c
	+++ src/http.c
	@@ -98,11 +98,11 @@
98	**
99	** We assume that a hexadecimal string of exactly 40 characters is a
100	** SHA1 hash, not an original password. If a user has a password which
101	** just happens to be a 40-character hex string, then this routine won't
102	** be able to distinguish it from a hash, the translation will not be
103	** performed, and the sync won't work.
104	*/
105	if( zPw && zPw[0] && (strlen(zPw)!=40 \|\| !validate16(zPw,40)) ){
106	const char *zProjectCode = 0;
107	if( g.url.flags & URL_USE_PARENT ){
108	zProjectCode = db_get("parent-project-code", 0);
	@@ -258,20 +258,20 @@
258	fossil_print("RUN %s\n", zCmd);
259	}
260	rc = fossil_system(zCmd);
261	if( rc ){
262	fossil_warning("Transport command failed: %s\n", zCmd);
263	}
264	fossil_free(zCmd);
265	file_delete(zUplink);
266	if( file_size(zDownlink, ExtFILE)<0 ){
267	blob_zero(pReply);
268	}else{
269	blob_read_from_file(pReply, zDownlink, ExtFILE);
270	file_delete(zDownlink);
271	}
272	return rc;
273	}
274
275	/*
276	** Sign the content in pSend, compress it, and send it to the server
277	** via HTTP or HTTPS. Get a reply, uncompress the reply, and store the reply
278

M src/http_ssl.c

+7 -7

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -59,11 +59,11 @@
59	59
60	60
61	61	/* This is a self-signed cert in the PEM format that can be used when
62	62	** no other certs are available.
63	63	*/
64		-static const char sslSelfCert[] =
	64	+static const char sslSelfCert[] =
65	65	"-----BEGIN CERTIFICATE-----\n"
66	66	"MIIDMTCCAhkCFGrDmuJkkzWERP/ITBvzwwI2lv0TMA0GCSqGSIb3DQEBCwUAMFQx\n"
67	67	"CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzESMBAGA1UEBwwJQ2hhcmxvdHRlMRMw\n"
68	68	"EQYDVQQKDApGb3NzaWwtU0NNMQ8wDQYDVQQDDAZGb3NzaWwwIBcNMjExMjI3MTEz\n"
69	69	"MTU2WhgPMjEyMTEyMjcxMTMxNTZaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJO\n"
		@@ -83,11 +83,11 @@
83	83	"s/TsrXk=\n"
84	84	"-----END CERTIFICATE-----\n";
85	85
86	86	/* This is the private-key corresponding to the cert above
87	87	*/
88		-static const char sslSelfPKey[] =
	88	+static const char sslSelfPKey[] =
89	89	"-----BEGIN PRIVATE KEY-----\n"
90	90	"MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCCbTU26GRQHQqL\n"
91	91	"q7vyZ0OxpAxmgfAKCxt6eIz+jBi2ZM/CB5vVXWVh2+SkSiWEA3UZiUqXxZlzmS/C\n"
92	92	"glZdiwLLDJML8B4OiV72oivFH/vJ7+cbvh1dTxnYiHuww7GfQngPrLfefiIYPDk1\n"
93	93	"GTUJHBQ7Ue477F7F8vKuHdVgwktF/JDM6M60aSqlo2D/oysirrb+dlurTlv0rjsY\n"
		@@ -206,11 +206,11 @@
206	206	}
207	207
208	208	/*
209	209	** Convert an OpenSSL ASN1_TIME to an ISO8601 timestamp.
210	210	**
211		-** Per RFC 5280, ASN1 timestamps in X.509 certificates must
	211	+** Per RFC 5280, ASN1 timestamps in X.509 certificates must
212	212	** be in UTC (Zulu timezone) with no fractional seconds.
213	213	**
214	214	** If showUtc==1, add " UTC" at the end of the returned string. This is
215	215	** not ISO8601-compliant, but makes the displayed value more user-friendly.
216	216	*/
		@@ -412,11 +412,11 @@
412	412	** be accepted. Communication will still be encrypted, but the
413	413	** client has no way of knowing whether it is talking to the
414	414	** real server or a man-in-the-middle imposter.
415	415	*/
416	416	void ssl_disable_cert_verification(void){
417		- sslNoCertVerify = 1;
	417	+ sslNoCertVerify = 1;
418	418	}
419	419
420	420	/*
421	421	** Open an SSL connection as a client that is to connect to the server
422	422	** identified by pUrlData.
		@@ -565,16 +565,16 @@
565	565	ssl_asn1time_to_iso8601(X509_get_notBefore(cert), 1));
566	566	BIO_printf(mem, "\n notAfter: %s",
567	567	ssl_asn1time_to_iso8601(X509_get_notAfter(cert), 1));
568	568	BIO_printf(mem, "\n sha256: %s", zHash);
569	569	desclen = BIO_get_mem_data(mem, &desc);
570		-
	570	+
571	571	prompt = mprintf("Unable to verify SSL cert from %s\n%.*s\n"
572	572	"accept this cert and continue (y/N/fingerprint)? ",
573	573	pUrlData->name, desclen, desc);
574	574	BIO_free(mem);
575		-
	575	+
576	576	prompt_user(prompt, &ans);
577	577	free(prompt);
578	578	cReply = blob_str(&ans)[0];
579	579	if( cReply!='y' && cReply!='Y'
580	580	&& fossil_stricmp(blob_str(&ans),zHash)!=0
		@@ -1185,12 +1185,12 @@
1185	1185	** Return the OpenSSL version number being used. Space to hold
1186	1186	** this name is obtained from fossil_malloc() and should be
1187	1187	** freed by the caller.
1188	1188	*/
1189	1189	char *fossil_openssl_version(void){
1190		-#if defined(FOSSIL_ENABLE_SSL)
	1190	+#if defined(FOSSIL_ENABLE_SSL)
1191	1191	return mprintf("%s (0x%09x)\n",
1192	1192	SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_NUMBER);
1193	1193	#else
1194	1194	return mprintf("none");
1195	1195	#endif
1196	1196	}
1197	1197

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -59,11 +59,11 @@
59
60
61	/* This is a self-signed cert in the PEM format that can be used when
62	** no other certs are available.
63	*/
64	static const char sslSelfCert[] =
65	"-----BEGIN CERTIFICATE-----\n"
66	"MIIDMTCCAhkCFGrDmuJkkzWERP/ITBvzwwI2lv0TMA0GCSqGSIb3DQEBCwUAMFQx\n"
67	"CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzESMBAGA1UEBwwJQ2hhcmxvdHRlMRMw\n"
68	"EQYDVQQKDApGb3NzaWwtU0NNMQ8wDQYDVQQDDAZGb3NzaWwwIBcNMjExMjI3MTEz\n"
69	"MTU2WhgPMjEyMTEyMjcxMTMxNTZaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJO\n"
	@@ -83,11 +83,11 @@
83	"s/TsrXk=\n"
84	"-----END CERTIFICATE-----\n";
85
86	/* This is the private-key corresponding to the cert above
87	*/
88	static const char sslSelfPKey[] =
89	"-----BEGIN PRIVATE KEY-----\n"
90	"MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCCbTU26GRQHQqL\n"
91	"q7vyZ0OxpAxmgfAKCxt6eIz+jBi2ZM/CB5vVXWVh2+SkSiWEA3UZiUqXxZlzmS/C\n"
92	"glZdiwLLDJML8B4OiV72oivFH/vJ7+cbvh1dTxnYiHuww7GfQngPrLfefiIYPDk1\n"
93	"GTUJHBQ7Ue477F7F8vKuHdVgwktF/JDM6M60aSqlo2D/oysirrb+dlurTlv0rjsY\n"
	@@ -206,11 +206,11 @@
206	}
207
208	/*
209	** Convert an OpenSSL ASN1_TIME to an ISO8601 timestamp.
210	**
211	** Per RFC 5280, ASN1 timestamps in X.509 certificates must
212	** be in UTC (Zulu timezone) with no fractional seconds.
213	**
214	** If showUtc==1, add " UTC" at the end of the returned string. This is
215	** not ISO8601-compliant, but makes the displayed value more user-friendly.
216	*/
	@@ -412,11 +412,11 @@
412	** be accepted. Communication will still be encrypted, but the
413	** client has no way of knowing whether it is talking to the
414	** real server or a man-in-the-middle imposter.
415	*/
416	void ssl_disable_cert_verification(void){
417	sslNoCertVerify = 1;
418	}
419
420	/*
421	** Open an SSL connection as a client that is to connect to the server
422	** identified by pUrlData.
	@@ -565,16 +565,16 @@
565	ssl_asn1time_to_iso8601(X509_get_notBefore(cert), 1));
566	BIO_printf(mem, "\n notAfter: %s",
567	ssl_asn1time_to_iso8601(X509_get_notAfter(cert), 1));
568	BIO_printf(mem, "\n sha256: %s", zHash);
569	desclen = BIO_get_mem_data(mem, &desc);
570
571	prompt = mprintf("Unable to verify SSL cert from %s\n%.*s\n"
572	"accept this cert and continue (y/N/fingerprint)? ",
573	pUrlData->name, desclen, desc);
574	BIO_free(mem);
575
576	prompt_user(prompt, &ans);
577	free(prompt);
578	cReply = blob_str(&ans)[0];
579	if( cReply!='y' && cReply!='Y'
580	&& fossil_stricmp(blob_str(&ans),zHash)!=0
	@@ -1185,12 +1185,12 @@
1185	** Return the OpenSSL version number being used. Space to hold
1186	** this name is obtained from fossil_malloc() and should be
1187	** freed by the caller.
1188	*/
1189	char *fossil_openssl_version(void){
1190	#if defined(FOSSIL_ENABLE_SSL)
1191	return mprintf("%s (0x%09x)\n",
1192	SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_NUMBER);
1193	#else
1194	return mprintf("none");
1195	#endif
1196	}
1197

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -59,11 +59,11 @@
59
60
61	/* This is a self-signed cert in the PEM format that can be used when
62	** no other certs are available.
63	*/
64	static const char sslSelfCert[] =
65	"-----BEGIN CERTIFICATE-----\n"
66	"MIIDMTCCAhkCFGrDmuJkkzWERP/ITBvzwwI2lv0TMA0GCSqGSIb3DQEBCwUAMFQx\n"
67	"CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzESMBAGA1UEBwwJQ2hhcmxvdHRlMRMw\n"
68	"EQYDVQQKDApGb3NzaWwtU0NNMQ8wDQYDVQQDDAZGb3NzaWwwIBcNMjExMjI3MTEz\n"
69	"MTU2WhgPMjEyMTEyMjcxMTMxNTZaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJO\n"
	@@ -83,11 +83,11 @@
83	"s/TsrXk=\n"
84	"-----END CERTIFICATE-----\n";
85
86	/* This is the private-key corresponding to the cert above
87	*/
88	static const char sslSelfPKey[] =
89	"-----BEGIN PRIVATE KEY-----\n"
90	"MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCCbTU26GRQHQqL\n"
91	"q7vyZ0OxpAxmgfAKCxt6eIz+jBi2ZM/CB5vVXWVh2+SkSiWEA3UZiUqXxZlzmS/C\n"
92	"glZdiwLLDJML8B4OiV72oivFH/vJ7+cbvh1dTxnYiHuww7GfQngPrLfefiIYPDk1\n"
93	"GTUJHBQ7Ue477F7F8vKuHdVgwktF/JDM6M60aSqlo2D/oysirrb+dlurTlv0rjsY\n"
	@@ -206,11 +206,11 @@
206	}
207
208	/*
209	** Convert an OpenSSL ASN1_TIME to an ISO8601 timestamp.
210	**
211	** Per RFC 5280, ASN1 timestamps in X.509 certificates must
212	** be in UTC (Zulu timezone) with no fractional seconds.
213	**
214	** If showUtc==1, add " UTC" at the end of the returned string. This is
215	** not ISO8601-compliant, but makes the displayed value more user-friendly.
216	*/
	@@ -412,11 +412,11 @@
412	** be accepted. Communication will still be encrypted, but the
413	** client has no way of knowing whether it is talking to the
414	** real server or a man-in-the-middle imposter.
415	*/
416	void ssl_disable_cert_verification(void){
417	sslNoCertVerify = 1;
418	}
419
420	/*
421	** Open an SSL connection as a client that is to connect to the server
422	** identified by pUrlData.
	@@ -565,16 +565,16 @@
565	ssl_asn1time_to_iso8601(X509_get_notBefore(cert), 1));
566	BIO_printf(mem, "\n notAfter: %s",
567	ssl_asn1time_to_iso8601(X509_get_notAfter(cert), 1));
568	BIO_printf(mem, "\n sha256: %s", zHash);
569	desclen = BIO_get_mem_data(mem, &desc);
570
571	prompt = mprintf("Unable to verify SSL cert from %s\n%.*s\n"
572	"accept this cert and continue (y/N/fingerprint)? ",
573	pUrlData->name, desclen, desc);
574	BIO_free(mem);
575
576	prompt_user(prompt, &ans);
577	free(prompt);
578	cReply = blob_str(&ans)[0];
579	if( cReply!='y' && cReply!='Y'
580	&& fossil_stricmp(blob_str(&ans),zHash)!=0
	@@ -1185,12 +1185,12 @@
1185	** Return the OpenSSL version number being used. Space to hold
1186	** this name is obtained from fossil_malloc() and should be
1187	** freed by the caller.
1188	*/
1189	char *fossil_openssl_version(void){
1190	#if defined(FOSSIL_ENABLE_SSL)
1191	return mprintf("%s (0x%09x)\n",
1192	SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_NUMBER);
1193	#else
1194	return mprintf("none");
1195	#endif
1196	}
1197

M src/import.c

+1 -1

		--- src/import.c
		+++ src/import.c
		@@ -817,11 +817,11 @@
817	817	if( strncmp(zLine, "N ", 2)==0 ){
818	818	/* No-op */
819	819	}else
820	820	if( strncmp(zLine, "property branch-nick ", 21)==0 ){
821	821	/* Breezy uses this property to store the branch name.
822		- ** It has two values. Integer branch number, then the
	822	+ ** It has two values. Integer branch number, then the
823	823	** user-readable branch name. */
824	824	z = &zLine[21];
825	825	next_token(&z);
826	826	fossil_free(gg.zBranch);
827	827	gg.zBranch = fossil_strdup(next_token(&z));
828	828

	--- src/import.c
	+++ src/import.c
	@@ -817,11 +817,11 @@
817	if( strncmp(zLine, "N ", 2)==0 ){
818	/* No-op */
819	}else
820	if( strncmp(zLine, "property branch-nick ", 21)==0 ){
821	/* Breezy uses this property to store the branch name.
822	** It has two values. Integer branch number, then the
823	** user-readable branch name. */
824	z = &zLine[21];
825	next_token(&z);
826	fossil_free(gg.zBranch);
827	gg.zBranch = fossil_strdup(next_token(&z));
828

	--- src/import.c
	+++ src/import.c
	@@ -817,11 +817,11 @@
817	if( strncmp(zLine, "N ", 2)==0 ){
818	/* No-op */
819	}else
820	if( strncmp(zLine, "property branch-nick ", 21)==0 ){
821	/* Breezy uses this property to store the branch name.
822	** It has two values. Integer branch number, then the
823	** user-readable branch name. */
824	z = &zLine[21];
825	next_token(&z);
826	fossil_free(gg.zBranch);
827	gg.zBranch = fossil_strdup(next_token(&z));
828

M src/info.c

+3 -3

		--- src/info.c
		+++ src/info.c
		@@ -2502,11 +2502,11 @@
2502	2502	page_tree();
2503	2503	return;
2504	2504	}
2505	2505	/* No directory found, look for an historic version of the file
2506	2506	** that was subsequently deleted. */
2507		- db_prepare(&q,
	2507	+ db_prepare(&q,
2508	2508	"SELECT fid, uuid FROM mlink, filename, event, blob"
2509	2509	" WHERE filename.name=%Q"
2510	2510	" AND mlink.fnid=filename.fnid AND mlink.fid>0"
2511	2511	" AND event.objid=mlink.mid"
2512	2512	" AND blob.rid=mlink.mid"
		@@ -2800,11 +2800,11 @@
2800	2800	if( strcmp(zModAction,"approve")==0 ){
2801	2801	moderation_approve('t', rid);
2802	2802	}
2803	2803	}
2804	2804	zTktTitle = db_table_has_column("repository", "ticket", "title" )
2805		- ? db_text("(No title)",
	2805	+ ? db_text("(No title)",
2806	2806	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2807	2807	: 0;
2808	2808	style_set_current_feature("tinfo");
2809	2809	style_header("Ticket Change Details");
2810	2810	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
		@@ -3832,11 +3832,11 @@
3832	3832	** If VERSION and the found ancestor refer to the same commit, the last two
3833	3833	** components are omitted, unless --long is provided. When no fitting tagged
3834	3834	** ancestor is found, show only the short hash of VERSION.
3835	3835	**
3836	3836	** Options:
3837		-** --digits Display so many hex digits of the hash
	3837	+** --digits Display so many hex digits of the hash
3838	3838	** (default: the larger of 6 and the 'hash-digit' setting)
3839	3839	** -d\|--dirty Show whether there are changes to be committed
3840	3840	** --long Always show all three components
3841	3841	** --match GLOB Consider only non-propagating tags matching GLOB
3842	3842	*/
3843	3843

	--- src/info.c
	+++ src/info.c
	@@ -2502,11 +2502,11 @@
2502	page_tree();
2503	return;
2504	}
2505	/* No directory found, look for an historic version of the file
2506	** that was subsequently deleted. */
2507	db_prepare(&q,
2508	"SELECT fid, uuid FROM mlink, filename, event, blob"
2509	" WHERE filename.name=%Q"
2510	" AND mlink.fnid=filename.fnid AND mlink.fid>0"
2511	" AND event.objid=mlink.mid"
2512	" AND blob.rid=mlink.mid"
	@@ -2800,11 +2800,11 @@
2800	if( strcmp(zModAction,"approve")==0 ){
2801	moderation_approve('t', rid);
2802	}
2803	}
2804	zTktTitle = db_table_has_column("repository", "ticket", "title" )
2805	? db_text("(No title)",
2806	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2807	: 0;
2808	style_set_current_feature("tinfo");
2809	style_header("Ticket Change Details");
2810	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
	@@ -3832,11 +3832,11 @@
3832	** If VERSION and the found ancestor refer to the same commit, the last two
3833	** components are omitted, unless --long is provided. When no fitting tagged
3834	** ancestor is found, show only the short hash of VERSION.
3835	**
3836	** Options:
3837	** --digits Display so many hex digits of the hash
3838	** (default: the larger of 6 and the 'hash-digit' setting)
3839	** -d\|--dirty Show whether there are changes to be committed
3840	** --long Always show all three components
3841	** --match GLOB Consider only non-propagating tags matching GLOB
3842	*/
3843

	--- src/info.c
	+++ src/info.c
	@@ -2502,11 +2502,11 @@
2502	page_tree();
2503	return;
2504	}
2505	/* No directory found, look for an historic version of the file
2506	** that was subsequently deleted. */
2507	db_prepare(&q,
2508	"SELECT fid, uuid FROM mlink, filename, event, blob"
2509	" WHERE filename.name=%Q"
2510	" AND mlink.fnid=filename.fnid AND mlink.fid>0"
2511	" AND event.objid=mlink.mid"
2512	" AND blob.rid=mlink.mid"
	@@ -2800,11 +2800,11 @@
2800	if( strcmp(zModAction,"approve")==0 ){
2801	moderation_approve('t', rid);
2802	}
2803	}
2804	zTktTitle = db_table_has_column("repository", "ticket", "title" )
2805	? db_text("(No title)",
2806	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2807	: 0;
2808	style_set_current_feature("tinfo");
2809	style_header("Ticket Change Details");
2810	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
	@@ -3832,11 +3832,11 @@
3832	** If VERSION and the found ancestor refer to the same commit, the last two
3833	** components are omitted, unless --long is provided. When no fitting tagged
3834	** ancestor is found, show only the short hash of VERSION.
3835	**
3836	** Options:
3837	** --digits Display so many hex digits of the hash
3838	** (default: the larger of 6 and the 'hash-digit' setting)
3839	** -d\|--dirty Show whether there are changes to be committed
3840	** --long Always show all three components
3841	** --match GLOB Consider only non-propagating tags matching GLOB
3842	*/
3843

M src/interwiki.c

+4 -4

		--- src/interwiki.c
		+++ src/interwiki.c
		@@ -45,14 +45,14 @@
45	45	** "base": Base URL for the remote site.
46	46	** "hash": Append this to "base" for Hash targets.
47	47	** "wiki": Append this to "base" for Wiki targets.
48	48	** }
49	49	**
50		-** If the remote wiki is Fossil, then the correct value for "hash"
	50	+** If the remote wiki is Fossil, then the correct value for "hash"
51	51	** is "/info/" and the correct value for "wiki" is "/wiki?name=".
52	52	** If (for example) Wikipedia is the remote, then "hash" should be
53		-** omitted and the correct value for "wiki" is "/wiki/".
	53	+** omitted and the correct value for "wiki" is "/wiki/".
54	54	**
55	55	** PageName is link name of the target wiki. Several different forms
56	56	** of PageName are recognized.
57	57	**
58	58	** Path If PageName is empty or begins with a "/" character, then
		@@ -82,11 +82,11 @@
82	82	if( zTarget[i]!=':' ) return 0;
83	83	nCode = i;
84	84	if( nCode==4 && strncmp(zTarget,"wiki",4)==0 ) return 0;
85	85	zPage = zTarget + nCode + 1;
86	86	nPage = (int)strlen(zPage);
87		- db_static_prepare(&q,
	87	+ db_static_prepare(&q,
88	88	"SELECT value->>'base', value->>'hash', value->>'wiki'"
89	89	" FROM config WHERE name=lower($name) AND json_valid(value)"
90	90	);
91	91	zName = mprintf("interwiki:%.*s", nCode, zTarget);
92	92	db_bind_text(&q, "$name", zName);
		@@ -222,11 +222,11 @@
222	222	db_begin_write();
223	223	db_unprotect(PROTECT_CONFIG);
224	224	for(i=3; i<g.argc; i++){
225	225	const char *zName = g.argv[i];
226	226	db_multi_exec(
227		- "DELETE FROM config WHERE name='interwiki:%q'",
	227	+ "DELETE FROM config WHERE name='interwiki:%q'",
228	228	zName
229	229	);
230	230	}
231	231	setup_incr_cfgcnt();
232	232	db_protect_pop();
233	233

	--- src/interwiki.c
	+++ src/interwiki.c
	@@ -45,14 +45,14 @@
45	** "base": Base URL for the remote site.
46	** "hash": Append this to "base" for Hash targets.
47	** "wiki": Append this to "base" for Wiki targets.
48	** }
49	**
50	** If the remote wiki is Fossil, then the correct value for "hash"
51	** is "/info/" and the correct value for "wiki" is "/wiki?name=".
52	** If (for example) Wikipedia is the remote, then "hash" should be
53	** omitted and the correct value for "wiki" is "/wiki/".
54	**
55	** PageName is link name of the target wiki. Several different forms
56	** of PageName are recognized.
57	**
58	** Path If PageName is empty or begins with a "/" character, then
	@@ -82,11 +82,11 @@
82	if( zTarget[i]!=':' ) return 0;
83	nCode = i;
84	if( nCode==4 && strncmp(zTarget,"wiki",4)==0 ) return 0;
85	zPage = zTarget + nCode + 1;
86	nPage = (int)strlen(zPage);
87	db_static_prepare(&q,
88	"SELECT value->>'base', value->>'hash', value->>'wiki'"
89	" FROM config WHERE name=lower($name) AND json_valid(value)"
90	);
91	zName = mprintf("interwiki:%.*s", nCode, zTarget);
92	db_bind_text(&q, "$name", zName);
	@@ -222,11 +222,11 @@
222	db_begin_write();
223	db_unprotect(PROTECT_CONFIG);
224	for(i=3; i<g.argc; i++){
225	const char *zName = g.argv[i];
226	db_multi_exec(
227	"DELETE FROM config WHERE name='interwiki:%q'",
228	zName
229	);
230	}
231	setup_incr_cfgcnt();
232	db_protect_pop();
233

	--- src/interwiki.c
	+++ src/interwiki.c
	@@ -45,14 +45,14 @@
45	** "base": Base URL for the remote site.
46	** "hash": Append this to "base" for Hash targets.
47	** "wiki": Append this to "base" for Wiki targets.
48	** }
49	**
50	** If the remote wiki is Fossil, then the correct value for "hash"
51	** is "/info/" and the correct value for "wiki" is "/wiki?name=".
52	** If (for example) Wikipedia is the remote, then "hash" should be
53	** omitted and the correct value for "wiki" is "/wiki/".
54	**
55	** PageName is link name of the target wiki. Several different forms
56	** of PageName are recognized.
57	**
58	** Path If PageName is empty or begins with a "/" character, then
	@@ -82,11 +82,11 @@
82	if( zTarget[i]!=':' ) return 0;
83	nCode = i;
84	if( nCode==4 && strncmp(zTarget,"wiki",4)==0 ) return 0;
85	zPage = zTarget + nCode + 1;
86	nPage = (int)strlen(zPage);
87	db_static_prepare(&q,
88	"SELECT value->>'base', value->>'hash', value->>'wiki'"
89	" FROM config WHERE name=lower($name) AND json_valid(value)"
90	);
91	zName = mprintf("interwiki:%.*s", nCode, zTarget);
92	db_bind_text(&q, "$name", zName);
	@@ -222,11 +222,11 @@
222	db_begin_write();
223	db_unprotect(PROTECT_CONFIG);
224	for(i=3; i<g.argc; i++){
225	const char *zName = g.argv[i];
226	db_multi_exec(
227	"DELETE FROM config WHERE name='interwiki:%q'",
228	zName
229	);
230	}
231	setup_incr_cfgcnt();
232	db_protect_pop();
233

M src/json.c

+5 -5

		--- src/json.c
		+++ src/json.c
		@@ -1299,11 +1299,11 @@
1299	1299	if(!g.json.cmd.a){
1300	1300	return NULL;
1301	1301	}else{
1302	1302	cson_value * rc = NULL;
1303	1303	Blob path = empty_blob;
1304		- unsigned int aLen = g.json.dispatchDepth+1;
	1304	+ unsigned int aLen = g.json.dispatchDepth+1;
1305	1305	/cson_array_length_get(g.json.cmd.a);/
1306	1306	unsigned int i = 1;
1307	1307	for( ; i < aLen; ++i ){
1308	1308	char const * part = cson_string_cstr(cson_value_get_string(
1309	1309	cson_array_get(g.json.cmd.a, i)));
		@@ -2031,11 +2031,11 @@
2031	2031	zTmp = db_get("project-description",NULL);
2032	2032	cson_object_set(jo, "projectDescription", json_new_string(zTmp));
2033	2033	fossil_free(zTmp);
2034	2034	zTmp = NULL;
2035	2035	fsize = file_size(g.zRepositoryName, ExtFILE);
2036		- cson_object_set(jo, "repositorySize",
	2036	+ cson_object_set(jo, "repositorySize",
2037	2037	cson_value_new_integer((cson_int_t)fsize));
2038	2038
2039	2039	if(full){
2040	2040	n = db_int(0, "SELECT count(*) FROM blob");
2041	2041	m = db_int(0, "SELECT count(*) FROM delta");
		@@ -2086,11 +2086,11 @@
2086	2086	cson_value_new_string(COMPILER_NAME, strlen(COMPILER_NAME)));
2087	2087
2088	2088	jv2 = cson_value_new_object();
2089	2089	jo2 = cson_value_get_object(jv2);
2090	2090	cson_object_set(jo, "sqlite", jv2);
2091		- sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)", sqlite3_sourceid(),
	2091	+ sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)", sqlite3_sourceid(),
2092	2092	&sqlite3_sourceid()[20], sqlite3_libversion());
2093	2093	SETBUF(jo2, "version");
2094	2094	cson_object_set(jo2, "pageCount", cson_value_new_integer(
2095	2095	(cson_int_t)db_int(0, "PRAGMA repository.page_count")));
2096	2096	cson_object_set(jo2, "pageSize", cson_value_new_integer(
		@@ -2097,13 +2097,13 @@
2097	2097	(cson_int_t)db_int(0, "PRAGMA repository.page_size")));
2098	2098	cson_object_set(jo2, "freeList", cson_value_new_integer(
2099	2099	(cson_int_t)db_int(0, "PRAGMA repository.freelist_count")));
2100	2100	sqlite3_snprintf(BufLen, zBuf, "%s", db_text(0,"PRAGMA repository.encoding"));
2101	2101	SETBUF(jo2, "encoding");
2102		- sqlite3_snprintf(BufLen, zBuf, "%s",
	2102	+ sqlite3_snprintf(BufLen, zBuf, "%s",
2103	2103	db_text(0, "PRAGMA repository.journal_mode"));
2104		- cson_object_set(jo2, "journalMode", *zBuf ?
	2104	+ cson_object_set(jo2, "journalMode", *zBuf ?
2105	2105	cson_value_new_string(zBuf, strlen(zBuf)) : cson_value_null());
2106	2106	return jv;
2107	2107	#undef SETBUF
2108	2108	}
2109	2109
2110	2110

	--- src/json.c
	+++ src/json.c
	@@ -1299,11 +1299,11 @@
1299	if(!g.json.cmd.a){
1300	return NULL;
1301	}else{
1302	cson_value * rc = NULL;
1303	Blob path = empty_blob;
1304	unsigned int aLen = g.json.dispatchDepth+1;
1305	/cson_array_length_get(g.json.cmd.a);/
1306	unsigned int i = 1;
1307	for( ; i < aLen; ++i ){
1308	char const * part = cson_string_cstr(cson_value_get_string(
1309	cson_array_get(g.json.cmd.a, i)));
	@@ -2031,11 +2031,11 @@
2031	zTmp = db_get("project-description",NULL);
2032	cson_object_set(jo, "projectDescription", json_new_string(zTmp));
2033	fossil_free(zTmp);
2034	zTmp = NULL;
2035	fsize = file_size(g.zRepositoryName, ExtFILE);
2036	cson_object_set(jo, "repositorySize",
2037	cson_value_new_integer((cson_int_t)fsize));
2038
2039	if(full){
2040	n = db_int(0, "SELECT count(*) FROM blob");
2041	m = db_int(0, "SELECT count(*) FROM delta");
	@@ -2086,11 +2086,11 @@
2086	cson_value_new_string(COMPILER_NAME, strlen(COMPILER_NAME)));
2087
2088	jv2 = cson_value_new_object();
2089	jo2 = cson_value_get_object(jv2);
2090	cson_object_set(jo, "sqlite", jv2);
2091	sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)", sqlite3_sourceid(),
2092	&sqlite3_sourceid()[20], sqlite3_libversion());
2093	SETBUF(jo2, "version");
2094	cson_object_set(jo2, "pageCount", cson_value_new_integer(
2095	(cson_int_t)db_int(0, "PRAGMA repository.page_count")));
2096	cson_object_set(jo2, "pageSize", cson_value_new_integer(
	@@ -2097,13 +2097,13 @@
2097	(cson_int_t)db_int(0, "PRAGMA repository.page_size")));
2098	cson_object_set(jo2, "freeList", cson_value_new_integer(
2099	(cson_int_t)db_int(0, "PRAGMA repository.freelist_count")));
2100	sqlite3_snprintf(BufLen, zBuf, "%s", db_text(0,"PRAGMA repository.encoding"));
2101	SETBUF(jo2, "encoding");
2102	sqlite3_snprintf(BufLen, zBuf, "%s",
2103	db_text(0, "PRAGMA repository.journal_mode"));
2104	cson_object_set(jo2, "journalMode", *zBuf ?
2105	cson_value_new_string(zBuf, strlen(zBuf)) : cson_value_null());
2106	return jv;
2107	#undef SETBUF
2108	}
2109
2110

	--- src/json.c
	+++ src/json.c
	@@ -1299,11 +1299,11 @@
1299	if(!g.json.cmd.a){
1300	return NULL;
1301	}else{
1302	cson_value * rc = NULL;
1303	Blob path = empty_blob;
1304	unsigned int aLen = g.json.dispatchDepth+1;
1305	/cson_array_length_get(g.json.cmd.a);/
1306	unsigned int i = 1;
1307	for( ; i < aLen; ++i ){
1308	char const * part = cson_string_cstr(cson_value_get_string(
1309	cson_array_get(g.json.cmd.a, i)));
	@@ -2031,11 +2031,11 @@
2031	zTmp = db_get("project-description",NULL);
2032	cson_object_set(jo, "projectDescription", json_new_string(zTmp));
2033	fossil_free(zTmp);
2034	zTmp = NULL;
2035	fsize = file_size(g.zRepositoryName, ExtFILE);
2036	cson_object_set(jo, "repositorySize",
2037	cson_value_new_integer((cson_int_t)fsize));
2038
2039	if(full){
2040	n = db_int(0, "SELECT count(*) FROM blob");
2041	m = db_int(0, "SELECT count(*) FROM delta");
	@@ -2086,11 +2086,11 @@
2086	cson_value_new_string(COMPILER_NAME, strlen(COMPILER_NAME)));
2087
2088	jv2 = cson_value_new_object();
2089	jo2 = cson_value_get_object(jv2);
2090	cson_object_set(jo, "sqlite", jv2);
2091	sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)", sqlite3_sourceid(),
2092	&sqlite3_sourceid()[20], sqlite3_libversion());
2093	SETBUF(jo2, "version");
2094	cson_object_set(jo2, "pageCount", cson_value_new_integer(
2095	(cson_int_t)db_int(0, "PRAGMA repository.page_count")));
2096	cson_object_set(jo2, "pageSize", cson_value_new_integer(
	@@ -2097,13 +2097,13 @@
2097	(cson_int_t)db_int(0, "PRAGMA repository.page_size")));
2098	cson_object_set(jo2, "freeList", cson_value_new_integer(
2099	(cson_int_t)db_int(0, "PRAGMA repository.freelist_count")));
2100	sqlite3_snprintf(BufLen, zBuf, "%s", db_text(0,"PRAGMA repository.encoding"));
2101	SETBUF(jo2, "encoding");
2102	sqlite3_snprintf(BufLen, zBuf, "%s",
2103	db_text(0, "PRAGMA repository.journal_mode"));
2104	cson_object_set(jo2, "journalMode", *zBuf ?
2105	cson_value_new_string(zBuf, strlen(zBuf)) : cson_value_null());
2106	return jv;
2107	#undef SETBUF
2108	}
2109
2110

M src/json_branch.c

+1 -1

		--- src/json_branch.c
		+++ src/json_branch.c
		@@ -202,11 +202,11 @@
202	202	int bAutoColor = 0; /* Value of "--bgcolor" is "auto" */
203	203
204	204	if( fossil_strncmp(zColor, "auto", 4)==0 ) {
205	205	bAutoColor = 1;
206	206	zColor = 0;
207		- }
	207	+ }
208	208	/* fossil branch new name */
209	209	if( zBranch==0 \|\| zBranch[0]==0 ){
210	210	zOpt->rcErrMsg = "Branch name may not be null/empty.";
211	211	return FSL_JSON_E_INVALID_ARGS;
212	212	}
213	213

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -202,11 +202,11 @@
202	int bAutoColor = 0; /* Value of "--bgcolor" is "auto" */
203
204	if( fossil_strncmp(zColor, "auto", 4)==0 ) {
205	bAutoColor = 1;
206	zColor = 0;
207	}
208	/* fossil branch new name */
209	if( zBranch==0 \|\| zBranch[0]==0 ){
210	zOpt->rcErrMsg = "Branch name may not be null/empty.";
211	return FSL_JSON_E_INVALID_ARGS;
212	}
213

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -202,11 +202,11 @@
202	int bAutoColor = 0; /* Value of "--bgcolor" is "auto" */
203
204	if( fossil_strncmp(zColor, "auto", 4)==0 ) {
205	bAutoColor = 1;
206	zColor = 0;
207	}
208	/* fossil branch new name */
209	if( zBranch==0 \|\| zBranch[0]==0 ){
210	zOpt->rcErrMsg = "Branch name may not be null/empty.";
211	return FSL_JSON_E_INVALID_ARGS;
212	}
213

M src/json_finfo.c

+1 -1

		--- src/json_finfo.c
		+++ src/json_finfo.c
		@@ -41,11 +41,11 @@
41	41	signed char sort = -1;
42	42	if(!g.perm.Read){
43	43	json_set_err(FSL_JSON_E_DENIED,"Requires 'o' privileges.");
44	44	return NULL;
45	45	}
46		- json_warn( FSL_JSON_W_UNKNOWN,
	46	+ json_warn( FSL_JSON_W_UNKNOWN,
47	47	"Achtung: the output of the finfo command is up for change.");
48	48
49	49	/* For the "name" argument we have to jump through some hoops to make sure
50	50	that we don't get the fossil-internally-assigned "name" option.
51	51	*/
52	52

	--- src/json_finfo.c
	+++ src/json_finfo.c
	@@ -41,11 +41,11 @@
41	signed char sort = -1;
42	if(!g.perm.Read){
43	json_set_err(FSL_JSON_E_DENIED,"Requires 'o' privileges.");
44	return NULL;
45	}
46	json_warn( FSL_JSON_W_UNKNOWN,
47	"Achtung: the output of the finfo command is up for change.");
48
49	/* For the "name" argument we have to jump through some hoops to make sure
50	that we don't get the fossil-internally-assigned "name" option.
51	*/
52

	--- src/json_finfo.c
	+++ src/json_finfo.c
	@@ -41,11 +41,11 @@
41	signed char sort = -1;
42	if(!g.perm.Read){
43	json_set_err(FSL_JSON_E_DENIED,"Requires 'o' privileges.");
44	return NULL;
45	}
46	json_warn( FSL_JSON_W_UNKNOWN,
47	"Achtung: the output of the finfo command is up for change.");
48
49	/* For the "name" argument we have to jump through some hoops to make sure
50	that we don't get the fossil-internally-assigned "name" option.
51	*/
52

M src/json_wiki.c

+1 -1

		--- src/json_wiki.c
		+++ src/json_wiki.c
		@@ -348,11 +348,11 @@
348	348	cson_value * nameV; /* wiki page name */
349	349	char const * zPageName; /* cstr form of page name */
350	350	cson_value * contentV; /* passed-in content */
351	351	cson_value * emptyContent = NULL; /* placeholder for empty content. */
352	352	cson_value * payV = NULL; /* payload/return value */
353		- cson_string const * jstr = NULL; /* temp for cson_value-to-cson_string
	353	+ cson_string const * jstr = NULL; /* temp for cson_value-to-cson_string
354	354	conversions. */
355	355	char const * zMimeType = 0;
356	356	unsigned int contentLen = 0;
357	357	int rid;
358	358	if( (createMode && !g.perm.NewWiki)
359	359

	--- src/json_wiki.c
	+++ src/json_wiki.c
	@@ -348,11 +348,11 @@
348	cson_value * nameV; /* wiki page name */
349	char const * zPageName; /* cstr form of page name */
350	cson_value * contentV; /* passed-in content */
351	cson_value * emptyContent = NULL; /* placeholder for empty content. */
352	cson_value * payV = NULL; /* payload/return value */
353	cson_string const * jstr = NULL; /* temp for cson_value-to-cson_string
354	conversions. */
355	char const * zMimeType = 0;
356	unsigned int contentLen = 0;
357	int rid;
358	if( (createMode && !g.perm.NewWiki)
359

	--- src/json_wiki.c
	+++ src/json_wiki.c
	@@ -348,11 +348,11 @@
348	cson_value * nameV; /* wiki page name */
349	char const * zPageName; /* cstr form of page name */
350	cson_value * contentV; /* passed-in content */
351	cson_value * emptyContent = NULL; /* placeholder for empty content. */
352	cson_value * payV = NULL; /* payload/return value */
353	cson_string const * jstr = NULL; /* temp for cson_value-to-cson_string
354	conversions. */
355	char const * zMimeType = 0;
356	unsigned int contentLen = 0;
357	int rid;
358	if( (createMode && !g.perm.NewWiki)
359

M src/login.c

+11 -11

		--- src/login.c
		+++ src/login.c
		@@ -254,11 +254,11 @@
254	254	*pzUsername = fossil_strdup(zLogin);
255	255	break;
256	256	}
257	257	}
258	258	db_finalize(&q);
259		- }
	259	+ }
260	260	free(zSha1Pw);
261	261	return uid;
262	262	}
263	263
264	264	/*
		@@ -775,11 +775,11 @@
775	775	}
776	776	@ <table class="login_out">
777	777	if( P("HTTPS")==0 ){
778	778	@ <tr><td class="form_label">Warning:</td>
779	779	@ <td><span class='securityWarning'>
780		- @ Login information, including the password,
	780	+ @ Login information, including the password,
781	781	@ will be sent in the clear over an unencrypted connection.
782	782	if( !g.sslNotAvailable ){
783	783	@ Consider logging in at
784	784	@ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
785	785	}
		@@ -824,11 +824,11 @@
824	824	@ </table>
825	825	if( zAnonPw && !noAnon ){
826	826	const char *zDecoded = captcha_decode(uSeed);
827	827	int bAutoCaptcha = db_get_boolean("auto-captcha", 0);
828	828	char *zCaptcha = captcha_render(zDecoded);
829		-
	829	+
830	830	@ <p><input type="hidden" name="cs" value="%u(uSeed)">
831	831	@ Visitors may enter <b>anonymous</b> as the user-ID with
832	832	@ the 8-character hexadecimal password shown below:</p>
833	833	@ <div class="captcha"><table class="captcha"><tr><td>\
834	834	@ <pre class="captcha">
		@@ -1029,11 +1029,11 @@
1029	1029	@ <p><span class="loginError">
1030	1030	@ This password-reset URL is invalid, probably because it has expired.
1031	1031	@ Password-reset URLs have a short lifespan.
1032	1032	@ </span></p>
1033	1033	style_finish_page();
1034		- sleep(1); /* Introduce a small delay on an invalid suffix as an
	1034	+ sleep(1); /* Introduce a small delay on an invalid suffix as an
1035	1035	** extra defense against search attacks */
1036	1036	return;
1037	1037	}
1038	1038	fossil_redirect_to_https_if_needed(1);
1039	1039	login_set_uid(uid, 0);
		@@ -1163,11 +1163,11 @@
1163	1163	if( rc==SQLITE_OK && sqlite3_step(pStmt)==SQLITE_ROW ){
1164	1164	db_unprotect(PROTECT_USER);
1165	1165	db_multi_exec(
1166	1166	"UPDATE user SET cookie=%Q, cexpire=%.17g"
1167	1167	" WHERE login=%Q",
1168		- zHash,
	1168	+ zHash,
1169	1169	sqlite3_column_double(pStmt, 0), zLogin
1170	1170	);
1171	1171	db_protect_pop();
1172	1172	nXfer++;
1173	1173	}
		@@ -1580,11 +1580,11 @@
1580	1580	p->ApndWiki = p->Hyperlink = p->Clone =
1581	1581	p->NewTkt = p->Password = p->RdAddr =
1582	1582	p->TktFmt = p->Attach = p->ApndTkt =
1583	1583	p->ModWiki = p->ModTkt =
1584	1584	p->RdForum = p->WrForum = p->ModForum =
1585		- p->WrTForum = p->AdminForum = p->Chat =
	1585	+ p->WrTForum = p->AdminForum = p->Chat =
1586	1586	p->EmailAlert = p->Announce = p->Debug = 1;
1587	1587	/* Fall thru into Read/Write */
1588	1588	case 'i': p->Read = p->Write = 1; break;
1589	1589	case 'o': p->Read = 1; break;
1590	1590	case 'z': p->Zip = 1; break;
		@@ -1827,11 +1827,11 @@
1827	1827	@ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)">
1828	1828	}
1829	1829
1830	1830	/*
1831	1831	** Check to see if the candidate username zUserID is already used.
1832		-** Return 1 if it is already in use. Return 0 if the name is
	1832	+** Return 1 if it is already in use. Return 0 if the name is
1833	1833	** available for a self-registeration.
1834	1834	*/
1835	1835	static int login_self_choosen_userid_already_exists(const char *zUserID){
1836	1836	int rc = db_exists(
1837	1837	"SELECT 1 FROM user WHERE login=%Q "
		@@ -1849,11 +1849,11 @@
1849	1849	** address is assigned to a particular user return the UID for that user.
1850	1850	** If the email address is used, but not by a particular user, return -1.
1851	1851	*/
1852	1852	static int email_address_in_use(const char *zEMail){
1853	1853	int uid;
1854		- uid = db_int(0,
	1854	+ uid = db_int(0,
1855	1855	"SELECT uid FROM user"
1856	1856	" WHERE info LIKE '%%<%q>%%'", zEMail);
1857	1857	if( uid>0 ){
1858	1858	if( db_exists("SELECT 1 FROM user WHERE uid=%d AND ("
1859	1859	" cap GLOB '[as]' OR"
		@@ -1878,11 +1878,11 @@
1878	1878	}
1879	1879
1880	1880	/*
1881	1881	** COMMAND: test-email-used
1882	1882	** Usage: fossil test-email-used EMAIL ...
1883		-**
	1883	+**
1884	1884	** Given a list of email addresses, show the UID and LOGIN associated
1885	1885	** with each one.
1886	1886	*/
1887	1887	void test_email_used(void){
1888	1888	int i;
		@@ -1903,11 +1903,11 @@
1903	1903	fossil_print("%s: UID %d (%s)\n", zEMail, uid, zLogin);
1904	1904	fossil_free(zLogin);
1905	1905	}
1906	1906	}
1907	1907	}
1908		-
	1908	+
1909	1909
1910	1910	/*
1911	1911	** Check an email address and confirm that it is valid for self-registration.
1912	1912	** The email address is known already to be well-formed. Return true
1913	1913	** if the email address is on the allowed list.
		@@ -1995,11 +1995,11 @@
1995	1995	iErrLine = 1;
1996	1996	zErr = "User ID too short. Must be at least 6 characters.";
1997	1997	}else if( sqlite3_strglob("[^-a-zA-Z0-9_.]",zUserID)==0 ){
1998	1998	iErrLine = 1;
1999	1999	zErr = "User ID may not contain spaces or special characters.";
2000		- }else if( sqlite3_strlike("anonymous%", zUserID, 0)==0
	2000	+ }else if( sqlite3_strlike("anonymous%", zUserID, 0)==0
2001	2001	\|\| sqlite3_strlike("nobody%", zUserID, 0)==0
2002	2002	\|\| sqlite3_strlike("reader%", zUserID, 0)==0
2003	2003	\|\| sqlite3_strlike("developer%", zUserID, 0)==0
2004	2004	){
2005	2005	iErrLine = 1;
2006	2006

	--- src/login.c
	+++ src/login.c
	@@ -254,11 +254,11 @@
254	*pzUsername = fossil_strdup(zLogin);
255	break;
256	}
257	}
258	db_finalize(&q);
259	}
260	free(zSha1Pw);
261	return uid;
262	}
263
264	/*
	@@ -775,11 +775,11 @@
775	}
776	@ <table class="login_out">
777	if( P("HTTPS")==0 ){
778	@ <tr><td class="form_label">Warning:</td>
779	@ <td><span class='securityWarning'>
780	@ Login information, including the password,
781	@ will be sent in the clear over an unencrypted connection.
782	if( !g.sslNotAvailable ){
783	@ Consider logging in at
784	@ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
785	}
	@@ -824,11 +824,11 @@
824	@ </table>
825	if( zAnonPw && !noAnon ){
826	const char *zDecoded = captcha_decode(uSeed);
827	int bAutoCaptcha = db_get_boolean("auto-captcha", 0);
828	char *zCaptcha = captcha_render(zDecoded);
829
830	@ <p><input type="hidden" name="cs" value="%u(uSeed)">
831	@ Visitors may enter <b>anonymous</b> as the user-ID with
832	@ the 8-character hexadecimal password shown below:</p>
833	@ <div class="captcha"><table class="captcha"><tr><td>\
834	@ <pre class="captcha">
	@@ -1029,11 +1029,11 @@
1029	@ <p><span class="loginError">
1030	@ This password-reset URL is invalid, probably because it has expired.
1031	@ Password-reset URLs have a short lifespan.
1032	@ </span></p>
1033	style_finish_page();
1034	sleep(1); /* Introduce a small delay on an invalid suffix as an
1035	** extra defense against search attacks */
1036	return;
1037	}
1038	fossil_redirect_to_https_if_needed(1);
1039	login_set_uid(uid, 0);
	@@ -1163,11 +1163,11 @@
1163	if( rc==SQLITE_OK && sqlite3_step(pStmt)==SQLITE_ROW ){
1164	db_unprotect(PROTECT_USER);
1165	db_multi_exec(
1166	"UPDATE user SET cookie=%Q, cexpire=%.17g"
1167	" WHERE login=%Q",
1168	zHash,
1169	sqlite3_column_double(pStmt, 0), zLogin
1170	);
1171	db_protect_pop();
1172	nXfer++;
1173	}
	@@ -1580,11 +1580,11 @@
1580	p->ApndWiki = p->Hyperlink = p->Clone =
1581	p->NewTkt = p->Password = p->RdAddr =
1582	p->TktFmt = p->Attach = p->ApndTkt =
1583	p->ModWiki = p->ModTkt =
1584	p->RdForum = p->WrForum = p->ModForum =
1585	p->WrTForum = p->AdminForum = p->Chat =
1586	p->EmailAlert = p->Announce = p->Debug = 1;
1587	/* Fall thru into Read/Write */
1588	case 'i': p->Read = p->Write = 1; break;
1589	case 'o': p->Read = 1; break;
1590	case 'z': p->Zip = 1; break;
	@@ -1827,11 +1827,11 @@
1827	@ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)">
1828	}
1829
1830	/*
1831	** Check to see if the candidate username zUserID is already used.
1832	** Return 1 if it is already in use. Return 0 if the name is
1833	** available for a self-registeration.
1834	*/
1835	static int login_self_choosen_userid_already_exists(const char *zUserID){
1836	int rc = db_exists(
1837	"SELECT 1 FROM user WHERE login=%Q "
	@@ -1849,11 +1849,11 @@
1849	** address is assigned to a particular user return the UID for that user.
1850	** If the email address is used, but not by a particular user, return -1.
1851	*/
1852	static int email_address_in_use(const char *zEMail){
1853	int uid;
1854	uid = db_int(0,
1855	"SELECT uid FROM user"
1856	" WHERE info LIKE '%%<%q>%%'", zEMail);
1857	if( uid>0 ){
1858	if( db_exists("SELECT 1 FROM user WHERE uid=%d AND ("
1859	" cap GLOB '[as]' OR"
	@@ -1878,11 +1878,11 @@
1878	}
1879
1880	/*
1881	** COMMAND: test-email-used
1882	** Usage: fossil test-email-used EMAIL ...
1883	**
1884	** Given a list of email addresses, show the UID and LOGIN associated
1885	** with each one.
1886	*/
1887	void test_email_used(void){
1888	int i;
	@@ -1903,11 +1903,11 @@
1903	fossil_print("%s: UID %d (%s)\n", zEMail, uid, zLogin);
1904	fossil_free(zLogin);
1905	}
1906	}
1907	}
1908
1909
1910	/*
1911	** Check an email address and confirm that it is valid for self-registration.
1912	** The email address is known already to be well-formed. Return true
1913	** if the email address is on the allowed list.
	@@ -1995,11 +1995,11 @@
1995	iErrLine = 1;
1996	zErr = "User ID too short. Must be at least 6 characters.";
1997	}else if( sqlite3_strglob("[^-a-zA-Z0-9_.]",zUserID)==0 ){
1998	iErrLine = 1;
1999	zErr = "User ID may not contain spaces or special characters.";
2000	}else if( sqlite3_strlike("anonymous%", zUserID, 0)==0
2001	\|\| sqlite3_strlike("nobody%", zUserID, 0)==0
2002	\|\| sqlite3_strlike("reader%", zUserID, 0)==0
2003	\|\| sqlite3_strlike("developer%", zUserID, 0)==0
2004	){
2005	iErrLine = 1;
2006

	--- src/login.c
	+++ src/login.c
	@@ -254,11 +254,11 @@
254	*pzUsername = fossil_strdup(zLogin);
255	break;
256	}
257	}
258	db_finalize(&q);
259	}
260	free(zSha1Pw);
261	return uid;
262	}
263
264	/*
	@@ -775,11 +775,11 @@
775	}
776	@ <table class="login_out">
777	if( P("HTTPS")==0 ){
778	@ <tr><td class="form_label">Warning:</td>
779	@ <td><span class='securityWarning'>
780	@ Login information, including the password,
781	@ will be sent in the clear over an unencrypted connection.
782	if( !g.sslNotAvailable ){
783	@ Consider logging in at
784	@ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
785	}
	@@ -824,11 +824,11 @@
824	@ </table>
825	if( zAnonPw && !noAnon ){
826	const char *zDecoded = captcha_decode(uSeed);
827	int bAutoCaptcha = db_get_boolean("auto-captcha", 0);
828	char *zCaptcha = captcha_render(zDecoded);
829
830	@ <p><input type="hidden" name="cs" value="%u(uSeed)">
831	@ Visitors may enter <b>anonymous</b> as the user-ID with
832	@ the 8-character hexadecimal password shown below:</p>
833	@ <div class="captcha"><table class="captcha"><tr><td>\
834	@ <pre class="captcha">
	@@ -1029,11 +1029,11 @@
1029	@ <p><span class="loginError">
1030	@ This password-reset URL is invalid, probably because it has expired.
1031	@ Password-reset URLs have a short lifespan.
1032	@ </span></p>
1033	style_finish_page();
1034	sleep(1); /* Introduce a small delay on an invalid suffix as an
1035	** extra defense against search attacks */
1036	return;
1037	}
1038	fossil_redirect_to_https_if_needed(1);
1039	login_set_uid(uid, 0);
	@@ -1163,11 +1163,11 @@
1163	if( rc==SQLITE_OK && sqlite3_step(pStmt)==SQLITE_ROW ){
1164	db_unprotect(PROTECT_USER);
1165	db_multi_exec(
1166	"UPDATE user SET cookie=%Q, cexpire=%.17g"
1167	" WHERE login=%Q",
1168	zHash,
1169	sqlite3_column_double(pStmt, 0), zLogin
1170	);
1171	db_protect_pop();
1172	nXfer++;
1173	}
	@@ -1580,11 +1580,11 @@
1580	p->ApndWiki = p->Hyperlink = p->Clone =
1581	p->NewTkt = p->Password = p->RdAddr =
1582	p->TktFmt = p->Attach = p->ApndTkt =
1583	p->ModWiki = p->ModTkt =
1584	p->RdForum = p->WrForum = p->ModForum =
1585	p->WrTForum = p->AdminForum = p->Chat =
1586	p->EmailAlert = p->Announce = p->Debug = 1;
1587	/* Fall thru into Read/Write */
1588	case 'i': p->Read = p->Write = 1; break;
1589	case 'o': p->Read = 1; break;
1590	case 'z': p->Zip = 1; break;
	@@ -1827,11 +1827,11 @@
1827	@ <input type="hidden" name="csrf" value="%s(g.zCsrfToken)">
1828	}
1829
1830	/*
1831	** Check to see if the candidate username zUserID is already used.
1832	** Return 1 if it is already in use. Return 0 if the name is
1833	** available for a self-registeration.
1834	*/
1835	static int login_self_choosen_userid_already_exists(const char *zUserID){
1836	int rc = db_exists(
1837	"SELECT 1 FROM user WHERE login=%Q "
	@@ -1849,11 +1849,11 @@
1849	** address is assigned to a particular user return the UID for that user.
1850	** If the email address is used, but not by a particular user, return -1.
1851	*/
1852	static int email_address_in_use(const char *zEMail){
1853	int uid;
1854	uid = db_int(0,
1855	"SELECT uid FROM user"
1856	" WHERE info LIKE '%%<%q>%%'", zEMail);
1857	if( uid>0 ){
1858	if( db_exists("SELECT 1 FROM user WHERE uid=%d AND ("
1859	" cap GLOB '[as]' OR"
	@@ -1878,11 +1878,11 @@
1878	}
1879
1880	/*
1881	** COMMAND: test-email-used
1882	** Usage: fossil test-email-used EMAIL ...
1883	**
1884	** Given a list of email addresses, show the UID and LOGIN associated
1885	** with each one.
1886	*/
1887	void test_email_used(void){
1888	int i;
	@@ -1903,11 +1903,11 @@
1903	fossil_print("%s: UID %d (%s)\n", zEMail, uid, zLogin);
1904	fossil_free(zLogin);
1905	}
1906	}
1907	}
1908
1909
1910	/*
1911	** Check an email address and confirm that it is valid for self-registration.
1912	** The email address is known already to be well-formed. Return true
1913	** if the email address is on the allowed list.
	@@ -1995,11 +1995,11 @@
1995	iErrLine = 1;
1996	zErr = "User ID too short. Must be at least 6 characters.";
1997	}else if( sqlite3_strglob("[^-a-zA-Z0-9_.]",zUserID)==0 ){
1998	iErrLine = 1;
1999	zErr = "User ID may not contain spaces or special characters.";
2000	}else if( sqlite3_strlike("anonymous%", zUserID, 0)==0
2001	\|\| sqlite3_strlike("nobody%", zUserID, 0)==0
2002	\|\| sqlite3_strlike("reader%", zUserID, 0)==0
2003	\|\| sqlite3_strlike("developer%", zUserID, 0)==0
2004	){
2005	iErrLine = 1;
2006

M src/main.c

+7 -7

		--- src/main.c
		+++ src/main.c
		@@ -852,11 +852,11 @@
852	852	zNewArgv[2] = g.argv[1];
853	853	zNewArgv[3] = 0;
854	854	g.argc = 3;
855	855	g.argv = zNewArgv;
856	856	#endif
857		- }
	857	+ }
858	858	zCmdName = g.argv[1];
859	859	}
860	860	#ifndef _WIN32
861	861	/* There is a bug in stunnel4 in which it sometimes starts up client
862	862	** processes without first opening file descriptor 2 (standard error).
		@@ -1414,11 +1414,11 @@
1414	1414	i -= 4;
1415	1415	}
1416	1416	}else{
1417	1417	/* Remove trailing ":80" from the HOST */
1418	1418	if( i>3 && z[i-1]=='0' && z[i-2]=='8' && z[i-3]==':' ) i -= 3;
1419		- }
	1419	+ }
1420	1420	if( i && z[i-1]=='.' ) i--;
1421	1421	z[i] = 0;
1422	1422	zCur = PD("SCRIPT_NAME","/");
1423	1423	i = strlen(zCur);
1424	1424	while( i>0 && zCur[i-1]=='/' ) i--;
		@@ -1614,11 +1614,11 @@
1614	1614	return 1;
1615	1615	}
1616	1616
1617	1617	/*
1618	1618	** Redirect to the equivalent HTTPS request if the current connection is
1619		-** insecure and if the redirect-to-https flag greater than or equal to
	1619	+** insecure and if the redirect-to-https flag greater than or equal to
1620	1620	** iLevel. iLevel is 1 for /login pages and 2 for every other page.
1621	1621	*/
1622	1622	int fossil_redirect_to_https_if_needed(int iLevel){
1623	1623	if( fossil_wants_https(iLevel) ){
1624	1624	const char *zQS = P("QUERY_STRING");
		@@ -1969,11 +1969,11 @@
1969	1969	cgi_replace_parameter("PATH_INFO", zPathInfo);
1970	1970	cgi_replace_parameter("SCRIPT_NAME", zNewScript);
1971	1971	etag_cancel();
1972	1972	}
1973	1973
1974		- /* If the content type is application/x-fossil or
	1974	+ /* If the content type is application/x-fossil or
1975	1975	** application/x-fossil-debug, then a sync/push/pull/clone is
1976	1976	** desired, so default the PATH_INFO to /xfer
1977	1977	*/
1978	1978	if( g.zContentType &&
1979	1979	strncmp(g.zContentType, "application/x-fossil", 20)==0 ){
		@@ -2785,11 +2785,11 @@
2785	2785	** process exit
2786	2786	** --nojail Drop root privilege but do not enter the chroot jail
2787	2787	** --nossl Do not do http: to https: redirects, regardless of
2788	2788	** the redirect-to-https setting.
2789	2789	** --notfound URL Use URL as the "HTTP 404, object not found" page
2790		-** --out FILE Write the HTTP reply to FILE instead of to
	2790	+** --out FILE Write the HTTP reply to FILE instead of to
2791	2791	** standard output
2792	2792	** --pkey FILE Read the private key used for TLS from FILE
2793	2793	** --repolist If REPOSITORY is directory, URL "/" lists all repos
2794	2794	** --scgi Interpret input as SCGI rather than HTTP
2795	2795	** --skin LABEL Use override skin LABEL. Use an empty string ("")
		@@ -3175,11 +3175,11 @@
3175	3175	const char zInitPage = 0; / Start on this page. --page option */
3176	3176	int findServerArg = 2; /* argv index for find_server_repository() */
3177	3177	char zRemote = 0; / Remote host on which to run "fossil ui" */
3178	3178	const char zJsMode; / The --jsmode parameter */
3179	3179	const char zFossilCmd =0; / Name of "fossil" binary on remote system */
3180		-
	3180	+
3181	3181
3182	3182	#if USE_SEE
3183	3183	db_setup_for_saved_encryption_key();
3184	3184	#endif
3185	3185
		@@ -3347,11 +3347,11 @@
3347	3347	Blob ssh;
3348	3348	char zLine[1000];
3349	3349	blob_init(&ssh, 0, 0);
3350	3350	transport_ssh_command(&ssh);
3351	3351	db_close_config();
3352		- blob_appendf(&ssh,
	3352	+ blob_appendf(&ssh,
3353	3353	" -t -L 127.0.0.1:%d:127.0.0.1:%d %!$",
3354	3354	iPort, iPort, zRemote
3355	3355	);
3356	3356	if( zFossilCmd==0 ){
3357	3357	blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH");
3358	3358

	--- src/main.c
	+++ src/main.c
	@@ -852,11 +852,11 @@
852	zNewArgv[2] = g.argv[1];
853	zNewArgv[3] = 0;
854	g.argc = 3;
855	g.argv = zNewArgv;
856	#endif
857	}
858	zCmdName = g.argv[1];
859	}
860	#ifndef _WIN32
861	/* There is a bug in stunnel4 in which it sometimes starts up client
862	** processes without first opening file descriptor 2 (standard error).
	@@ -1414,11 +1414,11 @@
1414	i -= 4;
1415	}
1416	}else{
1417	/* Remove trailing ":80" from the HOST */
1418	if( i>3 && z[i-1]=='0' && z[i-2]=='8' && z[i-3]==':' ) i -= 3;
1419	}
1420	if( i && z[i-1]=='.' ) i--;
1421	z[i] = 0;
1422	zCur = PD("SCRIPT_NAME","/");
1423	i = strlen(zCur);
1424	while( i>0 && zCur[i-1]=='/' ) i--;
	@@ -1614,11 +1614,11 @@
1614	return 1;
1615	}
1616
1617	/*
1618	** Redirect to the equivalent HTTPS request if the current connection is
1619	** insecure and if the redirect-to-https flag greater than or equal to
1620	** iLevel. iLevel is 1 for /login pages and 2 for every other page.
1621	*/
1622	int fossil_redirect_to_https_if_needed(int iLevel){
1623	if( fossil_wants_https(iLevel) ){
1624	const char *zQS = P("QUERY_STRING");
	@@ -1969,11 +1969,11 @@
1969	cgi_replace_parameter("PATH_INFO", zPathInfo);
1970	cgi_replace_parameter("SCRIPT_NAME", zNewScript);
1971	etag_cancel();
1972	}
1973
1974	/* If the content type is application/x-fossil or
1975	** application/x-fossil-debug, then a sync/push/pull/clone is
1976	** desired, so default the PATH_INFO to /xfer
1977	*/
1978	if( g.zContentType &&
1979	strncmp(g.zContentType, "application/x-fossil", 20)==0 ){
	@@ -2785,11 +2785,11 @@
2785	** process exit
2786	** --nojail Drop root privilege but do not enter the chroot jail
2787	** --nossl Do not do http: to https: redirects, regardless of
2788	** the redirect-to-https setting.
2789	** --notfound URL Use URL as the "HTTP 404, object not found" page
2790	** --out FILE Write the HTTP reply to FILE instead of to
2791	** standard output
2792	** --pkey FILE Read the private key used for TLS from FILE
2793	** --repolist If REPOSITORY is directory, URL "/" lists all repos
2794	** --scgi Interpret input as SCGI rather than HTTP
2795	** --skin LABEL Use override skin LABEL. Use an empty string ("")
	@@ -3175,11 +3175,11 @@
3175	const char zInitPage = 0; / Start on this page. --page option */
3176	int findServerArg = 2; /* argv index for find_server_repository() */
3177	char zRemote = 0; / Remote host on which to run "fossil ui" */
3178	const char zJsMode; / The --jsmode parameter */
3179	const char zFossilCmd =0; / Name of "fossil" binary on remote system */
3180
3181
3182	#if USE_SEE
3183	db_setup_for_saved_encryption_key();
3184	#endif
3185
	@@ -3347,11 +3347,11 @@
3347	Blob ssh;
3348	char zLine[1000];
3349	blob_init(&ssh, 0, 0);
3350	transport_ssh_command(&ssh);
3351	db_close_config();
3352	blob_appendf(&ssh,
3353	" -t -L 127.0.0.1:%d:127.0.0.1:%d %!$",
3354	iPort, iPort, zRemote
3355	);
3356	if( zFossilCmd==0 ){
3357	blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH");
3358

	--- src/main.c
	+++ src/main.c
	@@ -852,11 +852,11 @@
852	zNewArgv[2] = g.argv[1];
853	zNewArgv[3] = 0;
854	g.argc = 3;
855	g.argv = zNewArgv;
856	#endif
857	}
858	zCmdName = g.argv[1];
859	}
860	#ifndef _WIN32
861	/* There is a bug in stunnel4 in which it sometimes starts up client
862	** processes without first opening file descriptor 2 (standard error).
	@@ -1414,11 +1414,11 @@
1414	i -= 4;
1415	}
1416	}else{
1417	/* Remove trailing ":80" from the HOST */
1418	if( i>3 && z[i-1]=='0' && z[i-2]=='8' && z[i-3]==':' ) i -= 3;
1419	}
1420	if( i && z[i-1]=='.' ) i--;
1421	z[i] = 0;
1422	zCur = PD("SCRIPT_NAME","/");
1423	i = strlen(zCur);
1424	while( i>0 && zCur[i-1]=='/' ) i--;
	@@ -1614,11 +1614,11 @@
1614	return 1;
1615	}
1616
1617	/*
1618	** Redirect to the equivalent HTTPS request if the current connection is
1619	** insecure and if the redirect-to-https flag greater than or equal to
1620	** iLevel. iLevel is 1 for /login pages and 2 for every other page.
1621	*/
1622	int fossil_redirect_to_https_if_needed(int iLevel){
1623	if( fossil_wants_https(iLevel) ){
1624	const char *zQS = P("QUERY_STRING");
	@@ -1969,11 +1969,11 @@
1969	cgi_replace_parameter("PATH_INFO", zPathInfo);
1970	cgi_replace_parameter("SCRIPT_NAME", zNewScript);
1971	etag_cancel();
1972	}
1973
1974	/* If the content type is application/x-fossil or
1975	** application/x-fossil-debug, then a sync/push/pull/clone is
1976	** desired, so default the PATH_INFO to /xfer
1977	*/
1978	if( g.zContentType &&
1979	strncmp(g.zContentType, "application/x-fossil", 20)==0 ){
	@@ -2785,11 +2785,11 @@
2785	** process exit
2786	** --nojail Drop root privilege but do not enter the chroot jail
2787	** --nossl Do not do http: to https: redirects, regardless of
2788	** the redirect-to-https setting.
2789	** --notfound URL Use URL as the "HTTP 404, object not found" page
2790	** --out FILE Write the HTTP reply to FILE instead of to
2791	** standard output
2792	** --pkey FILE Read the private key used for TLS from FILE
2793	** --repolist If REPOSITORY is directory, URL "/" lists all repos
2794	** --scgi Interpret input as SCGI rather than HTTP
2795	** --skin LABEL Use override skin LABEL. Use an empty string ("")
	@@ -3175,11 +3175,11 @@
3175	const char zInitPage = 0; / Start on this page. --page option */
3176	int findServerArg = 2; /* argv index for find_server_repository() */
3177	char zRemote = 0; / Remote host on which to run "fossil ui" */
3178	const char zJsMode; / The --jsmode parameter */
3179	const char zFossilCmd =0; / Name of "fossil" binary on remote system */
3180
3181
3182	#if USE_SEE
3183	db_setup_for_saved_encryption_key();
3184	#endif
3185
	@@ -3347,11 +3347,11 @@
3347	Blob ssh;
3348	char zLine[1000];
3349	blob_init(&ssh, 0, 0);
3350	transport_ssh_command(&ssh);
3351	db_close_config();
3352	blob_appendf(&ssh,
3353	" -t -L 127.0.0.1:%d:127.0.0.1:%d %!$",
3354	iPort, iPort, zRemote
3355	);
3356	if( zFossilCmd==0 ){
3357	blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH");
3358

M src/manifest.c

+3 -3

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1226,11 +1226,11 @@
1226	1226	*/
1227	1227	blob_init(&copy, 0, 0);
1228	1228	blob_init(&errmsg, 0, 0);
1229	1229	blob_append(&copy, zIn, nIn);
1230	1230	pManifest = manifest_parse(&copy, 0, &errmsg);
1231		- iRes = pManifest!=0;
	1231	+ iRes = pManifest!=0;
1232	1232	manifest_destroy(pManifest);
1233	1233	blob_reset(&errmsg);
1234	1234	return iRes;
1235	1235	}
1236	1236
		@@ -1338,11 +1338,11 @@
1338	1338	}else if( !isWF && p!=0 ){
1339	1339	fossil_print("%d ERROR: manifest_is_well_formed() reported false "
1340	1340	"but manifest_parse() found nothing wrong.\n", id);
1341	1341	nErr++;
1342	1342	}
1343		- }else{
	1343	+ }else{
1344	1344	p = manifest_get(id, CFTYPE_ANY, &err);
1345	1345	if( p==0 ){
1346	1346	fossil_print("%d ERROR: %s\n", id, blob_str(&err));
1347	1347	nErr++;
1348	1348	}
		@@ -2113,11 +2113,11 @@
2113	2113	void manifest_create_event_triggers(void){
2114	2114	if( manifest_event_triggers_are_enabled ){
2115	2115	return; /* Triggers already exists. No-op. */
2116	2116	}
2117	2117	alert_create_trigger();
2118		- manifest_event_triggers_are_enabled = 1;
	2118	+ manifest_event_triggers_are_enabled = 1;
2119	2119	}
2120	2120
2121	2121	/*
2122	2122	** Disable manifest event triggers. Drop them if they exist, but mark
2123	2123	** them has having been created so that they won't be recreated. This
2124	2124

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1226,11 +1226,11 @@
1226	*/
1227	blob_init(&copy, 0, 0);
1228	blob_init(&errmsg, 0, 0);
1229	blob_append(&copy, zIn, nIn);
1230	pManifest = manifest_parse(&copy, 0, &errmsg);
1231	iRes = pManifest!=0;
1232	manifest_destroy(pManifest);
1233	blob_reset(&errmsg);
1234	return iRes;
1235	}
1236
	@@ -1338,11 +1338,11 @@
1338	}else if( !isWF && p!=0 ){
1339	fossil_print("%d ERROR: manifest_is_well_formed() reported false "
1340	"but manifest_parse() found nothing wrong.\n", id);
1341	nErr++;
1342	}
1343	}else{
1344	p = manifest_get(id, CFTYPE_ANY, &err);
1345	if( p==0 ){
1346	fossil_print("%d ERROR: %s\n", id, blob_str(&err));
1347	nErr++;
1348	}
	@@ -2113,11 +2113,11 @@
2113	void manifest_create_event_triggers(void){
2114	if( manifest_event_triggers_are_enabled ){
2115	return; /* Triggers already exists. No-op. */
2116	}
2117	alert_create_trigger();
2118	manifest_event_triggers_are_enabled = 1;
2119	}
2120
2121	/*
2122	** Disable manifest event triggers. Drop them if they exist, but mark
2123	** them has having been created so that they won't be recreated. This
2124

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1226,11 +1226,11 @@
1226	*/
1227	blob_init(&copy, 0, 0);
1228	blob_init(&errmsg, 0, 0);
1229	blob_append(&copy, zIn, nIn);
1230	pManifest = manifest_parse(&copy, 0, &errmsg);
1231	iRes = pManifest!=0;
1232	manifest_destroy(pManifest);
1233	blob_reset(&errmsg);
1234	return iRes;
1235	}
1236
	@@ -1338,11 +1338,11 @@
1338	}else if( !isWF && p!=0 ){
1339	fossil_print("%d ERROR: manifest_is_well_formed() reported false "
1340	"but manifest_parse() found nothing wrong.\n", id);
1341	nErr++;
1342	}
1343	}else{
1344	p = manifest_get(id, CFTYPE_ANY, &err);
1345	if( p==0 ){
1346	fossil_print("%d ERROR: %s\n", id, blob_str(&err));
1347	nErr++;
1348	}
	@@ -2113,11 +2113,11 @@
2113	void manifest_create_event_triggers(void){
2114	if( manifest_event_triggers_are_enabled ){
2115	return; /* Triggers already exists. No-op. */
2116	}
2117	alert_create_trigger();
2118	manifest_event_triggers_are_enabled = 1;
2119	}
2120
2121	/*
2122	** Disable manifest event triggers. Drop them if they exist, but mark
2123	** them has having been created so that they won't be recreated. This
2124

M src/markdown.c

+3 -3

		--- src/markdown.c
		+++ src/markdown.c
		@@ -64,11 +64,11 @@
64	64	void *opaque);
65	65	void (table_cell)(struct Blob ob, struct Blob *text, int flags,
66	66	void *opaque);
67	67	void (table_row)(struct Blob ob, struct Blob *cells, int flags,
68	68	void *opaque);
69		- void (footnote_item)(struct Blob ob, const struct Blob *text,
	69	+ void (footnote_item)(struct Blob ob, const struct Blob *text,
70	70	int index, int nUsed, void *opaque);
71	71
72	72	/* span level callbacks - NULL or return 0 prints the span verbatim */
73	73	int (autolink)(struct Blob ob, struct Blob *link,
74	74	enum mkd_autolink type, void *opaque);
		@@ -382,11 +382,11 @@
382	382	/* release the given working buffer back to the cache */
383	383	static void release_work_buffer(struct render rndr, struct Blob buf){
384	384	if( !buf ) return;
385	385	rndr->iDepth--;
386	386	blob_reset(buf);
387		- if( rndr->nBlobCache <
	387	+ if( rndr->nBlobCache <
388	388	(int)(sizeof(rndr->aBlobCache)/sizeof(rndr->aBlobCache[0])) ){
389	389	rndr->aBlobCache[rndr->nBlobCache++] = buf;
390	390	}else{
391	391	fossil_free(buf);
392	392	}
		@@ -2371,11 +2371,11 @@
2371	2371	beg += parse_list(ob, rndr, txt_data, end, 0);
2372	2372	}else if( prefix_oli(txt_data, end) ){
2373	2373	beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED);
2374	2374	}else if( has_table && is_tableline(txt_data, end) ){
2375	2375	beg += parse_table(ob, rndr, txt_data, end);
2376		- }else if( prefix_fencedcode(txt_data, end)
	2376	+ }else if( prefix_fencedcode(txt_data, end)
2377	2377	&& (i = char_codespan(ob, rndr, txt_data, 0, end))!=0
2378	2378	){
2379	2379	beg += i;
2380	2380	}else{
2381	2381	beg += parse_paragraph(ob, rndr, txt_data, end);
2382	2382

	--- src/markdown.c
	+++ src/markdown.c
	@@ -64,11 +64,11 @@
64	void *opaque);
65	void (table_cell)(struct Blob ob, struct Blob *text, int flags,
66	void *opaque);
67	void (table_row)(struct Blob ob, struct Blob *cells, int flags,
68	void *opaque);
69	void (footnote_item)(struct Blob ob, const struct Blob *text,
70	int index, int nUsed, void *opaque);
71
72	/* span level callbacks - NULL or return 0 prints the span verbatim */
73	int (autolink)(struct Blob ob, struct Blob *link,
74	enum mkd_autolink type, void *opaque);
	@@ -382,11 +382,11 @@
382	/* release the given working buffer back to the cache */
383	static void release_work_buffer(struct render rndr, struct Blob buf){
384	if( !buf ) return;
385	rndr->iDepth--;
386	blob_reset(buf);
387	if( rndr->nBlobCache <
388	(int)(sizeof(rndr->aBlobCache)/sizeof(rndr->aBlobCache[0])) ){
389	rndr->aBlobCache[rndr->nBlobCache++] = buf;
390	}else{
391	fossil_free(buf);
392	}
	@@ -2371,11 +2371,11 @@
2371	beg += parse_list(ob, rndr, txt_data, end, 0);
2372	}else if( prefix_oli(txt_data, end) ){
2373	beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED);
2374	}else if( has_table && is_tableline(txt_data, end) ){
2375	beg += parse_table(ob, rndr, txt_data, end);
2376	}else if( prefix_fencedcode(txt_data, end)
2377	&& (i = char_codespan(ob, rndr, txt_data, 0, end))!=0
2378	){
2379	beg += i;
2380	}else{
2381	beg += parse_paragraph(ob, rndr, txt_data, end);
2382

	--- src/markdown.c
	+++ src/markdown.c
	@@ -64,11 +64,11 @@
64	void *opaque);
65	void (table_cell)(struct Blob ob, struct Blob *text, int flags,
66	void *opaque);
67	void (table_row)(struct Blob ob, struct Blob *cells, int flags,
68	void *opaque);
69	void (footnote_item)(struct Blob ob, const struct Blob *text,
70	int index, int nUsed, void *opaque);
71
72	/* span level callbacks - NULL or return 0 prints the span verbatim */
73	int (autolink)(struct Blob ob, struct Blob *link,
74	enum mkd_autolink type, void *opaque);
	@@ -382,11 +382,11 @@
382	/* release the given working buffer back to the cache */
383	static void release_work_buffer(struct render rndr, struct Blob buf){
384	if( !buf ) return;
385	rndr->iDepth--;
386	blob_reset(buf);
387	if( rndr->nBlobCache <
388	(int)(sizeof(rndr->aBlobCache)/sizeof(rndr->aBlobCache[0])) ){
389	rndr->aBlobCache[rndr->nBlobCache++] = buf;
390	}else{
391	fossil_free(buf);
392	}
	@@ -2371,11 +2371,11 @@
2371	beg += parse_list(ob, rndr, txt_data, end, 0);
2372	}else if( prefix_oli(txt_data, end) ){
2373	beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED);
2374	}else if( has_table && is_tableline(txt_data, end) ){
2375	beg += parse_table(ob, rndr, txt_data, end);
2376	}else if( prefix_fencedcode(txt_data, end)
2377	&& (i = char_codespan(ob, rndr, txt_data, 0, end))!=0
2378	){
2379	beg += i;
2380	}else{
2381	beg += parse_paragraph(ob, rndr, txt_data, end);
2382

M src/markdown_html.c

+2 -2

		--- src/markdown_html.c
		+++ src/markdown_html.c
		@@ -780,12 +780,12 @@
780	780	char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0;
781	781	char zClose[20];
782	782
783	783	if( zLink==0 \|\| zLink[0]==0 ){
784	784	zClose[0] = 0;
785		- }else{
786		- static const int flags =
	785	+ }else{
	786	+ static const int flags =
787	787	WIKI_NOBADLINKS \|
788	788	WIKI_MARKDOWNLINKS
789	789	;
790	790	wiki_resolve_hyperlink(ob, flags, zLink, zClose, sizeof(zClose), 0, zTitle);
791	791	}
792	792

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -780,12 +780,12 @@
780	char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0;
781	char zClose[20];
782
783	if( zLink==0 \|\| zLink[0]==0 ){
784	zClose[0] = 0;
785	}else{
786	static const int flags =
787	WIKI_NOBADLINKS \|
788	WIKI_MARKDOWNLINKS
789	;
790	wiki_resolve_hyperlink(ob, flags, zLink, zClose, sizeof(zClose), 0, zTitle);
791	}
792

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -780,12 +780,12 @@
780	char *zTitle = title!=0 && blob_size(title)>0 ? blob_str(title) : 0;
781	char zClose[20];
782
783	if( zLink==0 \|\| zLink[0]==0 ){
784	zClose[0] = 0;
785	}else{
786	static const int flags =
787	WIKI_NOBADLINKS \|
788	WIKI_MARKDOWNLINKS
789	;
790	wiki_resolve_hyperlink(ob, flags, zLink, zClose, sizeof(zClose), 0, zTitle);
791	}
792

M src/merge.c

+2 -2

		--- src/merge.c
		+++ src/merge.c
		@@ -268,11 +268,11 @@
268	268	if( g.argc!=2 ){
269	269	fossil_fatal("unknown arguments to the %s command\n", g.argv[1]);
270	270	}
271	271	verify_all_options();
272	272	db_must_be_within_tree();
273		- debug_show_vfile();
	273	+ debug_show_vfile();
274	274	}
275	275
276	276
277	277	/*
278	278	** COMMAND: merge
		@@ -375,11 +375,11 @@
375	375	**
376	376	** When included on the command-line, --debug causes lots of state
377	377	** information to be displayed. This option is undocumented as it
378	378	** might change or be eliminated in future releases.
379	379	**
380		- ** The --show-vfile flag does a dump of the VFILE table for reference.
	380	+ ** The --show-vfile flag does a dump of the VFILE table for reference.
381	381	**
382	382	** Hints:
383	383	** * Combine --debug and --verbose for still more output.
384	384	** * The --dry-run option is also useful in combination with --debug.
385	385	*/
386	386

	--- src/merge.c
	+++ src/merge.c
	@@ -268,11 +268,11 @@
268	if( g.argc!=2 ){
269	fossil_fatal("unknown arguments to the %s command\n", g.argv[1]);
270	}
271	verify_all_options();
272	db_must_be_within_tree();
273	debug_show_vfile();
274	}
275
276
277	/*
278	** COMMAND: merge
	@@ -375,11 +375,11 @@
375	**
376	** When included on the command-line, --debug causes lots of state
377	** information to be displayed. This option is undocumented as it
378	** might change or be eliminated in future releases.
379	**
380	** The --show-vfile flag does a dump of the VFILE table for reference.
381	**
382	** Hints:
383	** * Combine --debug and --verbose for still more output.
384	** * The --dry-run option is also useful in combination with --debug.
385	*/
386

	--- src/merge.c
	+++ src/merge.c
	@@ -268,11 +268,11 @@
268	if( g.argc!=2 ){
269	fossil_fatal("unknown arguments to the %s command\n", g.argv[1]);
270	}
271	verify_all_options();
272	db_must_be_within_tree();
273	debug_show_vfile();
274	}
275
276
277	/*
278	** COMMAND: merge
	@@ -375,11 +375,11 @@
375	**
376	** When included on the command-line, --debug causes lots of state
377	** information to be displayed. This option is undocumented as it
378	** might change or be eliminated in future releases.
379	**
380	** The --show-vfile flag does a dump of the VFILE table for reference.
381	**
382	** Hints:
383	** * Combine --debug and --verbose for still more output.
384	** * The --dry-run option is also useful in combination with --debug.
385	*/
386

M src/merge3.c

+1 -1

		--- src/merge3.c
		+++ src/merge3.c
		@@ -211,11 +211,11 @@
211	211	int useCrLf = 0;
212	212	int ln1, ln2, lnPivot; /* Line numbers for all files */
213	213	DiffConfig DCfg;
214	214
215	215	blob_zero(pOut); /* Merge results stored in pOut */
216		-
	216	+
217	217	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
218	218	** keep it in the output. This should be secure enough not to cause
219	219	** unintended changes to the merged file and consistent with what
220	220	** users are using in their source files.
221	221	*/
222	222

	--- src/merge3.c
	+++ src/merge3.c
	@@ -211,11 +211,11 @@
211	int useCrLf = 0;
212	int ln1, ln2, lnPivot; /* Line numbers for all files */
213	DiffConfig DCfg;
214
215	blob_zero(pOut); /* Merge results stored in pOut */
216
217	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
218	** keep it in the output. This should be secure enough not to cause
219	** unintended changes to the merged file and consistent with what
220	** users are using in their source files.
221	*/
222

	--- src/merge3.c
	+++ src/merge3.c
	@@ -211,11 +211,11 @@
211	int useCrLf = 0;
212	int ln1, ln2, lnPivot; /* Line numbers for all files */
213	DiffConfig DCfg;
214
215	blob_zero(pOut); /* Merge results stored in pOut */
216
217	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
218	** keep it in the output. This should be secure enough not to cause
219	** unintended changes to the merged file and consistent with what
220	** users are using in their source files.
221	*/
222

M src/name.c

+4 -4

		--- src/name.c
		+++ src/name.c
		@@ -513,22 +513,22 @@
513	513
514	514	/* start:BR -> The first check-in on branch named BR */
515	515	if( strncmp(zTag, "start:", 6)==0 ){
516	516	rid = symbolic_name_to_rid(zTag+6, zType);
517	517	return start_of_branch(rid, 1);
518		- }
519		-
	518	+ }
	519	+
520	520	/* merge-in:BR -> Most recent merge-in for the branch named BR */
521	521	if( strncmp(zTag, "merge-in:", 9)==0 ){
522	522	rid = symbolic_name_to_rid(zTag+9, zType);
523	523	return start_of_branch(rid, 2);
524	524	}
525	525
526	526	/* symbolic-name ":" date-time */
527	527	nTag = strlen(zTag);
528	528	for(i=0; i<nTag-8 && zTag[i]!=':'; i++){}
529		- if( zTag[i]==':'
	529	+ if( zTag[i]==':'
530	530	&& (fossil_isdate(&zTag[i+1]) \|\| fossil_expand_datetime(&zTag[i+1],0)!=0)
531	531	){
532	532	char *zDate = mprintf("%s", &zTag[i+1]);
533	533	char zTagBase = mprintf("%.s", i, zTag);
534	534	char *zXDate;
		@@ -1087,11 +1087,11 @@
1087	1087	" WHERE mlink.fid=%d"
1088	1088	" AND filename.fnid=mlink.fnid"
1089	1089	" AND event.objid=mlink.mid"
1090	1090	" AND blob.rid=mlink.mid"
1091	1091	" ORDER BY event.mtime %s /sort/",
1092		- rid,
	1092	+ rid,
1093	1093	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1094	1094	while( db_step(&q)==SQLITE_ROW ){
1095	1095	if( flags & WHATIS_BRIEF ){
1096	1096	fossil_print("mtime: %s\n", db_column_text(&q,2));
1097	1097	}
1098	1098

	--- src/name.c
	+++ src/name.c
	@@ -513,22 +513,22 @@
513
514	/* start:BR -> The first check-in on branch named BR */
515	if( strncmp(zTag, "start:", 6)==0 ){
516	rid = symbolic_name_to_rid(zTag+6, zType);
517	return start_of_branch(rid, 1);
518	}
519
520	/* merge-in:BR -> Most recent merge-in for the branch named BR */
521	if( strncmp(zTag, "merge-in:", 9)==0 ){
522	rid = symbolic_name_to_rid(zTag+9, zType);
523	return start_of_branch(rid, 2);
524	}
525
526	/* symbolic-name ":" date-time */
527	nTag = strlen(zTag);
528	for(i=0; i<nTag-8 && zTag[i]!=':'; i++){}
529	if( zTag[i]==':'
530	&& (fossil_isdate(&zTag[i+1]) \|\| fossil_expand_datetime(&zTag[i+1],0)!=0)
531	){
532	char *zDate = mprintf("%s", &zTag[i+1]);
533	char zTagBase = mprintf("%.s", i, zTag);
534	char *zXDate;
	@@ -1087,11 +1087,11 @@
1087	" WHERE mlink.fid=%d"
1088	" AND filename.fnid=mlink.fnid"
1089	" AND event.objid=mlink.mid"
1090	" AND blob.rid=mlink.mid"
1091	" ORDER BY event.mtime %s /sort/",
1092	rid,
1093	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1094	while( db_step(&q)==SQLITE_ROW ){
1095	if( flags & WHATIS_BRIEF ){
1096	fossil_print("mtime: %s\n", db_column_text(&q,2));
1097	}
1098

	--- src/name.c
	+++ src/name.c
	@@ -513,22 +513,22 @@
513
514	/* start:BR -> The first check-in on branch named BR */
515	if( strncmp(zTag, "start:", 6)==0 ){
516	rid = symbolic_name_to_rid(zTag+6, zType);
517	return start_of_branch(rid, 1);
518	}
519
520	/* merge-in:BR -> Most recent merge-in for the branch named BR */
521	if( strncmp(zTag, "merge-in:", 9)==0 ){
522	rid = symbolic_name_to_rid(zTag+9, zType);
523	return start_of_branch(rid, 2);
524	}
525
526	/* symbolic-name ":" date-time */
527	nTag = strlen(zTag);
528	for(i=0; i<nTag-8 && zTag[i]!=':'; i++){}
529	if( zTag[i]==':'
530	&& (fossil_isdate(&zTag[i+1]) \|\| fossil_expand_datetime(&zTag[i+1],0)!=0)
531	){
532	char *zDate = mprintf("%s", &zTag[i+1]);
533	char zTagBase = mprintf("%.s", i, zTag);
534	char *zXDate;
	@@ -1087,11 +1087,11 @@
1087	" WHERE mlink.fid=%d"
1088	" AND filename.fnid=mlink.fnid"
1089	" AND event.objid=mlink.mid"
1090	" AND blob.rid=mlink.mid"
1091	" ORDER BY event.mtime %s /sort/",
1092	rid,
1093	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1094	while( db_step(&q)==SQLITE_ROW ){
1095	if( flags & WHATIS_BRIEF ){
1096	fossil_print("mtime: %s\n", db_column_text(&q,2));
1097	}
1098

M src/patch.c

+13 -13

		--- src/patch.c
		+++ src/patch.c
		@@ -71,11 +71,11 @@
71	71	/*
72	72	** mkdelta(X,Y)
73	73	**
74	74	** X is an numeric artifact id. Y is a filename.
75	75	**
76		-** Compute a compressed delta that carries X into Y. Or return
	76	+** Compute a compressed delta that carries X into Y. Or return
77	77	** and zero-length blob if X is equal to Y.
78	78	*/
79	79	static void mkdeltaFunc(
80	80	sqlite3_context *context,
81	81	int argc,
		@@ -162,11 +162,11 @@
162	162	" pathname TEXT,\n" /* Filename */
163	163	" origname TEXT,\n" /* Name before rename. NULL if not renamed */
164	164	" hash TEXT,\n" /* Baseline hash. NULL for new files. */
165	165	" isexe BOOL,\n" /* True if executable */
166	166	" islink BOOL,\n" /* True if is a symbolic link */
167		- " delta BLOB\n" /* compressed delta. NULL if deleted.
	167	+ " delta BLOB\n" /* compressed delta. NULL if deleted.
168	168	** length 0 if unchanged */
169	169	");"
170	170	"CREATE TABLE patch.cfg(\n"
171	171	" key TEXT,\n"
172	172	" value ANY\n"
		@@ -196,11 +196,11 @@
196	196	if( z ){
197	197	db_multi_exec(
198	198	"INSERT INTO patch.cfg(key,value)VALUES('hostname',%Q)", z);
199	199	fossil_free(z);
200	200	}
201		-
	201	+
202	202	/* New files */
203	203	db_multi_exec(
204	204	"INSERT INTO patch.chng(pathname,hash,isexe,islink,delta)"
205	205	" SELECT pathname, NULL, isexe, islink,"
206	206	" compress(read_co_file(%Q\|\|pathname))"
		@@ -249,11 +249,11 @@
249	249	#ifdef _WIN32
250	250	fflush(out);
251	251	_setmode(_fileno(out), _O_BINARY);
252	252	#endif
253	253	fwrite(pData, sz, 1, out);
254		- sqlite3_free(pData);
	254	+ sqlite3_free(pData);
255	255	fflush(out);
256	256	}
257	257	}
258	258
259	259	/*
		@@ -301,11 +301,11 @@
301	301	/*
302	302	** Show a summary of the content of a patch on standard output
303	303	*/
304	304	void patch_view(unsigned mFlags){
305	305	Stmt q;
306		- db_prepare(&q,
	306	+ db_prepare(&q,
307	307	"WITH nmap(nkey,nm) AS (VALUES"
308	308	"('baseline','BASELINE'),"
309	309	"('project-name','PROJECT-NAME'))"
310	310	"SELECT nm, value FROM nmap, patch.cfg WHERE nkey=key;"
311	311	);
		@@ -312,11 +312,11 @@
312	312	while( db_step(&q)==SQLITE_ROW ){
313	313	fossil_print("%-12s %s\n", db_column_text(&q,0), db_column_text(&q,1));
314	314	}
315	315	db_finalize(&q);
316	316	if( mFlags & PATCH_VERBOSE ){
317		- db_prepare(&q,
	317	+ db_prepare(&q,
318	318	"WITH nmap(nkey,nm,isDate) AS (VALUES"
319	319	"('project-code','PROJECT-CODE',0),"
320	320	"('date','TIMESTAMP',1),"
321	321	"('user','USER',0),"
322	322	"('hostname','HOSTNAME',0),"
		@@ -433,11 +433,11 @@
433	433	blob_appendf(&cmd, " merge %s\n", db_column_text(&q,1));
434	434	}else{
435	435	blob_appendf(&cmd, " merge --%s %s\n", zType, db_column_text(&q,1));
436	436	}
437	437	if( mFlags & PATCH_VERBOSE ){
438		- fossil_print("%-10s %s\n", db_column_text(&q,2),
	438	+ fossil_print("%-10s %s\n", db_column_text(&q,2),
439	439	db_column_text(&q,0));
440	440	}
441	441	}
442	442	db_finalize(&q);
443	443	if( mFlags & PATCH_DRYRUN ){
		@@ -561,11 +561,11 @@
561	561	blob_appendf(&cmd, " add %$\n", zPathname);
562	562	if( mFlags & PATCH_VERBOSE ){
563	563	fossil_print("%-10s %s\n", "NEW", zPathname);
564	564	}
565	565	}
566		- if( (mFlags & PATCH_DRYRUN)==0 ){
	566	+ if( (mFlags & PATCH_DRYRUN)==0 ){
567	567	if( isLink ){
568	568	symlink_create(blob_str(&data), zPathname);
569	569	}else{
570	570	blob_write_to_file(&data, zPathname);
571	571	}
		@@ -697,11 +697,11 @@
697	697	blob_init(&remote, 0, 0);
698	698	if( zFossilCmd==0 ){
699	699	blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0);
700	700	zFossilCmd = "fossil";
701	701	}
702		- blob_appendf(&remote, "%$ patch %s%s --dir64 %z -",
	702	+ blob_appendf(&remote, "%$ patch %s%s --dir64 %z -",
703	703	zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1));
704	704	blob_append_escaped_arg(&cmd, blob_str(&remote), 0);
705	705	blob_reset(&remote);
706	706	}
707	707	fossil_print("%s\n", blob_str(&cmd));
		@@ -777,11 +777,11 @@
777	777	);
778	778	while( db_step(&q)==SQLITE_ROW ){
779	779	int rid;
780	780	const char *zName;
781	781	Blob a, b;
782		-
	782	+
783	783	if( db_column_type(&q,0)!=SQLITE_INTEGER
784	784	&& db_column_type(&q,4)==SQLITE_TEXT
785	785	){
786	786	char *zUuid = fossil_strdup(db_column_text(&q,4));
787	787	char *zName = fossil_strdup(db_column_text(&q,1));
		@@ -899,11 +899,11 @@
899	899	**
900	900	** -f\|--force Apply the patch even though there are unsaved
901	901	** changes in the current check-out. Unsaved
902	902	** changes will be reverted and then the patch is
903	903	** applied.
904		-** --fossilcmd EXE Name of the "fossil" executable on the remote
	904	+** --fossilcmd EXE Name of the "fossil" executable on the remote
905	905	** -n\|--dry-run Do nothing, but print what would have happened
906	906	** -v\|--verbose Extra output explaining what happens
907	907	**
908	908	**
909	909	** > fossil patch pull REMOTE-CHECKOUT
		@@ -976,11 +976,11 @@
976	976	if( find_option("dry-run","n",0) ) flags \|= PATCH_DRYRUN;
977	977	if( find_option("verbose","v",0) ) flags \|= PATCH_VERBOSE;
978	978	if( find_option("force","f",0) ) flags \|= PATCH_FORCE;
979	979	db_must_be_within_tree();
980	980	verify_all_options();
981		- pIn = patch_remote_command(flags & (~PATCH_FORCE),
	981	+ pIn = patch_remote_command(flags & (~PATCH_FORCE),
982	982	"pull", "create", zFossilCmd, "r");
983	983	if( pIn ){
984	984	patch_attach(0, pIn);
985	985	pclose(pIn);
986	986	patch_apply(flags);
		@@ -1014,7 +1014,7 @@
1014	1014	patch_attach(zIn, stdin);
1015	1015	patch_view(flags);
1016	1016	}else
1017	1017	{
1018	1018	goto patch_usage;
1019		- }
	1019	+ }
1020	1020	}
1021	1021

	--- src/patch.c
	+++ src/patch.c
	@@ -71,11 +71,11 @@
71	/*
72	** mkdelta(X,Y)
73	**
74	** X is an numeric artifact id. Y is a filename.
75	**
76	** Compute a compressed delta that carries X into Y. Or return
77	** and zero-length blob if X is equal to Y.
78	*/
79	static void mkdeltaFunc(
80	sqlite3_context *context,
81	int argc,
	@@ -162,11 +162,11 @@
162	" pathname TEXT,\n" /* Filename */
163	" origname TEXT,\n" /* Name before rename. NULL if not renamed */
164	" hash TEXT,\n" /* Baseline hash. NULL for new files. */
165	" isexe BOOL,\n" /* True if executable */
166	" islink BOOL,\n" /* True if is a symbolic link */
167	" delta BLOB\n" /* compressed delta. NULL if deleted.
168	** length 0 if unchanged */
169	");"
170	"CREATE TABLE patch.cfg(\n"
171	" key TEXT,\n"
172	" value ANY\n"
	@@ -196,11 +196,11 @@
196	if( z ){
197	db_multi_exec(
198	"INSERT INTO patch.cfg(key,value)VALUES('hostname',%Q)", z);
199	fossil_free(z);
200	}
201
202	/* New files */
203	db_multi_exec(
204	"INSERT INTO patch.chng(pathname,hash,isexe,islink,delta)"
205	" SELECT pathname, NULL, isexe, islink,"
206	" compress(read_co_file(%Q\|\|pathname))"
	@@ -249,11 +249,11 @@
249	#ifdef _WIN32
250	fflush(out);
251	_setmode(_fileno(out), _O_BINARY);
252	#endif
253	fwrite(pData, sz, 1, out);
254	sqlite3_free(pData);
255	fflush(out);
256	}
257	}
258
259	/*
	@@ -301,11 +301,11 @@
301	/*
302	** Show a summary of the content of a patch on standard output
303	*/
304	void patch_view(unsigned mFlags){
305	Stmt q;
306	db_prepare(&q,
307	"WITH nmap(nkey,nm) AS (VALUES"
308	"('baseline','BASELINE'),"
309	"('project-name','PROJECT-NAME'))"
310	"SELECT nm, value FROM nmap, patch.cfg WHERE nkey=key;"
311	);
	@@ -312,11 +312,11 @@
312	while( db_step(&q)==SQLITE_ROW ){
313	fossil_print("%-12s %s\n", db_column_text(&q,0), db_column_text(&q,1));
314	}
315	db_finalize(&q);
316	if( mFlags & PATCH_VERBOSE ){
317	db_prepare(&q,
318	"WITH nmap(nkey,nm,isDate) AS (VALUES"
319	"('project-code','PROJECT-CODE',0),"
320	"('date','TIMESTAMP',1),"
321	"('user','USER',0),"
322	"('hostname','HOSTNAME',0),"
	@@ -433,11 +433,11 @@
433	blob_appendf(&cmd, " merge %s\n", db_column_text(&q,1));
434	}else{
435	blob_appendf(&cmd, " merge --%s %s\n", zType, db_column_text(&q,1));
436	}
437	if( mFlags & PATCH_VERBOSE ){
438	fossil_print("%-10s %s\n", db_column_text(&q,2),
439	db_column_text(&q,0));
440	}
441	}
442	db_finalize(&q);
443	if( mFlags & PATCH_DRYRUN ){
	@@ -561,11 +561,11 @@
561	blob_appendf(&cmd, " add %$\n", zPathname);
562	if( mFlags & PATCH_VERBOSE ){
563	fossil_print("%-10s %s\n", "NEW", zPathname);
564	}
565	}
566	if( (mFlags & PATCH_DRYRUN)==0 ){
567	if( isLink ){
568	symlink_create(blob_str(&data), zPathname);
569	}else{
570	blob_write_to_file(&data, zPathname);
571	}
	@@ -697,11 +697,11 @@
697	blob_init(&remote, 0, 0);
698	if( zFossilCmd==0 ){
699	blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0);
700	zFossilCmd = "fossil";
701	}
702	blob_appendf(&remote, "%$ patch %s%s --dir64 %z -",
703	zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1));
704	blob_append_escaped_arg(&cmd, blob_str(&remote), 0);
705	blob_reset(&remote);
706	}
707	fossil_print("%s\n", blob_str(&cmd));
	@@ -777,11 +777,11 @@
777	);
778	while( db_step(&q)==SQLITE_ROW ){
779	int rid;
780	const char *zName;
781	Blob a, b;
782
783	if( db_column_type(&q,0)!=SQLITE_INTEGER
784	&& db_column_type(&q,4)==SQLITE_TEXT
785	){
786	char *zUuid = fossil_strdup(db_column_text(&q,4));
787	char *zName = fossil_strdup(db_column_text(&q,1));
	@@ -899,11 +899,11 @@
899	**
900	** -f\|--force Apply the patch even though there are unsaved
901	** changes in the current check-out. Unsaved
902	** changes will be reverted and then the patch is
903	** applied.
904	** --fossilcmd EXE Name of the "fossil" executable on the remote
905	** -n\|--dry-run Do nothing, but print what would have happened
906	** -v\|--verbose Extra output explaining what happens
907	**
908	**
909	** > fossil patch pull REMOTE-CHECKOUT
	@@ -976,11 +976,11 @@
976	if( find_option("dry-run","n",0) ) flags \|= PATCH_DRYRUN;
977	if( find_option("verbose","v",0) ) flags \|= PATCH_VERBOSE;
978	if( find_option("force","f",0) ) flags \|= PATCH_FORCE;
979	db_must_be_within_tree();
980	verify_all_options();
981	pIn = patch_remote_command(flags & (~PATCH_FORCE),
982	"pull", "create", zFossilCmd, "r");
983	if( pIn ){
984	patch_attach(0, pIn);
985	pclose(pIn);
986	patch_apply(flags);
	@@ -1014,7 +1014,7 @@
1014	patch_attach(zIn, stdin);
1015	patch_view(flags);
1016	}else
1017	{
1018	goto patch_usage;
1019	}
1020	}
1021

	--- src/patch.c
	+++ src/patch.c
	@@ -71,11 +71,11 @@
71	/*
72	** mkdelta(X,Y)
73	**
74	** X is an numeric artifact id. Y is a filename.
75	**
76	** Compute a compressed delta that carries X into Y. Or return
77	** and zero-length blob if X is equal to Y.
78	*/
79	static void mkdeltaFunc(
80	sqlite3_context *context,
81	int argc,
	@@ -162,11 +162,11 @@
162	" pathname TEXT,\n" /* Filename */
163	" origname TEXT,\n" /* Name before rename. NULL if not renamed */
164	" hash TEXT,\n" /* Baseline hash. NULL for new files. */
165	" isexe BOOL,\n" /* True if executable */
166	" islink BOOL,\n" /* True if is a symbolic link */
167	" delta BLOB\n" /* compressed delta. NULL if deleted.
168	** length 0 if unchanged */
169	");"
170	"CREATE TABLE patch.cfg(\n"
171	" key TEXT,\n"
172	" value ANY\n"
	@@ -196,11 +196,11 @@
196	if( z ){
197	db_multi_exec(
198	"INSERT INTO patch.cfg(key,value)VALUES('hostname',%Q)", z);
199	fossil_free(z);
200	}
201
202	/* New files */
203	db_multi_exec(
204	"INSERT INTO patch.chng(pathname,hash,isexe,islink,delta)"
205	" SELECT pathname, NULL, isexe, islink,"
206	" compress(read_co_file(%Q\|\|pathname))"
	@@ -249,11 +249,11 @@
249	#ifdef _WIN32
250	fflush(out);
251	_setmode(_fileno(out), _O_BINARY);
252	#endif
253	fwrite(pData, sz, 1, out);
254	sqlite3_free(pData);
255	fflush(out);
256	}
257	}
258
259	/*
	@@ -301,11 +301,11 @@
301	/*
302	** Show a summary of the content of a patch on standard output
303	*/
304	void patch_view(unsigned mFlags){
305	Stmt q;
306	db_prepare(&q,
307	"WITH nmap(nkey,nm) AS (VALUES"
308	"('baseline','BASELINE'),"
309	"('project-name','PROJECT-NAME'))"
310	"SELECT nm, value FROM nmap, patch.cfg WHERE nkey=key;"
311	);
	@@ -312,11 +312,11 @@
312	while( db_step(&q)==SQLITE_ROW ){
313	fossil_print("%-12s %s\n", db_column_text(&q,0), db_column_text(&q,1));
314	}
315	db_finalize(&q);
316	if( mFlags & PATCH_VERBOSE ){
317	db_prepare(&q,
318	"WITH nmap(nkey,nm,isDate) AS (VALUES"
319	"('project-code','PROJECT-CODE',0),"
320	"('date','TIMESTAMP',1),"
321	"('user','USER',0),"
322	"('hostname','HOSTNAME',0),"
	@@ -433,11 +433,11 @@
433	blob_appendf(&cmd, " merge %s\n", db_column_text(&q,1));
434	}else{
435	blob_appendf(&cmd, " merge --%s %s\n", zType, db_column_text(&q,1));
436	}
437	if( mFlags & PATCH_VERBOSE ){
438	fossil_print("%-10s %s\n", db_column_text(&q,2),
439	db_column_text(&q,0));
440	}
441	}
442	db_finalize(&q);
443	if( mFlags & PATCH_DRYRUN ){
	@@ -561,11 +561,11 @@
561	blob_appendf(&cmd, " add %$\n", zPathname);
562	if( mFlags & PATCH_VERBOSE ){
563	fossil_print("%-10s %s\n", "NEW", zPathname);
564	}
565	}
566	if( (mFlags & PATCH_DRYRUN)==0 ){
567	if( isLink ){
568	symlink_create(blob_str(&data), zPathname);
569	}else{
570	blob_write_to_file(&data, zPathname);
571	}
	@@ -697,11 +697,11 @@
697	blob_init(&remote, 0, 0);
698	if( zFossilCmd==0 ){
699	blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0);
700	zFossilCmd = "fossil";
701	}
702	blob_appendf(&remote, "%$ patch %s%s --dir64 %z -",
703	zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1));
704	blob_append_escaped_arg(&cmd, blob_str(&remote), 0);
705	blob_reset(&remote);
706	}
707	fossil_print("%s\n", blob_str(&cmd));
	@@ -777,11 +777,11 @@
777	);
778	while( db_step(&q)==SQLITE_ROW ){
779	int rid;
780	const char *zName;
781	Blob a, b;
782
783	if( db_column_type(&q,0)!=SQLITE_INTEGER
784	&& db_column_type(&q,4)==SQLITE_TEXT
785	){
786	char *zUuid = fossil_strdup(db_column_text(&q,4));
787	char *zName = fossil_strdup(db_column_text(&q,1));
	@@ -899,11 +899,11 @@
899	**
900	** -f\|--force Apply the patch even though there are unsaved
901	** changes in the current check-out. Unsaved
902	** changes will be reverted and then the patch is
903	** applied.
904	** --fossilcmd EXE Name of the "fossil" executable on the remote
905	** -n\|--dry-run Do nothing, but print what would have happened
906	** -v\|--verbose Extra output explaining what happens
907	**
908	**
909	** > fossil patch pull REMOTE-CHECKOUT
	@@ -976,11 +976,11 @@
976	if( find_option("dry-run","n",0) ) flags \|= PATCH_DRYRUN;
977	if( find_option("verbose","v",0) ) flags \|= PATCH_VERBOSE;
978	if( find_option("force","f",0) ) flags \|= PATCH_FORCE;
979	db_must_be_within_tree();
980	verify_all_options();
981	pIn = patch_remote_command(flags & (~PATCH_FORCE),
982	"pull", "create", zFossilCmd, "r");
983	if( pIn ){
984	patch_attach(0, pIn);
985	pclose(pIn);
986	patch_apply(flags);
	@@ -1014,7 +1014,7 @@
1014	patch_attach(zIn, stdin);
1015	patch_view(flags);
1016	}else
1017	{
1018	goto patch_usage;
1019	}
1020	}
1021

M src/pikchrshow.c

+2 -2

		--- src/pikchrshow.c
		+++ src/pikchrshow.c
		@@ -135,11 +135,11 @@
135	135	}
136	136	if(!(PIKCHR_PROCESS_TH1 & pikFlags)
137	137	/* If any TH1_xxx flags are set, set TH1 */
138	138	&& (PIKCHR_PROCESS_TH1_NOSVG & pikFlags \|\| thFlags!=0)){
139	139	pikFlags \|= PIKCHR_PROCESS_TH1;
140		- }
	140	+ }
141	141	if(zNonce){
142	142	blob_appendf(pOut, "%s\n", zNonce);
143	143	}
144	144	if(PIKCHR_PROCESS_TH1 & pikFlags){
145	145	Blob out = empty_blob;
		@@ -546,11 +546,11 @@
546	546	** CSS to hide the SVG and reveal the source by default.
547	547	**
548	548	** -src Store the input pikchr's source code in the output as
549	549	** a separate element adjacent to the SVG one. Implied
550	550	** by -div-source.
551		-**
	551	+**
552	552	**
553	553	** -th Process the input using TH1 before passing it to pikchr
554	554	**
555	555	** -th-novar Disable $var and $<var> TH1 processing. Use this if the
556	556	** pikchr script uses '$' for its own purposes and that
557	557

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -135,11 +135,11 @@
135	}
136	if(!(PIKCHR_PROCESS_TH1 & pikFlags)
137	/* If any TH1_xxx flags are set, set TH1 */
138	&& (PIKCHR_PROCESS_TH1_NOSVG & pikFlags \|\| thFlags!=0)){
139	pikFlags \|= PIKCHR_PROCESS_TH1;
140	}
141	if(zNonce){
142	blob_appendf(pOut, "%s\n", zNonce);
143	}
144	if(PIKCHR_PROCESS_TH1 & pikFlags){
145	Blob out = empty_blob;
	@@ -546,11 +546,11 @@
546	** CSS to hide the SVG and reveal the source by default.
547	**
548	** -src Store the input pikchr's source code in the output as
549	** a separate element adjacent to the SVG one. Implied
550	** by -div-source.
551	**
552	**
553	** -th Process the input using TH1 before passing it to pikchr
554	**
555	** -th-novar Disable $var and $<var> TH1 processing. Use this if the
556	** pikchr script uses '$' for its own purposes and that
557

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -135,11 +135,11 @@
135	}
136	if(!(PIKCHR_PROCESS_TH1 & pikFlags)
137	/* If any TH1_xxx flags are set, set TH1 */
138	&& (PIKCHR_PROCESS_TH1_NOSVG & pikFlags \|\| thFlags!=0)){
139	pikFlags \|= PIKCHR_PROCESS_TH1;
140	}
141	if(zNonce){
142	blob_appendf(pOut, "%s\n", zNonce);
143	}
144	if(PIKCHR_PROCESS_TH1 & pikFlags){
145	Blob out = empty_blob;
	@@ -546,11 +546,11 @@
546	** CSS to hide the SVG and reveal the source by default.
547	**
548	** -src Store the input pikchr's source code in the output as
549	** a separate element adjacent to the SVG one. Implied
550	** by -div-source.
551	**
552	**
553	** -th Process the input using TH1 before passing it to pikchr
554	**
555	** -th-novar Disable $var and $<var> TH1 processing. Use this if the
556	** pikchr script uses '$' for its own purposes and that
557

M src/report.c

+1 -1

		--- src/report.c
		+++ src/report.c
		@@ -1126,11 +1126,11 @@
1126	1126	char *zMimetype;
1127	1127	int tabs;
1128	1128	Stmt q;
1129	1129	char *zErr1 = 0;
1130	1130	char *zErr2 = 0;
1131		-
	1131	+
1132	1132	login_check_credentials();
1133	1133	if( !g.perm.RdTkt ){ login_needed(g.anon.RdTkt); return; }
1134	1134	report_update_reportfmt_table();
1135	1135	rn = report_number();
1136	1136	tabs = P("tablist")!=0;
1137	1137

	--- src/report.c
	+++ src/report.c
	@@ -1126,11 +1126,11 @@
1126	char *zMimetype;
1127	int tabs;
1128	Stmt q;
1129	char *zErr1 = 0;
1130	char *zErr2 = 0;
1131
1132	login_check_credentials();
1133	if( !g.perm.RdTkt ){ login_needed(g.anon.RdTkt); return; }
1134	report_update_reportfmt_table();
1135	rn = report_number();
1136	tabs = P("tablist")!=0;
1137

	--- src/report.c
	+++ src/report.c
	@@ -1126,11 +1126,11 @@
1126	char *zMimetype;
1127	int tabs;
1128	Stmt q;
1129	char *zErr1 = 0;
1130	char *zErr2 = 0;
1131
1132	login_check_credentials();
1133	if( !g.perm.RdTkt ){ login_needed(g.anon.RdTkt); return; }
1134	report_update_reportfmt_table();
1135	rn = report_number();
1136	tabs = P("tablist")!=0;
1137

M src/rss.c

+2 -2

		--- src/rss.c
		+++ src/rss.c
		@@ -143,11 +143,11 @@
143	143
144	144	cgi_set_content_type("application/rss+xml");
145	145
146	146	zProjectName = db_get("project-name", 0);
147	147	if( zProjectName==0 ){
148		- zFreeProjectName = zProjectName =
	148	+ zFreeProjectName = zProjectName =
149	149	mprintf("Fossil source repository for: %s", g.zBaseURL);
150	150	}
151	151	zProjectDescr = db_get("project-description", 0);
152	152	if( zProjectDescr==0 ){
153	153	zProjectDescr = zProjectName;
		@@ -342,11 +342,11 @@
342	342
343	343	blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 );
344	344
345	345	zProjectName = db_get("project-name", 0);
346	346	if( zProjectName==0 ){
347		- zFreeProjectName = zProjectName =
	347	+ zFreeProjectName = zProjectName =
348	348	mprintf("Fossil source repository for: %s", zBaseURL);
349	349	}
350	350	zProjectDescr = db_get("project-description", 0);
351	351	if( zProjectDescr==0 ){
352	352	zProjectDescr = zProjectName;
353	353

	--- src/rss.c
	+++ src/rss.c
	@@ -143,11 +143,11 @@
143
144	cgi_set_content_type("application/rss+xml");
145
146	zProjectName = db_get("project-name", 0);
147	if( zProjectName==0 ){
148	zFreeProjectName = zProjectName =
149	mprintf("Fossil source repository for: %s", g.zBaseURL);
150	}
151	zProjectDescr = db_get("project-description", 0);
152	if( zProjectDescr==0 ){
153	zProjectDescr = zProjectName;
	@@ -342,11 +342,11 @@
342
343	blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 );
344
345	zProjectName = db_get("project-name", 0);
346	if( zProjectName==0 ){
347	zFreeProjectName = zProjectName =
348	mprintf("Fossil source repository for: %s", zBaseURL);
349	}
350	zProjectDescr = db_get("project-description", 0);
351	if( zProjectDescr==0 ){
352	zProjectDescr = zProjectName;
353

	--- src/rss.c
	+++ src/rss.c
	@@ -143,11 +143,11 @@
143
144	cgi_set_content_type("application/rss+xml");
145
146	zProjectName = db_get("project-name", 0);
147	if( zProjectName==0 ){
148	zFreeProjectName = zProjectName =
149	mprintf("Fossil source repository for: %s", g.zBaseURL);
150	}
151	zProjectDescr = db_get("project-description", 0);
152	if( zProjectDescr==0 ){
153	zProjectDescr = zProjectName;
	@@ -342,11 +342,11 @@
342
343	blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 );
344
345	zProjectName = db_get("project-name", 0);
346	if( zProjectName==0 ){
347	zFreeProjectName = zProjectName =
348	mprintf("Fossil source repository for: %s", zBaseURL);
349	}
350	zProjectDescr = db_get("project-description", 0);
351	if( zProjectDescr==0 ){
352	zProjectDescr = zProjectName;
353

M src/search.c

+2 -2

		--- src/search.c
		+++ src/search.c
		@@ -696,11 +696,11 @@
696	696	}else{
697	697	/* Legacy timeline search (the default) */
698	698	(void)search_init(blob_str(&pattern),"","","...",SRCHFLG_STATIC);
699	699	blob_reset(&pattern);
700	700	search_sql_setup(g.db);
701		-
	701	+
702	702	db_multi_exec(
703	703	"CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
704	704	"CREATE INDEX srch_idx1 ON srch(x);"
705	705	"INSERT INTO srch(rid,uuid,date,comment,x)"
706	706	" SELECT blob.rid, uuid, datetime(event.mtime,toLocal()),"
		@@ -2380,11 +2380,11 @@
2380	2380	}
2381	2381
2382	2382
2383	2383	/*
2384	2384	** Argument f should be a flag accepted by matchinfo() (a valid character
2385		-** in the string passed as the second argument). If it is not, -1 is
	2385	+** in the string passed as the second argument). If it is not, -1 is
2386	2386	** returned. Otherwise, if f is a valid matchinfo flag, the value returned
2387	2387	** is the number of 32-bit integers added to the output array if the
2388	2388	** table has nCol columns and the query nPhrase phrases.
2389	2389	*/
2390	2390	static int fts5MatchinfoFlagsize(int nCol, int nPhrase, char f){
2391	2391

	--- src/search.c
	+++ src/search.c
	@@ -696,11 +696,11 @@
696	}else{
697	/* Legacy timeline search (the default) */
698	(void)search_init(blob_str(&pattern),"","","...",SRCHFLG_STATIC);
699	blob_reset(&pattern);
700	search_sql_setup(g.db);
701
702	db_multi_exec(
703	"CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
704	"CREATE INDEX srch_idx1 ON srch(x);"
705	"INSERT INTO srch(rid,uuid,date,comment,x)"
706	" SELECT blob.rid, uuid, datetime(event.mtime,toLocal()),"
	@@ -2380,11 +2380,11 @@
2380	}
2381
2382
2383	/*
2384	** Argument f should be a flag accepted by matchinfo() (a valid character
2385	** in the string passed as the second argument). If it is not, -1 is
2386	** returned. Otherwise, if f is a valid matchinfo flag, the value returned
2387	** is the number of 32-bit integers added to the output array if the
2388	** table has nCol columns and the query nPhrase phrases.
2389	*/
2390	static int fts5MatchinfoFlagsize(int nCol, int nPhrase, char f){
2391

	--- src/search.c
	+++ src/search.c
	@@ -696,11 +696,11 @@
696	}else{
697	/* Legacy timeline search (the default) */
698	(void)search_init(blob_str(&pattern),"","","...",SRCHFLG_STATIC);
699	blob_reset(&pattern);
700	search_sql_setup(g.db);
701
702	db_multi_exec(
703	"CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
704	"CREATE INDEX srch_idx1 ON srch(x);"
705	"INSERT INTO srch(rid,uuid,date,comment,x)"
706	" SELECT blob.rid, uuid, datetime(event.mtime,toLocal()),"
	@@ -2380,11 +2380,11 @@
2380	}
2381
2382
2383	/*
2384	** Argument f should be a flag accepted by matchinfo() (a valid character
2385	** in the string passed as the second argument). If it is not, -1 is
2386	** returned. Otherwise, if f is a valid matchinfo flag, the value returned
2387	** is the number of 32-bit integers added to the output array if the
2388	** table has nCol columns and the query nPhrase phrases.
2389	*/
2390	static int fts5MatchinfoFlagsize(int nCol, int nPhrase, char f){
2391

M src/security_audit.c

+7 -7

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -336,11 +336,11 @@
336	336	/* Anonymous users probably should not be allowed act as moderators
337	337	** for wiki or tickets.
338	338	*/
339	339	if( hasAnyCap(zAnonCap, "lq5") ){
340	340	@ <li><p><b>WARNING:</b>
341		- @ Anonymous users can act as moderators for wiki, tickets, or
	341	+ @ Anonymous users can act as moderators for wiki, tickets, or
342	342	@ forum posts. This defeats the whole purpose of moderation.
343	343	@ Fix this by removing the "Mod-Wiki", "Mod-Tkt", and "Mod-Forum"
344	344	@ privileges (<a href="%R/setup_ucap_list">capabilities</a> "fq5")
345	345	@ from users "anonymous" and "nobody"
346	346	@ on the <a href="setup_ulist">User Configuration</a> page.
		@@ -353,11 +353,11 @@
353	353	@ <li><p><b>WARNING:</b>
354	354	@ TH1 scripts might be configured to run on any sync, push, pull, or
355	355	@ clone operation. See the the <a href="%R/xfersetup">/xfersetup</a>
356	356	@ page for more information. These TH1 scripts are a potential
357	357	@ security concern and so should be carefully audited by a human.
358		- }
	358	+ }
359	359
360	360	/* The strict-manifest-syntax setting should be on. */
361	361	if( db_get_boolean("strict-manifest-syntax",1)==0 ){
362	362	@ <li><p><b>WARNING:</b>
363	363	@ The "strict-manifest-syntax" flag is off. This is a security
		@@ -582,11 +582,11 @@
582	582	if( r<=0.0 ){
583	583	@ <li><p>
584	584	@ Load average limiting is turned off. This can cause the server
585	585	@ to bog down if many requests for expensive services (such as
586	586	@ large diffs or tarballs) arrive at about the same time.
587		- @ To fix this, set the
	587	+ @ To fix this, set the
588	588	@ <a href='%R/setup_access#slal'>"Server Load Average Limit"</a> on the
589	589	@ <a href='%R/setup_access'>Access Control</a> page to the approximate
590	590	@ the number of available cores on your server, or maybe just a little
591	591	@ less.
592	592	}else if( r>=8.0 ){
		@@ -604,11 +604,11 @@
604	604	@ To set up an error log,
605	605	if( fossil_strcmp(g.zCmdName, "cgi")==0 ){
606	606	@ make an entry like "errorlog: <i>FILENAME</i>" in the
607	607	@ CGI script at %h(P("SCRIPT_FILENAME")).
608	608	}else{
609		- @ add the "--errorlog <i>FILENAME</i>" option to the
	609	+ @ add the "--errorlog <i>FILENAME</i>" option to the
610	610	@ "%h(g.argv[0]) %h(g.zCmdName)" command that launched this server.
611	611	}
612	612	}else{
613	613	FILE *pTest = fossil_fopen(g.zErrlog,"a");
614	614	if( pTest==0 ){
		@@ -635,11 +635,11 @@
635	635	@ %d(nCgi) CGIs and %d(nFile-nCgi) static content and data files.
636	636	}
637	637
638	638	if( fileedit_glob()!=0 ){
639	639	@ <li><p><a href='%R/fileedit'>Online File Editing</a> is enabled
640		- @ for this repository. Clear the
	640	+ @ for this repository. Clear the
641	641	@ <a href='%R/setup_settings'>"fileedit-glob" setting</a> to
642	642	@ disable online editing.</p>
643	643	}
644	644
645	645	@ <li><p> User capability summary:
		@@ -651,11 +651,11 @@
651	651	@ <li><p> WARNING: No Content Security Policy (CSP) is specified in the
652	652	@ header. Though not required, a strong CSP is recommended. Fossil will
653	653	@ automatically insert an appropriate CSP if you let it generate the
654	654	@ HTML <tt><head></tt> element by omitting <tt><body></tt>
655	655	@ from the header configuration in your customized skin.
656		- @
	656	+ @
657	657	}else{
658	658	int ii;
659	659	@ <li><p> Content Security Policy:
660	660	@ <ol type="a">
661	661	for(ii=0; azCSP[ii]; ii++){
		@@ -787,11 +787,11 @@
787	787	@ like this:
788	788	@ <blockquote><pre>
789	789	@ errorlog: <i>FILENAME</i>
790	790	@ </pre></blockquote>
791	791	@ <li><p>
792		- @ If the server is running using one of
	792	+ @ If the server is running using one of
793	793	@ the "fossil http" or "fossil server" commands then add
794	794	@ a command-line option "--errorlog <i>FILENAME</i>" to that
795	795	@ command.
796	796	@ </ol>
797	797	style_finish_page();
798	798

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -336,11 +336,11 @@
336	/* Anonymous users probably should not be allowed act as moderators
337	** for wiki or tickets.
338	*/
339	if( hasAnyCap(zAnonCap, "lq5") ){
340	@ <li><p><b>WARNING:</b>
341	@ Anonymous users can act as moderators for wiki, tickets, or
342	@ forum posts. This defeats the whole purpose of moderation.
343	@ Fix this by removing the "Mod-Wiki", "Mod-Tkt", and "Mod-Forum"
344	@ privileges (<a href="%R/setup_ucap_list">capabilities</a> "fq5")
345	@ from users "anonymous" and "nobody"
346	@ on the <a href="setup_ulist">User Configuration</a> page.
	@@ -353,11 +353,11 @@
353	@ <li><p><b>WARNING:</b>
354	@ TH1 scripts might be configured to run on any sync, push, pull, or
355	@ clone operation. See the the <a href="%R/xfersetup">/xfersetup</a>
356	@ page for more information. These TH1 scripts are a potential
357	@ security concern and so should be carefully audited by a human.
358	}
359
360	/* The strict-manifest-syntax setting should be on. */
361	if( db_get_boolean("strict-manifest-syntax",1)==0 ){
362	@ <li><p><b>WARNING:</b>
363	@ The "strict-manifest-syntax" flag is off. This is a security
	@@ -582,11 +582,11 @@
582	if( r<=0.0 ){
583	@ <li><p>
584	@ Load average limiting is turned off. This can cause the server
585	@ to bog down if many requests for expensive services (such as
586	@ large diffs or tarballs) arrive at about the same time.
587	@ To fix this, set the
588	@ <a href='%R/setup_access#slal'>"Server Load Average Limit"</a> on the
589	@ <a href='%R/setup_access'>Access Control</a> page to the approximate
590	@ the number of available cores on your server, or maybe just a little
591	@ less.
592	}else if( r>=8.0 ){
	@@ -604,11 +604,11 @@
604	@ To set up an error log,
605	if( fossil_strcmp(g.zCmdName, "cgi")==0 ){
606	@ make an entry like "errorlog: <i>FILENAME</i>" in the
607	@ CGI script at %h(P("SCRIPT_FILENAME")).
608	}else{
609	@ add the "--errorlog <i>FILENAME</i>" option to the
610	@ "%h(g.argv[0]) %h(g.zCmdName)" command that launched this server.
611	}
612	}else{
613	FILE *pTest = fossil_fopen(g.zErrlog,"a");
614	if( pTest==0 ){
	@@ -635,11 +635,11 @@
635	@ %d(nCgi) CGIs and %d(nFile-nCgi) static content and data files.
636	}
637
638	if( fileedit_glob()!=0 ){
639	@ <li><p><a href='%R/fileedit'>Online File Editing</a> is enabled
640	@ for this repository. Clear the
641	@ <a href='%R/setup_settings'>"fileedit-glob" setting</a> to
642	@ disable online editing.</p>
643	}
644
645	@ <li><p> User capability summary:
	@@ -651,11 +651,11 @@
651	@ <li><p> WARNING: No Content Security Policy (CSP) is specified in the
652	@ header. Though not required, a strong CSP is recommended. Fossil will
653	@ automatically insert an appropriate CSP if you let it generate the
654	@ HTML <tt><head></tt> element by omitting <tt><body></tt>
655	@ from the header configuration in your customized skin.
656	@
657	}else{
658	int ii;
659	@ <li><p> Content Security Policy:
660	@ <ol type="a">
661	for(ii=0; azCSP[ii]; ii++){
	@@ -787,11 +787,11 @@
787	@ like this:
788	@ <blockquote><pre>
789	@ errorlog: <i>FILENAME</i>
790	@ </pre></blockquote>
791	@ <li><p>
792	@ If the server is running using one of
793	@ the "fossil http" or "fossil server" commands then add
794	@ a command-line option "--errorlog <i>FILENAME</i>" to that
795	@ command.
796	@ </ol>
797	style_finish_page();
798

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -336,11 +336,11 @@
336	/* Anonymous users probably should not be allowed act as moderators
337	** for wiki or tickets.
338	*/
339	if( hasAnyCap(zAnonCap, "lq5") ){
340	@ <li><p><b>WARNING:</b>
341	@ Anonymous users can act as moderators for wiki, tickets, or
342	@ forum posts. This defeats the whole purpose of moderation.
343	@ Fix this by removing the "Mod-Wiki", "Mod-Tkt", and "Mod-Forum"
344	@ privileges (<a href="%R/setup_ucap_list">capabilities</a> "fq5")
345	@ from users "anonymous" and "nobody"
346	@ on the <a href="setup_ulist">User Configuration</a> page.
	@@ -353,11 +353,11 @@
353	@ <li><p><b>WARNING:</b>
354	@ TH1 scripts might be configured to run on any sync, push, pull, or
355	@ clone operation. See the the <a href="%R/xfersetup">/xfersetup</a>
356	@ page for more information. These TH1 scripts are a potential
357	@ security concern and so should be carefully audited by a human.
358	}
359
360	/* The strict-manifest-syntax setting should be on. */
361	if( db_get_boolean("strict-manifest-syntax",1)==0 ){
362	@ <li><p><b>WARNING:</b>
363	@ The "strict-manifest-syntax" flag is off. This is a security
	@@ -582,11 +582,11 @@
582	if( r<=0.0 ){
583	@ <li><p>
584	@ Load average limiting is turned off. This can cause the server
585	@ to bog down if many requests for expensive services (such as
586	@ large diffs or tarballs) arrive at about the same time.
587	@ To fix this, set the
588	@ <a href='%R/setup_access#slal'>"Server Load Average Limit"</a> on the
589	@ <a href='%R/setup_access'>Access Control</a> page to the approximate
590	@ the number of available cores on your server, or maybe just a little
591	@ less.
592	}else if( r>=8.0 ){
	@@ -604,11 +604,11 @@
604	@ To set up an error log,
605	if( fossil_strcmp(g.zCmdName, "cgi")==0 ){
606	@ make an entry like "errorlog: <i>FILENAME</i>" in the
607	@ CGI script at %h(P("SCRIPT_FILENAME")).
608	}else{
609	@ add the "--errorlog <i>FILENAME</i>" option to the
610	@ "%h(g.argv[0]) %h(g.zCmdName)" command that launched this server.
611	}
612	}else{
613	FILE *pTest = fossil_fopen(g.zErrlog,"a");
614	if( pTest==0 ){
	@@ -635,11 +635,11 @@
635	@ %d(nCgi) CGIs and %d(nFile-nCgi) static content and data files.
636	}
637
638	if( fileedit_glob()!=0 ){
639	@ <li><p><a href='%R/fileedit'>Online File Editing</a> is enabled
640	@ for this repository. Clear the
641	@ <a href='%R/setup_settings'>"fileedit-glob" setting</a> to
642	@ disable online editing.</p>
643	}
644
645	@ <li><p> User capability summary:
	@@ -651,11 +651,11 @@
651	@ <li><p> WARNING: No Content Security Policy (CSP) is specified in the
652	@ header. Though not required, a strong CSP is recommended. Fossil will
653	@ automatically insert an appropriate CSP if you let it generate the
654	@ HTML <tt><head></tt> element by omitting <tt><body></tt>
655	@ from the header configuration in your customized skin.
656	@
657	}else{
658	int ii;
659	@ <li><p> Content Security Policy:
660	@ <ol type="a">
661	for(ii=0; azCSP[ii]; ii++){
	@@ -787,11 +787,11 @@
787	@ like this:
788	@ <blockquote><pre>
789	@ errorlog: <i>FILENAME</i>
790	@ </pre></blockquote>
791	@ <li><p>
792	@ If the server is running using one of
793	@ the "fossil http" or "fossil server" commands then add
794	@ a command-line option "--errorlog <i>FILENAME</i>" to that
795	@ command.
796	@ </ol>
797	style_finish_page();
798

M src/setup.c

+3 -3

		--- src/setup.c
		+++ src/setup.c
		@@ -588,11 +588,11 @@
588	588	@ <hr>
589	589	entry_attribute("Public pages", 30, "public-pages",
590	590	"pubpage", "", 0);
591	591	@ <p>A comma-separated list of glob patterns for pages that are accessible
592	592	@ without needing a login and using the privileges given by the
593		- @ "Default privileges" setting below.
	593	+ @ "Default privileges" setting below.
594	594	@
595	595	@ <p>Example use case: Set this field to "/doc/trunk/www/*" and set
596	596	@ the "Default privileges" to include the "o" privilege
597	597	@ to give anonymous users read-only permission to the
598	598	@ latest version of the embedded documentation in the www/ folder without
		@@ -1201,11 +1201,11 @@
1201	1201	@ <p>
1202	1202	if(P("resetMenu")!=0){
1203	1203	db_unset("mainmenu", 0);
1204	1204	cgi_delete_parameter("mmenu");
1205	1205	}
1206		- textarea_attribute("Main Menu", 12, 80,
	1206	+ textarea_attribute("Main Menu", 12, 80,
1207	1207	"mainmenu", "mmenu", style_default_mainmenu(), 0);
1208	1208	@ </p>
1209	1209	@ <p><input type='checkbox' id='cbResetMenu' name='resetMenu' value='1'>
1210	1210	@ <label for='cbResetMenu'>Reset menu to default value</label>
1211	1211	@ </p>
		@@ -1229,11 +1229,11 @@
1229	1229	@ </ol>
1230	1230	@
1231	1231	@ <p>The default value is blank, meaning no added entries.
1232	1232	@ (Property: sitemap-extra)
1233	1233	@ <p>
1234		- textarea_attribute("Custom Sitemap Entries", 8, 80,
	1234	+ textarea_attribute("Custom Sitemap Entries", 8, 80,
1235	1235	"sitemap-extra", "smextra", "", 0);
1236	1236	@ <hr>
1237	1237	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
1238	1238	@ </div></form>
1239	1239	db_end_transaction(0);
1240	1240

	--- src/setup.c
	+++ src/setup.c
	@@ -588,11 +588,11 @@
588	@ <hr>
589	entry_attribute("Public pages", 30, "public-pages",
590	"pubpage", "", 0);
591	@ <p>A comma-separated list of glob patterns for pages that are accessible
592	@ without needing a login and using the privileges given by the
593	@ "Default privileges" setting below.
594	@
595	@ <p>Example use case: Set this field to "/doc/trunk/www/*" and set
596	@ the "Default privileges" to include the "o" privilege
597	@ to give anonymous users read-only permission to the
598	@ latest version of the embedded documentation in the www/ folder without
	@@ -1201,11 +1201,11 @@
1201	@ <p>
1202	if(P("resetMenu")!=0){
1203	db_unset("mainmenu", 0);
1204	cgi_delete_parameter("mmenu");
1205	}
1206	textarea_attribute("Main Menu", 12, 80,
1207	"mainmenu", "mmenu", style_default_mainmenu(), 0);
1208	@ </p>
1209	@ <p><input type='checkbox' id='cbResetMenu' name='resetMenu' value='1'>
1210	@ <label for='cbResetMenu'>Reset menu to default value</label>
1211	@ </p>
	@@ -1229,11 +1229,11 @@
1229	@ </ol>
1230	@
1231	@ <p>The default value is blank, meaning no added entries.
1232	@ (Property: sitemap-extra)
1233	@ <p>
1234	textarea_attribute("Custom Sitemap Entries", 8, 80,
1235	"sitemap-extra", "smextra", "", 0);
1236	@ <hr>
1237	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
1238	@ </div></form>
1239	db_end_transaction(0);
1240

	--- src/setup.c
	+++ src/setup.c
	@@ -588,11 +588,11 @@
588	@ <hr>
589	entry_attribute("Public pages", 30, "public-pages",
590	"pubpage", "", 0);
591	@ <p>A comma-separated list of glob patterns for pages that are accessible
592	@ without needing a login and using the privileges given by the
593	@ "Default privileges" setting below.
594	@
595	@ <p>Example use case: Set this field to "/doc/trunk/www/*" and set
596	@ the "Default privileges" to include the "o" privilege
597	@ to give anonymous users read-only permission to the
598	@ latest version of the embedded documentation in the www/ folder without
	@@ -1201,11 +1201,11 @@
1201	@ <p>
1202	if(P("resetMenu")!=0){
1203	db_unset("mainmenu", 0);
1204	cgi_delete_parameter("mmenu");
1205	}
1206	textarea_attribute("Main Menu", 12, 80,
1207	"mainmenu", "mmenu", style_default_mainmenu(), 0);
1208	@ </p>
1209	@ <p><input type='checkbox' id='cbResetMenu' name='resetMenu' value='1'>
1210	@ <label for='cbResetMenu'>Reset menu to default value</label>
1211	@ </p>
	@@ -1229,11 +1229,11 @@
1229	@ </ol>
1230	@
1231	@ <p>The default value is blank, meaning no added entries.
1232	@ (Property: sitemap-extra)
1233	@ <p>
1234	textarea_attribute("Custom Sitemap Entries", 8, 80,
1235	"sitemap-extra", "smextra", "", 0);
1236	@ <hr>
1237	@ <p><input type="submit" name="submit" value="Apply Changes"></p>
1238	@ </div></form>
1239	db_end_transaction(0);
1240

M src/setupuser.c

+1 -1

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -810,11 +810,11 @@
810	810	@ are inherited by all logged-in users.
811	811	@ </p></li>
812	812	@
813	813	@ <li><p>
814	814	@ The "<span class="ueditInheritDeveloper"><sub>D</sub></span>"
815		- @ subscript suffix indicates the privileges of
	815	+ @ subscript suffix indicates the privileges of
816	816	@ <span class="usertype">developer</span> that
817	817	@ are inherited by all users with the
818	818	@ <span class="capability">Developer</span> privilege.
819	819	@ </p></li>
820	820	@
821	821

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -810,11 +810,11 @@
810	@ are inherited by all logged-in users.
811	@ </p></li>
812	@
813	@ <li><p>
814	@ The "<span class="ueditInheritDeveloper"><sub>D</sub></span>"
815	@ subscript suffix indicates the privileges of
816	@ <span class="usertype">developer</span> that
817	@ are inherited by all users with the
818	@ <span class="capability">Developer</span> privilege.
819	@ </p></li>
820	@
821

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -810,11 +810,11 @@
810	@ are inherited by all logged-in users.
811	@ </p></li>
812	@
813	@ <li><p>
814	@ The "<span class="ueditInheritDeveloper"><sub>D</sub></span>"
815	@ subscript suffix indicates the privileges of
816	@ <span class="usertype">developer</span> that
817	@ are inherited by all users with the
818	@ <span class="capability">Developer</span> privilege.
819	@ </p></li>
820	@
821

M src/sitemap.c

+2 -2

		--- src/sitemap.c
		+++ src/sitemap.c
		@@ -81,11 +81,11 @@
81	81	srchFlags = search_restrict(SRCH_ALL);
82	82	if( !isPopup ){
83	83	style_header("Site Map");
84	84	style_adunit_config(ADUNIT_RIGHT_OK);
85	85	}
86		-
	86	+
87	87	@ <ul id="sitemap" class="columns" style="column-width:20em">
88	88	if( (e&1)==0 ){
89	89	@ <li>%z(href("%R/home"))Home Page</a>
90	90	}
91	91
		@@ -152,11 +152,11 @@
152	152	}
153	153	#endif
154	154
155	155	if( inSublist ){
156	156	@ </ul>
157		- inSublist = 0;
	157	+ inSublist = 0;
158	158	}
159	159	@ </li>
160	160	if( g.perm.Read ){
161	161	const char *zEditGlob = db_get("fileedit-glob","");
162	162	@ <li>%z(href("%R/tree"))File Browser</a>
163	163

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -81,11 +81,11 @@
81	srchFlags = search_restrict(SRCH_ALL);
82	if( !isPopup ){
83	style_header("Site Map");
84	style_adunit_config(ADUNIT_RIGHT_OK);
85	}
86
87	@ <ul id="sitemap" class="columns" style="column-width:20em">
88	if( (e&1)==0 ){
89	@ <li>%z(href("%R/home"))Home Page</a>
90	}
91
	@@ -152,11 +152,11 @@
152	}
153	#endif
154
155	if( inSublist ){
156	@ </ul>
157	inSublist = 0;
158	}
159	@ </li>
160	if( g.perm.Read ){
161	const char *zEditGlob = db_get("fileedit-glob","");
162	@ <li>%z(href("%R/tree"))File Browser</a>
163

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -81,11 +81,11 @@
81	srchFlags = search_restrict(SRCH_ALL);
82	if( !isPopup ){
83	style_header("Site Map");
84	style_adunit_config(ADUNIT_RIGHT_OK);
85	}
86
87	@ <ul id="sitemap" class="columns" style="column-width:20em">
88	if( (e&1)==0 ){
89	@ <li>%z(href("%R/home"))Home Page</a>
90	}
91
	@@ -152,11 +152,11 @@
152	}
153	#endif
154
155	if( inSublist ){
156	@ </ul>
157	inSublist = 0;
158	}
159	@ </li>
160	if( g.perm.Read ){
161	const char *zEditGlob = db_get("fileedit-glob","");
162	@ <li>%z(href("%R/tree"))File Browser</a>
163

M src/skins.c

+2 -2

		--- src/skins.c
		+++ src/skins.c
		@@ -885,11 +885,11 @@
885	885	DCfg.diffFlags \|= DIFF_STRIP_EOLCR;
886	886	if( P("sbsdiff")!=0 ) DCfg.diffFlags \|= DIFF_SIDEBYSIDE;
887	887	blob_init(&to, zContent, -1);
888	888	blob_init(&from, skin_file_content(zBasis, zFile), -1);
889	889	blob_zero(&out);
890		- DCfg.diffFlags \|= DIFF_HTML \| DIFF_NOTTOOBIG;
	890	+ DCfg.diffFlags \|= DIFF_HTML \| DIFF_NOTTOOBIG;
891	891	if( DCfg.diffFlags & DIFF_SIDEBYSIDE ){
892	892	text_diff(&from, &to, &out, &DCfg);
893	893	@ %s(blob_str(&out))
894	894	}else{
895	895	DCfg.diffFlags \|= DIFF_LINENO;
		@@ -1206,11 +1206,11 @@
1206	1206	if( sqlite3_strglob(zPattern, zBase)==0 ){
1207	1207	nBase -= strlen(zPattern)-1;
1208	1208	zBase[nBase] = 0;
1209	1209	}
1210	1210	fossil_free(zPattern);
1211		- }
	1211	+ }
1212	1212	login_check_credentials();
1213	1213	style_header("Skins");
1214	1214	if( iDraftSkin \|\| nSkinRank<=1 ){
1215	1215	@ <p class="warning">Warning:
1216	1216	if( iDraftSkin>0 ){
1217	1217

	--- src/skins.c
	+++ src/skins.c
	@@ -885,11 +885,11 @@
885	DCfg.diffFlags \|= DIFF_STRIP_EOLCR;
886	if( P("sbsdiff")!=0 ) DCfg.diffFlags \|= DIFF_SIDEBYSIDE;
887	blob_init(&to, zContent, -1);
888	blob_init(&from, skin_file_content(zBasis, zFile), -1);
889	blob_zero(&out);
890	DCfg.diffFlags \|= DIFF_HTML \| DIFF_NOTTOOBIG;
891	if( DCfg.diffFlags & DIFF_SIDEBYSIDE ){
892	text_diff(&from, &to, &out, &DCfg);
893	@ %s(blob_str(&out))
894	}else{
895	DCfg.diffFlags \|= DIFF_LINENO;
	@@ -1206,11 +1206,11 @@
1206	if( sqlite3_strglob(zPattern, zBase)==0 ){
1207	nBase -= strlen(zPattern)-1;
1208	zBase[nBase] = 0;
1209	}
1210	fossil_free(zPattern);
1211	}
1212	login_check_credentials();
1213	style_header("Skins");
1214	if( iDraftSkin \|\| nSkinRank<=1 ){
1215	@ <p class="warning">Warning:
1216	if( iDraftSkin>0 ){
1217

	--- src/skins.c
	+++ src/skins.c
	@@ -885,11 +885,11 @@
885	DCfg.diffFlags \|= DIFF_STRIP_EOLCR;
886	if( P("sbsdiff")!=0 ) DCfg.diffFlags \|= DIFF_SIDEBYSIDE;
887	blob_init(&to, zContent, -1);
888	blob_init(&from, skin_file_content(zBasis, zFile), -1);
889	blob_zero(&out);
890	DCfg.diffFlags \|= DIFF_HTML \| DIFF_NOTTOOBIG;
891	if( DCfg.diffFlags & DIFF_SIDEBYSIDE ){
892	text_diff(&from, &to, &out, &DCfg);
893	@ %s(blob_str(&out))
894	}else{
895	DCfg.diffFlags \|= DIFF_LINENO;
	@@ -1206,11 +1206,11 @@
1206	if( sqlite3_strglob(zPattern, zBase)==0 ){
1207	nBase -= strlen(zPattern)-1;
1208	zBase[nBase] = 0;
1209	}
1210	fossil_free(zPattern);
1211	}
1212	login_check_credentials();
1213	style_header("Skins");
1214	if( iDraftSkin \|\| nSkinRank<=1 ){
1215	@ <p class="warning">Warning:
1216	if( iDraftSkin>0 ){
1217

M src/sqlcmd.c

+1 -1

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -384,11 +384,11 @@
384	384	**
385	385	** SELECT * FROM files_of_checkin('trunk');
386	386	**
387	387	** helptext A virtual table with one row for each command,
388	388	** webpage, and setting together with the built-in
389		-** help text.
	389	+** help text.
390	390	**
391	391	** now() Return the number of seconds since 1970.
392	392	**
393	393	** obscure(T) Obfuscate the text password T so that its
394	394	** original value is not readily visible. Fossil
395	395

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -384,11 +384,11 @@
384	**
385	** SELECT * FROM files_of_checkin('trunk');
386	**
387	** helptext A virtual table with one row for each command,
388	** webpage, and setting together with the built-in
389	** help text.
390	**
391	** now() Return the number of seconds since 1970.
392	**
393	** obscure(T) Obfuscate the text password T so that its
394	** original value is not readily visible. Fossil
395

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -384,11 +384,11 @@
384	**
385	** SELECT * FROM files_of_checkin('trunk');
386	**
387	** helptext A virtual table with one row for each command,
388	** webpage, and setting together with the built-in
389	** help text.
390	**
391	** now() Return the number of seconds since 1970.
392	**
393	** obscure(T) Obfuscate the text password T so that its
394	** original value is not readily visible. Fossil
395

M src/stat.c

+12 -12

		--- src/stat.c
		+++ src/stat.c
		@@ -557,11 +557,11 @@
557	557	@ <td><nobr>%h(db_column_text(&q,1))</nobr></td></tr>
558	558	}
559	559	cnt++;
560	560	}
561	561	db_finalize(&q);
562		-
	562	+
563	563	if( nOmitted ){
564	564	@ <tr><td><a href="urllist?all"><i>Show %d(nOmitted) more...</i></a>
565	565	}
566	566	if( cnt ){
567	567	@ </table>
		@@ -715,11 +715,11 @@
715	715	Blob sql;
716	716	const char *zArg = P("n");
717	717	login_check_credentials();
718	718	if( !g.perm.Admin ){ login_needed(0); return; }
719	719
720		- if( zArg!=0
	720	+ if( zArg!=0
721	721	&& db_table_exists("repository",zArg)
722	722	&& cgi_csrf_safe(1)
723	723	){
724	724	if( P("analyze")!=0 ){
725	725	db_multi_exec("ANALYZE \"%w\"", zArg);
		@@ -934,11 +934,11 @@
934	934	** Gather statistics on artifact types, counts, and sizes.
935	935	**
936	936	** Only populate the artstat.atype field if the bWithTypes parameter is true.
937	937	*/
938	938	void gather_artifact_stats(int bWithTypes){
939		- static const char zSql[] =
	939	+ static const char zSql[] =
940	940	@ CREATE TEMP TABLE artstat(
941	941	@ id INTEGER PRIMARY KEY, -- Corresponds to BLOB.RID
942	942	@ atype TEXT, -- 'data', 'manifest', 'tag', 'wiki', etc.
943	943	@ isDelta BOOLEAN, -- true if stored as a delta
944	944	@ szExp, -- expanded, uncompressed size
		@@ -949,46 +949,46 @@
949	949	@ delta.rid IS NOT NULL,
950	950	@ size, octet_length(content)
951	951	@ FROM blob LEFT JOIN delta ON blob.rid=delta.rid
952	952	@ WHERE content IS NOT NULL;
953	953	;
954		- static const char zSql2[] =
	954	+ static const char zSql2[] =
955	955	@ UPDATE artstat SET atype='file'
956	956	@ WHERE +id IN (SELECT fid FROM mlink);
957	957	@ UPDATE artstat SET atype='manifest'
958	958	@ WHERE id IN (SELECT objid FROM event WHERE type='ci') AND atype IS NULL;
959	959	@ UPDATE artstat SET atype='forum'
960	960	@ WHERE id IN (SELECT objid FROM event WHERE type='f') AND atype IS NULL;
961	961	@ UPDATE artstat SET atype='cluster'
962		- @ WHERE atype IS NULL
	962	+ @ WHERE atype IS NULL
963	963	@ AND id IN (SELECT rid FROM tagxref
964	964	@ WHERE tagid=(SELECT tagid FROM tag
965	965	@ WHERE tagname='cluster'));
966	966	@ UPDATE artstat SET atype='ticket'
967		- @ WHERE atype IS NULL
	967	+ @ WHERE atype IS NULL
968	968	@ AND id IN (SELECT rid FROM tagxref
969	969	@ WHERE tagid IN (SELECT tagid FROM tag
970	970	@ WHERE tagname GLOB 'tkt-*'));
971	971	@ UPDATE artstat SET atype='wiki'
972		- @ WHERE atype IS NULL
	972	+ @ WHERE atype IS NULL
973	973	@ AND id IN (SELECT rid FROM tagxref
974	974	@ WHERE tagid IN (SELECT tagid FROM tag
975	975	@ WHERE tagname GLOB 'wiki-*'));
976	976	@ UPDATE artstat SET atype='technote'
977		- @ WHERE atype IS NULL
	977	+ @ WHERE atype IS NULL
978	978	@ AND id IN (SELECT rid FROM tagxref
979	979	@ WHERE tagid IN (SELECT tagid FROM tag
980	980	@ WHERE tagname GLOB 'event-*'));
981	981	@ UPDATE artstat SET atype='attachment'
982		- @ WHERE atype IS NULL
983		- @ AND id IN (SELECT attachid FROM attachment UNION
	982	+ @ WHERE atype IS NULL
	983	+ @ AND id IN (SELECT attachid FROM attachment UNION
984	984	@ SELECT blob.rid FROM attachment JOIN blob ON uuid=src);
985	985	@ UPDATE artstat SET atype='tag'
986		- @ WHERE atype IS NULL
	986	+ @ WHERE atype IS NULL
987	987	@ AND id IN (SELECT srcid FROM tagxref);
988	988	@ UPDATE artstat SET atype='tag'
989		- @ WHERE atype IS NULL
	989	+ @ WHERE atype IS NULL
990	990	@ AND id IN (SELECT objid FROM event WHERE type='g');
991	991	@ UPDATE artstat SET atype='unused' WHERE atype IS NULL;
992	992	;
993	993	db_multi_exec("%s", zSql/safe-for-%s/);
994	994	if( bWithTypes ){
995	995

	--- src/stat.c
	+++ src/stat.c
	@@ -557,11 +557,11 @@
557	@ <td><nobr>%h(db_column_text(&q,1))</nobr></td></tr>
558	}
559	cnt++;
560	}
561	db_finalize(&q);
562
563	if( nOmitted ){
564	@ <tr><td><a href="urllist?all"><i>Show %d(nOmitted) more...</i></a>
565	}
566	if( cnt ){
567	@ </table>
	@@ -715,11 +715,11 @@
715	Blob sql;
716	const char *zArg = P("n");
717	login_check_credentials();
718	if( !g.perm.Admin ){ login_needed(0); return; }
719
720	if( zArg!=0
721	&& db_table_exists("repository",zArg)
722	&& cgi_csrf_safe(1)
723	){
724	if( P("analyze")!=0 ){
725	db_multi_exec("ANALYZE \"%w\"", zArg);
	@@ -934,11 +934,11 @@
934	** Gather statistics on artifact types, counts, and sizes.
935	**
936	** Only populate the artstat.atype field if the bWithTypes parameter is true.
937	*/
938	void gather_artifact_stats(int bWithTypes){
939	static const char zSql[] =
940	@ CREATE TEMP TABLE artstat(
941	@ id INTEGER PRIMARY KEY, -- Corresponds to BLOB.RID
942	@ atype TEXT, -- 'data', 'manifest', 'tag', 'wiki', etc.
943	@ isDelta BOOLEAN, -- true if stored as a delta
944	@ szExp, -- expanded, uncompressed size
	@@ -949,46 +949,46 @@
949	@ delta.rid IS NOT NULL,
950	@ size, octet_length(content)
951	@ FROM blob LEFT JOIN delta ON blob.rid=delta.rid
952	@ WHERE content IS NOT NULL;
953	;
954	static const char zSql2[] =
955	@ UPDATE artstat SET atype='file'
956	@ WHERE +id IN (SELECT fid FROM mlink);
957	@ UPDATE artstat SET atype='manifest'
958	@ WHERE id IN (SELECT objid FROM event WHERE type='ci') AND atype IS NULL;
959	@ UPDATE artstat SET atype='forum'
960	@ WHERE id IN (SELECT objid FROM event WHERE type='f') AND atype IS NULL;
961	@ UPDATE artstat SET atype='cluster'
962	@ WHERE atype IS NULL
963	@ AND id IN (SELECT rid FROM tagxref
964	@ WHERE tagid=(SELECT tagid FROM tag
965	@ WHERE tagname='cluster'));
966	@ UPDATE artstat SET atype='ticket'
967	@ WHERE atype IS NULL
968	@ AND id IN (SELECT rid FROM tagxref
969	@ WHERE tagid IN (SELECT tagid FROM tag
970	@ WHERE tagname GLOB 'tkt-*'));
971	@ UPDATE artstat SET atype='wiki'
972	@ WHERE atype IS NULL
973	@ AND id IN (SELECT rid FROM tagxref
974	@ WHERE tagid IN (SELECT tagid FROM tag
975	@ WHERE tagname GLOB 'wiki-*'));
976	@ UPDATE artstat SET atype='technote'
977	@ WHERE atype IS NULL
978	@ AND id IN (SELECT rid FROM tagxref
979	@ WHERE tagid IN (SELECT tagid FROM tag
980	@ WHERE tagname GLOB 'event-*'));
981	@ UPDATE artstat SET atype='attachment'
982	@ WHERE atype IS NULL
983	@ AND id IN (SELECT attachid FROM attachment UNION
984	@ SELECT blob.rid FROM attachment JOIN blob ON uuid=src);
985	@ UPDATE artstat SET atype='tag'
986	@ WHERE atype IS NULL
987	@ AND id IN (SELECT srcid FROM tagxref);
988	@ UPDATE artstat SET atype='tag'
989	@ WHERE atype IS NULL
990	@ AND id IN (SELECT objid FROM event WHERE type='g');
991	@ UPDATE artstat SET atype='unused' WHERE atype IS NULL;
992	;
993	db_multi_exec("%s", zSql/safe-for-%s/);
994	if( bWithTypes ){
995

	--- src/stat.c
	+++ src/stat.c
	@@ -557,11 +557,11 @@
557	@ <td><nobr>%h(db_column_text(&q,1))</nobr></td></tr>
558	}
559	cnt++;
560	}
561	db_finalize(&q);
562
563	if( nOmitted ){
564	@ <tr><td><a href="urllist?all"><i>Show %d(nOmitted) more...</i></a>
565	}
566	if( cnt ){
567	@ </table>
	@@ -715,11 +715,11 @@
715	Blob sql;
716	const char *zArg = P("n");
717	login_check_credentials();
718	if( !g.perm.Admin ){ login_needed(0); return; }
719
720	if( zArg!=0
721	&& db_table_exists("repository",zArg)
722	&& cgi_csrf_safe(1)
723	){
724	if( P("analyze")!=0 ){
725	db_multi_exec("ANALYZE \"%w\"", zArg);
	@@ -934,11 +934,11 @@
934	** Gather statistics on artifact types, counts, and sizes.
935	**
936	** Only populate the artstat.atype field if the bWithTypes parameter is true.
937	*/
938	void gather_artifact_stats(int bWithTypes){
939	static const char zSql[] =
940	@ CREATE TEMP TABLE artstat(
941	@ id INTEGER PRIMARY KEY, -- Corresponds to BLOB.RID
942	@ atype TEXT, -- 'data', 'manifest', 'tag', 'wiki', etc.
943	@ isDelta BOOLEAN, -- true if stored as a delta
944	@ szExp, -- expanded, uncompressed size
	@@ -949,46 +949,46 @@
949	@ delta.rid IS NOT NULL,
950	@ size, octet_length(content)
951	@ FROM blob LEFT JOIN delta ON blob.rid=delta.rid
952	@ WHERE content IS NOT NULL;
953	;
954	static const char zSql2[] =
955	@ UPDATE artstat SET atype='file'
956	@ WHERE +id IN (SELECT fid FROM mlink);
957	@ UPDATE artstat SET atype='manifest'
958	@ WHERE id IN (SELECT objid FROM event WHERE type='ci') AND atype IS NULL;
959	@ UPDATE artstat SET atype='forum'
960	@ WHERE id IN (SELECT objid FROM event WHERE type='f') AND atype IS NULL;
961	@ UPDATE artstat SET atype='cluster'
962	@ WHERE atype IS NULL
963	@ AND id IN (SELECT rid FROM tagxref
964	@ WHERE tagid=(SELECT tagid FROM tag
965	@ WHERE tagname='cluster'));
966	@ UPDATE artstat SET atype='ticket'
967	@ WHERE atype IS NULL
968	@ AND id IN (SELECT rid FROM tagxref
969	@ WHERE tagid IN (SELECT tagid FROM tag
970	@ WHERE tagname GLOB 'tkt-*'));
971	@ UPDATE artstat SET atype='wiki'
972	@ WHERE atype IS NULL
973	@ AND id IN (SELECT rid FROM tagxref
974	@ WHERE tagid IN (SELECT tagid FROM tag
975	@ WHERE tagname GLOB 'wiki-*'));
976	@ UPDATE artstat SET atype='technote'
977	@ WHERE atype IS NULL
978	@ AND id IN (SELECT rid FROM tagxref
979	@ WHERE tagid IN (SELECT tagid FROM tag
980	@ WHERE tagname GLOB 'event-*'));
981	@ UPDATE artstat SET atype='attachment'
982	@ WHERE atype IS NULL
983	@ AND id IN (SELECT attachid FROM attachment UNION
984	@ SELECT blob.rid FROM attachment JOIN blob ON uuid=src);
985	@ UPDATE artstat SET atype='tag'
986	@ WHERE atype IS NULL
987	@ AND id IN (SELECT srcid FROM tagxref);
988	@ UPDATE artstat SET atype='tag'
989	@ WHERE atype IS NULL
990	@ AND id IN (SELECT objid FROM event WHERE type='g');
991	@ UPDATE artstat SET atype='unused' WHERE atype IS NULL;
992	;
993	db_multi_exec("%s", zSql/safe-for-%s/);
994	if( bWithTypes ){
995

M src/statrep.c

+1 -1

		--- src/statrep.c
		+++ src/statrep.c
		@@ -130,11 +130,11 @@
130	130	db_multi_exec(
131	131	"CREATE TEMP VIEW v_reports AS "
132	132	"SELECT * FROM event WHERE type='ci' AND %s"
133	133	" AND objid %s IN (SELECT cid FROM plink WHERE NOT isprim)",
134	134	zTimeSpan/safe-for-%s/, zNot/safe-for-%s/
135		- );
	135	+ );
136	136	}
137	137	return statsReportType = rc;
138	138	}
139	139
140	140	/*
141	141

	--- src/statrep.c
	+++ src/statrep.c
	@@ -130,11 +130,11 @@
130	db_multi_exec(
131	"CREATE TEMP VIEW v_reports AS "
132	"SELECT * FROM event WHERE type='ci' AND %s"
133	" AND objid %s IN (SELECT cid FROM plink WHERE NOT isprim)",
134	zTimeSpan/safe-for-%s/, zNot/safe-for-%s/
135	);
136	}
137	return statsReportType = rc;
138	}
139
140	/*
141

	--- src/statrep.c
	+++ src/statrep.c
	@@ -130,11 +130,11 @@
130	db_multi_exec(
131	"CREATE TEMP VIEW v_reports AS "
132	"SELECT * FROM event WHERE type='ci' AND %s"
133	" AND objid %s IN (SELECT cid FROM plink WHERE NOT isprim)",
134	zTimeSpan/safe-for-%s/, zNot/safe-for-%s/
135	);
136	}
137	return statsReportType = rc;
138	}
139
140	/*
141

M src/style.c

+11 -11

		--- src/style.c
		+++ src/style.c
		@@ -452,11 +452,11 @@
452	452	blob_appendf(&url, "?id=%x", skin_id("css"));
453	453	if( P("once")!=0 && P("skin")!=0 ){
454	454	blob_appendf(&url, "&skin=%s&once", skin_in_use());
455	455	}
456	456
457		- /* Generate the CSS URL variable */
	457	+ /* Generate the CSS URL variable */
458	458	Th_Store("stylesheet_url", blob_str(&url));
459	459	blob_reset(&url);
460	460	}
461	461
462	462	/*
		@@ -472,11 +472,11 @@
472	472	char zUrl; / The URL */
473	473
474	474	zResource = mprintf("%s-image", zImageName);
475	475	zUrl = mprintf("%R/%s?id=%x", zImageName, skin_id(zResource));
476	476	free(zResource);
477		- zVarName = mprintf("%s_image_url", zImageName);
	477	+ zVarName = mprintf("%s_image_url", zImageName);
478	478	Th_Store(zVarName, zUrl);
479	479	free(zVarName);
480	480	free(zUrl);
481	481	}
482	482
		@@ -597,11 +597,11 @@
597	597	**
598	598	** The string returned is obtained from fossil_malloc() and
599	599	** should be released by the caller.
600	600	*/
601	601	char *style_csp(int toHeader){
602		- static const char zBackupCSP[] =
	602	+ static const char zBackupCSP[] =
603	603	"default-src 'self' data:; "
604	604	"script-src 'self' 'nonce-$nonce'; "
605	605	"style-src 'self' 'unsafe-inline'; "
606	606	"img-src * data:";
607	607	const char *zFormat;
		@@ -633,11 +633,11 @@
633	633
634	634	/*
635	635	** Disable content security policy for the current page.
636	636	** WARNING: Do not do this lightly!
637	637	**
638		-** This routine must be called before the CSP is sued by
	638	+** This routine must be called before the CSP is sued by
639	639	** style_header().
640	640	*/
641	641	void style_disable_csp(void){
642	642	disableCSP = 1;
643	643	}
		@@ -645,11 +645,11 @@
645	645	/*
646	646	** Default HTML page header text through <body>. If the repository-specific
647	647	** header template lacks a <body> tag, then all of the following is
648	648	** prepended.
649	649	*/
650		-static const char zDfltHeader[] =
	650	+static const char zDfltHeader[] =
651	651	@ <html>
652	652	@ <head>
653	653	@ <meta charset="UTF-8">
654	654	@ <base href="$baseurl/$current_page">
655	655	@ <meta http-equiv="Content-Security-Policy" content="$default_csp">
		@@ -670,11 +670,11 @@
670	670	}
671	671
672	672	/*
673	673	** The default TCL list that defines the main menu.
674	674	*/
675		-static const char zDfltMainMenu[] =
	675	+static const char zDfltMainMenu[] =
676	676	@ Home /home * {}
677	677	@ Timeline /timeline {o r j} {}
678	678	@ Files /dir?ci=tip oh desktoponly
679	679	@ Branches /brlist o wideonly
680	680	@ Tags /taglist o wideonly
		@@ -1285,11 +1285,11 @@
1285	1285	** * $home
1286	1286	** * $logo
1287	1287	** * $background
1288	1288	**
1289	1289	** The output from TH1 becomes the style sheet. Fossil always reports
1290		-** that the style sheet is cacheable.
	1290	+** that the style sheet is cacheable.
1291	1291	*/
1292	1292	void page_style_css(void){
1293	1293	Blob css = empty_blob;
1294	1294	int i;
1295	1295	const char * zDefaults;
		@@ -1325,11 +1325,11 @@
1325	1325	}
1326	1326
1327	1327	/*
1328	1328	** All possible capabilities
1329	1329	*/
1330		-static const char allCap[] =
	1330	+static const char allCap[] =
1331	1331	"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKL";
1332	1332
1333	1333	/*
1334	1334	** Compute the current login capabilities
1335	1335	*/
		@@ -1479,11 +1479,11 @@
1479	1479	default: {
1480	1480	@ CSRF safety = unsafe<br>
1481	1481	break;
1482	1482	}
1483	1483	}
1484		-
	1484	+
1485	1485	@ fossil_exe_id() = %h(fossil_exe_id())<br>
1486	1486	if( g.perm.Admin ){
1487	1487	int k;
1488	1488	for(k=0; g.argvOrig[k]; k++){
1489	1489	Blob t;
		@@ -1651,11 +1651,11 @@
1651	1651	** style_select_list_int("my-grapes", "my_grapes", "Grapes",
1652	1652	** "Select the number of grapes",
1653	1653	** atoi(PD("my_field","0")),
1654	1654	** "", 1, "2", 2, "Three", 3,
1655	1655	** NULL);
1656		-**
	1656	+**
1657	1657	*/
1658	1658	void style_select_list_int(const char * zWrapperId,
1659	1659	const char zFieldName, const char zLabel,
1660	1660	const char * zToolTip, int selectedVal,
1661	1661	... ){
		@@ -1775,11 +1775,11 @@
1775	1775	}
1776	1776	}
1777	1777	CX("<script nonce='%s'>/* %s:%d */\n", style_nonce(), zOrigin, iLine);
1778	1778	}
1779	1779
1780		-/* Generate the closing </script> tag
	1780	+/* Generate the closing </script> tag
1781	1781	*/
1782	1782	void style_script_end(void){
1783	1783	CX("</script>\n");
1784	1784	}
1785	1785
1786	1786

	--- src/style.c
	+++ src/style.c
	@@ -452,11 +452,11 @@
452	blob_appendf(&url, "?id=%x", skin_id("css"));
453	if( P("once")!=0 && P("skin")!=0 ){
454	blob_appendf(&url, "&skin=%s&once", skin_in_use());
455	}
456
457	/* Generate the CSS URL variable */
458	Th_Store("stylesheet_url", blob_str(&url));
459	blob_reset(&url);
460	}
461
462	/*
	@@ -472,11 +472,11 @@
472	char zUrl; / The URL */
473
474	zResource = mprintf("%s-image", zImageName);
475	zUrl = mprintf("%R/%s?id=%x", zImageName, skin_id(zResource));
476	free(zResource);
477	zVarName = mprintf("%s_image_url", zImageName);
478	Th_Store(zVarName, zUrl);
479	free(zVarName);
480	free(zUrl);
481	}
482
	@@ -597,11 +597,11 @@
597	**
598	** The string returned is obtained from fossil_malloc() and
599	** should be released by the caller.
600	*/
601	char *style_csp(int toHeader){
602	static const char zBackupCSP[] =
603	"default-src 'self' data:; "
604	"script-src 'self' 'nonce-$nonce'; "
605	"style-src 'self' 'unsafe-inline'; "
606	"img-src * data:";
607	const char *zFormat;
	@@ -633,11 +633,11 @@
633
634	/*
635	** Disable content security policy for the current page.
636	** WARNING: Do not do this lightly!
637	**
638	** This routine must be called before the CSP is sued by
639	** style_header().
640	*/
641	void style_disable_csp(void){
642	disableCSP = 1;
643	}
	@@ -645,11 +645,11 @@
645	/*
646	** Default HTML page header text through <body>. If the repository-specific
647	** header template lacks a <body> tag, then all of the following is
648	** prepended.
649	*/
650	static const char zDfltHeader[] =
651	@ <html>
652	@ <head>
653	@ <meta charset="UTF-8">
654	@ <base href="$baseurl/$current_page">
655	@ <meta http-equiv="Content-Security-Policy" content="$default_csp">
	@@ -670,11 +670,11 @@
670	}
671
672	/*
673	** The default TCL list that defines the main menu.
674	*/
675	static const char zDfltMainMenu[] =
676	@ Home /home * {}
677	@ Timeline /timeline {o r j} {}
678	@ Files /dir?ci=tip oh desktoponly
679	@ Branches /brlist o wideonly
680	@ Tags /taglist o wideonly
	@@ -1285,11 +1285,11 @@
1285	** * $home
1286	** * $logo
1287	** * $background
1288	**
1289	** The output from TH1 becomes the style sheet. Fossil always reports
1290	** that the style sheet is cacheable.
1291	*/
1292	void page_style_css(void){
1293	Blob css = empty_blob;
1294	int i;
1295	const char * zDefaults;
	@@ -1325,11 +1325,11 @@
1325	}
1326
1327	/*
1328	** All possible capabilities
1329	*/
1330	static const char allCap[] =
1331	"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKL";
1332
1333	/*
1334	** Compute the current login capabilities
1335	*/
	@@ -1479,11 +1479,11 @@
1479	default: {
1480	@ CSRF safety = unsafe<br>
1481	break;
1482	}
1483	}
1484
1485	@ fossil_exe_id() = %h(fossil_exe_id())<br>
1486	if( g.perm.Admin ){
1487	int k;
1488	for(k=0; g.argvOrig[k]; k++){
1489	Blob t;
	@@ -1651,11 +1651,11 @@
1651	** style_select_list_int("my-grapes", "my_grapes", "Grapes",
1652	** "Select the number of grapes",
1653	** atoi(PD("my_field","0")),
1654	** "", 1, "2", 2, "Three", 3,
1655	** NULL);
1656	**
1657	*/
1658	void style_select_list_int(const char * zWrapperId,
1659	const char zFieldName, const char zLabel,
1660	const char * zToolTip, int selectedVal,
1661	... ){
	@@ -1775,11 +1775,11 @@
1775	}
1776	}
1777	CX("<script nonce='%s'>/* %s:%d */\n", style_nonce(), zOrigin, iLine);
1778	}
1779
1780	/* Generate the closing </script> tag
1781	*/
1782	void style_script_end(void){
1783	CX("</script>\n");
1784	}
1785
1786

	--- src/style.c
	+++ src/style.c
	@@ -452,11 +452,11 @@
452	blob_appendf(&url, "?id=%x", skin_id("css"));
453	if( P("once")!=0 && P("skin")!=0 ){
454	blob_appendf(&url, "&skin=%s&once", skin_in_use());
455	}
456
457	/* Generate the CSS URL variable */
458	Th_Store("stylesheet_url", blob_str(&url));
459	blob_reset(&url);
460	}
461
462	/*
	@@ -472,11 +472,11 @@
472	char zUrl; / The URL */
473
474	zResource = mprintf("%s-image", zImageName);
475	zUrl = mprintf("%R/%s?id=%x", zImageName, skin_id(zResource));
476	free(zResource);
477	zVarName = mprintf("%s_image_url", zImageName);
478	Th_Store(zVarName, zUrl);
479	free(zVarName);
480	free(zUrl);
481	}
482
	@@ -597,11 +597,11 @@
597	**
598	** The string returned is obtained from fossil_malloc() and
599	** should be released by the caller.
600	*/
601	char *style_csp(int toHeader){
602	static const char zBackupCSP[] =
603	"default-src 'self' data:; "
604	"script-src 'self' 'nonce-$nonce'; "
605	"style-src 'self' 'unsafe-inline'; "
606	"img-src * data:";
607	const char *zFormat;
	@@ -633,11 +633,11 @@
633
634	/*
635	** Disable content security policy for the current page.
636	** WARNING: Do not do this lightly!
637	**
638	** This routine must be called before the CSP is sued by
639	** style_header().
640	*/
641	void style_disable_csp(void){
642	disableCSP = 1;
643	}
	@@ -645,11 +645,11 @@
645	/*
646	** Default HTML page header text through <body>. If the repository-specific
647	** header template lacks a <body> tag, then all of the following is
648	** prepended.
649	*/
650	static const char zDfltHeader[] =
651	@ <html>
652	@ <head>
653	@ <meta charset="UTF-8">
654	@ <base href="$baseurl/$current_page">
655	@ <meta http-equiv="Content-Security-Policy" content="$default_csp">
	@@ -670,11 +670,11 @@
670	}
671
672	/*
673	** The default TCL list that defines the main menu.
674	*/
675	static const char zDfltMainMenu[] =
676	@ Home /home * {}
677	@ Timeline /timeline {o r j} {}
678	@ Files /dir?ci=tip oh desktoponly
679	@ Branches /brlist o wideonly
680	@ Tags /taglist o wideonly
	@@ -1285,11 +1285,11 @@
1285	** * $home
1286	** * $logo
1287	** * $background
1288	**
1289	** The output from TH1 becomes the style sheet. Fossil always reports
1290	** that the style sheet is cacheable.
1291	*/
1292	void page_style_css(void){
1293	Blob css = empty_blob;
1294	int i;
1295	const char * zDefaults;
	@@ -1325,11 +1325,11 @@
1325	}
1326
1327	/*
1328	** All possible capabilities
1329	*/
1330	static const char allCap[] =
1331	"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKL";
1332
1333	/*
1334	** Compute the current login capabilities
1335	*/
	@@ -1479,11 +1479,11 @@
1479	default: {
1480	@ CSRF safety = unsafe<br>
1481	break;
1482	}
1483	}
1484
1485	@ fossil_exe_id() = %h(fossil_exe_id())<br>
1486	if( g.perm.Admin ){
1487	int k;
1488	for(k=0; g.argvOrig[k]; k++){
1489	Blob t;
	@@ -1651,11 +1651,11 @@
1651	** style_select_list_int("my-grapes", "my_grapes", "Grapes",
1652	** "Select the number of grapes",
1653	** atoi(PD("my_field","0")),
1654	** "", 1, "2", 2, "Three", 3,
1655	** NULL);
1656	**
1657	*/
1658	void style_select_list_int(const char * zWrapperId,
1659	const char zFieldName, const char zLabel,
1660	const char * zToolTip, int selectedVal,
1661	... ){
	@@ -1775,11 +1775,11 @@
1775	}
1776	}
1777	CX("<script nonce='%s'>/* %s:%d */\n", style_nonce(), zOrigin, iLine);
1778	}
1779
1780	/* Generate the closing </script> tag
1781	*/
1782	void style_script_end(void){
1783	CX("</script>\n");
1784	}
1785
1786

M src/sync.c

+3 -3

		--- src/sync.c
		+++ src/sync.c
		@@ -128,11 +128,11 @@
128	128	return 0;
129	129	}
130	130	zAutosync = db_get_for_subsystem("autosync", zSubsys);
131	131	if( zAutosync==0 ) zAutosync = "on"; /* defend against misconfig */
132	132	if( is_false(zAutosync) ) return 0;
133		- if( db_get_boolean("dont-push",0)
	133	+ if( db_get_boolean("dont-push",0)
134	134	\|\| sqlite3_strglob("pull", zAutosync)==0
135	135	){
136	136	flags &= ~SYNC_CKIN_LOCK;
137	137	if( flags & SYNC_PUSH ) return 0;
138	138	}
		@@ -533,11 +533,11 @@
533	533	**
534	534	** Show all remote repository URLs.
535	535	**
536	536	** > fossil remote off
537	537	**
538		-** Forget the default URL. This disables autosync.
	538	+** Forget the default URL. This disables autosync.
539	539	**
540	540	** This is a convenient way to enter "airplane mode". To enter
541	541	** airplane mode, first save the current default URL, then turn the
542	542	** default off. Perhaps like this:
543	543	**
		@@ -595,11 +595,11 @@
595	595	**
596	596	** The last-sync-url might be duplicated into one of the sync-url:NAME
597	597	** entries. Thus, when doing a "fossil sync --all" or an autosync with
598	598	** autosync=all, each sync-url:NAME entry is checked to see if it is the
599	599	** same as last-sync-url and if it is then that entry is skipped.
600		- */
	600	+ */
601	601
602	602	if( g.argc==2 ){
603	603	/* "fossil remote" with no arguments: Show the last sync URL. */
604	604	zUrl = db_get("last-sync-url", 0);
605	605	if( zUrl==0 ){
606	606

	--- src/sync.c
	+++ src/sync.c
	@@ -128,11 +128,11 @@
128	return 0;
129	}
130	zAutosync = db_get_for_subsystem("autosync", zSubsys);
131	if( zAutosync==0 ) zAutosync = "on"; /* defend against misconfig */
132	if( is_false(zAutosync) ) return 0;
133	if( db_get_boolean("dont-push",0)
134	\|\| sqlite3_strglob("pull", zAutosync)==0
135	){
136	flags &= ~SYNC_CKIN_LOCK;
137	if( flags & SYNC_PUSH ) return 0;
138	}
	@@ -533,11 +533,11 @@
533	**
534	** Show all remote repository URLs.
535	**
536	** > fossil remote off
537	**
538	** Forget the default URL. This disables autosync.
539	**
540	** This is a convenient way to enter "airplane mode". To enter
541	** airplane mode, first save the current default URL, then turn the
542	** default off. Perhaps like this:
543	**
	@@ -595,11 +595,11 @@
595	**
596	** The last-sync-url might be duplicated into one of the sync-url:NAME
597	** entries. Thus, when doing a "fossil sync --all" or an autosync with
598	** autosync=all, each sync-url:NAME entry is checked to see if it is the
599	** same as last-sync-url and if it is then that entry is skipped.
600	*/
601
602	if( g.argc==2 ){
603	/* "fossil remote" with no arguments: Show the last sync URL. */
604	zUrl = db_get("last-sync-url", 0);
605	if( zUrl==0 ){
606

	--- src/sync.c
	+++ src/sync.c
	@@ -128,11 +128,11 @@
128	return 0;
129	}
130	zAutosync = db_get_for_subsystem("autosync", zSubsys);
131	if( zAutosync==0 ) zAutosync = "on"; /* defend against misconfig */
132	if( is_false(zAutosync) ) return 0;
133	if( db_get_boolean("dont-push",0)
134	\|\| sqlite3_strglob("pull", zAutosync)==0
135	){
136	flags &= ~SYNC_CKIN_LOCK;
137	if( flags & SYNC_PUSH ) return 0;
138	}
	@@ -533,11 +533,11 @@
533	**
534	** Show all remote repository URLs.
535	**
536	** > fossil remote off
537	**
538	** Forget the default URL. This disables autosync.
539	**
540	** This is a convenient way to enter "airplane mode". To enter
541	** airplane mode, first save the current default URL, then turn the
542	** default off. Perhaps like this:
543	**
	@@ -595,11 +595,11 @@
595	**
596	** The last-sync-url might be duplicated into one of the sync-url:NAME
597	** entries. Thus, when doing a "fossil sync --all" or an autosync with
598	** autosync=all, each sync-url:NAME entry is checked to see if it is the
599	** same as last-sync-url and if it is then that entry is skipped.
600	*/
601
602	if( g.argc==2 ){
603	/* "fossil remote" with no arguments: Show the last sync URL. */
604	zUrl = db_get("last-sync-url", 0);
605	if( zUrl==0 ){
606

M src/tag.c

+2 -2

		--- src/tag.c
		+++ src/tag.c
		@@ -640,13 +640,13 @@
640	640
641	641	if( zTagType!=0 ){
642	642	int l = strlen(zTagType);
643	643	if( strncmp(zTagType,"cancel",l)==0 ){
644	644	nTagType = 0;
645		- }else if( strncmp(zTagType,"singleton",l)==0 ){
	645	+ }else if( strncmp(zTagType,"singleton",l)==0 ){
646	646	nTagType = 1;
647		- }else if( strncmp(zTagType,"propagated",l)==0 ){
	647	+ }else if( strncmp(zTagType,"propagated",l)==0 ){
648	648	nTagType = 2;
649	649	}else{
650	650	fossil_fatal("unrecognized tag type");
651	651	}
652	652	}
653	653

	--- src/tag.c
	+++ src/tag.c
	@@ -640,13 +640,13 @@
640
641	if( zTagType!=0 ){
642	int l = strlen(zTagType);
643	if( strncmp(zTagType,"cancel",l)==0 ){
644	nTagType = 0;
645	}else if( strncmp(zTagType,"singleton",l)==0 ){
646	nTagType = 1;
647	}else if( strncmp(zTagType,"propagated",l)==0 ){
648	nTagType = 2;
649	}else{
650	fossil_fatal("unrecognized tag type");
651	}
652	}
653

	--- src/tag.c
	+++ src/tag.c
	@@ -640,13 +640,13 @@
640
641	if( zTagType!=0 ){
642	int l = strlen(zTagType);
643	if( strncmp(zTagType,"cancel",l)==0 ){
644	nTagType = 0;
645	}else if( strncmp(zTagType,"singleton",l)==0 ){
646	nTagType = 1;
647	}else if( strncmp(zTagType,"propagated",l)==0 ){
648	nTagType = 2;
649	}else{
650	fossil_fatal("unrecognized tag type");
651	}
652	}
653

M src/timeline.c

+10 -10

		--- src/timeline.c
		+++ src/timeline.c
		@@ -41,11 +41,11 @@
41	41	"%h %c"
42	42	#define TIMELINE_FMT_MEDIUM \
43	43	"Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"
44	44	#define TIMELINE_FMT_FULL \
45	45	"Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n"\
46		- "Branch: %b%nTags: %t%nPhase: %p"
	46	+ "Branch: %b%nTags: %t%nPhase: %p"
47	47	/*
48	48	** Add an appropriate tag to the output if "rid" is unpublished (private)
49	49	*/
50	50	#define UNPUB_TAG "<em>(unpublished)</em>"
51	51	void tag_private_status(int rid){
		@@ -153,11 +153,11 @@
153	153	db_reset(&q);
154	154	return res;
155	155	}
156	156
157	157	/*
158		-** Return the text of the unformatted
	158	+** Return the text of the unformatted
159	159	** forum post given by the RID in the argument.
160	160	*/
161	161	static void forum_post_content_function(
162	162	sqlite3_context *context,
163	163	int argc,
		@@ -366,11 +366,11 @@
366	366	zExtraClass = " tktTlClosed";
367	367	}else{
368	368	zExtraClass = " tktTlOpen";
369	369	}
370	370	fossil_free(zTktid);
371		- }
	371	+ }
372	372	}
373	373	if( zType[0]=='e' && tagid ){
374	374	if( bTimestampLinksToInfo ){
375	375	char *zId;
376	376	zId = db_text(0, "SELECT substr(tagname, 7) FROM tag WHERE tagid=%d",
		@@ -676,11 +676,11 @@
676	676	}
677	677
678	678	if( tmFlags & TIMELINE_SHOWRID ){
679	679	int srcId = delta_source_rid(rid);
680	680	if( srcId ){
681		- cgi_printf(" id: %z%d←%d</a>",
	681	+ cgi_printf(" id: %z%d←%d</a>",
682	682	href("%R/deltachain/%d",rid), rid, srcId);
683	683	}else{
684	684	cgi_printf(" id: %z%d</a>",
685	685	href("%R/deltachain/%d",rid), rid);
686	686	}
		@@ -2222,11 +2222,11 @@
2222	2222	blob_appendf(&desc, " of %z%h</a>",
2223	2223	href("%R/info?name=%h", zCiName), zCiName);
2224	2224	if( ridBackTo ){
2225	2225	if( np==0 ){
2226	2226	blob_reset(&desc);
2227		- blob_appendf(&desc,
	2227	+ blob_appendf(&desc,
2228	2228	"Check-in %z%h</a> only (%z%h</a> is not an ancestor)",
2229	2229	href("%R/info?name=%h",zCiName), zCiName,
2230	2230	href("%R/info?name=%h",zBackTo), zBackTo);
2231	2231	}else{
2232	2232	blob_appendf(&desc, " back to %z%h</a>",
		@@ -2237,11 +2237,11 @@
2237	2237	}
2238	2238	}
2239	2239	}else if( ridFwdTo ){
2240	2240	if( nd==0 ){
2241	2241	blob_reset(&desc);
2242		- blob_appendf(&desc,
	2242	+ blob_appendf(&desc,
2243	2243	"Check-in %z%h</a> only (%z%h</a> is not an descendant)",
2244	2244	href("%R/info?name=%h",zCiName), zCiName,
2245	2245	href("%R/info?name=%h",zFwdTo), zFwdTo);
2246	2246	}else{
2247	2247	blob_appendf(&desc, " up to %z%h</a>",
		@@ -3028,11 +3028,11 @@
3028	3028	const char *zCurrentUuid = 0;
3029	3029	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
3030	3030	Stmt fchngQuery; /* Query for file changes on check-ins */
3031	3031	int rc;
3032	3032	/* True: separate entries with a newline after file listing */
3033		- int bVerboseNL = (zFormat &&
	3033	+ int bVerboseNL = (zFormat &&
3034	3034	(fossil_strcmp(zFormat, TIMELINE_FMT_ONELINE)!=0));
3035	3035	/* True: separate entries with a newline even with no file listing */
3036	3036	int bNoVerboseNL = (zFormat &&
3037	3037	(fossil_strcmp(zFormat, TIMELINE_FMT_MEDIUM)==0 \|\|
3038	3038	fossil_strcmp(zFormat, TIMELINE_FMT_FULL)==0));
		@@ -3171,11 +3171,11 @@
3171	3171	db_reset(&fchngQuery);
3172	3172	if( bVerboseNL ) fossil_print("\n");
3173	3173	}else{
3174	3174	if( bNoVerboseNL ) fossil_print("\n");
3175	3175	}
3176		-
	3176	+
3177	3177	nEntry++; /* record another complete entry */
3178	3178	}
3179	3179	if( rc==SQLITE_DONE ){
3180	3180	/* Did the underlying query actually have all entries? */
3181	3181	if( nAbsLimit==0 ){
		@@ -3215,11 +3215,11 @@
3215	3215	@ , coalesce(euser,user,'?') AS user0
3216	3216	@ , (SELECT case when length(x)>0 then x else '' end
3217	3217	@ FROM (SELECT group_concat(substr(tagname,5), ', ') AS x
3218	3218	@ FROM tag, tagxref
3219	3219	@ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid
3220		- @ AND tagxref.rid=blob.rid AND tagxref.tagtype>0)) AS tags
	3220	+ @ AND tagxref.rid=blob.rid AND tagxref.tagtype>0)) AS tags
3221	3221	@ FROM tag CROSS JOIN event CROSS JOIN blob
3222	3222	@ LEFT JOIN tagxref ON tagxref.tagid=tag.tagid
3223	3223	@ AND tagxref.tagtype>0
3224	3224	@ AND tagxref.rid=blob.rid
3225	3225	@ WHERE blob.rid=event.objid
		@@ -3276,11 +3276,11 @@
3276	3276	**
3277	3277	** Options:
3278	3278	** -b\|--branch BRANCH Show only items on the branch named BRANCH
3279	3279	** -c\|--current-branch Show only items on the current branch
3280	3280	** -F\|--format Entry format. Values "oneline", "medium", and "full"
3281		-** get mapped to the full options below. Otherwise a
	3281	+** get mapped to the full options below. Otherwise a
3282	3282	** string which can contain these placeholders:
3283	3283	** %n newline
3284	3284	** %% a raw %
3285	3285	** %H commit hash
3286	3286	** %h abbreviated commit hash
3287	3287

	--- src/timeline.c
	+++ src/timeline.c
	@@ -41,11 +41,11 @@
41	"%h %c"
42	#define TIMELINE_FMT_MEDIUM \
43	"Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"
44	#define TIMELINE_FMT_FULL \
45	"Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n"\
46	"Branch: %b%nTags: %t%nPhase: %p"
47	/*
48	** Add an appropriate tag to the output if "rid" is unpublished (private)
49	*/
50	#define UNPUB_TAG "<em>(unpublished)</em>"
51	void tag_private_status(int rid){
	@@ -153,11 +153,11 @@
153	db_reset(&q);
154	return res;
155	}
156
157	/*
158	** Return the text of the unformatted
159	** forum post given by the RID in the argument.
160	*/
161	static void forum_post_content_function(
162	sqlite3_context *context,
163	int argc,
	@@ -366,11 +366,11 @@
366	zExtraClass = " tktTlClosed";
367	}else{
368	zExtraClass = " tktTlOpen";
369	}
370	fossil_free(zTktid);
371	}
372	}
373	if( zType[0]=='e' && tagid ){
374	if( bTimestampLinksToInfo ){
375	char *zId;
376	zId = db_text(0, "SELECT substr(tagname, 7) FROM tag WHERE tagid=%d",
	@@ -676,11 +676,11 @@
676	}
677
678	if( tmFlags & TIMELINE_SHOWRID ){
679	int srcId = delta_source_rid(rid);
680	if( srcId ){
681	cgi_printf(" id: %z%d←%d</a>",
682	href("%R/deltachain/%d",rid), rid, srcId);
683	}else{
684	cgi_printf(" id: %z%d</a>",
685	href("%R/deltachain/%d",rid), rid);
686	}
	@@ -2222,11 +2222,11 @@
2222	blob_appendf(&desc, " of %z%h</a>",
2223	href("%R/info?name=%h", zCiName), zCiName);
2224	if( ridBackTo ){
2225	if( np==0 ){
2226	blob_reset(&desc);
2227	blob_appendf(&desc,
2228	"Check-in %z%h</a> only (%z%h</a> is not an ancestor)",
2229	href("%R/info?name=%h",zCiName), zCiName,
2230	href("%R/info?name=%h",zBackTo), zBackTo);
2231	}else{
2232	blob_appendf(&desc, " back to %z%h</a>",
	@@ -2237,11 +2237,11 @@
2237	}
2238	}
2239	}else if( ridFwdTo ){
2240	if( nd==0 ){
2241	blob_reset(&desc);
2242	blob_appendf(&desc,
2243	"Check-in %z%h</a> only (%z%h</a> is not an descendant)",
2244	href("%R/info?name=%h",zCiName), zCiName,
2245	href("%R/info?name=%h",zFwdTo), zFwdTo);
2246	}else{
2247	blob_appendf(&desc, " up to %z%h</a>",
	@@ -3028,11 +3028,11 @@
3028	const char *zCurrentUuid = 0;
3029	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
3030	Stmt fchngQuery; /* Query for file changes on check-ins */
3031	int rc;
3032	/* True: separate entries with a newline after file listing */
3033	int bVerboseNL = (zFormat &&
3034	(fossil_strcmp(zFormat, TIMELINE_FMT_ONELINE)!=0));
3035	/* True: separate entries with a newline even with no file listing */
3036	int bNoVerboseNL = (zFormat &&
3037	(fossil_strcmp(zFormat, TIMELINE_FMT_MEDIUM)==0 \|\|
3038	fossil_strcmp(zFormat, TIMELINE_FMT_FULL)==0));
	@@ -3171,11 +3171,11 @@
3171	db_reset(&fchngQuery);
3172	if( bVerboseNL ) fossil_print("\n");
3173	}else{
3174	if( bNoVerboseNL ) fossil_print("\n");
3175	}
3176
3177	nEntry++; /* record another complete entry */
3178	}
3179	if( rc==SQLITE_DONE ){
3180	/* Did the underlying query actually have all entries? */
3181	if( nAbsLimit==0 ){
	@@ -3215,11 +3215,11 @@
3215	@ , coalesce(euser,user,'?') AS user0
3216	@ , (SELECT case when length(x)>0 then x else '' end
3217	@ FROM (SELECT group_concat(substr(tagname,5), ', ') AS x
3218	@ FROM tag, tagxref
3219	@ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid
3220	@ AND tagxref.rid=blob.rid AND tagxref.tagtype>0)) AS tags
3221	@ FROM tag CROSS JOIN event CROSS JOIN blob
3222	@ LEFT JOIN tagxref ON tagxref.tagid=tag.tagid
3223	@ AND tagxref.tagtype>0
3224	@ AND tagxref.rid=blob.rid
3225	@ WHERE blob.rid=event.objid
	@@ -3276,11 +3276,11 @@
3276	**
3277	** Options:
3278	** -b\|--branch BRANCH Show only items on the branch named BRANCH
3279	** -c\|--current-branch Show only items on the current branch
3280	** -F\|--format Entry format. Values "oneline", "medium", and "full"
3281	** get mapped to the full options below. Otherwise a
3282	** string which can contain these placeholders:
3283	** %n newline
3284	** %% a raw %
3285	** %H commit hash
3286	** %h abbreviated commit hash
3287

	--- src/timeline.c
	+++ src/timeline.c
	@@ -41,11 +41,11 @@
41	"%h %c"
42	#define TIMELINE_FMT_MEDIUM \
43	"Commit: %h%nDate: %d%nAuthor: %a%nComment: %c"
44	#define TIMELINE_FMT_FULL \
45	"Commit: %H%nDate: %d%nAuthor: %a%nComment: %c%n"\
46	"Branch: %b%nTags: %t%nPhase: %p"
47	/*
48	** Add an appropriate tag to the output if "rid" is unpublished (private)
49	*/
50	#define UNPUB_TAG "<em>(unpublished)</em>"
51	void tag_private_status(int rid){
	@@ -153,11 +153,11 @@
153	db_reset(&q);
154	return res;
155	}
156
157	/*
158	** Return the text of the unformatted
159	** forum post given by the RID in the argument.
160	*/
161	static void forum_post_content_function(
162	sqlite3_context *context,
163	int argc,
	@@ -366,11 +366,11 @@
366	zExtraClass = " tktTlClosed";
367	}else{
368	zExtraClass = " tktTlOpen";
369	}
370	fossil_free(zTktid);
371	}
372	}
373	if( zType[0]=='e' && tagid ){
374	if( bTimestampLinksToInfo ){
375	char *zId;
376	zId = db_text(0, "SELECT substr(tagname, 7) FROM tag WHERE tagid=%d",
	@@ -676,11 +676,11 @@
676	}
677
678	if( tmFlags & TIMELINE_SHOWRID ){
679	int srcId = delta_source_rid(rid);
680	if( srcId ){
681	cgi_printf(" id: %z%d←%d</a>",
682	href("%R/deltachain/%d",rid), rid, srcId);
683	}else{
684	cgi_printf(" id: %z%d</a>",
685	href("%R/deltachain/%d",rid), rid);
686	}
	@@ -2222,11 +2222,11 @@
2222	blob_appendf(&desc, " of %z%h</a>",
2223	href("%R/info?name=%h", zCiName), zCiName);
2224	if( ridBackTo ){
2225	if( np==0 ){
2226	blob_reset(&desc);
2227	blob_appendf(&desc,
2228	"Check-in %z%h</a> only (%z%h</a> is not an ancestor)",
2229	href("%R/info?name=%h",zCiName), zCiName,
2230	href("%R/info?name=%h",zBackTo), zBackTo);
2231	}else{
2232	blob_appendf(&desc, " back to %z%h</a>",
	@@ -2237,11 +2237,11 @@
2237	}
2238	}
2239	}else if( ridFwdTo ){
2240	if( nd==0 ){
2241	blob_reset(&desc);
2242	blob_appendf(&desc,
2243	"Check-in %z%h</a> only (%z%h</a> is not an descendant)",
2244	href("%R/info?name=%h",zCiName), zCiName,
2245	href("%R/info?name=%h",zFwdTo), zFwdTo);
2246	}else{
2247	blob_appendf(&desc, " up to %z%h</a>",
	@@ -3028,11 +3028,11 @@
3028	const char *zCurrentUuid = 0;
3029	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
3030	Stmt fchngQuery; /* Query for file changes on check-ins */
3031	int rc;
3032	/* True: separate entries with a newline after file listing */
3033	int bVerboseNL = (zFormat &&
3034	(fossil_strcmp(zFormat, TIMELINE_FMT_ONELINE)!=0));
3035	/* True: separate entries with a newline even with no file listing */
3036	int bNoVerboseNL = (zFormat &&
3037	(fossil_strcmp(zFormat, TIMELINE_FMT_MEDIUM)==0 \|\|
3038	fossil_strcmp(zFormat, TIMELINE_FMT_FULL)==0));
	@@ -3171,11 +3171,11 @@
3171	db_reset(&fchngQuery);
3172	if( bVerboseNL ) fossil_print("\n");
3173	}else{
3174	if( bNoVerboseNL ) fossil_print("\n");
3175	}
3176
3177	nEntry++; /* record another complete entry */
3178	}
3179	if( rc==SQLITE_DONE ){
3180	/* Did the underlying query actually have all entries? */
3181	if( nAbsLimit==0 ){
	@@ -3215,11 +3215,11 @@
3215	@ , coalesce(euser,user,'?') AS user0
3216	@ , (SELECT case when length(x)>0 then x else '' end
3217	@ FROM (SELECT group_concat(substr(tagname,5), ', ') AS x
3218	@ FROM tag, tagxref
3219	@ WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid
3220	@ AND tagxref.rid=blob.rid AND tagxref.tagtype>0)) AS tags
3221	@ FROM tag CROSS JOIN event CROSS JOIN blob
3222	@ LEFT JOIN tagxref ON tagxref.tagid=tag.tagid
3223	@ AND tagxref.tagtype>0
3224	@ AND tagxref.rid=blob.rid
3225	@ WHERE blob.rid=event.objid
	@@ -3276,11 +3276,11 @@
3276	**
3277	** Options:
3278	** -b\|--branch BRANCH Show only items on the branch named BRANCH
3279	** -c\|--current-branch Show only items on the current branch
3280	** -F\|--format Entry format. Values "oneline", "medium", and "full"
3281	** get mapped to the full options below. Otherwise a
3282	** string which can contain these placeholders:
3283	** %n newline
3284	** %% a raw %
3285	** %H commit hash
3286	** %h abbreviated commit hash
3287

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -557,11 +557,11 @@
557	557	if( sqlite3_stricmp(z2,"main")!=0
558	558	&& sqlite3_stricmp(z2,"repository")!=0
559	559	){
560	560	goto ticket_schema_error;
561	561	}
562		- if( sqlite3_strnicmp(z0,"ticket",6)!=0
	562	+ if( sqlite3_strnicmp(z0,"ticket",6)!=0
563	563	&& sqlite3_strnicmp(z0,"fx_",3)!=0
564	564	){
565	565	goto ticket_schema_error;
566	566	}
567	567	break;
		@@ -1213,11 +1213,11 @@
1213	1213	/*
1214	1214	** WEBPAGE: tkttimeline
1215	1215	** URL: /tkttimeline/TICKETUUID
1216	1216	**
1217	1217	** Show the change history for a single ticket in timeline format.
1218		-**
	1218	+**
1219	1219	** Query parameters:
1220	1220	**
1221	1221	** y=ci Show only check-ins associated with the ticket
1222	1222	*/
1223	1223	void tkttimeline_page(void){
1224	1224

	--- src/tkt.c
	+++ src/tkt.c
	@@ -557,11 +557,11 @@
557	if( sqlite3_stricmp(z2,"main")!=0
558	&& sqlite3_stricmp(z2,"repository")!=0
559	){
560	goto ticket_schema_error;
561	}
562	if( sqlite3_strnicmp(z0,"ticket",6)!=0
563	&& sqlite3_strnicmp(z0,"fx_",3)!=0
564	){
565	goto ticket_schema_error;
566	}
567	break;
	@@ -1213,11 +1213,11 @@
1213	/*
1214	** WEBPAGE: tkttimeline
1215	** URL: /tkttimeline/TICKETUUID
1216	**
1217	** Show the change history for a single ticket in timeline format.
1218	**
1219	** Query parameters:
1220	**
1221	** y=ci Show only check-ins associated with the ticket
1222	*/
1223	void tkttimeline_page(void){
1224

	--- src/tkt.c
	+++ src/tkt.c
	@@ -557,11 +557,11 @@
557	if( sqlite3_stricmp(z2,"main")!=0
558	&& sqlite3_stricmp(z2,"repository")!=0
559	){
560	goto ticket_schema_error;
561	}
562	if( sqlite3_strnicmp(z0,"ticket",6)!=0
563	&& sqlite3_strnicmp(z0,"fx_",3)!=0
564	){
565	goto ticket_schema_error;
566	}
567	break;
	@@ -1213,11 +1213,11 @@
1213	/*
1214	** WEBPAGE: tkttimeline
1215	** URL: /tkttimeline/TICKETUUID
1216	**
1217	** Show the change history for a single ticket in timeline format.
1218	**
1219	** Query parameters:
1220	**
1221	** y=ci Show only check-ins associated with the ticket
1222	*/
1223	void tkttimeline_page(void){
1224

M src/unicode.c

+1 -1

		--- src/unicode.c
		+++ src/unicode.c
		@@ -240,11 +240,11 @@
240	240	iHi = iTest-1;
241	241	}
242	242	}
243	243	assert( key>=aDia[iRes] );
244	244	if( bComplex==0 && (aChar[iRes] & 0x80) ) return c;
245		- return (c > (aDia[iRes]>>3) + (aDia[iRes]&0x07)) ? c :
	245	+ return (c > (aDia[iRes]>>3) + (aDia[iRes]&0x07)) ? c :
246	246	((int)aChar[iRes] & 0x7F);
247	247	}
248	248
249	249
250	250	/*
251	251

	--- src/unicode.c
	+++ src/unicode.c
	@@ -240,11 +240,11 @@
240	iHi = iTest-1;
241	}
242	}
243	assert( key>=aDia[iRes] );
244	if( bComplex==0 && (aChar[iRes] & 0x80) ) return c;
245	return (c > (aDia[iRes]>>3) + (aDia[iRes]&0x07)) ? c :
246	((int)aChar[iRes] & 0x7F);
247	}
248
249
250	/*
251

	--- src/unicode.c
	+++ src/unicode.c
	@@ -240,11 +240,11 @@
240	iHi = iTest-1;
241	}
242	}
243	assert( key>=aDia[iRes] );
244	if( bComplex==0 && (aChar[iRes] & 0x80) ) return c;
245	return (c > (aDia[iRes]>>3) + (aDia[iRes]&0x07)) ? c :
246	((int)aChar[iRes] & 0x7F);
247	}
248
249
250	/*
251

M src/update.c

+1 -1

		--- src/update.c
		+++ src/update.c
		@@ -567,11 +567,11 @@
567	567	fossil_print("%.79c\n",'-');
568	568	if( nUpdate==0 ){
569	569	show_common_info(tid, "checkout:", 1, 0);
570	570	fossil_print("%-13s None. Already up-to-date\n", "changes:");
571	571	}else{
572		- fossil_print("%-13s %.40s %s\n", "updated-from:", rid_to_uuid(vid),
	572	+ fossil_print("%-13s %.40s %s\n", "updated-from:", rid_to_uuid(vid),
573	573	db_text("", "SELECT datetime(mtime) \|\| ' UTC' FROM event "
574	574	" WHERE objid=%d", vid));
575	575	show_common_info(tid, "updated-to:", 1, 0);
576	576	fossil_print("%-13s %d file%s modified.\n", "changes:",
577	577	nUpdate, nUpdate>1 ? "s" : "");
578	578

	--- src/update.c
	+++ src/update.c
	@@ -567,11 +567,11 @@
567	fossil_print("%.79c\n",'-');
568	if( nUpdate==0 ){
569	show_common_info(tid, "checkout:", 1, 0);
570	fossil_print("%-13s None. Already up-to-date\n", "changes:");
571	}else{
572	fossil_print("%-13s %.40s %s\n", "updated-from:", rid_to_uuid(vid),
573	db_text("", "SELECT datetime(mtime) \|\| ' UTC' FROM event "
574	" WHERE objid=%d", vid));
575	show_common_info(tid, "updated-to:", 1, 0);
576	fossil_print("%-13s %d file%s modified.\n", "changes:",
577	nUpdate, nUpdate>1 ? "s" : "");
578

	--- src/update.c
	+++ src/update.c
	@@ -567,11 +567,11 @@
567	fossil_print("%.79c\n",'-');
568	if( nUpdate==0 ){
569	show_common_info(tid, "checkout:", 1, 0);
570	fossil_print("%-13s None. Already up-to-date\n", "changes:");
571	}else{
572	fossil_print("%-13s %.40s %s\n", "updated-from:", rid_to_uuid(vid),
573	db_text("", "SELECT datetime(mtime) \|\| ' UTC' FROM event "
574	" WHERE objid=%d", vid));
575	show_common_info(tid, "updated-to:", 1, 0);
576	fossil_print("%-13s %d file%s modified.\n", "changes:",
577	nUpdate, nUpdate>1 ? "s" : "");
578

M src/url.c

+3 -3

		--- src/url.c
		+++ src/url.c
		@@ -89,11 +89,11 @@
89	89	** passwd Password.
90	90	** hostname HOST:PORT or just HOST if port is the default.
91	91	** canonical The URL in canonical form, omitting the password
92	92	**
93	93	** If URL_USECONFIG is set and zUrl is NULL or "default", then parse the
94		-** URL stored in last-sync-url and last-sync-pw of the CONFIG table. Or if
	94	+** URL stored in last-sync-url and last-sync-pw of the CONFIG table. Or if
95	95	** URL_USE_PARENT is also set, then use parent-project-url and
96	96	** parent-project-pw from the CONFIG table instead of last-sync-url
97	97	** and last-sync-pw.
98	98	**
99	99	** If URL_USE_CONFIG is set and zUrl is a symbolic name, then look up
		@@ -317,11 +317,11 @@
317	317	pUrlData->protocol = "file";
318	318	pUrlData->path = mprintf("");
319	319	pUrlData->name = mprintf("%b", &cfile);
320	320	pUrlData->canonical = mprintf("file://%T", pUrlData->name);
321	321	blob_reset(&cfile);
322		- }else if( pUrlData->user!=0 && pUrlData->passwd==0
	322	+ }else if( pUrlData->user!=0 && pUrlData->passwd==0
323	323	&& (urlFlags & URL_PROMPT_PW)!=0 ){
324	324	url_prompt_for_password_local(pUrlData);
325	325	}else if( pUrlData->user!=0 && ( urlFlags & URL_ASK_REMEMBER_PW ) ){
326	326	if( isatty(fileno(stdin)) && ( urlFlags & URL_REMEMBER_PW )==0 ){
327	327	if( save_password_prompt(pUrlData->passwd) ){
		@@ -791,11 +791,11 @@
791	791	**
792	792	** * If the URL has a path, use the tail of the path, with any suffix
793	793	** elided.
794	794	**
795	795	** * If the URL is just a domain name, without a path, then use the
796		-** first element of the domain name, except skip over "www." if
	796	+** first element of the domain name, except skip over "www." if
797	797	** present and if there is a ".com" or ".org" or similar suffix.
798	798	**
799	799	** The string returned is obtained from fossil_malloc(). NULL might be
800	800	** returned if there is an error.
801	801	*/
802	802

	--- src/url.c
	+++ src/url.c
	@@ -89,11 +89,11 @@
89	** passwd Password.
90	** hostname HOST:PORT or just HOST if port is the default.
91	** canonical The URL in canonical form, omitting the password
92	**
93	** If URL_USECONFIG is set and zUrl is NULL or "default", then parse the
94	** URL stored in last-sync-url and last-sync-pw of the CONFIG table. Or if
95	** URL_USE_PARENT is also set, then use parent-project-url and
96	** parent-project-pw from the CONFIG table instead of last-sync-url
97	** and last-sync-pw.
98	**
99	** If URL_USE_CONFIG is set and zUrl is a symbolic name, then look up
	@@ -317,11 +317,11 @@
317	pUrlData->protocol = "file";
318	pUrlData->path = mprintf("");
319	pUrlData->name = mprintf("%b", &cfile);
320	pUrlData->canonical = mprintf("file://%T", pUrlData->name);
321	blob_reset(&cfile);
322	}else if( pUrlData->user!=0 && pUrlData->passwd==0
323	&& (urlFlags & URL_PROMPT_PW)!=0 ){
324	url_prompt_for_password_local(pUrlData);
325	}else if( pUrlData->user!=0 && ( urlFlags & URL_ASK_REMEMBER_PW ) ){
326	if( isatty(fileno(stdin)) && ( urlFlags & URL_REMEMBER_PW )==0 ){
327	if( save_password_prompt(pUrlData->passwd) ){
	@@ -791,11 +791,11 @@
791	**
792	** * If the URL has a path, use the tail of the path, with any suffix
793	** elided.
794	**
795	** * If the URL is just a domain name, without a path, then use the
796	** first element of the domain name, except skip over "www." if
797	** present and if there is a ".com" or ".org" or similar suffix.
798	**
799	** The string returned is obtained from fossil_malloc(). NULL might be
800	** returned if there is an error.
801	*/
802

	--- src/url.c
	+++ src/url.c
	@@ -89,11 +89,11 @@
89	** passwd Password.
90	** hostname HOST:PORT or just HOST if port is the default.
91	** canonical The URL in canonical form, omitting the password
92	**
93	** If URL_USECONFIG is set and zUrl is NULL or "default", then parse the
94	** URL stored in last-sync-url and last-sync-pw of the CONFIG table. Or if
95	** URL_USE_PARENT is also set, then use parent-project-url and
96	** parent-project-pw from the CONFIG table instead of last-sync-url
97	** and last-sync-pw.
98	**
99	** If URL_USE_CONFIG is set and zUrl is a symbolic name, then look up
	@@ -317,11 +317,11 @@
317	pUrlData->protocol = "file";
318	pUrlData->path = mprintf("");
319	pUrlData->name = mprintf("%b", &cfile);
320	pUrlData->canonical = mprintf("file://%T", pUrlData->name);
321	blob_reset(&cfile);
322	}else if( pUrlData->user!=0 && pUrlData->passwd==0
323	&& (urlFlags & URL_PROMPT_PW)!=0 ){
324	url_prompt_for_password_local(pUrlData);
325	}else if( pUrlData->user!=0 && ( urlFlags & URL_ASK_REMEMBER_PW ) ){
326	if( isatty(fileno(stdin)) && ( urlFlags & URL_REMEMBER_PW )==0 ){
327	if( save_password_prompt(pUrlData->passwd) ){
	@@ -791,11 +791,11 @@
791	**
792	** * If the URL has a path, use the tail of the path, with any suffix
793	** elided.
794	**
795	** * If the URL is just a domain name, without a path, then use the
796	** first element of the domain name, except skip over "www." if
797	** present and if there is a ".com" or ".org" or similar suffix.
798	**
799	** The string returned is obtained from fossil_malloc(). NULL might be
800	** returned if there is an error.
801	*/
802

M src/vfile.c

+2 -2

		--- src/vfile.c
		+++ src/vfile.c
		@@ -1042,17 +1042,17 @@
1042	1042	db_multi_exec(
1043	1043	"INSERT OR IGNORE INTO idMap(oldrid, newrid)"
1044	1044	" SELECT vfile.mrid, blob.rid FROM vfile, blob"
1045	1045	" WHERE blob.uuid=vfile.mhash;"
1046	1046	);
1047		-
	1047	+
1048	1048	if( dryRun ){
1049	1049	Stmt q;
1050	1050	db_prepare(&q, "SELECT oldrid, newrid, blob.uuid"
1051	1051	" FROM idMap, blob WHERE blob.rid=idMap.newrid");
1052	1052	while( db_step(&q)==SQLITE_ROW ){
1053		- fossil_print("%8d -> %8d %.25s\n",
	1053	+ fossil_print("%8d -> %8d %.25s\n",
1054	1054	db_column_int(&q,0),
1055	1055	db_column_int(&q,1),
1056	1056	db_column_text(&q,2));
1057	1057	}
1058	1058	db_finalize(&q);
1059	1059

	--- src/vfile.c
	+++ src/vfile.c
	@@ -1042,17 +1042,17 @@
1042	db_multi_exec(
1043	"INSERT OR IGNORE INTO idMap(oldrid, newrid)"
1044	" SELECT vfile.mrid, blob.rid FROM vfile, blob"
1045	" WHERE blob.uuid=vfile.mhash;"
1046	);
1047
1048	if( dryRun ){
1049	Stmt q;
1050	db_prepare(&q, "SELECT oldrid, newrid, blob.uuid"
1051	" FROM idMap, blob WHERE blob.rid=idMap.newrid");
1052	while( db_step(&q)==SQLITE_ROW ){
1053	fossil_print("%8d -> %8d %.25s\n",
1054	db_column_int(&q,0),
1055	db_column_int(&q,1),
1056	db_column_text(&q,2));
1057	}
1058	db_finalize(&q);
1059

	--- src/vfile.c
	+++ src/vfile.c
	@@ -1042,17 +1042,17 @@
1042	db_multi_exec(
1043	"INSERT OR IGNORE INTO idMap(oldrid, newrid)"
1044	" SELECT vfile.mrid, blob.rid FROM vfile, blob"
1045	" WHERE blob.uuid=vfile.mhash;"
1046	);
1047
1048	if( dryRun ){
1049	Stmt q;
1050	db_prepare(&q, "SELECT oldrid, newrid, blob.uuid"
1051	" FROM idMap, blob WHERE blob.rid=idMap.newrid");
1052	while( db_step(&q)==SQLITE_ROW ){
1053	fossil_print("%8d -> %8d %.25s\n",
1054	db_column_int(&q,0),
1055	db_column_int(&q,1),
1056	db_column_text(&q,2));
1057	}
1058	db_finalize(&q);
1059

M src/wiki.c

+10 -10

		--- src/wiki.c
		+++ src/wiki.c
		@@ -85,11 +85,11 @@
85	85	return db_int(0, "SELECT tagid FROM tag WHERE tagname='wiki-%q/%q'",
86	86	zPrefix, zPageName);
87	87	}
88	88
89	89	/*
90		-** Return the RID of the next or previous version of a wiki page.
	90	+** Return the RID of the next or previous version of a wiki page.
91	91	** Return 0 if rid is the last/first version.
92	92	*/
93	93	int wiki_next(int tagid, double mtime){
94	94	return db_int(0,
95	95	"SELECT srcid FROM tagxref"
		@@ -413,11 +413,11 @@
413	413	*/
414	414	int wiki_page_type(const char *zPageName){
415	415	if( db_get_boolean("wiki-about",1)==0 ){
416	416	return WIKITYPE_NORMAL;
417	417	}else
418		- if( sqlite3_strglob("checkin/*", zPageName)==0
	418	+ if( sqlite3_strglob("checkin/*", zPageName)==0
419	419	&& db_exists("SELECT 1 FROM blob WHERE uuid=%Q",zPageName+8)
420	420	){
421	421	return WIKITYPE_CHECKIN;
422	422	}else
423	423	if( sqlite3_strglob("branch/*", zPageName)==0 ){
		@@ -447,11 +447,11 @@
447	447	** Add an appropriate style_header() for either the /wiki or /wikiedit page
448	448	** for zPageName. zExtra is an empty string for /wiki but has the text
449	449	** "Edit: " for /wikiedit.
450	450	**
451	451	** If the page is /wiki and the page is one of the special times (check-in,
452		-** branch, or tag) and the "p" query parameter is omitted, then do a
	452	+** branch, or tag) and the "p" query parameter is omitted, then do a
453	453	** redirect to the display of the check-in, branch, or tag rather than
454	454	** continuing to the plain wiki display.
455	455	*/
456	456	static int wiki_page_header(
457	457	int eType, /* Page type. Might be WIKITYPE_UNKNOWN */
		@@ -744,11 +744,11 @@
744	744	** a sandbox page, but it is reported as writable here (with rid 0).
745	745	*/
746	746	static int wiki_ajax_can_write(const char zPageName, int pRid){
747	747	int rid = 0;
748	748	const char * zErr = 0;
749		-
	749	+
750	750	if(pRid) *pRid = 0;
751	751	if(!zPageName \|\| !*zPageName
752	752	\|\| !wiki_name_is_wellformed((unsigned const char *)zPageName)){
753	753	zErr = "Invalid page name.";
754	754	}else if(is_sandbox(zPageName)){
		@@ -767,11 +767,11 @@
767	767	}else{
768	768	zErr = "Cannot happen! Please report this as a bug.";
769	769	}
770	770	}
771	771	ajax_route_error(403, "%s", zErr);
772		- return 0;
	772	+ return 0;
773	773	}
774	774
775	775
776	776	/*
777	777	** Emits an array of attachment info records for the given wiki page
		@@ -1013,11 +1013,11 @@
1013	1013	** ajax_route_error(). On success, an object in the form documented
1014	1014	** for wiki_ajax_emit_page_object().
1015	1015	*/
1016	1016	static void wiki_ajax_route_fetch(void){
1017	1017	const char * zPageName = P("page");
1018		-
	1018	+
1019	1019	if( zPageName==0 \|\| zPageName[0]==0 ){
1020	1020	ajax_route_error(400,"Missing page name.");
1021	1021	return;
1022	1022	}
1023	1023	cgi_set_content_type("application/json");
		@@ -1204,11 +1204,11 @@
1204	1204	/*
1205	1205	** WEBPAGE: wikiajax hidden
1206	1206	**
1207	1207	** An internal dispatcher for wiki AJAX operations. Not for direct
1208	1208	** client use. All routes defined by this interface are app-internal,
1209		-** subject to change
	1209	+** subject to change
1210	1210	*/
1211	1211	void wiki_ajax_page(void){
1212	1212	const char * zName = P("name");
1213	1213	AjaxRoute routeName = {0,0,0,0};
1214	1214	const AjaxRoute * pRoute = 0;
		@@ -1344,11 +1344,11 @@
1344	1344	"class='hidden'"
1345	1345	">");
1346	1346	CX("<div>Loading wiki pages list...</div>");
1347	1347	CX("</div>"/#wikiedit-tab-pages/);
1348	1348	}
1349		-
	1349	+
1350	1350	/***** Content tab *****/
1351	1351	{
1352	1352	CX("<div id='wikiedit-tab-content' "
1353	1353	"data-tab-parent='wikiedit-tabs' "
1354	1354	"data-tab-label='Editor' "
		@@ -1906,11 +1906,11 @@
1906	1906	** wmtime time most recent version was created
1907	1907	** wcnt Number of versions of this wiki page
1908	1908	**
1909	1909	** The wrid value is zero for deleted wiki pages.
1910	1910	*/
1911		-static const char listAllWikiPages[] =
	1911	+static const char listAllWikiPages[] =
1912	1912	@ SELECT
1913	1913	@ substr(tag.tagname, 6) AS wname,
1914	1914	@ lower(substr(tag.tagname, 6)) AS sortname,
1915	1915	@ tagxref.value+0 AS wrid,
1916	1916	@ max(tagxref.mtime) AS wmtime,
		@@ -2483,11 +2483,11 @@
2483	2483	const char *zName = db_column_text(&q, 0);
2484	2484	const int wrid = db_column_int(&q, 2);
2485	2485	if(!showAll && !wrid){
2486	2486	continue;
2487	2487	}
2488		- if( !showCkBr &&
	2488	+ if( !showCkBr &&
2489	2489	(sqlite3_strglob("checkin/*", zName)==0 \|\|
2490	2490	sqlite3_strglob("branch/*", zName)==0) ){
2491	2491	continue;
2492	2492	}
2493	2493	if( showIds ){
2494	2494

	--- src/wiki.c
	+++ src/wiki.c
	@@ -85,11 +85,11 @@
85	return db_int(0, "SELECT tagid FROM tag WHERE tagname='wiki-%q/%q'",
86	zPrefix, zPageName);
87	}
88
89	/*
90	** Return the RID of the next or previous version of a wiki page.
91	** Return 0 if rid is the last/first version.
92	*/
93	int wiki_next(int tagid, double mtime){
94	return db_int(0,
95	"SELECT srcid FROM tagxref"
	@@ -413,11 +413,11 @@
413	*/
414	int wiki_page_type(const char *zPageName){
415	if( db_get_boolean("wiki-about",1)==0 ){
416	return WIKITYPE_NORMAL;
417	}else
418	if( sqlite3_strglob("checkin/*", zPageName)==0
419	&& db_exists("SELECT 1 FROM blob WHERE uuid=%Q",zPageName+8)
420	){
421	return WIKITYPE_CHECKIN;
422	}else
423	if( sqlite3_strglob("branch/*", zPageName)==0 ){
	@@ -447,11 +447,11 @@
447	** Add an appropriate style_header() for either the /wiki or /wikiedit page
448	** for zPageName. zExtra is an empty string for /wiki but has the text
449	** "Edit: " for /wikiedit.
450	**
451	** If the page is /wiki and the page is one of the special times (check-in,
452	** branch, or tag) and the "p" query parameter is omitted, then do a
453	** redirect to the display of the check-in, branch, or tag rather than
454	** continuing to the plain wiki display.
455	*/
456	static int wiki_page_header(
457	int eType, /* Page type. Might be WIKITYPE_UNKNOWN */
	@@ -744,11 +744,11 @@
744	** a sandbox page, but it is reported as writable here (with rid 0).
745	*/
746	static int wiki_ajax_can_write(const char zPageName, int pRid){
747	int rid = 0;
748	const char * zErr = 0;
749
750	if(pRid) *pRid = 0;
751	if(!zPageName \|\| !*zPageName
752	\|\| !wiki_name_is_wellformed((unsigned const char *)zPageName)){
753	zErr = "Invalid page name.";
754	}else if(is_sandbox(zPageName)){
	@@ -767,11 +767,11 @@
767	}else{
768	zErr = "Cannot happen! Please report this as a bug.";
769	}
770	}
771	ajax_route_error(403, "%s", zErr);
772	return 0;
773	}
774
775
776	/*
777	** Emits an array of attachment info records for the given wiki page
	@@ -1013,11 +1013,11 @@
1013	** ajax_route_error(). On success, an object in the form documented
1014	** for wiki_ajax_emit_page_object().
1015	*/
1016	static void wiki_ajax_route_fetch(void){
1017	const char * zPageName = P("page");
1018
1019	if( zPageName==0 \|\| zPageName[0]==0 ){
1020	ajax_route_error(400,"Missing page name.");
1021	return;
1022	}
1023	cgi_set_content_type("application/json");
	@@ -1204,11 +1204,11 @@
1204	/*
1205	** WEBPAGE: wikiajax hidden
1206	**
1207	** An internal dispatcher for wiki AJAX operations. Not for direct
1208	** client use. All routes defined by this interface are app-internal,
1209	** subject to change
1210	*/
1211	void wiki_ajax_page(void){
1212	const char * zName = P("name");
1213	AjaxRoute routeName = {0,0,0,0};
1214	const AjaxRoute * pRoute = 0;
	@@ -1344,11 +1344,11 @@
1344	"class='hidden'"
1345	">");
1346	CX("<div>Loading wiki pages list...</div>");
1347	CX("</div>"/#wikiedit-tab-pages/);
1348	}
1349
1350	/***** Content tab *****/
1351	{
1352	CX("<div id='wikiedit-tab-content' "
1353	"data-tab-parent='wikiedit-tabs' "
1354	"data-tab-label='Editor' "
	@@ -1906,11 +1906,11 @@
1906	** wmtime time most recent version was created
1907	** wcnt Number of versions of this wiki page
1908	**
1909	** The wrid value is zero for deleted wiki pages.
1910	*/
1911	static const char listAllWikiPages[] =
1912	@ SELECT
1913	@ substr(tag.tagname, 6) AS wname,
1914	@ lower(substr(tag.tagname, 6)) AS sortname,
1915	@ tagxref.value+0 AS wrid,
1916	@ max(tagxref.mtime) AS wmtime,
	@@ -2483,11 +2483,11 @@
2483	const char *zName = db_column_text(&q, 0);
2484	const int wrid = db_column_int(&q, 2);
2485	if(!showAll && !wrid){
2486	continue;
2487	}
2488	if( !showCkBr &&
2489	(sqlite3_strglob("checkin/*", zName)==0 \|\|
2490	sqlite3_strglob("branch/*", zName)==0) ){
2491	continue;
2492	}
2493	if( showIds ){
2494

	--- src/wiki.c
	+++ src/wiki.c
	@@ -85,11 +85,11 @@
85	return db_int(0, "SELECT tagid FROM tag WHERE tagname='wiki-%q/%q'",
86	zPrefix, zPageName);
87	}
88
89	/*
90	** Return the RID of the next or previous version of a wiki page.
91	** Return 0 if rid is the last/first version.
92	*/
93	int wiki_next(int tagid, double mtime){
94	return db_int(0,
95	"SELECT srcid FROM tagxref"
	@@ -413,11 +413,11 @@
413	*/
414	int wiki_page_type(const char *zPageName){
415	if( db_get_boolean("wiki-about",1)==0 ){
416	return WIKITYPE_NORMAL;
417	}else
418	if( sqlite3_strglob("checkin/*", zPageName)==0
419	&& db_exists("SELECT 1 FROM blob WHERE uuid=%Q",zPageName+8)
420	){
421	return WIKITYPE_CHECKIN;
422	}else
423	if( sqlite3_strglob("branch/*", zPageName)==0 ){
	@@ -447,11 +447,11 @@
447	** Add an appropriate style_header() for either the /wiki or /wikiedit page
448	** for zPageName. zExtra is an empty string for /wiki but has the text
449	** "Edit: " for /wikiedit.
450	**
451	** If the page is /wiki and the page is one of the special times (check-in,
452	** branch, or tag) and the "p" query parameter is omitted, then do a
453	** redirect to the display of the check-in, branch, or tag rather than
454	** continuing to the plain wiki display.
455	*/
456	static int wiki_page_header(
457	int eType, /* Page type. Might be WIKITYPE_UNKNOWN */
	@@ -744,11 +744,11 @@
744	** a sandbox page, but it is reported as writable here (with rid 0).
745	*/
746	static int wiki_ajax_can_write(const char zPageName, int pRid){
747	int rid = 0;
748	const char * zErr = 0;
749
750	if(pRid) *pRid = 0;
751	if(!zPageName \|\| !*zPageName
752	\|\| !wiki_name_is_wellformed((unsigned const char *)zPageName)){
753	zErr = "Invalid page name.";
754	}else if(is_sandbox(zPageName)){
	@@ -767,11 +767,11 @@
767	}else{
768	zErr = "Cannot happen! Please report this as a bug.";
769	}
770	}
771	ajax_route_error(403, "%s", zErr);
772	return 0;
773	}
774
775
776	/*
777	** Emits an array of attachment info records for the given wiki page
	@@ -1013,11 +1013,11 @@
1013	** ajax_route_error(). On success, an object in the form documented
1014	** for wiki_ajax_emit_page_object().
1015	*/
1016	static void wiki_ajax_route_fetch(void){
1017	const char * zPageName = P("page");
1018
1019	if( zPageName==0 \|\| zPageName[0]==0 ){
1020	ajax_route_error(400,"Missing page name.");
1021	return;
1022	}
1023	cgi_set_content_type("application/json");
	@@ -1204,11 +1204,11 @@
1204	/*
1205	** WEBPAGE: wikiajax hidden
1206	**
1207	** An internal dispatcher for wiki AJAX operations. Not for direct
1208	** client use. All routes defined by this interface are app-internal,
1209	** subject to change
1210	*/
1211	void wiki_ajax_page(void){
1212	const char * zName = P("name");
1213	AjaxRoute routeName = {0,0,0,0};
1214	const AjaxRoute * pRoute = 0;
	@@ -1344,11 +1344,11 @@
1344	"class='hidden'"
1345	">");
1346	CX("<div>Loading wiki pages list...</div>");
1347	CX("</div>"/#wikiedit-tab-pages/);
1348	}
1349
1350	/***** Content tab *****/
1351	{
1352	CX("<div id='wikiedit-tab-content' "
1353	"data-tab-parent='wikiedit-tabs' "
1354	"data-tab-label='Editor' "
	@@ -1906,11 +1906,11 @@
1906	** wmtime time most recent version was created
1907	** wcnt Number of versions of this wiki page
1908	**
1909	** The wrid value is zero for deleted wiki pages.
1910	*/
1911	static const char listAllWikiPages[] =
1912	@ SELECT
1913	@ substr(tag.tagname, 6) AS wname,
1914	@ lower(substr(tag.tagname, 6)) AS sortname,
1915	@ tagxref.value+0 AS wrid,
1916	@ max(tagxref.mtime) AS wmtime,
	@@ -2483,11 +2483,11 @@
2483	const char *zName = db_column_text(&q, 0);
2484	const int wrid = db_column_int(&q, 2);
2485	if(!showAll && !wrid){
2486	continue;
2487	}
2488	if( !showCkBr &&
2489	(sqlite3_strglob("checkin/*", zName)==0 \|\|
2490	sqlite3_strglob("branch/*", zName)==0) ){
2491	continue;
2492	}
2493	if( showIds ){
2494

M src/wikiformat.c

+1 -1

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -2219,11 +2219,11 @@
2219	2219	iMatchCnt = 2;
2220	2220	}else if( iMatchCnt==2 ){
2221	2221	if( (zStart[0]=='"' \|\| zStart[0]=='\'') && zStart[n-1]==zStart[0] ){
2222	2222	zStart++;
2223	2223	n -= 2;
2224		- }
	2224	+ }
2225	2225	*pLen = n;
2226	2226	return zStart;
2227	2227	}else{
2228	2228	iMatchCnt = 0;
2229	2229	}
2230	2230

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -2219,11 +2219,11 @@
2219	iMatchCnt = 2;
2220	}else if( iMatchCnt==2 ){
2221	if( (zStart[0]=='"' \|\| zStart[0]=='\'') && zStart[n-1]==zStart[0] ){
2222	zStart++;
2223	n -= 2;
2224	}
2225	*pLen = n;
2226	return zStart;
2227	}else{
2228	iMatchCnt = 0;
2229	}
2230

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -2219,11 +2219,11 @@
2219	iMatchCnt = 2;
2220	}else if( iMatchCnt==2 ){
2221	if( (zStart[0]=='"' \|\| zStart[0]=='\'') && zStart[n-1]==zStart[0] ){
2222	zStart++;
2223	n -= 2;
2224	}
2225	*pLen = n;
2226	return zStart;
2227	}else{
2228	iMatchCnt = 0;
2229	}
2230

M src/winhttp.c

+7 -7

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -668,11 +668,11 @@
668	668	/* Use a subdirectory for temp files (can then be excluded from virus scan) */
669	669	zTempSubDirPath = mprintf("%s%s\\",fossil_path_to_utf8(zTmpPath),zTempSubDir);
670	670	if ( !file_mkdir(zTempSubDirPath, ExtFILE, 0) \|\|
671	671	file_isdir(zTempSubDirPath, ExtFILE)==1 ){
672	672	wcscpy(zTmpPath, fossil_utf8_to_path(zTempSubDirPath, 1));
673		- }
	673	+ }
674	674	if( g.fHttpTrace ){
675	675	zTempPrefix = mprintf("httptrace");
676	676	}else{
677	677	zTempPrefix = mprintf("%sfossil_server_P%d",
678	678	fossil_unicode_to_utf8(zTmpPath), iPort);
		@@ -1372,16 +1372,16 @@
1372	1372	SERVICE_ALL_ACCESS);
1373	1373	if( !hSvc ) winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1374	1374	QueryServiceStatus(hSvc, &sstat);
1375	1375	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
1376	1376	fossil_print("Starting service '%s'", zSvcName);
1377		- if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
1378		- if( !StartServiceW(hSvc, 0, NULL) ){
1379		- winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1380		- }
1381		- QueryServiceStatus(hSvc, &sstat);
1382		- }
	1377	+ if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
	1378	+ if( !StartServiceW(hSvc, 0, NULL) ){
	1379	+ winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
	1380	+ }
	1381	+ QueryServiceStatus(hSvc, &sstat);
	1382	+ }
1383	1383	while( sstat.dwCurrentState==SERVICE_START_PENDING \|\|
1384	1384	sstat.dwCurrentState==SERVICE_STOPPED ){
1385	1385	Sleep(100);
1386	1386	fossil_print(".");
1387	1387	QueryServiceStatus(hSvc, &sstat);
1388	1388

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -668,11 +668,11 @@
668	/* Use a subdirectory for temp files (can then be excluded from virus scan) */
669	zTempSubDirPath = mprintf("%s%s\\",fossil_path_to_utf8(zTmpPath),zTempSubDir);
670	if ( !file_mkdir(zTempSubDirPath, ExtFILE, 0) \|\|
671	file_isdir(zTempSubDirPath, ExtFILE)==1 ){
672	wcscpy(zTmpPath, fossil_utf8_to_path(zTempSubDirPath, 1));
673	}
674	if( g.fHttpTrace ){
675	zTempPrefix = mprintf("httptrace");
676	}else{
677	zTempPrefix = mprintf("%sfossil_server_P%d",
678	fossil_unicode_to_utf8(zTmpPath), iPort);
	@@ -1372,16 +1372,16 @@
1372	SERVICE_ALL_ACCESS);
1373	if( !hSvc ) winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1374	QueryServiceStatus(hSvc, &sstat);
1375	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
1376	fossil_print("Starting service '%s'", zSvcName);
1377	if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
1378	if( !StartServiceW(hSvc, 0, NULL) ){
1379	winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1380	}
1381	QueryServiceStatus(hSvc, &sstat);
1382	}
1383	while( sstat.dwCurrentState==SERVICE_START_PENDING \|\|
1384	sstat.dwCurrentState==SERVICE_STOPPED ){
1385	Sleep(100);
1386	fossil_print(".");
1387	QueryServiceStatus(hSvc, &sstat);
1388

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -668,11 +668,11 @@
668	/* Use a subdirectory for temp files (can then be excluded from virus scan) */
669	zTempSubDirPath = mprintf("%s%s\\",fossil_path_to_utf8(zTmpPath),zTempSubDir);
670	if ( !file_mkdir(zTempSubDirPath, ExtFILE, 0) \|\|
671	file_isdir(zTempSubDirPath, ExtFILE)==1 ){
672	wcscpy(zTmpPath, fossil_utf8_to_path(zTempSubDirPath, 1));
673	}
674	if( g.fHttpTrace ){
675	zTempPrefix = mprintf("httptrace");
676	}else{
677	zTempPrefix = mprintf("%sfossil_server_P%d",
678	fossil_unicode_to_utf8(zTmpPath), iPort);
	@@ -1372,16 +1372,16 @@
1372	SERVICE_ALL_ACCESS);
1373	if( !hSvc ) winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1374	QueryServiceStatus(hSvc, &sstat);
1375	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
1376	fossil_print("Starting service '%s'", zSvcName);
1377	if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
1378	if( !StartServiceW(hSvc, 0, NULL) ){
1379	winhttp_fatal("start", zSvcName, win32_get_last_errmsg());
1380	}
1381	QueryServiceStatus(hSvc, &sstat);
1382	}
1383	while( sstat.dwCurrentState==SERVICE_START_PENDING \|\|
1384	sstat.dwCurrentState==SERVICE_STOPPED ){
1385	Sleep(100);
1386	fossil_print(".");
1387	QueryServiceStatus(hSvc, &sstat);
1388

M src/xfer.c

+3 -3

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1834,11 +1834,11 @@
1834	1834	memset(&x, 0, sizeof(x));
1835	1835	url_parse_local(zUrl, URL_OMIT_USER, &x);
1836	1836	if( x.name!=0 && sqlite3_strlike("%localhost%", x.name, 0)!=0 ){
1837	1837	@ pragma link %F(x.canonical) %F(zArg) %lld(iMtime)
1838	1838	}
1839		- url_unparse(&x);
	1839	+ url_unparse(&x);
1840	1840	}
1841	1841	db_finalize(&q);
1842	1842	}
1843	1843
1844	1844	/* Send the server timestamp last, in case prior processing happened
		@@ -1859,11 +1859,11 @@
1859	1859	**
1860	1860	** Pass the sync-protocol input file XFERFILE into the server-side sync
1861	1861	** protocol handler. Generate a reply on standard output.
1862	1862	**
1863	1863	** This command was original created to help debug the server side of
1864		-** sync messages. The XFERFILE is the uncompressed content of an
	1864	+** sync messages. The XFERFILE is the uncompressed content of an
1865	1865	** "xfer" HTTP request from client to server. This command interprets
1866	1866	** that message and generates the content of an HTTP reply (without any
1867	1867	** encoding and without the HTTP reply headers) and writes that reply
1868	1868	** on standard output.
1869	1869	**
		@@ -2528,11 +2528,11 @@
2528	2528	"Warning: uv-pull-only \n"
2529	2529	" Unable to push unversioned content because you lack\n"
2530	2530	" sufficient permission on the server\n"
2531	2531	);
2532	2532	uvPullOnly = 2;
2533		- }
	2533	+ }
2534	2534	if( iStatus<=3 \|\| uvPullOnly ){
2535	2535	db_multi_exec("DELETE FROM uv_tosend WHERE name=%Q", zName);
2536	2536	}else if( iStatus==4 ){
2537	2537	db_multi_exec("UPDATE uv_tosend SET mtimeOnly=1 WHERE name=%Q",zName);
2538	2538	}else if( iStatus==5 ){
2539	2539

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1834,11 +1834,11 @@
1834	memset(&x, 0, sizeof(x));
1835	url_parse_local(zUrl, URL_OMIT_USER, &x);
1836	if( x.name!=0 && sqlite3_strlike("%localhost%", x.name, 0)!=0 ){
1837	@ pragma link %F(x.canonical) %F(zArg) %lld(iMtime)
1838	}
1839	url_unparse(&x);
1840	}
1841	db_finalize(&q);
1842	}
1843
1844	/* Send the server timestamp last, in case prior processing happened
	@@ -1859,11 +1859,11 @@
1859	**
1860	** Pass the sync-protocol input file XFERFILE into the server-side sync
1861	** protocol handler. Generate a reply on standard output.
1862	**
1863	** This command was original created to help debug the server side of
1864	** sync messages. The XFERFILE is the uncompressed content of an
1865	** "xfer" HTTP request from client to server. This command interprets
1866	** that message and generates the content of an HTTP reply (without any
1867	** encoding and without the HTTP reply headers) and writes that reply
1868	** on standard output.
1869	**
	@@ -2528,11 +2528,11 @@
2528	"Warning: uv-pull-only \n"
2529	" Unable to push unversioned content because you lack\n"
2530	" sufficient permission on the server\n"
2531	);
2532	uvPullOnly = 2;
2533	}
2534	if( iStatus<=3 \|\| uvPullOnly ){
2535	db_multi_exec("DELETE FROM uv_tosend WHERE name=%Q", zName);
2536	}else if( iStatus==4 ){
2537	db_multi_exec("UPDATE uv_tosend SET mtimeOnly=1 WHERE name=%Q",zName);
2538	}else if( iStatus==5 ){
2539

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1834,11 +1834,11 @@
1834	memset(&x, 0, sizeof(x));
1835	url_parse_local(zUrl, URL_OMIT_USER, &x);
1836	if( x.name!=0 && sqlite3_strlike("%localhost%", x.name, 0)!=0 ){
1837	@ pragma link %F(x.canonical) %F(zArg) %lld(iMtime)
1838	}
1839	url_unparse(&x);
1840	}
1841	db_finalize(&q);
1842	}
1843
1844	/* Send the server timestamp last, in case prior processing happened
	@@ -1859,11 +1859,11 @@
1859	**
1860	** Pass the sync-protocol input file XFERFILE into the server-side sync
1861	** protocol handler. Generate a reply on standard output.
1862	**
1863	** This command was original created to help debug the server side of
1864	** sync messages. The XFERFILE is the uncompressed content of an
1865	** "xfer" HTTP request from client to server. This command interprets
1866	** that message and generates the content of an HTTP reply (without any
1867	** encoding and without the HTTP reply headers) and writes that reply
1868	** on standard output.
1869	**
	@@ -2528,11 +2528,11 @@
2528	"Warning: uv-pull-only \n"
2529	" Unable to push unversioned content because you lack\n"
2530	" sufficient permission on the server\n"
2531	);
2532	uvPullOnly = 2;
2533	}
2534	if( iStatus<=3 \|\| uvPullOnly ){
2535	db_multi_exec("DELETE FROM uv_tosend WHERE name=%Q", zName);
2536	}else if( iStatus==4 ){
2537	db_multi_exec("UPDATE uv_tosend SET mtimeOnly=1 WHERE name=%Q",zName);
2538	}else if( iStatus==5 ){
2539

M src/zip.c

+17 -17

		--- src/zip.c
		+++ src/zip.c
		@@ -138,11 +138,11 @@
138	138	static int archiveDeviceCharacteristics(sqlite3_file *pFile){
139	139	return 0;
140	140	}
141	141
142	142	static int archiveOpen(
143		- sqlite3_vfs pVfs, const char zName,
	143	+ sqlite3_vfs pVfs, const char zName,
144	144	sqlite3_file pFile, int flags, int pOutFlags
145	145	){
146	146	static struct sqlite3_io_methods methods = {
147	147	1, /* iVersion */
148	148	archiveClose,
		@@ -247,12 +247,12 @@
247	247	** pFile is the file to be appended. zName is the name
248	248	** that the file should be saved as.
249	249	*/
250	250	static void zip_add_file_to_zip(
251	251	Archive *p,
252		- const char *zName,
253		- const Blob *pFile,
	252	+ const char *zName,
	253	+ const Blob *pFile,
254	254	int mPerm
255	255	){
256	256	z_stream stream;
257	257	int nameLen;
258	258	int toOut = 0;
		@@ -374,12 +374,12 @@
374	374	nEntry++;
375	375	}
376	376
377	377	static void zip_add_file_to_sqlar(
378	378	Archive *p,
379		- const char *zName,
380		- const Blob *pFile,
	379	+ const char *zName,
	380	+ const Blob *pFile,
381	381	int mPerm
382	382	){
383	383	int nName = (int)strlen(zName);
384	384
385	385	if( p->db==0 ){
		@@ -396,16 +396,16 @@
396	396	p->vfs.xRandomness = archiveRandomness;
397	397	p->vfs.xSleep = archiveSleep;
398	398	p->vfs.xCurrentTime = archiveCurrentTime;
399	399	p->vfs.xGetLastError = archiveGetLastError;
400	400	sqlite3_vfs_register(&p->vfs, 0);
401		- sqlite3_open_v2("file:xyz.db", &p->db,
	401	+ sqlite3_open_v2("file:xyz.db", &p->db,
402	402	SQLITE_OPEN_CREATE\|SQLITE_OPEN_READWRITE, p->vfs.zName
403	403	);
404	404	assert( p->db );
405	405	blob_zero(&p->tmp);
406		- sqlite3_exec(p->db,
	406	+ sqlite3_exec(p->db,
407	407	"PRAGMA page_size=512;"
408	408	"PRAGMA journal_mode = off;"
409	409	"PRAGMA cache_spill = off;"
410	410	"BEGIN;"
411	411	"CREATE TABLE sqlar("
		@@ -414,12 +414,12 @@
414	414	"mtime INT, -- last modification time\n"
415	415	"sz INT, -- original file size\n"
416	416	"data BLOB -- compressed content\n"
417	417	");", 0, 0, 0
418	418	);
419		- sqlite3_prepare(p->db,
420		- "INSERT INTO sqlar VALUES(?, ?, ?, ?, ?)", -1,
	419	+ sqlite3_prepare(p->db,
	420	+ "INSERT INTO sqlar VALUES(?, ?, ?, ?, ?)", -1,
421	421	&p->pInsert, 0
422	422	);
423	423	assert( p->pInsert );
424	424
425	425	sqlite3_bind_int64(p->pInsert, 3, unixTime);
		@@ -437,11 +437,11 @@
437	437	}else{
438	438	sqlite3_bind_text(p->pInsert, 1, zName, nName, SQLITE_STATIC);
439	439	if( mPerm==PERM_LNK ){
440	440	sqlite3_bind_int(p->pInsert, 2, 0120755);
441	441	sqlite3_bind_int(p->pInsert, 4, -1);
442		- sqlite3_bind_text(p->pInsert, 5,
	442	+ sqlite3_bind_text(p->pInsert, 5,
443	443	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
444	444	);
445	445	}else{
446	446	unsigned int nIn = blob_size(pFile);
447	447	unsigned long int nOut = nIn;
		@@ -450,15 +450,15 @@
450	450	zip_blob_minsize(&p->tmp, nIn);
451	451	compress( (unsigned char*)
452	452	blob_buffer(&p->tmp), &nOut, (unsigned char*)blob_buffer(pFile), nIn
453	453	);
454	454	if( nOut>=(unsigned long)nIn ){
455		- sqlite3_bind_blob(p->pInsert, 5,
	455	+ sqlite3_bind_blob(p->pInsert, 5,
456	456	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
457	457	);
458	458	}else{
459		- sqlite3_bind_blob(p->pInsert, 5,
	459	+ sqlite3_bind_blob(p->pInsert, 5,
460	460	blob_buffer(&p->tmp), nOut, SQLITE_STATIC
461	461	);
462	462	}
463	463	}
464	464	}
		@@ -467,12 +467,12 @@
467	467	sqlite3_reset(p->pInsert);
468	468	}
469	469
470	470	static void zip_add_file(
471	471	Archive *p,
472		- const char *zName,
473		- const Blob *pFile,
	472	+ const char *zName,
	473	+ const Blob *pFile,
474	474	int mPerm
475	475	){
476	476	if( p->eType==ARCHIVE_ZIP ){
477	477	zip_add_file_to_zip(p, zName, pFile, mPerm);
478	478	}else{
		@@ -786,11 +786,11 @@
786	786	" WHERE event.objid=%d"
787	787	" AND blob.rid=%d",
788	788	db_get("project-name", "unnamed"), rid, rid
789	789	);
790	790	}
791		- zip_of_checkin(eType, rid, zOut ? &zip : 0,
	791	+ zip_of_checkin(eType, rid, zOut ? &zip : 0,
792	792	zName, pInclude, pExclude, listFlag);
793	793	glob_free(pInclude);
794	794	glob_free(pExclude);
795	795	if( zOut ){
796	796	blob_write_to_file(&zip, zOut);
		@@ -947,18 +947,18 @@
947	947	zExclude = P("ex");
948	948	if( zExclude ) pExclude = glob_create(zExclude);
949	949	if( zInclude==0 && zExclude==0 ){
950	950	etag_check_for_invariant_name(z);
951	951	}
952		- if( eType==ARCHIVE_ZIP
	952	+ if( eType==ARCHIVE_ZIP
953	953	&& nName>4
954	954	&& fossil_strcmp(&zName[nName-4], ".zip")==0
955	955	){
956	956	/* Special case: Remove the ".zip" suffix. */
957	957	nName -= 4;
958	958	zName[nName] = 0;
959		- }else if( eType==ARCHIVE_SQLAR
	959	+ }else if( eType==ARCHIVE_SQLAR
960	960	&& nName>6
961	961	&& fossil_strcmp(&zName[nName-6], ".sqlar")==0
962	962	){
963	963	/* Special case: Remove the ".sqlar" suffix. */
964	964	nName -= 6;
965	965

	--- src/zip.c
	+++ src/zip.c
	@@ -138,11 +138,11 @@
138	static int archiveDeviceCharacteristics(sqlite3_file *pFile){
139	return 0;
140	}
141
142	static int archiveOpen(
143	sqlite3_vfs pVfs, const char zName,
144	sqlite3_file pFile, int flags, int pOutFlags
145	){
146	static struct sqlite3_io_methods methods = {
147	1, /* iVersion */
148	archiveClose,
	@@ -247,12 +247,12 @@
247	** pFile is the file to be appended. zName is the name
248	** that the file should be saved as.
249	*/
250	static void zip_add_file_to_zip(
251	Archive *p,
252	const char *zName,
253	const Blob *pFile,
254	int mPerm
255	){
256	z_stream stream;
257	int nameLen;
258	int toOut = 0;
	@@ -374,12 +374,12 @@
374	nEntry++;
375	}
376
377	static void zip_add_file_to_sqlar(
378	Archive *p,
379	const char *zName,
380	const Blob *pFile,
381	int mPerm
382	){
383	int nName = (int)strlen(zName);
384
385	if( p->db==0 ){
	@@ -396,16 +396,16 @@
396	p->vfs.xRandomness = archiveRandomness;
397	p->vfs.xSleep = archiveSleep;
398	p->vfs.xCurrentTime = archiveCurrentTime;
399	p->vfs.xGetLastError = archiveGetLastError;
400	sqlite3_vfs_register(&p->vfs, 0);
401	sqlite3_open_v2("file:xyz.db", &p->db,
402	SQLITE_OPEN_CREATE\|SQLITE_OPEN_READWRITE, p->vfs.zName
403	);
404	assert( p->db );
405	blob_zero(&p->tmp);
406	sqlite3_exec(p->db,
407	"PRAGMA page_size=512;"
408	"PRAGMA journal_mode = off;"
409	"PRAGMA cache_spill = off;"
410	"BEGIN;"
411	"CREATE TABLE sqlar("
	@@ -414,12 +414,12 @@
414	"mtime INT, -- last modification time\n"
415	"sz INT, -- original file size\n"
416	"data BLOB -- compressed content\n"
417	");", 0, 0, 0
418	);
419	sqlite3_prepare(p->db,
420	"INSERT INTO sqlar VALUES(?, ?, ?, ?, ?)", -1,
421	&p->pInsert, 0
422	);
423	assert( p->pInsert );
424
425	sqlite3_bind_int64(p->pInsert, 3, unixTime);
	@@ -437,11 +437,11 @@
437	}else{
438	sqlite3_bind_text(p->pInsert, 1, zName, nName, SQLITE_STATIC);
439	if( mPerm==PERM_LNK ){
440	sqlite3_bind_int(p->pInsert, 2, 0120755);
441	sqlite3_bind_int(p->pInsert, 4, -1);
442	sqlite3_bind_text(p->pInsert, 5,
443	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
444	);
445	}else{
446	unsigned int nIn = blob_size(pFile);
447	unsigned long int nOut = nIn;
	@@ -450,15 +450,15 @@
450	zip_blob_minsize(&p->tmp, nIn);
451	compress( (unsigned char*)
452	blob_buffer(&p->tmp), &nOut, (unsigned char*)blob_buffer(pFile), nIn
453	);
454	if( nOut>=(unsigned long)nIn ){
455	sqlite3_bind_blob(p->pInsert, 5,
456	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
457	);
458	}else{
459	sqlite3_bind_blob(p->pInsert, 5,
460	blob_buffer(&p->tmp), nOut, SQLITE_STATIC
461	);
462	}
463	}
464	}
	@@ -467,12 +467,12 @@
467	sqlite3_reset(p->pInsert);
468	}
469
470	static void zip_add_file(
471	Archive *p,
472	const char *zName,
473	const Blob *pFile,
474	int mPerm
475	){
476	if( p->eType==ARCHIVE_ZIP ){
477	zip_add_file_to_zip(p, zName, pFile, mPerm);
478	}else{
	@@ -786,11 +786,11 @@
786	" WHERE event.objid=%d"
787	" AND blob.rid=%d",
788	db_get("project-name", "unnamed"), rid, rid
789	);
790	}
791	zip_of_checkin(eType, rid, zOut ? &zip : 0,
792	zName, pInclude, pExclude, listFlag);
793	glob_free(pInclude);
794	glob_free(pExclude);
795	if( zOut ){
796	blob_write_to_file(&zip, zOut);
	@@ -947,18 +947,18 @@
947	zExclude = P("ex");
948	if( zExclude ) pExclude = glob_create(zExclude);
949	if( zInclude==0 && zExclude==0 ){
950	etag_check_for_invariant_name(z);
951	}
952	if( eType==ARCHIVE_ZIP
953	&& nName>4
954	&& fossil_strcmp(&zName[nName-4], ".zip")==0
955	){
956	/* Special case: Remove the ".zip" suffix. */
957	nName -= 4;
958	zName[nName] = 0;
959	}else if( eType==ARCHIVE_SQLAR
960	&& nName>6
961	&& fossil_strcmp(&zName[nName-6], ".sqlar")==0
962	){
963	/* Special case: Remove the ".sqlar" suffix. */
964	nName -= 6;
965

	--- src/zip.c
	+++ src/zip.c
	@@ -138,11 +138,11 @@
138	static int archiveDeviceCharacteristics(sqlite3_file *pFile){
139	return 0;
140	}
141
142	static int archiveOpen(
143	sqlite3_vfs pVfs, const char zName,
144	sqlite3_file pFile, int flags, int pOutFlags
145	){
146	static struct sqlite3_io_methods methods = {
147	1, /* iVersion */
148	archiveClose,
	@@ -247,12 +247,12 @@
247	** pFile is the file to be appended. zName is the name
248	** that the file should be saved as.
249	*/
250	static void zip_add_file_to_zip(
251	Archive *p,
252	const char *zName,
253	const Blob *pFile,
254	int mPerm
255	){
256	z_stream stream;
257	int nameLen;
258	int toOut = 0;
	@@ -374,12 +374,12 @@
374	nEntry++;
375	}
376
377	static void zip_add_file_to_sqlar(
378	Archive *p,
379	const char *zName,
380	const Blob *pFile,
381	int mPerm
382	){
383	int nName = (int)strlen(zName);
384
385	if( p->db==0 ){
	@@ -396,16 +396,16 @@
396	p->vfs.xRandomness = archiveRandomness;
397	p->vfs.xSleep = archiveSleep;
398	p->vfs.xCurrentTime = archiveCurrentTime;
399	p->vfs.xGetLastError = archiveGetLastError;
400	sqlite3_vfs_register(&p->vfs, 0);
401	sqlite3_open_v2("file:xyz.db", &p->db,
402	SQLITE_OPEN_CREATE\|SQLITE_OPEN_READWRITE, p->vfs.zName
403	);
404	assert( p->db );
405	blob_zero(&p->tmp);
406	sqlite3_exec(p->db,
407	"PRAGMA page_size=512;"
408	"PRAGMA journal_mode = off;"
409	"PRAGMA cache_spill = off;"
410	"BEGIN;"
411	"CREATE TABLE sqlar("
	@@ -414,12 +414,12 @@
414	"mtime INT, -- last modification time\n"
415	"sz INT, -- original file size\n"
416	"data BLOB -- compressed content\n"
417	");", 0, 0, 0
418	);
419	sqlite3_prepare(p->db,
420	"INSERT INTO sqlar VALUES(?, ?, ?, ?, ?)", -1,
421	&p->pInsert, 0
422	);
423	assert( p->pInsert );
424
425	sqlite3_bind_int64(p->pInsert, 3, unixTime);
	@@ -437,11 +437,11 @@
437	}else{
438	sqlite3_bind_text(p->pInsert, 1, zName, nName, SQLITE_STATIC);
439	if( mPerm==PERM_LNK ){
440	sqlite3_bind_int(p->pInsert, 2, 0120755);
441	sqlite3_bind_int(p->pInsert, 4, -1);
442	sqlite3_bind_text(p->pInsert, 5,
443	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
444	);
445	}else{
446	unsigned int nIn = blob_size(pFile);
447	unsigned long int nOut = nIn;
	@@ -450,15 +450,15 @@
450	zip_blob_minsize(&p->tmp, nIn);
451	compress( (unsigned char*)
452	blob_buffer(&p->tmp), &nOut, (unsigned char*)blob_buffer(pFile), nIn
453	);
454	if( nOut>=(unsigned long)nIn ){
455	sqlite3_bind_blob(p->pInsert, 5,
456	blob_buffer(pFile), blob_size(pFile), SQLITE_STATIC
457	);
458	}else{
459	sqlite3_bind_blob(p->pInsert, 5,
460	blob_buffer(&p->tmp), nOut, SQLITE_STATIC
461	);
462	}
463	}
464	}
	@@ -467,12 +467,12 @@
467	sqlite3_reset(p->pInsert);
468	}
469
470	static void zip_add_file(
471	Archive *p,
472	const char *zName,
473	const Blob *pFile,
474	int mPerm
475	){
476	if( p->eType==ARCHIVE_ZIP ){
477	zip_add_file_to_zip(p, zName, pFile, mPerm);
478	}else{
	@@ -786,11 +786,11 @@
786	" WHERE event.objid=%d"
787	" AND blob.rid=%d",
788	db_get("project-name", "unnamed"), rid, rid
789	);
790	}
791	zip_of_checkin(eType, rid, zOut ? &zip : 0,
792	zName, pInclude, pExclude, listFlag);
793	glob_free(pInclude);
794	glob_free(pExclude);
795	if( zOut ){
796	blob_write_to_file(&zip, zOut);
	@@ -947,18 +947,18 @@
947	zExclude = P("ex");
948	if( zExclude ) pExclude = glob_create(zExclude);
949	if( zInclude==0 && zExclude==0 ){
950	etag_check_for_invariant_name(z);
951	}
952	if( eType==ARCHIVE_ZIP
953	&& nName>4
954	&& fossil_strcmp(&zName[nName-4], ".zip")==0
955	){
956	/* Special case: Remove the ".zip" suffix. */
957	nName -= 4;
958	zName[nName] = 0;
959	}else if( eType==ARCHIVE_SQLAR
960	&& nName>6
961	&& fossil_strcmp(&zName[nName-6], ".sqlar")==0
962	){
963	/* Special case: Remove the ".sqlar" suffix. */
964	nName -= 6;
965

M tools/codecheck1.c

+1 -1

		--- tools/codecheck1.c
		+++ tools/codecheck1.c
		@@ -604,11 +604,11 @@
604	604	if( never_safe(zExpr) ){
605	605	printf("%s:%d: Argument %d to %.*s() is not safe for"
606	606	" a query parameter\n",
607	607	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
608	608	nErr++;
609		-
	609	+
610	610	}else if( (fmtFlags & FMT_SQL)!=0 && !is_sql_safe(zExpr) ){
611	611	printf("%s:%d: Argument %d to %.*s() not safe for SQL\n",
612	612	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
613	613	nErr++;
614	614	}
615	615

	--- tools/codecheck1.c
	+++ tools/codecheck1.c
	@@ -604,11 +604,11 @@
604	if( never_safe(zExpr) ){
605	printf("%s:%d: Argument %d to %.*s() is not safe for"
606	" a query parameter\n",
607	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
608	nErr++;
609
610	}else if( (fmtFlags & FMT_SQL)!=0 && !is_sql_safe(zExpr) ){
611	printf("%s:%d: Argument %d to %.*s() not safe for SQL\n",
612	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
613	nErr++;
614	}
615

	--- tools/codecheck1.c
	+++ tools/codecheck1.c
	@@ -604,11 +604,11 @@
604	if( never_safe(zExpr) ){
605	printf("%s:%d: Argument %d to %.*s() is not safe for"
606	" a query parameter\n",
607	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
608	nErr++;
609
610	}else if( (fmtFlags & FMT_SQL)!=0 && !is_sql_safe(zExpr) ){
611	printf("%s:%d: Argument %d to %.*s() not safe for SQL\n",
612	zFilename, lnFCall, i+fmtArg, szFName, zFCall);
613	nErr++;
614	}
615

M tools/mkindex.c

+1 -1

		--- tools/mkindex.c
		+++ tools/mkindex.c
		@@ -38,11 +38,11 @@
38	38	**
39	39	** Commands are 1st-tier by default. If the command name begins with
40	40	** "test-" or if the command name has a "test" argument, then it becomes
41	41	** a test command. If the command name has a "2nd-tier" argument or ends
42	42	** with a "*" character, it is second tier. If the command name has an "alias"
43		-** argument or ends with a "#" character, it is an alias: another name
	43	+** argument or ends with a "#" character, it is an alias: another name
44	44	** (a one-to-one replacement) for a command. Examples:
45	45	**
46	46	** COMMAND: abcde*
47	47	** COMMAND: fghij 2nd-tier
48	48	** COMMAND: mnopq#
49	49

	--- tools/mkindex.c
	+++ tools/mkindex.c
	@@ -38,11 +38,11 @@
38	**
39	** Commands are 1st-tier by default. If the command name begins with
40	** "test-" or if the command name has a "test" argument, then it becomes
41	** a test command. If the command name has a "2nd-tier" argument or ends
42	** with a "*" character, it is second tier. If the command name has an "alias"
43	** argument or ends with a "#" character, it is an alias: another name
44	** (a one-to-one replacement) for a command. Examples:
45	**
46	** COMMAND: abcde*
47	** COMMAND: fghij 2nd-tier
48	** COMMAND: mnopq#
49

	--- tools/mkindex.c
	+++ tools/mkindex.c
	@@ -38,11 +38,11 @@
38	**
39	** Commands are 1st-tier by default. If the command name begins with
40	** "test-" or if the command name has a "test" argument, then it becomes
41	** a test command. If the command name has a "2nd-tier" argument or ends
42	** with a "*" character, it is second tier. If the command name has an "alias"
43	** argument or ends with a "#" character, it is an alias: another name
44	** (a one-to-one replacement) for a command. Examples:
45	**
46	** COMMAND: abcde*
47	** COMMAND: fghij 2nd-tier
48	** COMMAND: mnopq#
49

M tools/skintxt2config.c

+2 -2

		--- tools/skintxt2config.c
		+++ tools/skintxt2config.c
		@@ -1,6 +1,6 @@
1		-/* -- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -- */
	1	+/* -- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -- */
2	2	/* vim: set ts=2 et sw=2 tw=80: */
3	3	/*
4	4	** Copyright (c) 2021 Stephan Beal (https://wanderinghorse.net/home/stephan/)
5	5	**
6	6	** This program is free software; you can redistribute it and/or
		@@ -102,11 +102,11 @@
102	102	if(rc){
103	103	free(zMem);
104	104	}else{
105	105	*zContent = zMem;
106	106	*nContent = fpos;
107		- }
	107	+ }
108	108	return rc;
109	109	}
110	110
111	111	/*
112	112	** Expects zFilename to be one of the conventional skin filename
113	113

	--- tools/skintxt2config.c
	+++ tools/skintxt2config.c
	@@ -1,6 +1,6 @@
1	/* -- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -- */
2	/* vim: set ts=2 et sw=2 tw=80: */
3	/*
4	** Copyright (c) 2021 Stephan Beal (https://wanderinghorse.net/home/stephan/)
5	**
6	** This program is free software; you can redistribute it and/or
	@@ -102,11 +102,11 @@
102	if(rc){
103	free(zMem);
104	}else{
105	*zContent = zMem;
106	*nContent = fpos;
107	}
108	return rc;
109	}
110
111	/*
112	** Expects zFilename to be one of the conventional skin filename
113

	--- tools/skintxt2config.c
	+++ tools/skintxt2config.c
	@@ -1,6 +1,6 @@
1	/* -- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -- */
2	/* vim: set ts=2 et sw=2 tw=80: */
3	/*
4	** Copyright (c) 2021 Stephan Beal (https://wanderinghorse.net/home/stephan/)
5	**
6	** This program is free software; you can redistribute it and/or
	@@ -102,11 +102,11 @@
102	if(rc){
103	free(zMem);
104	}else{
105	*zContent = zMem;
106	*nContent = fpos;
107	}
108	return rc;
109	}
110
111	/*
112	** Expects zFilename to be one of the conventional skin filename
113

Fossil SCM

Keyboard Shortcuts